Merge branch 'dev'

Author: hauke96

.gitignore

@@ -13,6 +13,10 @@ server/database/.tmp.*
 
 # Docker stuff
 postgres-data
+.env
 
 # Backups
-*.sql.gz
+*.sql.gz
+
+# Example files
+example*

build.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Exit on errors
+set -e
+
+# First parameter must be tag name
+if [ -z $1 ]
+then
+  echo "ERROR: Specify tag name."
+  echo
+  echo "Example:"
+  echo
+  echo "    $(basename $0) \"0.8.0-dev\""
+  exit 1
+fi
+TAG=$1
+
+function ok {
+  echo
+  echo "OK"
+}
+
+function hline {
+  echo
+  printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' =
+  echo " $1"
+  printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' =
+  echo
+}
+
+hline "[1/4] Build server"
+docker build -t simpletaskmanager/stm-server:$TAG server
+ok
+
+hline "[2/4] Build Client"
+echo "This step might take a while..."
+echo
+docker build -t simpletaskmanager/stm-client:$TAG client
+ok
+
+hline "[3/4] Push server"
+docker push simpletaskmanager/stm-server:$TAG
+ok
+
+hline "[4/4] Push client"
+docker push simpletaskmanager/stm-client:$TAG
+ok
+
+echo
+printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' =
+echo
+echo "DONE"

client/Dockerfile

@@ -1,28 +1,20 @@
-## Stage 1 : Install dependencies
-FROM node:15.7.0 as builder
+# Stage 1: Buil
+FROM node:16-alpine AS builder
 
-RUN mkdir /stm-client
+COPY . /stm-client
 WORKDIR /stm-client/
 
 COPY package.json /stm-client/package.json
 COPY package-lock.json /stm-client/package-lock.json
 
 RUN npm install
 
+RUN NODE_OPTIONS="--max_old_space_size=4096" npm run build
 
