More stuff which seems to make it work

openfoodfoundation · Apr 14, 2023 · 2ffae75 · 2ffae75
1 parent e866547
commit 2ffae75
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 54 deletions.
diff --git a/app/components/products_table_component/products_table_component.scss b/app/components/products_table_component/products_table_component.scss
@@ -41,7 +41,7 @@
       background-position: center;
       background-repeat: no-repeat;
       background-size: 50px 50px;
-      background-image: url("../images/spinning-circles.svg");
+      background-image: url("/images/spinning-circles.svg");
     }
   }
 }
diff --git a/app/webpacker/css/admin/plugins/font-awesome.scss b/app/webpacker/css/admin/plugins/font-awesome.scss
@@ -27,11 +27,11 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=3.2.1');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),
-      url('../fonts/fontawesome-webfont.woff?v=3.2.1') format('woff'),
-      url('../fonts/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),
-      url('../fonts/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
+  src: url('/fonts/fontawesome-webfont.eot?v=3.2.1');
+  src: url('/fonts/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),
+      url('/fonts/fontawesome-webfont.woff?v=3.2.1') format('woff'),
+      url('/fonts/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),
+      url('/fonts/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
   font-weight: normal;
   font-style: normal;
 }

diff --git a/app/webpacker/css/admin/welcome.scss b/app/webpacker/css/admin/welcome.scss
@@ -7,7 +7,7 @@
 
     @include fullbg;
     background-color: black;
-    background-image: url("../images/home/tagline-bg.jpg");
+    background-image: url("/images/home/tagline-bg.jpg");
     background-repeat: no-repeat;
     background-position: center center;
     margin-bottom: 2em;

diff --git a/app/webpacker/css/darkswarm/_shop-navigation.scss b/app/webpacker/css/darkswarm/_shop-navigation.scss
@@ -60,7 +60,7 @@ ordercycle {
     }
 
     select {
-      background-image: url('../images/white-caret.svg');
+      background-image: url('/images/white-caret.svg');
       background-size: 30px auto;
       background-position-x: 102%;
       height: 2.35em;
@@ -145,7 +145,7 @@ shop ordercycle {
 
       select {
         background-color: $white;
-        background-image: url('../images/black-caret.svg');
+        background-image: url('/black-caret.svg');
         color: $grey-500;
         font-style: italic;
       }

diff --git a/app/webpacker/css/darkswarm/footer.scss b/app/webpacker/css/darkswarm/footer.scss
@@ -46,7 +46,7 @@ footer {
 
         width: 100%;
         border: 1px solid rgba($dark-grey, 0.35);
-        background-image: url("../images/tile-wide.png");
+        background-image: url("/images/tile-wide.png");
         background-position: center center;
         background-color: #bbb;
         padding: 12px 0 8px 0;

diff --git a/app/webpacker/css/darkswarm/home_panes.scss b/app/webpacker/css/darkswarm/home_panes.scss
@@ -36,7 +36,7 @@
 }
 
 #stats.pane {
-  background-image: url("../images/home/background-blurred-oranges.jpg");
+  background-image: url("/images/home/background-blurred-oranges.jpg");
   background-position: center center;
   background-color: $ofn-grey;
 
@@ -88,7 +88,7 @@
   }
 
   .home-icon-box {
-    background-image: url("../images/ofn-o.png");
+    background-image: url("/images/ofn-o.png");
     background-position: center center;
     background-repeat: no-repeat;
     background-size: auto 100%;
@@ -115,15 +115,15 @@
       background-size: auto 100%;
 
       &.search {
-        background-image: url("../images/icon-mask-magnifier.png");
+        background-image: url("/images/icon-mask-magnifier.png");
       }
 
       &.shop {
-        background-image: url("../images/icon-mask-apple.png");
+        background-image: url("/images/icon-mask-apple.png");
       }
 
       &.pick-up-delivery {
-        background-image: url("../images/icon-mask-truck.png");
+        background-image: url("/images/icon-mask-truck.png");
       }
     }
   }

diff --git a/app/webpacker/css/darkswarm/home_tagline.scss b/app/webpacker/css/darkswarm/home_tagline.scss
@@ -9,7 +9,7 @@
     @include fullbg;
 
     background-color: $ofn-grey;
-    //background-image: url("../../images/home/home.jpg");
+    //background-image: url("/../images/home/home.jpg");
     position: fixed;
     left: 0;
     right: 0;

diff --git a/app/webpacker/css/darkswarm/mixins.scss b/app/webpacker/css/darkswarm/mixins.scss
@@ -3,7 +3,7 @@
 // Generic \\
 
 @mixin tiledPane {
-  background-image: url("../images/tile-wide.png");
+  background-image: url("/images/tile-wide.png");
   background-color: $brand-colour;
   background-position: center center;
 
@@ -177,21 +177,21 @@
 
 @mixin producersbg {
   background-color: lighten($clr-turquoise, 68%);
-  background-image: url("../images/producers.svg");
+  background-image: url("/images/producers.svg");
   background-position: center 50px;
   background-repeat: no-repeat;
   background-size: 922px 763px;
 }
 
 @mixin hubsbg {
   background-color: $brand-colour;
-  background-image: url("../images/hubs-bg.jpg");
+  background-image: url("/images/hubs-bg.jpg");
   background-position: center center;
 }
 
 @mixin groupsbg {
   background-color: lighten($clr-brick, 56%);
-  background-image: url("../images/groups.svg");
+  background-image: url("/images/groups.svg");
   background-position: center 50px;
   background-repeat: no-repeat;
   background-size: 922px 922px;

diff --git a/app/webpacker/css/darkswarm/page_alert.scss b/app/webpacker/css/darkswarm/page_alert.scss
@@ -9,7 +9,7 @@ $page-alert-height: 55px;
     border-left: none;
     border-right: none;
     background-color: #bbb;
-    background-image: url("../images/tile-wide.png");
+    background-image: url("/images/tile-wide.png");
     background-position: center center;
     padding: 12px 0 8px 0;
     margin: 0;

diff --git a/app/webpacker/css/darkswarm/shop_search.scss b/app/webpacker/css/darkswarm/shop_search.scss
@@ -27,7 +27,7 @@
     padding: 0 2.25em 0 2.75em;
     width: 100%;
     min-width: 0;
-    background: $white url("../images/icn-search-grey.png") 1em center no-repeat;
+    background: $white url("/images/icn-search-grey.png") 1em center no-repeat;
     font-size: 1rem; // avoid zoom on iphone, see issue #4535
 
     &::placeholder {

diff --git a/app/webpacker/css/darkswarm/split-checkout.scss b/app/webpacker/css/darkswarm/split-checkout.scss
@@ -298,7 +298,7 @@
     }
 
     &:after {
-      background-image: url("../images/edit-with-pen.svg");
+      background-image: url("/images/edit-with-pen.svg");
       content: " ";
       display: inline-block;
       width: 1em;

diff --git a/app/webpacker/css/darkswarm/style.scss b/app/webpacker/css/darkswarm/style.scss
@@ -1,10 +1,10 @@
 @font-face {
 	font-family: 'OFN';
-	src: url('../fonts/OFN-v2.eot');
-	src: url('../fonts/OFN-v2.eot') format('embedded-opentype'),
-		url('../fonts/OFN-v2.woff') format('woff'),
-		url('../fonts/OFN-v2.ttf') format('truetype'),
-		url('../fonts/OFN-v2.svg') format('svg');
+	src: url('/fonts/OFN-v2.eot');
+	src: url('/fonts/OFN-v2.eot') format('embedded-opentype'),
+		url('/fonts/OFN-v2.woff') format('woff'),
+		url('/fonts/OFN-v2.ttf') format('truetype'),
+		url('/fonts/OFN-v2.svg') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }

diff --git a/app/webpacker/css/shared/question-mark-icon.scss b/app/webpacker/css/shared/question-mark-icon.scss
@@ -6,7 +6,7 @@
 }
 
 .question-mark-icon {
-  background-image: url("../images/question-mark-icon.svg");
+  background-image: url("/images/question-mark-icon.svg");
   background-size: cover;
   background-repeat: no-repeat;
   border-radius: 50%;

diff --git a/app/webpacker/css/shared/variables/variables.scss b/app/webpacker/css/shared/variables/variables.scss
@@ -9,11 +9,11 @@ $modal-zIndex: 1005;
 
 @font-face {
 	font-family: 'OFN';
-	src: url('../fonts/OFN-v2.eot');
-	src: url('../fonts/OFN-v2.eot') format('embedded-opentype'),
-		url('../fonts/OFN-v2.woff') format('woff'),
-		url('../fonts/OFN-v2.ttf') format('truetype'),
-		url('../fonts/OFN-v2.svg') format('svg');
+	src: url('/fonts/OFN-v2.eot');
+	src: url('/fonts/OFN-v2.eot') format('embedded-opentype'),
+		url('/fonts/OFN-v2.woff') format('woff'),
+		url('/fonts/OFN-v2.ttf') format('truetype'),
+		url('/fonts/OFN-v2.svg') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }

diff --git a/app/webpacker/packs/application.js b/app/webpacker/packs/application.js
@@ -12,8 +12,8 @@ mrujs.start({
   ],
 });
 
-require.context("../fonts", true);
-const images = require.context("../images", true);
-const imagePath = (name) => images(name, true);
+// require.context("../fonts", true);
+// const images = require.context("../images", true);
+// const imagePath = (name) => images(name, true);
 
 import "controllers";
diff --git a/config/webpacker.yml b/config/webpacker.yml
@@ -12,9 +12,8 @@ default: &default
   # ['app/assets', 'engine/foo/app/assets']
   additional_paths: [
     'vendor',
+    'app/assets',
     'app/webpacker/css',
-    'app/assets/fonts',
-    'app/assets/images',
     'engines/web/app/assets/stylesheets',
     'app/components'
   ]

diff --git a/vendor/assets/stylesheets/select2.css.scss b/vendor/assets/stylesheets/select2.css.scss
@@ -95,7 +95,7 @@ Version: 3.4.3 Timestamp: Tue Sep 17 06:47:14 PDT 2013
     text-decoration: none;
 
     border: 0;
-    background: url('../images/select2.png') right top no-repeat;
+    background: url('/images/select2.png') right top no-repeat;
     cursor: pointer;
     outline: 0;
 }
@@ -199,7 +199,7 @@ Version: 3.4.3 Timestamp: Tue Sep 17 06:47:14 PDT 2013
     display: block;
     width: 100%;
     height: 100%;
-    background: url('../images/select2.png') no-repeat 0 1px;
+    background: url('/images/select2.png') no-repeat 0 1px;
 }
 
 .select2-search {
@@ -233,23 +233,23 @@ Version: 3.4.3 Timestamp: Tue Sep 17 06:47:14 PDT 2013
     -webkit-box-shadow: none;
             box-shadow: none;
 
-    background: #fff url('../images/select2.png') no-repeat 100% -22px;
-    background: url('../images/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
-    background: url('../images/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../images/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../images/select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%);
+    background: #fff url('/images/select2.png') no-repeat 100% -22px;
+    background: url('/images/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('/images/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('/images/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('/images/select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%);
 }
 
 .select2-drop.select2-drop-above .select2-search input {
     margin-top: 4px;
 }
 
 .select2-search input.select2-active {
-    background: #fff url('../images/select2-spinner.gif') no-repeat 100%;
-    background: url('../images/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
-    background: url('../images/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../images/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../images/select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%);
+    background: #fff url('/images/select2-spinner.gif') no-repeat 100%;
+    background: url('/images/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('/images/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('/images/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('/images/select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%);
 }
 
 .select2-container-active .select2-choice,
@@ -393,7 +393,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-more-results.select2-active {
-    background: #f4f4f4 url('../images/select2-spinner.gif') no-repeat 100%;
+    background: #f4f4f4 url('/images/select2-spinner.gif') no-repeat 100%;
 }
 
 .select2-more-results {
@@ -481,7 +481,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
-    background: #fff url('../images/select2-spinner.gif') no-repeat 100% !important;
+    background: #fff url('/images/select2-spinner.gif') no-repeat 100% !important;
 }
 
 .select2-default {
@@ -535,7 +535,7 @@ disabled look for disabled choices in the results dropdown
 
     font-size: 1px;
     outline: none;
-    background: url('../images/select2.png') right top no-repeat;
+    background: url('/images/select2.png') right top no-repeat;
 }
 
 .select2-container-multi .select2-search-choice-close {