Fixed to work on docker

ridweng · ridweng · commit fd136ab35198 · 2022-03-31T16:32:14.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,6 @@
+client
+node_modules/**
+.key.scrt
+.scrt.env
+Dockerfile
+.editorconfig
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,8 @@
+FROM alpine
+RUN apk add --update nodejs npm
+WORKDIR /usr/src/app
+COPY package*.json ./
+RUN npm ci --only=production
+COPY . .
+EXPOSE 3300
+CMD ["npm", "start"]
diff --git a/buildFrontEnd.sh b/buildFrontEnd.sh
@@ -0,0 +1,3 @@
+cd client
+ng build --optimization=true --aot=true --build-optimizer=true --configuration=production --output-hashing none &&
+docker build -t $1 .
diff --git a/client/src/app/pages/dashboard/dashboard.component.ts b/client/src/app/pages/dashboard/dashboard.component.ts
@@ -20,7 +20,7 @@ export class DashboardComponent implements OnInit {
     private windowService: NbWindowService,
     public datepipe: DatePipe
   ) { }
-  source: any = new LocalDataSource();
+  source = new LocalDataSource();
 
   show: boolean = false;
 
@@ -31,10 +31,13 @@ export class DashboardComponent implements OnInit {
   getSerials(){
     this.face.getSerials().subscribe(
       res => {
-        this.source = res['data']
-        for(const data of this.source){
-          data.expiracy = this.datepipe.transform(data.expiracy, 'MMM dd, yyyy');
+        let dataTable = res['data']
+        for(const data of dataTable){
+          if(data.expiracy != 'Unlimited'){
+            data.expiracy = this.datepipe.transform(data.expiracy, 'MMM dd, yyyy');
+          }
         }
+        this.source.load(dataTable)
       },
       err => console.error(err)
     )
diff --git a/client/src/environments/environment.prod.ts b/client/src/environments/environment.prod.ts
@@ -6,4 +6,5 @@
 export const environment = {
   api: '/api',
   production: true,
+  SERIAL: 'th1s_isTh3+_secrt-4-encrypt10n(S3rVe85Ide)'
 };
diff --git a/client/src/index.html b/client/src/index.html
@@ -7,9 +7,9 @@
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="shortcut icon" href="/api/pictures/favicon1.ico">
-  <link rel="icon" type="image/png" href="/api/pictures/favicon1.png">
-  <link rel="icon" type="image/x-icon" href="/api/pictures/favicon1.ico">
+  <link rel="shortcut icon" href="./assets/favicon1.ico">
+  <link rel="icon" type="image/png" href="./assets/favicon1.png">
+  <link rel="icon" type="image/x-icon" href="./assets/favicon1.ico">
 </head>
 <body>
   <ngx-app>Loading...</ngx-app>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '3'
+
+services:
+  serial-server:
+    network_mode: host
+    image: graymatics1/serial-back-end:1.0.2
+    restart: always
+    volumes:
+      - /home/alex/Desktop/office/system/.scrt.env:/usr/src/app/.scrt.env
+
+  serial-ui:
+    image: graymatics1/serial-front-end:1.0.4
+    restart: always
+    ports:
+      - 80:80
+    volumes:
+      - /home/alex/Desktop/office/system/nginx.conf:/etc/nginx/conf.d/default.conf
diff --git a/nginx.conf b/nginx.conf
@@ -0,0 +1,19 @@
+server {
+    listen 80;
+    server_name localhost;
+    root /usr/share/nginx/html;
+    index index.html;
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /api {
+        proxy_pass http://172.19.0.1:3000;
+        client_max_body_size 1G;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serial-server",
-  "version": "0.0.2",
+  "version": "1.0.1",
   "private": true,
   "author": "Alex Ignacio Kaiser",
   "scripts": {
diff --git a/src/bin/www b/src/bin/www
@@ -43,8 +43,6 @@ server.listen(port);
 server.on('error', onError);
 server.on('listening', onListening);
 
-decide()
-
 /**
  * Normalize a port into a number, string, or false.
  */
diff --git a/src/controllers/serial.controllers.js b/src/controllers/serial.controllers.js
@@ -110,7 +110,7 @@ exports.create = async (req,res) => {
         // data.expiry = data.expiry.getDate()+'-'+(data.expiry.getMonth()+1)+'-'+data.expiry.getFullYear();
     }
     console.log('Successfull login: Creating new serial key.')
-    Serial.create({
+    await Serial.create({
         serial: serial,
         owner: data.owner,
         expiracy: data.expiry

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+cd client`
	`2`	`+ng build --optimization=true --aot=true --build-optimizer=true --configuration=production --output-hashing none &&`
	`3`	`+docker build -t $1 .`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "serial-server",`
`3`		`- "version": "0.0.2",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"author": "Alex Ignacio Kaiser",`
`6`	`6`	`"scripts": {`