From 73d15dcdffe2a301e0267c84150875bbdb0c7d54 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Wed, 14 Oct 2020 21:35:37 +0200 Subject: [PATCH 01/55] Moved assets to src folder. --- {public => src}/assets/fonts/bold.otf | Bin {public => src}/assets/fonts/bold.woff | Bin {public => src}/assets/fonts/regular.otf | Bin {public => src}/assets/fonts/regular.woff | Bin {public => src}/assets/images/192x192.png | Bin {public => src}/assets/images/512x512.png | Bin .../assets/images/android-chrome-144x144.png | Bin {public => src}/assets/images/apple-touch-icon.png | Bin {public => src}/assets/images/browserconfig.xml | 0 {public => src}/assets/images/favicon-16x16.png | Bin {public => src}/assets/images/favicon-32x32.png | Bin {public => src}/assets/images/favicon.ico | Bin {public => src}/assets/images/favicon.png | Bin {public => src}/assets/images/knowit.svg | 0 {public => src}/assets/images/lodd.svg | 0 {public => src}/assets/images/mstile-150x150.png | Bin {public => src}/assets/images/notification.svg | 0 {public => src}/assets/images/safari-pinned-tab.svg | 0 {public => src}/assets/images/vipps-logo.svg | 0 {public => src}/assets/images/vipps-qr.png | Bin {public => src}/assets/images/vipps.png | Bin {public => src}/assets/manifest.json | 6 +++--- 22 files changed, 3 insertions(+), 3 deletions(-) rename {public => src}/assets/fonts/bold.otf (100%) rename {public => src}/assets/fonts/bold.woff (100%) rename {public => src}/assets/fonts/regular.otf (100%) rename {public => src}/assets/fonts/regular.woff (100%) rename {public => src}/assets/images/192x192.png (100%) rename {public => src}/assets/images/512x512.png (100%) rename {public => src}/assets/images/android-chrome-144x144.png (100%) rename {public => src}/assets/images/apple-touch-icon.png (100%) rename {public => src}/assets/images/browserconfig.xml (100%) rename {public => src}/assets/images/favicon-16x16.png (100%) rename {public => src}/assets/images/favicon-32x32.png (100%) rename {public => src}/assets/images/favicon.ico (100%) rename {public => src}/assets/images/favicon.png (100%) rename {public => src}/assets/images/knowit.svg (100%) rename {public => src}/assets/images/lodd.svg (100%) rename {public => src}/assets/images/mstile-150x150.png (100%) rename {public => src}/assets/images/notification.svg (100%) rename {public => src}/assets/images/safari-pinned-tab.svg (100%) rename {public => src}/assets/images/vipps-logo.svg (100%) rename {public => src}/assets/images/vipps-qr.png (100%) rename {public => src}/assets/images/vipps.png (100%) rename {public => src}/assets/manifest.json (76%) diff --git a/public/assets/fonts/bold.otf b/src/assets/fonts/bold.otf similarity index 100% rename from public/assets/fonts/bold.otf rename to src/assets/fonts/bold.otf diff --git a/public/assets/fonts/bold.woff b/src/assets/fonts/bold.woff similarity index 100% rename from public/assets/fonts/bold.woff rename to src/assets/fonts/bold.woff diff --git a/public/assets/fonts/regular.otf b/src/assets/fonts/regular.otf similarity index 100% rename from public/assets/fonts/regular.otf rename to src/assets/fonts/regular.otf diff --git a/public/assets/fonts/regular.woff b/src/assets/fonts/regular.woff similarity index 100% rename from public/assets/fonts/regular.woff rename to src/assets/fonts/regular.woff diff --git a/public/assets/images/192x192.png b/src/assets/images/192x192.png similarity index 100% rename from public/assets/images/192x192.png rename to src/assets/images/192x192.png diff --git a/public/assets/images/512x512.png b/src/assets/images/512x512.png similarity index 100% rename from public/assets/images/512x512.png rename to src/assets/images/512x512.png diff --git a/public/assets/images/android-chrome-144x144.png b/src/assets/images/android-chrome-144x144.png similarity index 100% rename from public/assets/images/android-chrome-144x144.png rename to src/assets/images/android-chrome-144x144.png diff --git a/public/assets/images/apple-touch-icon.png b/src/assets/images/apple-touch-icon.png similarity index 100% rename from public/assets/images/apple-touch-icon.png rename to src/assets/images/apple-touch-icon.png diff --git a/public/assets/images/browserconfig.xml b/src/assets/images/browserconfig.xml similarity index 100% rename from public/assets/images/browserconfig.xml rename to src/assets/images/browserconfig.xml diff --git a/public/assets/images/favicon-16x16.png b/src/assets/images/favicon-16x16.png similarity index 100% rename from public/assets/images/favicon-16x16.png rename to src/assets/images/favicon-16x16.png diff --git a/public/assets/images/favicon-32x32.png b/src/assets/images/favicon-32x32.png similarity index 100% rename from public/assets/images/favicon-32x32.png rename to src/assets/images/favicon-32x32.png diff --git a/public/assets/images/favicon.ico b/src/assets/images/favicon.ico similarity index 100% rename from public/assets/images/favicon.ico rename to src/assets/images/favicon.ico diff --git a/public/assets/images/favicon.png b/src/assets/images/favicon.png similarity index 100% rename from public/assets/images/favicon.png rename to src/assets/images/favicon.png diff --git a/public/assets/images/knowit.svg b/src/assets/images/knowit.svg similarity index 100% rename from public/assets/images/knowit.svg rename to src/assets/images/knowit.svg diff --git a/public/assets/images/lodd.svg b/src/assets/images/lodd.svg similarity index 100% rename from public/assets/images/lodd.svg rename to src/assets/images/lodd.svg diff --git a/public/assets/images/mstile-150x150.png b/src/assets/images/mstile-150x150.png similarity index 100% rename from public/assets/images/mstile-150x150.png rename to src/assets/images/mstile-150x150.png diff --git a/public/assets/images/notification.svg b/src/assets/images/notification.svg similarity index 100% rename from public/assets/images/notification.svg rename to src/assets/images/notification.svg diff --git a/public/assets/images/safari-pinned-tab.svg b/src/assets/images/safari-pinned-tab.svg similarity index 100% rename from public/assets/images/safari-pinned-tab.svg rename to src/assets/images/safari-pinned-tab.svg diff --git a/public/assets/images/vipps-logo.svg b/src/assets/images/vipps-logo.svg similarity index 100% rename from public/assets/images/vipps-logo.svg rename to src/assets/images/vipps-logo.svg diff --git a/public/assets/images/vipps-qr.png b/src/assets/images/vipps-qr.png similarity index 100% rename from public/assets/images/vipps-qr.png rename to src/assets/images/vipps-qr.png diff --git a/public/assets/images/vipps.png b/src/assets/images/vipps.png similarity index 100% rename from public/assets/images/vipps.png rename to src/assets/images/vipps.png diff --git a/public/assets/manifest.json b/src/assets/manifest.json similarity index 76% rename from public/assets/manifest.json rename to src/assets/manifest.json index e74eb8f..00ac85f 100644 --- a/public/assets/manifest.json +++ b/src/assets/manifest.json @@ -8,17 +8,17 @@ "lang": "nb-NO", "icons": [ { - "src": "/public/assets/images/android-chrome-144x144.png", + "src": "/assets/images/android-chrome-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src": "/public/assets/images/192x192.png", + "src": "/assets/images/192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/public/assets/images/512x512.png", + "src": "/assets/images/512x512.png", "sizes": "512x512", "type": "image/png" } From 72ba0fb39846d6e793439497207f988e22f8d4fa Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Wed, 14 Oct 2020 21:41:05 +0200 Subject: [PATCH 02/55] Updated references to new assets location. All references are now also absolute to escape relative references. --- src/Vinlottis.vue | 8 ++++---- src/components/RegisterPage.vue | 4 ++-- src/components/VinlottisPage.vue | 2 +- src/components/VirtualLotteryPage.vue | 4 ++-- src/components/VirtualLotteryRegistrationPage.vue | 4 ++-- src/service-worker/service-worker.js | 4 ++-- src/styles/global.scss | 4 ++-- src/templates/Create.html | 12 ++++++------ src/ui/Banner.vue | 2 +- src/ui/RaffleGenerator.vue | 4 ++-- src/ui/Vipps.vue | 4 ++-- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Vinlottis.vue b/src/Vinlottis.vue index d0063a7..54830eb 100644 --- a/src/Vinlottis.vue +++ b/src/Vinlottis.vue @@ -82,16 +82,16 @@ export default { @font-face { font-family: "knowit"; font-weight: 600; - src: url("/../public/assets/fonts/bold.woff"), - url("/../public/assets/fonts/bold.woff") format("woff"), local("Arial"); + src: url("/assets/fonts/bold.woff"), + url("/assets/fonts/bold.woff") format("woff"), local("Arial"); font-display: swap; } @font-face { font-family: "knowit"; font-weight: 300; - src: url("/../public/assets/fonts/regular.eot"), - url("/../public/assets/fonts/regular.woff") format("woff"), local("Arial"); + src: url("/assets/fonts/regular.eot"), + url("/assets/fonts/regular.woff") format("woff"), local("Arial"); font-display: swap; } diff --git a/src/components/RegisterPage.vue b/src/components/RegisterPage.vue index 52345d4..88d25f2 100644 --- a/src/components/RegisterPage.vue +++ b/src/components/RegisterPage.vue @@ -654,9 +654,9 @@ hr { width: 150px; height: 150px; margin: 20px; - -webkit-mask-image: url(/../../public/assets/images/lodd.svg); + -webkit-mask-image: url(/assets/images/lodd.svg); background-repeat: no-repeat; - mask-image: url(/../../public/assets/images/lodd.svg); + mask-image: url(/assets/images/lodd.svg); -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; diff --git a/src/components/VinlottisPage.vue b/src/components/VinlottisPage.vue index a157d93..5068654 100644 --- a/src/components/VinlottisPage.vue +++ b/src/components/VinlottisPage.vue @@ -4,7 +4,7 @@

Vinlotteri

Notification-bell { function showLocalNotification(title, body, link, swRegistration) { const options = { body, - icon: "https://lottis.vin/public/assets/images/favicon.png", - image: "https://lottis.vin/public/assets/images/favicon.png", + icon: "https://lottis.vin/assets/images/favicon.png", + image: "https://lottis.vin/assets/images/favicon.png", vibrate: [300], data: { link: link } }; diff --git a/src/styles/global.scss b/src/styles/global.scss index 43b5e72..321f9db 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -275,9 +275,9 @@ textarea { .raffle-element { margin: 20px 0; - -webkit-mask-image: url(/../../public/assets/images/lodd.svg); + -webkit-mask-image: url(/assets/images/lodd.svg); background-repeat: no-repeat; - mask-image: url(/../../public/assets/images/lodd.svg); + mask-image: url(/assets/images/lodd.svg); -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; color: #333333; diff --git a/src/templates/Create.html b/src/templates/Create.html index 56aa835..2a3fdc0 100644 --- a/src/templates/Create.html +++ b/src/templates/Create.html @@ -12,7 +12,7 @@ @@ -23,24 +23,24 @@ - + diff --git a/src/ui/Banner.vue b/src/ui/Banner.vue index 9a53fa8..295f5d9 100644 --- a/src/ui/Banner.vue +++ b/src/ui/Banner.vue @@ -2,7 +2,7 @@
diff --git a/src/ui/RaffleGenerator.vue b/src/ui/RaffleGenerator.vue index 02e8c4a..5a4eae4 100644 --- a/src/ui/RaffleGenerator.vue +++ b/src/ui/RaffleGenerator.vue @@ -287,9 +287,9 @@ label .text { width: 150px; height: 150px; margin: 20px; - -webkit-mask-image: url(/../../public/assets/images/lodd.svg); + -webkit-mask-image: url(/assets/images/lodd.svg); background-repeat: no-repeat; - mask-image: url(/../../public/assets/images/lodd.svg); + mask-image: url(/assets/images/lodd.svg); -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; diff --git a/src/ui/Vipps.vue b/src/ui/Vipps.vue index 952b9c4..093ee38 100644 --- a/src/ui/Vipps.vue +++ b/src/ui/Vipps.vue @@ -6,7 +6,7 @@ @click="openVipps" > @@ -21,7 +21,7 @@ pr. lodd
diff --git a/src/ui/RaffleGenerator.vue b/src/ui/RaffleGenerator.vue index ed6ce92..acea3b7 100644 --- a/src/ui/RaffleGenerator.vue +++ b/src/ui/RaffleGenerator.vue @@ -292,9 +292,9 @@ label .text { width: 150px; height: 150px; margin: 20px; - -webkit-mask-image: url(/assets/images/lodd.svg); + -webkit-mask-image: url(/public/assets/images/lodd.svg); background-repeat: no-repeat; - mask-image: url(/assets/images/lodd.svg); + mask-image: url(/public/assets/images/lodd.svg); -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; diff --git a/src/ui/Vipps.vue b/src/ui/Vipps.vue index 093ee38..952b9c4 100644 --- a/src/ui/Vipps.vue +++ b/src/ui/Vipps.vue @@ -6,7 +6,7 @@ @click="openVipps" > @@ -21,7 +21,7 @@ pr. lodd