From a704082779630534d22ed5fe92e196e647df965a Mon Sep 17 00:00:00 2001
From: Fluffy <michal-gdula@protonmail.com>
Date: Wed, 8 May 2024 10:27:15 +0100
Subject: [PATCH] Clean up image folder structure

---
 front/public/{ => assets}/BackgroundTexture.svg     |   0
 front/public/{ => assets}/BackgroundTextureAlt.svg  |   0
 front/public/{ => assets}/BannerLoading.svg         |   0
 front/public/{ => assets}/Logo.svg                  |   0
 front/public/{ => assets}/LogoAlt.svg               |   0
 front/public/{ => assets}/MenuItemLoading.svg       |   0
 front/public/{ => assets}/MenuItemLoadingAlt.svg    |   0
 front/public/{ => assets}/Noise.png                 | Bin
 .../{ => banner_images}/BannerExampleImage.jpg      | Bin
 front/public/{ => item_images}/dab.jpg              | Bin
 front/public/{ => item_images}/sonichog.jpg         | Bin
 front/public/{ => item_images}/wathog.jpg           | Bin
 front/src/App.svelte                                |   2 +-
 front/src/components/BasketItem.svelte              |   2 +-
 front/src/components/MenuItem.svelte                |   2 +-
 front/src/lib/test-api.ts                           |   2 +-
 front/src/lib/test-data.ts                          |   6 +++---
 front/src/pages/PageItem.svelte                     |   2 +-
 front/src/styles/_reset.scss                        |   2 +-
 19 files changed, 9 insertions(+), 9 deletions(-)
 rename front/public/{ => assets}/BackgroundTexture.svg (100%)
 rename front/public/{ => assets}/BackgroundTextureAlt.svg (100%)
 rename front/public/{ => assets}/BannerLoading.svg (100%)
 rename front/public/{ => assets}/Logo.svg (100%)
 rename front/public/{ => assets}/LogoAlt.svg (100%)
 rename front/public/{ => assets}/MenuItemLoading.svg (100%)
 rename front/public/{ => assets}/MenuItemLoadingAlt.svg (100%)
 rename front/public/{ => assets}/Noise.png (100%)
 rename front/public/{ => banner_images}/BannerExampleImage.jpg (100%)
 rename front/public/{ => item_images}/dab.jpg (100%)
 rename front/public/{ => item_images}/sonichog.jpg (100%)
 rename front/public/{ => item_images}/wathog.jpg (100%)

diff --git a/front/public/BackgroundTexture.svg b/front/public/assets/BackgroundTexture.svg
similarity index 100%
rename from front/public/BackgroundTexture.svg
rename to front/public/assets/BackgroundTexture.svg
diff --git a/front/public/BackgroundTextureAlt.svg b/front/public/assets/BackgroundTextureAlt.svg
similarity index 100%
rename from front/public/BackgroundTextureAlt.svg
rename to front/public/assets/BackgroundTextureAlt.svg
diff --git a/front/public/BannerLoading.svg b/front/public/assets/BannerLoading.svg
similarity index 100%
rename from front/public/BannerLoading.svg
rename to front/public/assets/BannerLoading.svg
diff --git a/front/public/Logo.svg b/front/public/assets/Logo.svg
similarity index 100%
rename from front/public/Logo.svg
rename to front/public/assets/Logo.svg
diff --git a/front/public/LogoAlt.svg b/front/public/assets/LogoAlt.svg
similarity index 100%
rename from front/public/LogoAlt.svg
rename to front/public/assets/LogoAlt.svg
diff --git a/front/public/MenuItemLoading.svg b/front/public/assets/MenuItemLoading.svg
similarity index 100%
rename from front/public/MenuItemLoading.svg
rename to front/public/assets/MenuItemLoading.svg
diff --git a/front/public/MenuItemLoadingAlt.svg b/front/public/assets/MenuItemLoadingAlt.svg
similarity index 100%
rename from front/public/MenuItemLoadingAlt.svg
rename to front/public/assets/MenuItemLoadingAlt.svg
diff --git a/front/public/Noise.png b/front/public/assets/Noise.png
similarity index 100%
rename from front/public/Noise.png
rename to front/public/assets/Noise.png
diff --git a/front/public/BannerExampleImage.jpg b/front/public/banner_images/BannerExampleImage.jpg
similarity index 100%
rename from front/public/BannerExampleImage.jpg
rename to front/public/banner_images/BannerExampleImage.jpg
diff --git a/front/public/dab.jpg b/front/public/item_images/dab.jpg
similarity index 100%
rename from front/public/dab.jpg
rename to front/public/item_images/dab.jpg
diff --git a/front/public/sonichog.jpg b/front/public/item_images/sonichog.jpg
similarity index 100%
rename from front/public/sonichog.jpg
rename to front/public/item_images/sonichog.jpg
diff --git a/front/public/wathog.jpg b/front/public/item_images/wathog.jpg
similarity index 100%
rename from front/public/wathog.jpg
rename to front/public/item_images/wathog.jpg
diff --git a/front/src/App.svelte b/front/src/App.svelte
index d4192b6..d2b5785 100644
--- a/front/src/App.svelte
+++ b/front/src/App.svelte
@@ -6,7 +6,7 @@
 
     import Cart from './lib/cart';
     import routes from './routes';
