From 2609d8cf259f393bc04eeef1418ee0cff33c8e14 Mon Sep 17 00:00:00 2001
From: Jeremy Likness <jeremy@jeremylikness.com>
Date: Wed, 29 Jan 2020 13:54:59 -0800
Subject: [PATCH] updates for relative url

---
 .github/workflows/main.yml      |  6 +++--
 index.html                      | 44 ++++++++++++++++-----------------
 manifest.json                   | 12 ++++-----
 slides/001-title.html           |  2 +-
 slides/020-angular-project.html |  2 +-
 slides/030-impact1.html         |  2 +-
 slides/040-impact2.html         |  2 +-
 slides/050-cost.html            |  2 +-
 slides/060-ng-conf1.html        |  2 +-
 slides/070-ng-conf2.html        |  2 +-
 slides/090-embrace.html         |  2 +-
 11 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9a23c08..1ad3f1a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,7 +50,9 @@ jobs:
           path: ${{ env.OUTPUT_PATH }}
 
       - name: Fix Base URL
-        run: sed -i "s/base href=\"\/\"/base href=\"\/vanillajs\/\"/g" ${{ env.OUTPUT_PATH }}index.html
-         
+        run: |
+          sed -i "s/base href=\"\/\"/base href=\"\/vanillajs\/\"/g" ${{ env.OUTPUT_PATH }}index.html
+          sed -i "s/scope: \'\/\'/scope: \'\/vanillajs/\'/g" ${{ env.OUTPUT_PATH }}index.html
+
       - name: Deploy to Azure Storage
         run: az storage blob upload-batch --source ${{ env.OUTPUT_PATH }} --destination \$web/vanillajs --account-name ${STORAGE_NAME}
diff --git a/index.html b/index.html
index b77e885..b6fb12e 100644
--- a/index.html
+++ b/index.html
@@ -9,29 +9,29 @@
     <meta name="description" content="DevNexus presentation Vanilla.js: Modern 1st Party JavaScript">
     <meta name="theme-color" content="#FFFFFF" />
     <meta http-equiv="Content-Security-Policy"
-        content="default-src 'self'; script-src 'self' 'unsafe-eval' 'sha256-TJ4T4ywZLNJftBZ/C40uficokKH5JwSWtCX5PNccNbI='; child-src 'self'; connect-src 'self'; font-src 'self'; frame-src 'self'; img-src 'self'; media-src 'self'; object-src 'none'; style-src 'self';">
-    <link rel="manifest" href="/manifest.json" />
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link rel="apple-touch-icon" sizes="57x57" href="/appicons/apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="/appicons/apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon" sizes="72x72" href="/appicons/apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="/appicons/apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon" sizes="60x60" href="/appicons/apple-touch-icon-60x60.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="/appicons/apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="76x76" href="/appicons/apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="/appicons/apple-touch-icon-152x152.png" />
-    <link rel="icon" type="image/png" href="/appicons/favicon-196x196.png" sizes="196x196" />
-    <link rel="icon" type="image/png" href="/appicons/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/png" href="/appicons/favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="/appicons/favicon-16x16.png" sizes="16x16" />
-    <link rel="icon" type="image/png" href="/appicons/favicon-128.png" sizes="128x128" />
+        content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; child-src 'self'; connect-src 'self'; font-src 'self'; frame-src 'self'; img-src 'self'; media-src 'self'; object-src 'none'; style-src 'self';">
+    <link rel="manifest" href="./manifest.json" />
+    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+    <link rel="apple-touch-icon" sizes="57x57" href="./appicons/apple-touch-icon-57x57.png" />
+    <link rel="apple-touch-icon" sizes="114x114" href="./appicons/apple-touch-icon-114x114.png" />
+    <link rel="apple-touch-icon" sizes="72x72" href="./appicons/apple-touch-icon-72x72.png" />
+    <link rel="apple-touch-icon" sizes="144x144" href="./appicons/apple-touch-icon-144x144.png" />
+    <link rel="apple-touch-icon" sizes="60x60" href="./appicons/apple-touch-icon-60x60.png" />
+    <link rel="apple-touch-icon" sizes="120x120" href="./appicons/apple-touch-icon-120x120.png" />
+    <link rel="apple-touch-icon" sizes="76x76" href="./appicons/apple-touch-icon-76x76.png" />
+    <link rel="apple-touch-icon" sizes="152x152" href="./appicons/apple-touch-icon-152x152.png" />
+    <link rel="icon" type="image/png" href="./appicons/favicon-196x196.png" sizes="196x196" />
+    <link rel="icon" type="image/png" href="./appicons/favicon-96x96.png" sizes="96x96" />
+    <link rel="icon" type="image/png" href="./appicons/favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./appicons/favicon-16x16.png" sizes="16x16" />
+    <link rel="icon" type="image/png" href="./appicons/favicon-128.png" sizes="128x128" />
     <meta name="application-name" content="Vanilla.js: Modern 1st Party JavaScript" />
     <meta name="msapplication-TileColor" content="#FFFFFF" />
