added firebase hosting for spacebook

Citolab · Jun 19, 2023 · 22b1dc2 · 22b1dc2
1 parent 00d8d49
commit 22b1dc2
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 release/
 backend/Diggel.Backend/appsettings.local.json
 frontend/tools/android-app/key/diggel.jks
+frontend/.firebase/hosting.ZGlzdC9hcHBzL3NwYWNlYm9vaw.cache
diff --git a/frontend/.firebaserc b/frontend/.firebaserc
@@ -0,0 +1,15 @@
+{
+  "projects": {
+    "default": "citolab-qti",
+    "spacebook": "citolab-qti"
+  },
+  "targets": {
+    "citolab-qti": {
+      "hosting": {
+        "spacebook": [
+          "citolab-spacebook"
+        ]
+      }
+    }
+  }
+}
diff --git a/frontend/angular.json b/frontend/angular.json
@@ -346,6 +346,33 @@
                 }
               ]
             },
+            "production-nobackend": {
+              "fileReplacements": [
+                {
+                  "replace": "environments/environment.ts",
+                  "with": "environments/environment.prod.nobackend.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
+            },
             "localprod": {
               "fileReplacements": [
                 {

diff --git a/frontend/apps/spacebook/src/app/app.component.html b/frontend/apps/spacebook/src/app/app.component.html
@@ -4,9 +4,9 @@
   style="bottom: 5px; left: 5px; z-index: 1000"
 >
   <div class="d-flex">
-    <span *ngIf="!userService.useBackend" class="badge badge-danger m-2"
+    <!-- <span *ngIf="!userService.useBackend" class="badge badge-danger m-2"
       >No backend</span
-    >
+    > -->
     <span
       style="z-index: 1000; cursor: pointer"
       (click)="setLang('en')"
@@ -26,7 +26,7 @@
     </span>
   </div>
 </div>
-<div
+<!-- <div
   *ngIf="allowNavigation"
   class="position-fixed"
   style="top: 12px; right: 50vw; z-index: 10000"
@@ -57,5 +57,5 @@
       </button>
     </div>
   </div>
-</div>
+</div> -->
 <router-outlet></router-outlet>
diff --git a/frontend/apps/spacetalk/src/app/startPage/start.page.ts b/frontend/apps/spacetalk/src/app/startPage/start.page.ts
@@ -11,7 +11,7 @@ export class StartPageComponent
   extends BaseStartPageComponent
   implements OnInit {
   ngOnInit() {
-    this.welcomeMessage = `Ik moet een spreekbeurt maken over Bolivia met het programma
+    this.welcomeMessage = `Ik moet een spreekbeurt maken over de Tweede Wereldoorlog met het programma
       SpaceTalk. Ik heb dit nog niet zo vaak gedaan. Kun jij me helpen? `;
     this.firstItem = itemDefinitions[0];
     super.ngOnInit();

diff --git a/frontend/environments/environment.prod.nobackend.ts b/frontend/environments/environment.prod.nobackend.ts
@@ -0,0 +1,7 @@
+export const environment = {
+  production: true,
+  apibase: 'https://diggel.azurewebsites.net/', // value will be reduced to / if its serve on save url
+  useBackend: false,
+  updateUrl:
+    'https://diggel.azurewebsites.net/remote_server_apk/version.xml',
+};
diff --git a/frontend/firebase.json b/frontend/firebase.json
@@ -0,0 +1,22 @@
+{
+  "hosting": [
+    {
+      "target": "spacebook",
+      "public": "dist/apps/spacebook",
+      "predeploy": [
+        "nx build spacebook --configuration=production-nobackend"
+      ],
+      "ignore": [
+        "firebase.json",
+        "**/.*",
+        "**/node_modules/**"
+      ],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ]
+    }
+  ]
+}
diff --git a/frontend/libs/data/src/lib/translations/translations-nl.ts b/frontend/libs/data/src/lib/translations/translations-nl.ts
@@ -26,7 +26,7 @@ export const translations = {...en,
     DIGGEL_NEXT_SESSION: `Klik op verder om de volgende opdracht te starten`,
     DIGGEL_END: `Dit is het eind van de toets. Bedankt voor het meedoen!`,
     DIGGEL_NOT_ANSWERED: '<span class="h5">😱</span> Je hebt mijn vraag nog niet helemaal beantwoord.',
-    DIGGEL_REGISTRATION_NOT_ANSWERED: '<span class="h5">😱</span> The registration is not yet completed.',
+    DIGGEL_REGISTRATION_NOT_ANSWERED: '<span class="h5">😱</span> Je bent nog niet helemaal klaar met registreren.',
     DIGGEL_NEXT_ITEM: 'Ok, dan gaan we verder!',
     DIGGEL_HELP: `Ik ga je helpen`,
     DIGGEL_WELCOME: `

diff --git a/frontend/libs/ui/src/lib/components/base-end.component.ts b/frontend/libs/ui/src/lib/components/base-end.component.ts
@@ -27,7 +27,7 @@ export abstract class BaseEndPageComponent implements OnInit, OnDestroy {
     protected translate: TranslateService
   ) {
     toastr.clear();
-    this.textSessionReady = translate.instant('SPACEBOOK_END_THANKS`,');
+    this.textSessionReady = translate.instant('SPACEBOOK_END_THANKS');
   }
   ngOnDestroy(): void {
     if (this.endSubscription) {

diff --git a/frontend/package.json b/frontend/package.json
@@ -34,6 +34,7 @@
     "build:spacegram:prod:cordova": "ng build spacegram --delete-output-path --prod --base-href . --output-path tools/android-app/www/spacegram",
     "build:webspace:prod:cordova": "ng build webspace --delete-output-path --prod --base-href . --output-path tools/android-app/www/webspace",
     "build:spacetalk:prod:cordova": "ng build spacetalk --delete-output-path --prod --base-href . --output-path tools/android-app/www/spacetalk",
+    "deploy:diggel:nobackend": "firebase use citolab-qti && firebase deploy --only hosting:spacebook",
     "apk:build": "npm run build:prod:cordova && npm run --prefix tools/android-app apk:build",
     "apk:nobuild": "npm run --prefix tools/android-app apk:build",
     "lint": "nx workspace-lint && ng lint diggel && ng lint spacebook && ng lint spacegram && ng lint webspace && ng lint spacetalk && ng lint data && ng lint ui",