diff --git a/gulpfile.js b/gulpfile.js index 88503fd..505c260 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -240,8 +240,9 @@ var copyFiles = function (done) { // updates version in all assets var updateAssetVersion = function (done) { - return src('src/copy/**/*.{php,html}') + return src('src/copy/**/**/*.{php,html}') .pipe(hashsrc({build_dir:paths.input,src_path:"/",hash_len:"6",query_name:"v"})) + .pipe(hashsrc({build_dir:paths.input,src_path:"/",hash_len:"6",query_name:"v",exts:[".json"]})) .pipe(dest(paths.output)); }; // Watch for changes to the src directory diff --git a/src/copy/Kontakt.html b/src/copy/Kontakt.html index 451e93d..4a242a2 100644 --- a/src/copy/Kontakt.html +++ b/src/copy/Kontakt.html @@ -14,7 +14,7 @@ - + diff --git a/src/copy/img/background85.webp b/src/copy/background85.webp similarity index 100% rename from src/copy/img/background85.webp rename to src/copy/background85.webp diff --git a/src/copy/include/html_head.php b/src/copy/include/html_head.php index 4c98a8a..2c847ec 100644 --- a/src/copy/include/html_head.php +++ b/src/copy/include/html_head.php @@ -24,7 +24,7 @@ echo " - + - - - - - - + + + + + + - - + + diff --git a/src/copy/sw.js b/src/copy/sw.js index 9886e4f..70e2568 100644 --- a/src/copy/sw.js +++ b/src/copy/sw.js @@ -13,19 +13,19 @@ self.addEventListener('install', function(e) { '/Samhäll', '/Teknik', '/Kontakt', - '/assets/css/main.min.css', - '/assets/img/tips.jpg ', - '/assets/img/background.jpg ', - '/assets/img/background85.webp ', - '/assets/img/favicon/manifest.json', - '/assets/img/favicon/android-chrome-192x192.png', - '/assets/img/favicon/favicon-32x32.png', - '/assets/img/favicon/favicon-16x16.png', - '/assets/img/favicon/favicon.ico', - '/assets/js/softscrollscript.js', - '/assets/js/material.min.js', - '/assets/js/smallScript.js', - '/assets/js/modernizer-webp.js', + '/css/main.min.css', + '/img/tips.jpg ', + '/img/background.jpg ', + '/img/background85.webp ', + '/img/favicon/manifest.json', + '/img/favicon/android-chrome-192x192.png', + '/img/favicon/favicon-32x32.png', + '/img/favicon/favicon-16x16.png', + '/img/favicon/favicon.ico', + '/js/softscrollscript.js', + '/js/material.min.js', + '/js/smallScript.js', + '/js/modernizer-webp.js', 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js', 'https://fonts.googleapis.com/icon?family=Material+Icons', 'https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2', @@ -50,4 +50,4 @@ self.addEventListener('fetch', function(event) { return response || fetch(event.request); }) ); -}); \ No newline at end of file +}); diff --git a/src/css/main.min.css b/src/css/main.css similarity index 100% rename from src/css/main.min.css rename to src/css/main.css diff --git a/src/copy/img/background.jpg b/src/img/background.jpg similarity index 100% rename from src/copy/img/background.jpg rename to src/img/background.jpg diff --git a/src/img/background85.webp b/src/img/background85.webp new file mode 100644 index 0000000..5d7b4ae Binary files /dev/null and b/src/img/background85.webp differ diff --git a/src/copy/img/christopher-burns-9bwXKkVC4UU-unsplash SMALL.png b/src/img/christopher-burns-9bwXKkVC4UU-unsplash SMALL.png similarity index 100% rename from src/copy/img/christopher-burns-9bwXKkVC4UU-unsplash SMALL.png rename to src/img/christopher-burns-9bwXKkVC4UU-unsplash SMALL.png diff --git a/src/copy/img/christopher-burns-9bwXKkVC4UU-unsplash.jpg b/src/img/christopher-burns-9bwXKkVC4UU-unsplash.jpg similarity index 100% rename from src/copy/img/christopher-burns-9bwXKkVC4UU-unsplash.jpg rename to src/img/christopher-burns-9bwXKkVC4UU-unsplash.jpg diff --git a/src/copy/img/favicon/android-chrome-192x192.png b/src/img/favicon/android-chrome-192x192.png similarity index 100% rename from src/copy/img/favicon/android-chrome-192x192.png rename to src/img/favicon/android-chrome-192x192.png diff --git a/src/copy/img/favicon/android-chrome-512x512.png b/src/img/favicon/android-chrome-512x512.png similarity index 100% rename from src/copy/img/favicon/android-chrome-512x512.png rename to src/img/favicon/android-chrome-512x512.png diff --git a/src/copy/img/favicon/apple-touch-icon-114x114-precomposed.png b/src/img/favicon/apple-touch-icon-114x114-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-114x114-precomposed.png rename to src/img/favicon/apple-touch-icon-114x114-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-114x114.png b/src/img/favicon/apple-touch-icon-114x114.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-114x114.png rename to src/img/favicon/apple-touch-icon-114x114.png diff --git a/src/copy/img/favicon/apple-touch-icon-120x120-precomposed.png b/src/img/favicon/apple-touch-icon-120x120-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-120x120-precomposed.png rename to src/img/favicon/apple-touch-icon-120x120-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-120x120.png b/src/img/favicon/apple-touch-icon-120x120.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-120x120.png rename to src/img/favicon/apple-touch-icon-120x120.png diff --git a/src/copy/img/favicon/apple-touch-icon-144x144-precomposed.png b/src/img/favicon/apple-touch-icon-144x144-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-144x144-precomposed.png rename to src/img/favicon/apple-touch-icon-144x144-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-144x144.png b/src/img/favicon/apple-touch-icon-144x144.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-144x144.png rename to src/img/favicon/apple-touch-icon-144x144.png diff --git a/src/copy/img/favicon/apple-touch-icon-152x152-precomposed.png b/src/img/favicon/apple-touch-icon-152x152-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-152x152-precomposed.png rename to src/img/favicon/apple-touch-icon-152x152-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-152x152.png b/src/img/favicon/apple-touch-icon-152x152.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-152x152.png rename to src/img/favicon/apple-touch-icon-152x152.png diff --git a/src/copy/img/favicon/apple-touch-icon-180x180-precomposed.png b/src/img/favicon/apple-touch-icon-180x180-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-180x180-precomposed.png rename to src/img/favicon/apple-touch-icon-180x180-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-180x180.png b/src/img/favicon/apple-touch-icon-180x180.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-180x180.png rename to src/img/favicon/apple-touch-icon-180x180.png diff --git a/src/copy/img/favicon/apple-touch-icon-57x57-precomposed.png b/src/img/favicon/apple-touch-icon-57x57-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-57x57-precomposed.png rename to src/img/favicon/apple-touch-icon-57x57-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-57x57.png b/src/img/favicon/apple-touch-icon-57x57.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-57x57.png rename to src/img/favicon/apple-touch-icon-57x57.png diff --git a/src/copy/img/favicon/apple-touch-icon-60x60-precomposed.png b/src/img/favicon/apple-touch-icon-60x60-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-60x60-precomposed.png rename to src/img/favicon/apple-touch-icon-60x60-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-60x60.png b/src/img/favicon/apple-touch-icon-60x60.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-60x60.png rename to src/img/favicon/apple-touch-icon-60x60.png diff --git a/src/copy/img/favicon/apple-touch-icon-72x72-precomposed.png b/src/img/favicon/apple-touch-icon-72x72-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-72x72-precomposed.png rename to src/img/favicon/apple-touch-icon-72x72-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-72x72.png b/src/img/favicon/apple-touch-icon-72x72.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-72x72.png rename to src/img/favicon/apple-touch-icon-72x72.png diff --git a/src/copy/img/favicon/apple-touch-icon-76x76-precomposed.png b/src/img/favicon/apple-touch-icon-76x76-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-76x76-precomposed.png rename to src/img/favicon/apple-touch-icon-76x76-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon-76x76.png b/src/img/favicon/apple-touch-icon-76x76.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-76x76.png rename to src/img/favicon/apple-touch-icon-76x76.png diff --git a/src/copy/img/favicon/apple-touch-icon-precomposed.png b/src/img/favicon/apple-touch-icon-precomposed.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon-precomposed.png rename to src/img/favicon/apple-touch-icon-precomposed.png diff --git a/src/copy/img/favicon/apple-touch-icon.png b/src/img/favicon/apple-touch-icon.png similarity index 100% rename from src/copy/img/favicon/apple-touch-icon.png rename to src/img/favicon/apple-touch-icon.png diff --git a/src/copy/img/favicon/browserconfig.xml b/src/img/favicon/browserconfig.xml similarity index 100% rename from src/copy/img/favicon/browserconfig.xml rename to src/img/favicon/browserconfig.xml diff --git a/src/copy/img/favicon/favicon-16x16.png b/src/img/favicon/favicon-16x16.png similarity index 100% rename from src/copy/img/favicon/favicon-16x16.png rename to src/img/favicon/favicon-16x16.png diff --git a/src/copy/img/favicon/favicon-32x32.png b/src/img/favicon/favicon-32x32.png similarity index 100% rename from src/copy/img/favicon/favicon-32x32.png rename to src/img/favicon/favicon-32x32.png diff --git a/src/copy/img/favicon/favicon.ico b/src/img/favicon/favicon.ico similarity index 100% rename from src/copy/img/favicon/favicon.ico rename to src/img/favicon/favicon.ico diff --git a/src/copy/img/favicon/manifest.json b/src/img/favicon/manifest.json similarity index 100% rename from src/copy/img/favicon/manifest.json rename to src/img/favicon/manifest.json diff --git a/src/copy/img/favicon/mstile-144x144.png b/src/img/favicon/mstile-144x144.png similarity index 100% rename from src/copy/img/favicon/mstile-144x144.png rename to src/img/favicon/mstile-144x144.png diff --git a/src/copy/img/favicon/mstile-150x150.png b/src/img/favicon/mstile-150x150.png similarity index 100% rename from src/copy/img/favicon/mstile-150x150.png rename to src/img/favicon/mstile-150x150.png diff --git a/src/copy/img/favicon/mstile-310x310.png b/src/img/favicon/mstile-310x310.png similarity index 100% rename from src/copy/img/favicon/mstile-310x310.png rename to src/img/favicon/mstile-310x310.png diff --git a/src/copy/img/favicon/mstile-70x70.png b/src/img/favicon/mstile-70x70.png similarity index 100% rename from src/copy/img/favicon/mstile-70x70.png rename to src/img/favicon/mstile-70x70.png diff --git a/src/copy/img/favicon/safari-pinned-tab.svg b/src/img/favicon/safari-pinned-tab.svg similarity index 100% rename from src/copy/img/favicon/safari-pinned-tab.svg rename to src/img/favicon/safari-pinned-tab.svg diff --git a/src/copy/img/loader.gif b/src/img/loader.gif similarity index 100% rename from src/copy/img/loader.gif rename to src/img/loader.gif diff --git a/src/copy/img/tips.jpg b/src/img/tips.jpg similarity index 100% rename from src/copy/img/tips.jpg rename to src/img/tips.jpg diff --git a/src/copy/img/tips.webp b/src/img/tips.webp similarity index 100% rename from src/copy/img/tips.webp rename to src/img/tips.webp