-    <meta name="msapplication-TileImage" content="/appicons/mstile-144x144.png" />
-    <meta name="msapplication-square70x70logo" content="/appicons/mstile-70x70.png" />
-    <meta name="msapplication-square150x150logo" content="/appicons/mstile-150x150.png" />
-    <meta name="msapplication-wide310x150logo" content="/appicons/mstile-310x150.png" />
-    <meta name="msapplication-square310x310logo" content="/appicons/mstile-310x310.png" />
+    <meta name="msapplication-TileImage" content="./appicons/mstile-144x144.png" />
+    <meta name="msapplication-square70x70logo" content="./appicons/mstile-70x70.png" />
+    <meta name="msapplication-square150x150logo" content="./appicons/mstile-150x150.png" />
+    <meta name="msapplication-wide310x150logo" content="./appicons/mstile-310x150.png" />
+    <meta name="msapplication-square310x310logo" content="./appicons/mstile-310x310.png" />
     <link rel="stylesheet" href="css/style.css">
     <link rel="stylesheet" href="css/animations.css">
 </head>
@@ -53,7 +53,7 @@
     <script>
         if ('serviceWorker' in navigator) {
             navigator.serviceWorker
-                .register('/pwa.js', { scope: '/' })
+                .register('./pwa.js', { scope: '/' })
                 .then(() => {
                     console.info('Vanilla.js Service Worker Registered');
                 }, err => console.error("Vanilla.js Service Worker registration failed: ", err));
diff --git a/manifest.json b/manifest.json
index 134759d..e60a64c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,27 +3,27 @@
     "short_name": "vanilla-js",
     "description": "A Single Page Application built in 100% pure modern JavaScript with no frameworks.",
     "icons": [{
-      "src": "/appicons/favicon-128.png",
+      "src": "./appicons/favicon-128.png",
       "sizes": "128x128",
       "type": "image/png"
     }, {
-      "src": "/appicons/apple-touch-icon-144x144.png",
+      "src": "./appicons/apple-touch-icon-144x144.png",
       "sizes": "144x144",
       "type": "image/png"
     }, {
-      "src": "/appicons/apple-touch-icon-152x152.png",
+      "src": "./appicons/apple-touch-icon-152x152.png",
       "sizes": "152x152",
       "type": "image/png"
     }, {
-      "src": "/appicons/favicon-196x196.png",
+      "src": "./appicons/favicon-196x196.png",
       "sizes": "196x196",
       "type": "image/png"
     }, {
-      "src": "/appicons/splash.png",
+      "src": "./appicons/splash.png",
       "sizes": "512x512",
       "type": "image/png"
     }],
-    "start_url": "/index.html",
+    "start_url": "./index.html",
     "display": "standalone",
     "orientation" : "any",
     "background_color": "#FFFFFF",
diff --git a/slides/001-title.html b/slides/001-title.html
index 1598931..bec06c0 100644
--- a/slides/001-title.html
+++ b/slides/001-title.html
@@ -1,6 +1,6 @@
 <title>Vanilla.js: Modern 1st Party JavaScript</title>
 <h1>Vanilla.js: Modern 1st Party JavaScript</h1>
-<img src="/images/vanillin.png" class="anim-spin" alt="Vanillin molecule" title="Vanillin molecule"/>
+<img src="images/vanillin.png" class="anim-spin" alt="Vanillin molecule" title="Vanillin molecule"/>
 <h2>Jeremy Likness</h2>
 <h3>Cloud Advocate, Microsoft</h3>
 <next-slide>020-angular-project</next-slide>
diff --git a/slides/020-angular-project.html b/slides/020-angular-project.html
index a3a580d..634e49b 100644
--- a/slides/020-angular-project.html
+++ b/slides/020-angular-project.html
@@ -5,7 +5,7 @@ ng new my-app
 ng build --prod
 </pre>
 <div class="center">
-    <video src="/videos/angularproject.mp4" controls></video>
+    <video src="videos/angularproject.mp4" controls></video>
 </div>
 <next-slide>030-impact1</next-slide>
 <transition>slide-left</transition>
\ No newline at end of file
diff --git a/slides/030-impact1.html b/slides/030-impact1.html
index 4a3e7e5..7fb414b 100644
--- a/slides/030-impact1.html
+++ b/slides/030-impact1.html
@@ -1,5 +1,5 @@
 <title>What's the Impact?</title>
 <h1>What's the Impact?</h1>
-<img src="/images/ng-size.png" class="expandable" alt="Size of Angular App" title="Size of Angular app" />
+<img src="images/ng-size.png" class="expandable" alt="Size of Angular App" title="Size of Angular app" />
 <transition>fade</transition>
 <next-slide>040-impact2</next-slide>
\ No newline at end of file
diff --git a/slides/040-impact2.html b/slides/040-impact2.html
index 32d184b..4690665 100644
--- a/slides/040-impact2.html
+++ b/slides/040-impact2.html
@@ -1,6 +1,6 @@
 <title>What's the Impact (to be fair)?</title>
 <h1>What's the Impact? (to be fair)</h1>
-<img src="/images/ng-dist-size.png" class="expandable" alt="Size of Angular App Distribution"
+<img src="images/ng-dist-size.png" class="expandable" alt="Size of Angular App Distribution"
     title="Size of Angular app distribution" />
 <next-slide>050-cost</next-slide>
 <transition>fade</transition>
\ No newline at end of file
diff --git a/slides/050-cost.html b/slides/050-cost.html
index 2b95ecd..10e6af0 100644
--- a/slides/050-cost.html
+++ b/slides/050-cost.html
@@ -1,5 +1,5 @@
 <title>What's the Cost?</title>
 <h1>What's the Cost?</h1>
-<img src="/images/security-alerts.png" class="expandable" alt="Security alerts"
+<img src="images/security-alerts.png" class="expandable" alt="Security alerts"
     title="Security alerts" />
 <next-slide>060-ng-conf1</next-slide>
\ No newline at end of file
diff --git a/slides/060-ng-conf1.html b/slides/060-ng-conf1.html
index 7e52575..bb882a2 100644
--- a/slides/060-ng-conf1.html
+++ b/slides/060-ng-conf1.html
@@ -3,6 +3,6 @@
 <ul>
     <li><i>Here's proof from 2014...</i></li>
 </ul>
-<img src="/images/ng-conf-ski.png" class="appear expandable" alt="Standing on a ski slope"
+<img src="images/ng-conf-ski.png" class="appear expandable" alt="Standing on a ski slope"
     title="Standing on a ski slope" />
 <next-slide>070-ng-conf2</next-slide>
\ No newline at end of file
diff --git a/slides/070-ng-conf2.html b/slides/070-ng-conf2.html
index 8db828d..3f05f67 100644
--- a/slides/070-ng-conf2.html
+++ b/slides/070-ng-conf2.html
@@ -3,7 +3,7 @@
 <ul>
     <li><i>Here's proof from 2014...</i></li>
 </ul>
-<img src="/images/ng-conf.png" class="expandable" alt="Inside the inaugural Angular conference ngConf"
+<img src="images/ng-conf.png" class="expandable" alt="Inside the inaugural Angular conference ngConf"
     title="Inside the inaugural Angular conference ngConf" />
 <transition>fade</transition>
 <next-slide>080-why</next-slide>
\ No newline at end of file
diff --git a/slides/090-embrace.html b/slides/090-embrace.html
index 5bb37c1..f8150f9 100644
--- a/slides/090-embrace.html
+++ b/slides/090-embrace.html
@@ -1,4 +1,4 @@
 <title>Embrace the Triad</title>
 <h1>Embrace the Triad</h1>
-<img src="/images/triad.png" alt="The triad: JavaScript, CSS3 and HTML5"/>
+<img src="images/triad.png" alt="The triad: JavaScript, CSS3 and HTML5"/>
 <next-slide>100-javascript-new</next-slide>
\ No newline at end of file