From 7922d88bf8b9a6396ee266035f6c90dd7fa64851 Mon Sep 17 00:00:00 2001
From: CheddarCrisp <cheddar@crispbyte.dev>
Date: Thu, 12 Mar 2020 20:30:20 -0400
Subject: [PATCH] Add to the about page Prevent stray events from highlighting
 buttons after closing a dialog

---
 .gitignore                  |   3 +-
 package-lock.json           |  75 +++++++++++++++++++++++++++++++++---
 package.json                |   1 +
 src/img/GitHub-Mark.png     | Bin 0 -> 942 bytes
 src/ncounter/About.svelte   |  46 ++++++++++++++++++++++
 src/ncounter/App.svelte     |   4 +-
 src/ncounter/Counter.svelte |   4 +-
 src/sw.js                   |   2 +-
 webpack.common.js           |   6 ++-
 9 files changed, 128 insertions(+), 13 deletions(-)
 create mode 100644 src/img/GitHub-Mark.png

diff --git a/.gitignore b/.gitignore
index 04c01ba..3bdd52e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
-dist/
\ No newline at end of file
+dist/
+.DS_Store
diff --git a/package-lock.json b/package-lock.json
index 6352087..c600b83 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -328,9 +328,9 @@
       }
     },
     "acorn": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
-      "integrity": "sha1-fSWuBbuK0fm2mRCOEJTs14hK3B8=",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -2106,6 +2106,69 @@
       "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
       "dev": true
     },
