Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 4ce0aa1

Browse files
feat: allow access to shapes (assets) to all DeckDeckGo clients
Signed-off-by: peterpeterparker <[email protected]>
1 parent 7cd2904 commit 4ce0aa1

File tree

5 files changed

+170
-148
lines changed

5 files changed

+170
-148
lines changed

studio/firebase.json

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,50 @@
11
{
22
"hosting": {
33
"public": "www",
4-
"ignore": [
5-
"firebase.json",
6-
"**/.*",
7-
"**/node_modules/**"
8-
],
4+
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
95
"rewrites": [
106
{
117
"source": "**",
128
"destination": "/index.html"
139
}
1410
],
15-
"headers": [{
16-
"source" : "sw.js",
17-
"headers" : [{
18-
"key" : "Cache-Control",
19-
"value" : "public,max-age=0,must-revalidate"
20-
}]
21-
},{
22-
"source" : "/",
23-
"headers" : [{
24-
"key" : "Cache-Control",
25-
"value" : "public,max-age=0,must-revalidate"
26-
}]
27-
},
28-
{
29-
"source": "assets/icons/**/*",
30-
"headers": [
31-
{
32-
"key": "Access-Control-Allow-Origin",
33-
"value": "*"
34-
}
35-
]
36-
}]
11+
"headers": [
12+
{
13+
"source": "sw.js",
14+
"headers": [
15+
{
16+
"key": "Cache-Control",
17+
"value": "public,max-age=0,must-revalidate"
18+
}
19+
]
20+
},
21+
{
22+
"source": "/",
23+
"headers": [
24+
{
25+
"key": "Cache-Control",
26+
"value": "public,max-age=0,must-revalidate"
27+
}
28+
]
29+
},
30+
{
31+
"source": "assets/icons/**/*",
32+
"headers": [
33+
{
34+
"key": "Access-Control-Allow-Origin",
35+
"value": "*"
36+
}
37+
]
38+
},
39+
{
40+
"source": "assets/img/shapes/*",
41+
"headers": [
42+
{
43+
"key": "Access-Control-Allow-Origin",
44+
"value": "*"
45+
}
46+
]
47+
}
48+
]
3749
}
3850
}

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {EnvironmentConfigService} from '../../../services/core/environment/envir
1414
import {UserService} from '../../../services/data/user/user.service';
1515
import {AnonymousService} from '../../../services/editor/anonymous/anonymous.service';
1616
import {DeckEditorService} from '../../../services/editor/deck/deck-editor.service';
17+
import {EnvironmentDeckDeckGoConfig} from '../../../services/core/environment/environment-config';
1718

1819
@Component({
1920
tag: 'app-create-slide',
@@ -38,6 +39,8 @@ export class AppCreateSlide {
3839

3940
private timerSubscription: Subscription;
4041

42+
private config: EnvironmentDeckDeckGoConfig = EnvironmentConfigService.getInstance().get('deckdeckgo');
43+
4144
constructor() {
4245
this.userService = UserService.getInstance();
4346
this.anonymousService = AnonymousService.getInstance();
@@ -461,20 +464,24 @@ export class AppCreateSlide {
461464
);
462465
}
463466

464-
// TODO: Assets path
465-
466467
private renderShapes() {
467468
return (
468469
<div class="item" custom-tappable onClick={() => this.addSlide(SlideTemplate['ASPECT-RATIO'])}>
469470
<deckgo-slide-aspect-ratio class="showcase" grid={true}>
470-
<deckgo-lazy-img svg-src="/assets/img/shapes/robot-solid.svg" aria-label="Robot" class="robot"></deckgo-lazy-img>
471-
<deckgo-lazy-img svg-src="/assets/img/shapes/desktop-solid.svg" aria-label="Desktop" class="desktop"></deckgo-lazy-img>
472-
<deckgo-lazy-img svg-src="/assets/img/shapes/arrow-right-solid.svg" aria-label="Arrow" class="arrow-start"></deckgo-lazy-img>
473-
<deckgo-lazy-img svg-src="/assets/img/shapes/cloud-solid.svg" aria-label="Cloud" class="cloud"></deckgo-lazy-img>
474-
<deckgo-lazy-img svg-src="/assets/img/shapes/arrow-right-solid.svg" aria-label="Arrow" class="arrow-end-top"></deckgo-lazy-img>
475-
<deckgo-lazy-img svg-src="/assets/img/shapes/arrow-right-solid.svg" aria-label="Arrow" class="arrow-end-bottom"></deckgo-lazy-img>
476-
<deckgo-lazy-img svg-src="/assets/img/shapes/database-solid.svg" aria-label="Database" class="database"></deckgo-lazy-img>
477-
<deckgo-lazy-img svg-src="/assets/img/shapes/envelope-solid.svg" aria-label="Envelope" class="envelope"></deckgo-lazy-img>
471+
<deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/robot-solid.svg`} aria-label="Robot" class="robot"></deckgo-lazy-img>
472+
<deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/desktop-solid.svg`} aria-label="Desktop" class="desktop"></deckgo-lazy-img>
473+
<deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/arrow-right-solid.svg`} aria-label="Arrow" class="arrow-start"></deckgo-lazy-img>
474+
<deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/cloud-solid.svg`} aria-label="Cloud" class="cloud"></deckgo-lazy-img>
475+
<deckgo-lazy-img
476+
svg-src={`${this.config.globalAssetsUrl}/img/shapes/arrow-right-solid.svg`}
477+
aria-label="Arrow"
478+
class="arrow-end-top"></deckgo-lazy-img>
479+
<deckgo-lazy-img
480+
svg-src={`${this.config.globalAssetsUrl}/img/shapes/arrow-right-solid.svg`}
481+
aria-label="Arrow"
482+
class="arrow-end-bottom"></deckgo-lazy-img>
483+
<deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/database-solid.svg`} aria-label="Database" class="database"></deckgo-lazy-img>
484+
<deckgo-lazy-img svg-src={`${this.config.globalAssetsUrl}/img/shapes/envelope-solid.svg`} aria-label="Envelope" class="envelope"></deckgo-lazy-img>
478485
</deckgo-slide-aspect-ratio>
479486
</div>
480487
);

0 commit comments

Comments
 (0)