-    import Logo from '/LogoAlt.svg';
+    import Logo from '/assets/LogoAlt.svg';
 
     const links = {
         home: {path: '/', className: 'active'},
diff --git a/front/src/components/BasketItem.svelte b/front/src/components/BasketItem.svelte
index 6c99c6f..c308aa7 100644
--- a/front/src/components/BasketItem.svelte
+++ b/front/src/components/BasketItem.svelte
@@ -26,7 +26,7 @@
     {#if item.data.images}
         <img src="{item.data.images[0]}" alt="Item" class="basket-item-image">
     {:else}
-        <img src="/MenuItemLoading.svg" alt="Item" class="basket-item-image">
+        <img src="/assets/MenuItemLoading.svg" alt="Item" class="basket-item-image">
     {/if}
 
     <ul class="basket-item-data">
diff --git a/front/src/components/MenuItem.svelte b/front/src/components/MenuItem.svelte
index 6c9fb30..3ead38c 100644
--- a/front/src/components/MenuItem.svelte
+++ b/front/src/components/MenuItem.svelte
@@ -3,7 +3,7 @@
     import { Acorn, Fish, Leaf, Pepper, ArrowUpRight, GrainsSlash } from 'phosphor-svelte';
 
     import { type Item, Labels} from "../lib/types";
-    import LoadingImage from '/MenuItemLoadingAlt.svg';
+    import LoadingImage from '/assets/MenuItemLoadingAlt.svg';
     import {onMount} from "svelte";
 
     export let item: Item;
diff --git a/front/src/lib/test-api.ts b/front/src/lib/test-api.ts
index 95aaa8f..1f83027 100644
--- a/front/src/lib/test-api.ts
+++ b/front/src/lib/test-api.ts
@@ -14,7 +14,7 @@ export async function getAnnouncements(): Promise<{ image: string }> {
     await fakeDelay(200);
 
     const data = {
-        image: "/BannerExampleImage.jpg",
+        image: "/banner_images/BannerExampleImage.jpg",
     };
     cache["announcement_banner"] = data;
 
diff --git a/front/src/lib/test-data.ts b/front/src/lib/test-data.ts
index c6d914c..59a9ed1 100644
--- a/front/src/lib/test-data.ts
+++ b/front/src/lib/test-data.ts
@@ -49,14 +49,14 @@ const TestData: Item[] = [
         name: "GwaGwa",
         price: 69,
         labels: [Labels.nut],
-        images: ["/dab.jpg"],
+        images: ["/item_images/dab.jpg"],
     },
     {
         uuid: "hogmelon",
         name: "Hogermellon",
         price: 1111,
         labels: [Labels.fish],
-        images: ["/wathog.jpg"],
+        images: ["/item_images/wathog.jpg"],
         description: "Example",
     },
     {
@@ -64,7 +64,7 @@ const TestData: Item[] = [
         name: "Blue HOGGGGG",
         price: 0,
         labels: [Labels.nut, Labels.gluten, Labels.spicy],
-        images: ["/sonichog.jpg"],
+        images: ["/item_images/sonichog.jpg"],
         description: "Example",
     },
 ];
diff --git a/front/src/pages/PageItem.svelte b/front/src/pages/PageItem.svelte
index f9f2558..826fa4c 100644
--- a/front/src/pages/PageItem.svelte
+++ b/front/src/pages/PageItem.svelte
@@ -58,7 +58,7 @@
                 {#if item.images}
                     <img src="{item.images[0]}" alt="Item">
                 {:else}
-                    <img src="/MenuItemLoading.svg" alt="Item">
+                    <img src="/assets/MenuItemLoading.svg" alt="Item">
                 {/if}
             </div>
             <ul>
diff --git a/front/src/styles/_reset.scss b/front/src/styles/_reset.scss
index 1574209..c5c09b1 100644
--- a/front/src/styles/_reset.scss
+++ b/front/src/styles/_reset.scss
@@ -22,7 +22,7 @@ body,
 body {
     background-color: darken($color-background, 10%);
     //background-color: $color-background;
-    background-image: url("/Noise.png");
+    background-image: url("/assets/Noise.png");
     color: $color-on-background;
 }