release 0.3.0

Author: kikkomep

.github/workflows/docker.yaml

@@ -36,6 +36,7 @@ jobs:
           sw_version_tag=false
           if [[ "${ref_name}" == "master" || "${ref_name}" == "develop" ]]; then sw_version_tag=true; fi
           echo "ENABLE_SOFTWARE_VERSION_TAG=${sw_version_tag}" >> $GITHUB_ENV
+          cp package.json{,.orig} && jq --arg sw_ver "${sw_version}.build${{ github.run_number }}" '.version = $sw_ver' package.json.orig > package.json
 
       # Extract Docker metadata
       - name: Extract Docker metadata

README.md

@@ -16,11 +16,11 @@ site](https://crs4.github.io/life_monitor) for more information.
 
 ## Development server
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+Run `npm run start:dev` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+Run `npm build --configuration production` to build the project. The build artifacts will be stored in the `dist/` directory.
 
 ## Further help
 
@@ -35,5 +35,6 @@ To get more help on the Angular CLI use `ng help` or go check out the [Angular C
   </div>
   <img alt="EOSC-Life, CRS4, BBMRI-ERIC Logos"
        src="https://github.com/crs4/life_monitor/raw/master/docs/footer-logo.svg"
-	   width="350" align="center"/>
+	   width="350" align="center"/>wq
+
 </div>

angular.json

@@ -22,14 +22,19 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
-            "assets": ["src/favicon.ico", "src/assets"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              "src/manifest.webmanifest"
+            ],
             "styles": [
-              "./node_modules/chart.js/dist/Chart.min.css",
+              "./node_modules/primeicons/primeicons.css",
+              "./node_modules/primeng/resources/primeng.min.css",
               "./node_modules/bs-stepper/dist/css/bs-stepper.min.css",
               "./node_modules/bootstrap-select/dist/css/bootstrap-select.min.css",
               "./node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css",
               "./node_modules/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css",
+              "src/ngstyles.css",
               "src/styles.scss"
             ],
             "scripts": [
@@ -44,7 +49,23 @@
               "./node_modules/datatables.net-buttons/js/buttons.html5.min.js",
               "./node_modules/datatables.net-buttons/js/buttons.print.min.js",
               "./node_modules/datatables.net-buttons/js/buttons.colVis.min.js",
-              "./node_modules/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"
+              "./node_modules/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js",
+              "./node_modules/chart.js/dist/Chart.js",
+              "./node_modules/swiped-events/dist/swiped-events.min.js"
+            ],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true,
+            "webWorkerTsConfig": "tsconfig.worker.json",
+            "serviceWorker": true,
+            "ngswConfigPath": "ngsw-config.json",
+            "allowedCommonJsDependencies": [
+              "deep-equal",
+              "crypto-js",
+              "chart.js"
             ]
           },
           "configurations": {
@@ -74,8 +95,17 @@
                   "maximumError": "10kb"
                 }
               ]
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
-          }
+          },
+          "defaultConfiguration": "development"
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -85,8 +115,12 @@
           "configurations": {
             "production": {
               "browserTarget": "lifemonitor:build:production"
+            },
+            "development": {
+              "browserTarget": "lifemonitor:build:development"
             }
-          }
+          },
+          "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
@@ -101,9 +135,14 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "assets": ["src/favicon.ico", "src/assets"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              "src/manifest.webmanifest"
+            ],
             "styles": ["src/styles.scss"],
-            "scripts": []
+            "scripts": [],
+            "webWorkerTsConfig": "tsconfig.worker.json"
           }
         },
         "lint": {

docker/Dockerfile

@@ -16,23 +16,24 @@ RUN npm install -g @angular/cli@11.2.14 && npm ci
 COPY  . .
 
 # Build front-end for production deployments
-RUN ng build --prod
+RUN ng build --configuration production
 
 
 ##############################################################
 # target stage: serve angular app through NGINX
 ##############################################################
-FROM nginx:1.21.1
+FROM crs4/lifemonitor-web:base
 
 # comment user directive as master process is run as user in OpenShift anyhow
-RUN sed -i.bak 's/^user/#user/' /etc/nginx/nginx.conf
+# RUN sed -i.bak 's/^user/#user/' /etc/nginx/nginx.conf
 # Copy the compiled angular app from the 'frontend-build' stage
 COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
 # Copy NGINX site configuration
 COPY --from=builder /app/dist/lifemonitor /app
 
 # Fix permissions
-RUN chmod g+rwx /var/cache/nginx /var/run /var/log/nginx
+RUN mkdir -p /var/cache/nginx /var/log/nginx \
+    && chmod -R g+rwx /var/cache/nginx /var/run/ /var/log/nginx
 
 # Set the working dir
 WORKDIR /app

k8s/lifemonitor-web/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
 data:
   config.json : |-
     {
-        "apiBaseUrl": "{{ .Values.backend.apiUrl }}",
+        "apiBaseUrl": "https://{{ .Values.externalServerName }}/api",
+        "socketBaseUrl": "https://{{ .Values.externalServerName }}",
         "clientId": "{{ .Values.backend.clientId }}"
     }

k8s/lifemonitor-web/templates/deployment.yaml

@@ -30,7 +30,16 @@ spec:
           volumeMounts:
             - name: frontend-config
               mountPath: /app/assets/config.json
-              subPath: config.json
+              subPath: config.json            
+            - name: nginx-config
+              mountPath: /usr/local/openresty/nginx/conf/nginx.conf
+              subPath: nginx.conf
+            - name: nginx-config
+              mountPath: /etc/nginx/conf.d/webapp.prod.conf
+              subPath: app.conf
+            - name: logs-storage
+              mountPath: /var/log/nginx
+
           # livenessProbe:
           #   httpGet:
           #     path: /
@@ -46,6 +55,12 @@ spec:
           configMap:
             name: {{ include "lifemonitor-web.fullname" . }}-frontend-config
             defaultMode: 0644
+        - name: nginx-config
+          configMap:
+            name: {{ include "lifemonitor-web.fullname" . }}-nginx-config
+            defaultMode: 0644  
+        - name: logs-storage
+          emptyDir: {}
     {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}