From 6764bf0d6d25e4c6227f0ae9a0bb26706fc7f96c Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Fri, 18 Oct 2019 05:09:49 +0000
Subject: [PATCH] Add serviceworker, render logos directly

---
 webclient/public/index.html       |   4 +
 webclient/public/site.webmanifest |   4 +-
 webclient/src/Feed.js             |   6 +-
 webclient/src/Results.js          |   6 +-
 webclient/src/index.js            |   6 ++
 webclient/src/serviceWorker.js    | 135 ++++++++++++++++++++++++++++++
 webclient/src/utils.js            |   6 --
 7 files changed, 155 insertions(+), 12 deletions(-)
 create mode 100644 webclient/src/serviceWorker.js

diff --git a/webclient/public/index.html b/webclient/public/index.html
index 88094c5..7b876b0 100644
--- a/webclient/public/index.html
+++ b/webclient/public/index.html
@@ -17,6 +17,10 @@
 	<meta name="msapplication-TileColor" content="#da532c">
 	<meta name="theme-color" content="#000000">
 
+	<link rel="preload" href="logos/reddit.png" as="image">
+	<link rel="preload" href="logos/hackernews.png" as="image">
+	<link rel="preload" href="logos/tildes.png" as="image">
+
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/webclient/public/site.webmanifest b/webclient/public/site.webmanifest
index 9eab6b7..d0bd940 100644
--- a/webclient/public/site.webmanifest
+++ b/webclient/public/site.webmanifest
@@ -1,6 +1,6 @@
 {
-    "name": "",
-    "short_name": "",
+    "name": "QotNews",
+    "short_name": "QotNews",
     "icons": [
         {
             "src": "/android-chrome-192x192.png",
diff --git a/webclient/src/Feed.js b/webclient/src/Feed.js
index 310cf72..1ced433 100644
--- a/webclient/src/Feed.js
+++ b/webclient/src/Feed.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import localForage from 'localforage';
-import { siteLogo, sourceLink, infoLine } from './utils.js';
+import { sourceLink, infoLine } from './utils.js';
 
 class Feed extends React.Component {
 	constructor(props) {
@@ -63,7 +63,9 @@ class Feed extends React.Component {
 								</div>
 
 								<div className='title'>
-									<Link className='link' to={'/' + x.id}>{siteLogo[x.source]} {x.title}</Link>
+									<Link className='link' to={'/' + x.id}>
+										<img className='source-logo' src={'logos/'+x.source+'.png'} /> {x.title}
+									</Link>
 
 									<span className='source'>
 										&#8203;({sourceLink(x)})
diff --git a/webclient/src/Results.js b/webclient/src/Results.js
index f643481..4b263d7 100644
--- a/webclient/src/Results.js
+++ b/webclient/src/Results.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
-import { siteLogo, sourceLink, infoLine } from './utils.js';
+import { sourceLink, infoLine } from './utils.js';
 
 class Results extends React.Component {
 	constructor(props) {
@@ -58,7 +58,9 @@ class Results extends React.Component {
 									</div>
 
 									<div className='title'>
-										<Link className='link' to={'/' + x.id}>{siteLogo[x.source]} {x.title}</Link>
+										<Link className='link' to={'/' + x.id}>
+											<img className='source-logo' src={'logos/'+x.source+'.png'} /> {x.title}
+										</Link>
 
 										<span className='source'>
 											&#8203;({sourceLink(x)})
diff --git a/webclient/src/index.js b/webclient/src/index.js
index b597a44..a019143 100644
--- a/webclient/src/index.js
+++ b/webclient/src/index.js
@@ -1,5 +1,11 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
+import * as serviceWorker from './serviceWorker';
 
 ReactDOM.render(<App />, document.getElementById('root'));
+
+// If you want your app to work offline and load faster, you can change
+// // unregister() to register() below. Note this comes with some pitfalls.
+// // Learn more about service workers: https://bit.ly/CRA-PWA
+serviceWorker.register();
diff --git a/webclient/src/serviceWorker.js b/webclient/src/serviceWorker.js
new file mode 100644
index 0000000..f8c7e50
--- /dev/null
+++ b/webclient/src/serviceWorker.js
@@ -0,0 +1,135 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read https://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.1/8 is considered localhost for IPv4.
+    window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    )
+);
+
+export function register(config) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          console.log(
+            'This web app is being served cache-first by a service ' +
+              'worker. To learn more, visit https://bit.ly/CRA-PWA'
+          );
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl, config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then(registration => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (installingWorker == null) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the updated precached content has been fetched,
+              // but the previous service worker will still serve the older
+              // content until all client tabs are closed.
+              console.log(
+                'New content is available and will be used when all ' +
+                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+              );
+
+              // Execute callback
+              if (config && config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config && config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch(error => {
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl, config) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl)
+    .then(response => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      const contentType = response.headers.get('content-type');
+      if (
+        response.status === 404 ||
+        (contentType != null && contentType.indexOf('javascript') === -1)
+      ) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then(registration => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      console.log(
+        'No internet connection found. App is running in offline mode.'
+      );
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready.then(registration => {
+      registration.unregister();
+    });
+  }
+}
diff --git a/webclient/src/utils.js b/webclient/src/utils.js
index 8e20263..b63caa1 100644
--- a/webclient/src/utils.js
+++ b/webclient/src/utils.js
@@ -11,12 +11,6 @@ export const sourceLink = (story) => {
 	return (<a className='source' href={url}>{host}</a>);
 };
 
-export const siteLogo = {
-	hackernews: <img className='source-logo' src='logos/hackernews.png' />,
-	tildes: <img className='source-logo' src='logos/tildes.png' />,
-	reddit: <img className='source-logo' src='logos/reddit.png' />,
-};
-
 export const infoLine = (story) =>
 	<div className='info'>
 		{story.score} points