Merge pull request #650 from deckgo/shapes-assets-public-deployment

feat: allow access to shapes (assets) to all DeckDeckGo clients

Author: peterpeterparker

studio/firebase.json

@@ -1,38 +1,50 @@
 {
   "hosting": {
     "public": "www",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ],
+    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
     "rewrites": [
       {
         "source": "**",
         "destination": "/index.html"
       }
     ],
-    "headers": [{
-      "source" : "sw.js",
-      "headers" : [{
-        "key" : "Cache-Control",
-        "value" : "public,max-age=0,must-revalidate"
-      }]
-    },{
-      "source" : "/",
-      "headers" : [{
-        "key" : "Cache-Control",
-        "value" : "public,max-age=0,must-revalidate"
-      }]
-    },
-    {
-      "source": "assets/icons/**/*",
-      "headers": [
-        {
-          "key": "Access-Control-Allow-Origin",
-          "value": "*"
-        }
-      ]
-    }]
+    "headers": [
+      {
+        "source": "sw.js",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "public,max-age=0,must-revalidate"
+          }
+        ]
+      },
+      {
+        "source": "/",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "public,max-age=0,must-revalidate"
+          }
+        ]
+      },
+      {
+        "source": "assets/icons/**/*",
+        "headers": [
+          {
+            "key": "Access-Control-Allow-Origin",
+            "value": "*"
+          }
+        ]
+      },
+      {
+        "source": "assets/img/shapes/*",
+        "headers": [
+          {
+            "key": "Access-Control-Allow-Origin",
+            "value": "*"
+          }
+        ]
+      }
+    ]
   }
 }

studio/src/app/popovers/editor/app-create-slide/app-create-slide.tsx

@@ -14,6 +14,7 @@ import {EnvironmentConfigService} from '../../../services/core/environment/envir
 import {UserService} from '../../../services/data/user/user.service';
 import {AnonymousService} from '../../../services/editor/anonymous/anonymous.service';
 import {DeckEditorService} from '../../../services/editor/deck/deck-editor.service';
+import {EnvironmentDeckDeckGoConfig} from '../../../services/core/environment/environment-config';
 
 @Component({
   tag: 'app-create-slide',
@@ -38,6 +39,8 @@ export class AppCreateSlide {
 
   private timerSubscription: Subscription;
 
+  private config: EnvironmentDeckDeckGoConfig = EnvironmentConfigService.getInstance().get('deckdeckgo');
+
   constructor() {
     this.userService = UserService.getInstance();
     this.anonymousService = AnonymousService.getInstance();
@@ -461,20 +464,24 @@ export class AppCreateSlide {
     );
   }
 
-  // TODO: Assets path
-
   private renderShapes() {
     return (
       <div class="item" custom-tappable onClick={() => this.addSlide(SlideTemplate['ASPECT-RATIO'])}>
         <deckgo-slide-aspect-ratio class="showcase" grid={true}>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/robot-solid.svg" aria-label="Robot" class="robot"></deckgo-lazy-img>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/desktop-solid.svg" aria-label="Desktop" class="desktop"></deckgo-lazy-img>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/arrow-right-solid.svg" aria-label="Arrow" class="arrow-start"></deckgo-lazy-img>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/cloud-solid.svg" aria-label="Cloud" class="cloud"></deckgo-lazy-img>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/arrow-right-solid.svg" aria-label="Arrow" class="arrow-end-top"></deckgo-lazy-img>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/arrow-right-solid.svg" aria-label="Arrow" class="arrow-end-bottom"></deckgo-lazy-img>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/database-solid.svg" aria-label="Database" class="database"></deckgo-lazy-img>
-          <deckgo-lazy-img svg-src="/assets/img/shapes/envelope-solid.svg" aria-label="Envelope" class="envelope"></deckgo-lazy-img>
+          <deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/robot-solid.svg`} aria-label="Robot" class="robot"></deckgo-lazy-img>
+          <deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/desktop-solid.svg`} aria-label="Desktop" class="desktop"></deckgo-lazy-img>
+          <deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/arrow-right-solid.svg`} aria-label="Arrow" class="arrow-start"></deckgo-lazy-img>
+          <deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/cloud-solid.svg`} aria-label="Cloud" class="cloud"></deckgo-lazy-img>
+          <deckgo-lazy-img
+            svg-src={`${this.config.globalAssetsUrl}/img/shapes/arrow-right-solid.svg`}
+            aria-label="Arrow"
+            class="arrow-end-top"></deckgo-lazy-img>
+          <deckgo-lazy-img
+            svg-src={`${this.config.globalAssetsUrl}/img/shapes/arrow-right-solid.svg`}
+            aria-label="Arrow"
+            class="arrow-end-bottom"></deckgo-lazy-img>
+          <deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/database-solid.svg`} aria-label="Database" class="database"></deckgo-lazy-img>
+          <deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/envelope-solid.svg`} aria-label="Envelope" class="envelope"></deckgo-lazy-img>
         </deckgo-slide-aspect-ratio>
       </div>
     );