New shrage version

.dockerignore

@@ -0,0 +1,10 @@
+node_modules
+.gitignore
+.git
+.vscode
+.firebase
+.editorconfig
+/node_modules
+/e2e
+*.zip
+*.md

.dockerignore.save

@@ -0,0 +1,9 @@
+dist
+node_modules
+.gitignore
+.git
+.vscodedist
+node_modules
+.gitignore
+.git
+.vscode

.editorconfig

@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

.gitignore

@@ -60,6 +60,14 @@ dist/*
 
 # dotenv environment variables file
 .env
+.env.copy
+
+# src/environments/*
 
 # next.js build output
 .next
+
+/certs
+
+*.tar.gz
+*.7z

Dockerfile

@@ -0,0 +1,26 @@
+###--- STAGE 1 - Build ---###
+FROM node:12-alpine as BUILD
+WORKDIR /usr/src/app
+COPY package*.json ./
+COPY tsconfig.json ./
+COPY .env ./
+RUN cat ./.env | grep NPM_TOKEN | cut -d '=' -f 2- > /tmp/NPM_TOKEN && \
+    export NPM_TOKEN=$(cat /tmp/NPM_TOKEN) && \
+    rm /tmp/NPM_TOKEN
+RUN echo @yesodot:registry=https://gitlab.com/api/v4/projects/29372887/packages/npm/>> .npmrc
+RUN echo //gitlab.com/api/v4/projects/29372887/packages/npm/:_authToken=$(echo $NPM_TOKEN) >> .npmrc
+RUN cat .npmrc
+RUN npm install
+COPY . .
+RUN npm run build:prod
+
+###--- STAGE 2 - Production ---###
+FROM node:12-alpine as PROD
+ENV NODE_ENV=prod
+WORKDIR /usr/src/app
+COPY --from=BUILD /usr/src/app/node_modules ./node_modules
+COPY --from=BUILD /usr/src/app/package*.json ./
+COPY --from=BUILD /usr/src/app/dist ./dist
+COPY src/certs ./usr/src/app/dist/src/certs
+ENTRYPOINT ["node", "/usr/src/app/dist/src/server.js"]
+

Dockerfile.copy

@@ -0,0 +1,19 @@
+###--- STAGE 1 - Build ---###
+FROM node:12-alpine as BUILD
+WORKDIR /usr/src/app
+COPY package*.json ./
+COPY tsconfig.json ./
+RUN npm install
+COPY . .
+RUN npm run build:dev
+
+###--- STAGE 2 - Production ---###
+FROM node:12-alpine as PROD
+ENV NODE_ENV=prod
+WORKDIR /usr/src/app
+COPY --from=BUILD /usr/src/app/node_modules ./node_modules
+COPY --from=BUILD /usr/src/app/package*.json ./
+COPY --from=BUILD /usr/src/app/dist ./dist
+COPY src/certs ./usr/src/app/dist/src/certs
+ENTRYPOINT ["node", "/usr/src/app/dist/src/server.js"]
+

Dockerfile.outside

@@ -0,0 +1,19 @@
+###--- STAGE 1 - Build ---###
+FROM node:12-alpine as BUILD
+WORKDIR /usr/src/app
+COPY package*.json ./
+COPY tsconfig.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+###--- STAGE 2 - Production ---###
+FROM node:12-alpine as PROD
+ENV NODE_ENV=prod
+WORKDIR /usr/src/app
+COPY --from=BUILD /usr/src/app/node_modules ./node_modules
+COPY --from=BUILD /usr/src/app/package*.json ./
+COPY --from=BUILD /usr/src/app/dist ./dist
+COPY src/certs ./usr/src/app/dist/src/certs
+ENTRYPOINT ["node", "/usr/src/app/dist/src/server.js"]
+

DockerfileNginx

@@ -0,0 +1,17 @@
+# Stage 1
+FROM node:10-alpine as build-step
+RUN mkdir -p /app
+WORKDIR /app
+COPY package.json /app
+RUN npm install
+RUN npm install -g typescript@3.7.5
+COPY . /app
+RUN npm run build --prod
+
+# Stage 2
+FROM nginx:1.17.1-alpine
+COPY --from=build-step /app/dist/SpikeClient /usr/share/nginx/html
+RUN mkdir -p /etc/nginx/ssl
+COPY nginx.crt /etc/nginx/ssl
+COPY nginx.key /etc/nginx/ssl
+COPY nginx.conf /etc/nginx

README.md

@@ -1,6 +1,6 @@
-# Spike Client
+# SpikeClient
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.8.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.6.
 
 ## Development server
 

angular.json

@@ -1,28 +1,30 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
+  "version": 1, 
   "newProjectRoot": "projects",
   "projects": {
-    "serverRegisterClient": {
+    "SpikeClient": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/serverRegisterClient",
+            "outputPath": "dist/SpikeClient",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
+              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "src/styles.css"
             ],
             "scripts": []
@@ -40,88 +42,86 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "serverRegisterClient:build"
+            "browserTarget": "SpikeClient:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "serverRegisterClient:build:production"
+              "browserTarget": "SpikeClient:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "serverRegisterClient:build"
+            "browserTarget": "SpikeClient:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
+              "src/styles.css"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "serverRegisterClient-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "serverRegisterClient:serve"
+            "devServerTarget": "SpikeClient:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "serverRegisterClient:serve:production"
+              "devServerTarget": "SpikeClient:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
   },
-  "defaultProject": "serverRegisterClient"
-}
+  "defaultProject": "SpikeClient"
+}

browserslist

@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.

docker-compose.yml

@@ -0,0 +1,13 @@
+version: '2.0'
+services:
+  spike-client:
+    container_name: spike-client
+    image: spikeproj/spike-client:latest
+    ports:
+      - '4200:4200' # Change it if you want
+    build: .
+    volumes:
+      - ./logs:/usr/src/app/logs
+    restart: always
+    env_file: 
+      - ./.env

e2e/protractor.conf.js

@@ -1,15 +1,19 @@
+// @ts-check
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
 const { SpecReporter } = require('jasmine-spec-reporter');
 
+/**
+ * @type { import("protractor").Config }
+ */
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
     './src/**/*.e2e-spec.ts'
   ],
   capabilities: {
-    'browserName': 'chrome'
+    browserName: 'chrome'
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
@@ -21,7 +25,7 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: require('path').join(__dirname, './tsconfig.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }

e2e/src/app.e2e-spec.ts

@@ -1,4 +1,5 @@
 import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
 
 describe('workspace-project App', () => {
   let page: AppPage;
@@ -9,6 +10,14 @@ describe('workspace-project App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to serverRegisterClient!');
+    expect(page.getTitleText()).toEqual('SpikeClient app is running!');
+  });
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
   });
 });

e2e/src/app.po.ts

@@ -1,11 +1,11 @@
 import { browser, by, element } from 'protractor';
 
 export class AppPage {
-  navigateTo() {
-    return browser.get('/');
+  navigateTo(): Promise<unknown> {
+    return browser.get(browser.baseUrl) as Promise<unknown>;
   }
 
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+  getTitleText(): Promise<string> {
+    return element(by.css('app-root .content span')).getText() as Promise<string>;
   }
 }