From edd6e03fc229ce2ff5e0a7ecad834efd417684d3 Mon Sep 17 00:00:00 2001
From: hideya kawahara <hideya@users.noreply.github.com>
Date: Thu, 21 Jun 2018 00:05:12 +0900
Subject: [PATCH] un-PWA-ize the app

---
 README.md                | 15 ++-------
 public/index.html        |  2 +-
 public/manifest.json     | 15 ---------
 public/service-worker.js | 66 ----------------------------------------
 src/index.js             | 14 ++++-----
 5 files changed, 10 insertions(+), 102 deletions(-)
 delete mode 100644 public/manifest.json
 delete mode 100644 public/service-worker.js

diff --git a/README.md b/README.md
index 7479f34..604ba3e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
-# Doodle Recognition PWA with TensorFlow.js
+# Doodle Recognition Web App with TensorFlow.js
 
-This is an example [PWA](https://en.wikipedia.org/wiki/Progressive_Web_Apps)
+This is an example Web App
 that uses [TensorFlow.js](https://js.tensorflow.org/) and performs doodle recognition.
 
 It loads a pre-trained CNN model that was converted to TensorFlow.js format
@@ -32,17 +32,6 @@ yarn start  # Starts a web server and opens a page. Also watches for changes.
 ```
 
 After `yarn build`, `public` directory holds the deployable files.
-Note that those files need to be served via **https** to enable PWA features
-(unless they are served from `localhost`).
-
-### <a name="notes-on-debugging"></a>Notes on Debugging
-
-This is a PWA, so the involved files will be cached
-(it is different from the browser cache; it is Service Worker controlled cache).
-Attention is required to make sure that each debug execution respects
-the latest file changes. Please reference the document
-["Debugging Service Workers"](https://developers.google.com/web/fundamentals/codelabs/debugging-service-workers/)
-for details including the other aspects of debugging PWA and Service Workers.
 
 ### Updating Pre-trained Model Data
 
diff --git a/public/index.html b/public/index.html
index 7c48a24..18db99c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Doodle Recognition with TensorFlow.js</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="manifest" href="./manifest.json">
+    <!-- link rel="manifest" href="./manifest.json" -->
     <link rel="icon" type="image/png" href="./marulabo-icon.png">
     <style>
       body {margin: 20px; text-align: center; font-family: sans-serif;}
diff --git a/public/manifest.json b/public/manifest.json
deleted file mode 100644
index ad2f6f6..0000000
--- a/public/manifest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "Doodle Recognition PWA",
-  "short_name": "Doodle PWA",
-  "description": "Doodle Recognition with TensorFlow.js",
-  "start_url": "./index.html",
-  "orientation": "portrait",
-  "background_color": "white",
-  "theme_color": "white",
-  "display": "standalone",
-  "icons": [{
-    "src": "./marulabo-icon.png",
-    "sizes": "96x96",
-    "type": "image/png"
-  }]
-}
diff --git a/public/service-worker.js b/public/service-worker.js
deleted file mode 100644
index 9f9843c..0000000
--- a/public/service-worker.js
+++ /dev/null
@@ -1,66 +0,0 @@
-'use strict';
-
-// ref: https://developers.google.com/web/ilt/pwa/caching-files-with-service-worker
-// ref: https://qiita.com/y_fujieda/items/f9e765ac9d89ba241154
-
-const CACHE_NAME = 'main-rev-2';
-const URLS_TO_CACHE = [
-  './index.html',
-  './bundle.js',
-  './model/tensorflowjs_model.pb',
-  './model/weights_manifest.json',
-  './model/group1-shard1of4',
-  './model/group1-shard2of4',
-  './model/group1-shard3of4',
-  './model/group1-shard4of4',
-  'https://cdnjs.cloudflare.com/ajax/libs/signature_pad/1.5.3/signature_pad.min.js'
-];
-
-self.addEventListener('install', event => {
-  console.log('SW: Service Worker installed');
-  event.waitUntil(
-    caches.open(CACHE_NAME).then(cache => {
-      console.log('SW: Adding to cache:', CACHE_NAME, 'files:', URLS_TO_CACHE);
-      return cache.addAll(URLS_TO_CACHE);
-    })
-  );
-});
-
-self.addEventListener('activate', event => {
-  console.log('SW: Service Worker became active');
-  // delete old cache if exists
-  event.waitUntil(
-    caches.keys().then(cacheNames => {
-      return Promise.all(
-        cacheNames.map(cacheName => {
-          // delete the cache if its name (revision) is not the current one
-          if (cacheName !== CACHE_NAME) {
-            console.log('SW: Deleting cache:', cacheName);
-            return caches.delete(cacheName);
-          }
-        })
-      );
-    })
-  );
-});
-
-// If a request doesn't match anything in the cache,
-// get it from the network, send it to the page
-// and add it to the cache at the same time.
-self.addEventListener('fetch', event => {
-  event.respondWith(
-    caches.open(CACHE_NAME).then(cache => {
-      return cache.match(event.request).then(response => {
-        if (response) {
-          console.log('SW: Fetch: read from cache:', CACHE_NAME, 'file:', event.request.url);
-          return response;
-        }
-        return fetch(event.request).then(netResponse => {
-          console.log('SW: Fetch: read from the network:', event.request.url);
-          cache.put(event.request, netResponse.clone());
-          return netResponse;
-        });
-      });
-    })
-  );
-});
diff --git a/src/index.js b/src/index.js
index 0ec987b..eb9db4a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -109,10 +109,10 @@ class ResultTable {
   }
 }
 
-if ('serviceWorker' in navigator) {
-  navigator.serviceWorker.register('./service-worker.js')
-    .then(success => console.log('Service Worker registered:', success))
-    .catch(error => console.error('Error: Failed to register Service Worker:', error));
-} else {
-  console.log('Warning: No support for Service Workers');
-}
+// if ('serviceWorker' in navigator) {
+//   navigator.serviceWorker.register('./service-worker.js')
+//     .then(success => console.log('Service Worker registered:', success))
+//     .catch(error => console.error('Error: Failed to register Service Worker:', error));
+// } else {
+//   console.log('Warning: No support for Service Workers');
+// }