ディレクトリ構成の見直し

ta-kon · Jul 28, 2018 · 828a302 · 828a302
1 parent 7fba08d
commit 828a302
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 21 deletions.
diff --git a/kintaro.css → css/kintaro.css b/kintaro.css → css/kintaro.css
diff --git a/img/kintaro-icon.png b/img/kintaro-icon.png
diff --git a/kintaro_192.png → img/kintaro_192.png b/kintaro_192.png → img/kintaro_192.png
diff --git a/kintaro_512.png → img/kintaro_512.png b/kintaro_512.png → img/kintaro_512.png
diff --git a/index.html b/index.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8" lang="ja">
     <meta http-equiv="content-language" content="ja">
     <link rel="manifest" href="manifest.json">
+    <link rel="icon" type="image/png" href="/img/kintaro-icon.png">
     <meta name="author" content="ta-kon">
     <meta name="theme-color" content="#4E5D6C">
     <meta name="description" content="作業時間の計算を行います。">
@@ -51,12 +52,12 @@
     <script defer src="https://cdnjs.cloudflare.com/ajax/libs/decimal.js/10.0.1/decimal.min.js"></script>
 
     <!-- original source -->
-    <script defer src="kintaroCommonFunc.js"></script>
-    <script defer src="kintaroModel.js"></script>
-    <script defer src="kintaroCalc.js"></script>
-    <script defer src="kintaroView.js"></script>
-    <script defer src="kintaroNotify.js"></script>
-    <link rel="stylesheet" href="kintaro.css">
+    <script defer src="js/kintaroCommonFunc.js"></script>
+    <script defer src="js/kintaroModel.js"></script>
+    <script defer src="js/kintaroCalc.js"></script>
+    <script defer src="js/kintaroView.js"></script>
+    <script defer src="js/kintaroNotify.js"></script>
+    <link rel="stylesheet" href="css/kintaro.css">
 
     <!-- Created: 2018/06/13 21:13 -->
     <title>勤太郎</title>
@@ -234,4 +235,4 @@ <h2>休憩</h2>
     </script>
 </body>
 
-</html>
+</html>
diff --git a/kintaroCalc.js → js/kintaroCalc.js b/kintaroCalc.js → js/kintaroCalc.js
diff --git a/kintaroCommonFunc.js → js/kintaroCommonFunc.js b/kintaroCommonFunc.js → js/kintaroCommonFunc.js
diff --git a/kintaroModel.js → js/kintaroModel.js b/kintaroModel.js → js/kintaroModel.js
diff --git a/kintaroNotify.js → js/kintaroNotify.js b/kintaroNotify.js → js/kintaroNotify.js
diff --git a/kintaroView.js → js/kintaroView.js b/kintaroView.js → js/kintaroView.js
diff --git a/kintaroServiceWorker.js b/kintaroServiceWorker.js
@@ -1,28 +1,32 @@
 'use strict';
 
-const CashVersion = '20180722';
+// 作成日: 2018/07/22
+const CashVersion = '201807282350';
 
 const CashFiles = [
+    // CDN
     'https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js',
     'https://cdnjs.cloudflare.com/ajax/libs/bootswatch/4.1.1/superhero/bootstrap.min.css',
     'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-material-datetimepicker/2.7.1/css/bootstrap-material-datetimepicker.min.css',
     'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js',
     'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-material-datetimepicker/2.7.1/js/bootstrap-material-datetimepicker.min.js',
     'https://cdnjs.cloudflare.com/ajax/libs/push.js/1.0.5/push.min.js',
     'https://cdnjs.cloudflare.com/ajax/libs/decimal.js/10.0.1/decimal.min.js',
+
+    // github.io
     'https://pages-themes.github.io/slate/assets/images/blacktocat.png',
-    './kintaroCommonFunc.js',
-    './kintaroModel.js',
-    './kintaroCalc.js',
-    './kintaroView.js',
-    './kintaroNotify.js',
-    './kintaro.css',
+
+    // Site Source
+    './js/kintaroCommonFunc.js',
+    './js/kintaroModel.js',
+    './js/kintaroCalc.js',
+    './js/kintaroView.js',
+    './js/kintaroNotify.js',
+    './css/kintaro.css',
+    './img/kintaro-icon.png',
     './',
 ];
 
-let ExistFileUrl = {};
-CashFiles.forEach(function (fileName) { ExistFileUrl[fileName] = true; });
-
 self.addEventListener('install', function (event) {
     event.waitUntil(
         caches.open(CashVersion).then(function (cache) {
@@ -34,14 +38,14 @@ self.addEventListener('install', function (event) {
 });
 
 self.addEventListener('activate', function (event) {
-    console.log('activate');
+    console.log('Service Worker activate');
 });
 
 self.addEventListener('fetch', function (event) {
     event.respondWith(
         caches.match(event.request)
             .then(function (response) {
-                // キャッシュがあったのでそのレスポンスを返す
+                // キャッシュがあったなら、そのレスポンスを返す
                 if (response) {
                     return response;
                 }

diff --git a/manifest.json b/manifest.json
@@ -3,12 +3,12 @@
   "name": "勤太郎",
   "icons": [
     {
-      "src": "kintaro_192.png",
+      "src": "img/kintaro_192.png",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "kintaro_512.png",
+      "src": "img/kintaro_512.png",
       "sizes": "512x512",
       "type": "image/png"
     }