-
-## STAGE 2 : Build the client
-COPY ./ ./
-RUN NODE_OPTIONS="--max_old_space_size=4096" npm run build-prod
-
-
-
-## STAGE 3 : Configure nginx and run client
-FROM nginx:1.19.6
-
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+# Stage 2: Run
+FROM nginx:1.21.1-alpine
 
 RUN rm -rf /usr/share/nginx/html/*
-COPY --from=builder ./stm-client/dist/simple-task-manager /usr/share/nginx/html
+COPY --from=builder /stm-client/dist/simple-task-manager /usr/share/nginx/html
 
-CMD [ "nginx", "-g", "daemon off;" ]
+ENTRYPOINT nginx -g 'daemon off;'

client/Dockerfile-test

@@ -91,7 +91,7 @@ UIが更新され、source messages.xlfが変更されたら、ステップ3 - 6
 
 ```json
   "projects": {
-    "simple-task-manager": {
+    "simple-task-dashboard": {
       "i18n": {
         "sourceLocale": "en-US",
         "locales": {
@@ -122,15 +122,15 @@ UIが更新され、source messages.xlfが変更されたら、ステップ3 - 6
         "serve": {
           "configurations": {
             "production": {
-              "browserTarget": "simple-task-manager:build:production"
+              "browserTarget": "simple-task-dashboard:build:production"
             },
             "ja": {
-              "browserTarget": "simple-task-manager:build:ja"
+              "browserTarget": "simple-task-dashboard:build:ja"
             },
             "de": {
-              "browserTarget": "simple-task-manager:build:de"
+              "browserTarget": "simple-task-dashboard:build:de"
             },
             "<langID>": {
-              "browserTarget": "simple-task-manager:build:<langID>"
+              "browserTarget": "simple-task-dashboard:build:<langID>"
             }
 ```

client/README.ja.md

@@ -53,7 +53,8 @@ See the [development README](../doc/development/README.md) for details.
 
 # Configuration
 
-Currently the client has a very simple dev- and prod-configuration in `client/src/environments`.
+The client has a dev-, local- and prod-configuration in `client/src/environments`.
+The dev-environment is the default one, the local-environment uses a locally hosted authentication server and the prod-environment is used for deployment on a server. 
 
 Encryption (HTTPS) and HTTP-Server configs depend on the used HTTP-Server (Apache-HTTP, nginx, ...), so take a look at their documentation or at the `./client/nginx.conf` for my nginx config used in the `stm-client` docker container.
 
@@ -97,7 +98,7 @@ To tell the Angular-compiler about the new language, add the following three par
 
 ```json
   "projects": {
-    "simple-task-manager": {
+    "simple-task-dashboard": {
       "i18n": {
         "sourceLocale": "en-US",
         "locales": {
@@ -128,15 +129,15 @@ To tell the Angular-compiler about the new language, add the following three par
         "serve": {
           "configurations": {
             "production": {
-              "browserTarget": "simple-task-manager:build:production"
+              "browserTarget": "simple-task-dashboard:build:production"
             },
             "ja": {
-              "browserTarget": "simple-task-manager:build:ja"
+              "browserTarget": "simple-task-dashboard:build:ja"
             },
             "de": {
-              "browserTarget": "simple-task-manager:build:de"
+              "browserTarget": "simple-task-dashboard:build:de"
             },
             "<langID>": {
-              "browserTarget": "simple-task-manager:build:<langID>"
+              "browserTarget": "simple-task-dashboard:build:<langID>"
             }
 ```

client/README.md

@@ -122,34 +122,7 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "10kb",
-                  "maximumError": "15kb"
-                }
-              ]
-            },
-            "test": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.test.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": false,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "12mb",
-                  "maximumError": "15mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "9kb",
+                  "maximumWarning": "12kb",
                   "maximumError": "15kb"
                 }
               ]
@@ -166,9 +139,6 @@
             "local": {
               "browserTarget": "simple-task-manager:build:local"
             },
-            "test": {
-              "browserTarget": "simple-task-manager:build:test"
-            },
             "production": {
               "browserTarget": "simple-task-manager:build:production"
             },
@@ -219,25 +189,12 @@
           "options": {
             "tsConfig": [
               "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
+              "tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        },
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "simple-task-manager:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "simple-task-manager:serve:production"
-            }
-          }
         }
       }
     }

client/angular.json

@@ -1,7 +1,7 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
+// Karma configuration
+// Generated on Fri Oct 01 2021 23:14:14 GMT+0200 (Mitteleuropäische Sommerzeit)
 
-module.exports = function (config) {
+module.exports = function(config) {
   config.set({
     basePath: '',
     frameworks: ['jasmine', '@angular-devkit/build-angular'],
@@ -13,11 +13,13 @@ module.exports = function (config) {
       require('karma-coverage'),
       require('@angular-devkit/build-angular/plugins/karma')
     ],
-    client: {
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
+    files: [
+      './**/*.spec.ts'
+    ],
+    exclude: [ ],
+    preprocessors: { },
     coverageReporter: {
-      dir: require('path').join(__dirname, './coverage/simple-task-manager'),
+      dir: require('path').join(__dirname, './coverage/simple-task-dashboard'),
       reporters: [
         { type: 'html', subdir: 'report-html' },
         { type: 'lcov', subdir: 'report-lcov' },
@@ -27,17 +29,24 @@ module.exports = function (config) {
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
-    logLevel: config.LOG_DEBUG,
+    logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['ChromeHeadlessNoSandbox', 'FirefoxHeadless'],
-	customLaunchers: {
-        ChromeHeadlessNoSandbox: {
-            base: 'ChromeHeadless',
-            flags: ['--no-sandbox']
-        }
+    browsers: ['HeadlessFirefox'],
+    customLaunchers: {
+      ChromeHeadlessNoSandbox: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox']
+      },
+      HeadlessFirefox: {
+        base: 'FirefoxHeadless',
+        flags: [
+          '-headless',
+        ],
+      }
     },
     singleRun: false,
     restartOnFileChange: true,
-    browserNoActivityTimeout: 900 * 1000 // 15 min.
-  });
-};
+    browserNoActivityTimeout: 900 * 1000, // 15 min.
+    concurrency: Infinity,
+  })
+}