+    "file-loader": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz",
+      "integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.4.0",
+        "schema-utils": "^2.5.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+          "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "schema-utils": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.12.0",
+            "ajv-keywords": "^3.4.1"
+          }
+        }
+      }
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -3674,9 +3737,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "lcid": {
diff --git a/package.json b/package.json
index 2385925..79f3419 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "css-loader": "^3.4.2",
+    "file-loader": "^5.1.0",
     "google-fonts-webpack-plugin": "^0.4.4",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
diff --git a/src/img/GitHub-Mark.png b/src/img/GitHub-Mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d803ca034143f027c0f4496a07576d761629e5
GIT binary patch
literal 942
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!rUm$fxB_W$QL({>=IxAF0(6;S
zNswPK1OKm=cj7p|FPP<^_2le6Uxm+ksZ#4}OGH`U9$&p|LWlYN>rItGMpt@O*qOI2
z@|Y6gm8^f0fq`k7r;B4q#No5oZWgU_5MX-{ADLpPAtQ3JV~2X$+wb)|Coej2p_zG0
zY2LZ==~|bbe)0Kl{KBZbtb4Vn@X>3f8;hS+9EpDLer4)=_WTKvvddFUY}c{;pC=~#
z%0x5h%jwNCs*XnX$xUbGwTii*DLMIoMdQrhK2GQLc-*9gZuju~|L?+Iv1|2%ycdeI
zziEkmS-@%{X{*B=yy`Ev-np_%l>*z(sRrzhblQ1ym1U^Cf3{J?{8i^xrrkCVO;~AH
zwQ~Cs1tslIWs#Foto1i_tXLuaf013>s*Cw`n-}wKHNJk?Q8r<D<i+>ucAE1gzIb-U
zho=i099|$fyUQ{@<S9SfU&Tw&)1t5ZIJ7`ND`Mv_&n#(nTfvv!{~j!kOA0vY{Fs>`
z{-6+(_dYg-CmUZo9eBD>Hp|!6@yU|h=!5^NT2E-3a_!kH>d>+Fp{$vvV2e^v&OXj)
zj@+9)%}d+a75h_pw#*QI#K`q)yPQCL6R+ZI-A41mH%>=VFDGOk7Ijd$aBTYh71kYZ
ze%N*^*R${Kj0^blx8%y_C(=y!s}`;4*cj``{r$+AD8Z-66YlpNP%iZLl=~<aGV#dI
zy{ijqFSY#GsMveAc;}qlOF1`E#aWH_+g-b!lE<^?jRV(yug{sH?hntazv|vQ{cPSF
z#?rXF<!#&Z&*`uJvHZ@dXD<`{7!JG6h`)M2RoGP7K>70I$FsICOBUJ`tF@qVVfDeg
z4=d6q8yWB8+Qm0F+x&J^-Hq(uH+MQ3s~@d+b9jf`IX&g9&coLP7oLiYd5}|A;d5>h
z)3fD1LGC`9niCEjki2dwsVg@7>x$(EZoK61?v}D;U32b(ud-*OhU<0}IV}P87gPWB
z`EvQWE}x#{@gnqWj3igjUIC$(FCA|GHb3}q%A@)(;{7$QXC|5~lmjMj22WQ%mvv4F
FO#m3|dK3Tv

literal 0
HcmV?d00001

diff --git a/src/ncounter/About.svelte b/src/ncounter/About.svelte
index dd0bfaa..66705b0 100644
--- a/src/ncounter/About.svelte
+++ b/src/ncounter/About.svelte
@@ -5,6 +5,13 @@
         <h2>Release |BUILD_DATE|</h2>
         <h2>&copy; |BUILD_YEAR|</h2>
     </header>
+    <div class="repo">
+        <a href="https://github.com/cheddarcrisp/ncounter" rel="noopener external" target="_blank"><img src="{ GitHubIcon }" alt="GitHub">Source Code</a>
+        <a href="https://github.com/cheddarcrisp/ncounter/issues" rel="noopener external" target="_blank"><img src="{ GitHubIcon }" alt="GitHub">Issues and feedback</a>
+    </div>
+    <h3>Privacy Policy</h3>
+    <p>No cookies. No tracking. All data is stored on your device.
+        Everything you do with this application is private.</p>
     <div class="licenses">
         <h2>Open Source License Information</h2>
         <Licenses></Licenses>
@@ -13,7 +20,10 @@
 <script>
 import Licenses from './Licenses.svelte';
 import { createEventDispatcher } from 'svelte';
+import GitHubIcon from '../img/GitHub-Mark.png';
+
 const dispatch = createEventDispatcher();
+
 </script>
 <style>
 .about {
@@ -41,6 +51,36 @@ const dispatch = createEventDispatcher();
     text-align: center;
 }
 
+.repo {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    margin: 6px 0;
+    flex: none;
+}
+
+.repo > a {
+    display: inline-flex;
+    align-items: center;
+    color: rgba(0, 0, 0, 0.87);
+    text-decoration: none;
+    padding: 5px;
+    background-color: #F0F0F0;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+    border: 2px solid transparent;
+}
+
+.repo > a:hover, .repo > a:focus {
+    box-shadow: none;
+    border-color: var(--highlight-color);
+}
+
+.repo > a > img {
+    width: 24px;
+    height: 24px;
+    margin-right: 4px;
+}
+
 h1 {
     font-weight: 600;
     font-size: 24px;
@@ -50,6 +90,12 @@ h2 {
     font-size: 18px;
 }
 
+h3 {
+    font-size: 18px;
+    font-weight: 600;
+    margin: 12px 0 6px 0;
+}
+
 .licenses h2{
     font-weight: 600;
 }
diff --git a/src/ncounter/App.svelte b/src/ncounter/App.svelte
index 84f6418..02128c7 100644
--- a/src/ncounter/App.svelte
+++ b/src/ncounter/App.svelte
@@ -17,8 +17,8 @@
         <label>Target<input type="text" pattern="(0|([1-9]\d*))(\.\d+)?" inputmode="decimal" bind:value={newCounter.max} /></label>
         <label>Save history<input type="checkbox" bind:checked={newCounter.saveHistory} /></label>
         <div class="buttons">
-            <button class="ok" on:click|preventDefault={ add }>OK</button>
-            <button on:click|preventDefault={ () => { showAddDialog = false; } }>Cancel</button>
+            <button class="ok" on:click|preventDefault|stopPropagation={ add }>OK</button>
+            <button on:click|preventDefault|stopPropagation={ () => { showAddDialog = false; } }>Cancel</button>
         </div>
     </form>
 </div>
diff --git a/src/ncounter/Counter.svelte b/src/ncounter/Counter.svelte
index bca5ef9..ded3176 100644
--- a/src/ncounter/Counter.svelte
+++ b/src/ncounter/Counter.svelte
@@ -20,8 +20,8 @@
             <h1>{ showIncrement ? "Add" : "Set" }</h1>
             <input class="dialog-value" type="text" required pattern="(0|([1-9]\d*))(\.\d+)?" inputmode="decimal" bind:value={ dialogValue } use:focus />
             <div class="buttons">
-                <button class="ok" on:click|preventDefault={ dialogDone }>OK</button>
-                <button on:click|preventDefault={ dialogCancel }>Cancel</button>
+                <button class="ok" on:click|preventDefault|stopPropagation={ dialogDone }>OK</button>
+                <button on:click|preventDefault|stopPropagation={ dialogCancel }>Cancel</button>
             </div>
         </form>
     </div>
diff --git a/src/sw.js b/src/sw.js
index 9797d74..9669e6d 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -29,7 +29,7 @@ registerRoute(
 );
 
 registerRoute(
-    /\.(?:js|css)$/,
+    /\.(?:js|css|png)$/,
     new StaleWhileRevalidate({
       cacheName: 'static-resources',
     })
diff --git a/webpack.common.js b/webpack.common.js
index 8102525..ab8cbd7 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -37,7 +37,7 @@ module.exports = {
                 from: 'src/icon/safari-pinned-tab.svg', to: 'icons'
             },
             {
-                from: 'src/icon/favicon.ice', to: 'icons'
+                from: 'src/icon/favicon.ico', to: 'icons'
             },
             {
                 from: 'src/icon/site.webmanifest', to: 'icons'
@@ -82,6 +82,10 @@ module.exports = {
                     'style-loader',
                     'css-loader'
                 ]
+            },
+            {
+                test: /\.png$/,
+                loader: 'file-loader'
             }
         ]
     },