more gulp versioning and move img folder

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

src/copy/Kontakt.html

@@ -14,7 +14,7 @@
 <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
 <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
 <script async src="js/modernizer-webp.js"></script>
-<link rel="stylesheet" async href="css/main.min.css">
+<link rel="stylesheet" async href="css/main.css">
 <link rel='preload' async href='img/background85.webp' as='image' type='image/webp'>
 <link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
 <link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">

src/copy/include/html_head.php

@@ -24,7 +24,7 @@ echo "
 <link disabled class='lateLoader' rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
 <link rel='stylesheet' defer href='https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css'>
 <script data-ad-client='ca-pub-5143923140938916' defer src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js'></script>
-<link rel='stylesheet' async href='css/main.min.css'>
+<link rel='stylesheet' async href='css/main.css'>
 
 <!--[if lt IE 9]>
     <script src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js'></script>

src/copy/index.html

@@ -22,8 +22,8 @@
 <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
 <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
 <script async src="/js/modernizer-webp.js"></script>
-<link rel="stylesheet" async href="/css/main.min.css">
+<link rel="stylesheet" async href="/css/main.css">
-<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
+<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
 <link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
 <script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 
@@ -39,17 +39,17 @@
   FAVICON
   XXXXXXX
   -->
-	<link href="img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
+	<link href="/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
-	<link href="img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
+	<link href="/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
-	<link href="img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
+	<link href="/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
-	<link href="img/favicon/manifest.json" rel="manifest">
+	<link href="/img/favicon/manifest.json" rel="manifest">
-	<link color="#2b5797" href="img/favicon/safari-pinned-tab.svg" rel="mask-icon">
+	<link color="#2b5797" href="/img/favicon/safari-pinned-tab.svg" rel="mask-icon">
-	<link href="img/favicon/favicon.ico" rel="shortcut icon">
+	<link href="/img/favicon/favicon.ico" rel="shortcut icon">
 	<meta content="Meritv&auml;rde" name="apple-mobile-web-app-title">
 	<meta content="Meritv&auml;rde" name="application-name">
 	<meta content="#2b5797" name="msapplication-TileColor">
-	<meta content="img/favicon/mstile-144x144.png" name="msapplication-TileImage">
+	<meta content="/img/favicon/mstile-144x144.png" name="msapplication-TileImage">
-	<meta content="img/favicon/browserconfig.xml" name="msapplication-config">
+	<meta content="/img/favicon/browserconfig.xml" name="msapplication-config">
 	<meta name="theme-color" content="#27233a">
 	<meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" />
 

src/copy/sw.js

@@ -13,19 +13,19 @@ self.addEventListener('install', function(e) {
 		'/Samhäll',
 		'/Teknik',
 		'/Kontakt',
-		'/assets/css/main.min.css',
+		'/css/main.min.css',
-		'/assets/img/tips.jpg ',
+		'/img/tips.jpg ',
-		'/assets/img/background.jpg ',
+		'/img/background.jpg ',
-		'/assets/img/background85.webp ',
+		'/img/background85.webp ',
-		'/assets/img/favicon/manifest.json',
+		'/img/favicon/manifest.json',
-		'/assets/img/favicon/android-chrome-192x192.png',
+		'/img/favicon/android-chrome-192x192.png',
-		'/assets/img/favicon/favicon-32x32.png',
+		'/img/favicon/favicon-32x32.png',
-		'/assets/img/favicon/favicon-16x16.png',
+		'/img/favicon/favicon-16x16.png',
-		'/assets/img/favicon/favicon.ico',
+		'/img/favicon/favicon.ico',
-		'/assets/js/softscrollscript.js',
+		'/js/softscrollscript.js',
-		'/assets/js/material.min.js',
+		'/js/material.min.js',
-		'/assets/js/smallScript.js',
+		'/js/smallScript.js',
-		'/assets/js/modernizer-webp.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);
 	})
 	);
-});
+});