Merge branch 'main' into main

Author: esoadamo

.github/workflows/deploy-ahlava.yml

@@ -1,10 +1,10 @@
-name: deploy-kyzikos
+name: deploy-prod
 on:
   push:
     branches:
-      - 'dev-kyzikos'
+      - 'prod'
 jobs:
-  deploy-kyzikos:
+  deploy-prod:
     runs-on: ubuntu-latest
     steps:
       - run: mkdir src
@@ -19,7 +19,7 @@ jobs:
         run: |
           cd src &&
           npm install &&
-          npm run build.kyzikos &&
+          npm run build.prod &&
           cd dist/web-frontend-angular/cs/ &&
           cp -r ../cgi-bin cgi-bin &&
           tar -cvf ../../dist.tar *
@@ -48,7 +48,7 @@ jobs:
         shell: bash
         run: |
           echo "Asset URL: ${{ steps.upload_tar.outputs.browser_download_url }}"
-          status="$(curl -X POST -u '${{ secrets.KYZIKOS_DEPLOY_USER }}:${{ secrets.KYZIKOS_DEPLOY_PASSWORD }}' -d '${{ steps.upload_tar.outputs.browser_download_url }}' '${{ secrets.KYZIKOS_DEPLOY_URL }}')"
+          status="$(curl -X POST -u '${{ secrets.PROD_DEPLOY_USER }}:${{ secrets.PROD_DEPLOY_PASSWORD }}' -d '${{ steps.upload_tar.outputs.browser_download_url }}' '${{ secrets.PROD_DEPLOY_URL }}')"
           if [ "$status" = "OK" ]; then
             echo "Notified OK!"
           else

.github/workflows/deploy-kleobis.yml

@@ -48,31 +48,6 @@
             "ngswConfigPath": "ngsw-config.json"
           },
           "configurations": {
-            "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                },
-                {
-                  "replace": "src/routes/routes.ts",
-                  "with": "src/routes/routes.cs.ts"
-                }
-              ],
-              "outputHashing": "all"
-            },
             "pubdev": {
               "buildOptimizer": false,
               "optimization": false,
@@ -91,26 +66,7 @@
                 }
               ]
             },
-            "kyzikos": {
-              "buildOptimizer": true,
-              "optimization": true,
-              "vendorChunk": true,
-              "extractLicenses": false,
-              "sourceMap": false,
-              "namedChunks": true,
-              "baseHref": "/",
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.kyzikos.ts"
-                },
-                {
-                  "replace": "src/routes/routes.ts",
-                  "with": "src/routes/routes.cs.ts"
-                }
-              ]
-            },
-            "kleobis": {
+            "production": {
               "buildOptimizer": true,
               "optimization": true,
               "vendorChunk": true,
@@ -121,7 +77,7 @@
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.kleobis.ts"
+                  "with": "src/environments/environment.prod.ts"
                 },
                 {
                   "replace": "src/routes/routes.ts",

.github/workflows/deploy-kyzikos.yml renamed to .github/workflows/deploy-prod.yml

@@ -8,8 +8,7 @@
     "start": "ng serve",
     "build": "npm run gen.changelog && ng build",
     "build.pubdev": "npm run gen.changelog && ng build --configuration pubdev",
-    "build.kyzikos": "npm run gen.changelog && ng build --configuration kyzikos && cp -r src/cgi-bin/ dist/web-frontend-angular/cgi-bin/",
-    "build.kleobis": "npm run gen.changelog && ng build --configuration kleobis && cp src/matomo/kleobis.js dist/web-frontend-angular/*/assets/scripts/matomo.js && cp -r src/cgi-bin/ dist/web-frontend-angular/cgi-bin/",
+    "build.prod": "npm run gen.changelog && ng build --configuration production && cp src/matomo/prod.js dist/web-frontend-angular/*/assets/scripts/matomo.js && cp -r src/cgi-bin/ dist/web-frontend-angular/cgi-bin/",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
     "gen.theme": "util/gen-scss-theme.sh",