From 865654de87619cb3ee882f45c8ee1d5594326811 Mon Sep 17 00:00:00 2001
From: Fluffy <michal-gdula@protonmail.com>
Date: Wed, 15 May 2024 19:55:51 +0100
Subject: [PATCH] Remove unused 500 rename MenuList to MenuItemGrid to
 represent the component better Adjust 404 page

---
 .../{MenuList.svelte => MenuItemGrid.svelte}  |  0
 front/src/pages/404.svelte                    |  2 +-
 front/src/pages/500.svelte                    | 32 -------------------
 front/src/pages/Cart.svelte                   |  4 +--
 front/src/pages/Index.svelte                  | 14 ++++----
 front/src/pages/Item.svelte                   |  4 +--
 front/src/pages/Menu.svelte                   |  2 +-
 front/src/routes.js                           | 16 +++-------
 8 files changed, 18 insertions(+), 56 deletions(-)
 rename front/src/components/{MenuList.svelte => MenuItemGrid.svelte} (100%)
 delete mode 100644 front/src/pages/500.svelte

diff --git a/front/src/components/MenuList.svelte b/front/src/components/MenuItemGrid.svelte
similarity index 100%
rename from front/src/components/MenuList.svelte
rename to front/src/components/MenuItemGrid.svelte
diff --git a/front/src/pages/404.svelte b/front/src/pages/404.svelte
index d3b3dec..2db36fe 100644
--- a/front/src/pages/404.svelte
+++ b/front/src/pages/404.svelte
@@ -4,7 +4,7 @@
 
 <div>
     <h1>You're lost!&nbsp;<SmileySad weight="fill" /></h1>
-    <p>Error 404</p>
+    <p>Error ForOhFor</p>
 </div>
 
 <style lang="scss">
diff --git a/front/src/pages/500.svelte b/front/src/pages/500.svelte
deleted file mode 100644
index 3200ebd..0000000
--- a/front/src/pages/500.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-<script lang="ts">
-    import { SmileySad } from "phosphor-svelte";
-</script>
-
-<div>
-    <h1>Server Fucking Died!&nbsp;<SmileySad weight="fill" /></h1>
-    <p>Error 500</p>
-</div>
-
-<style lang="scss">
-    @import "../styles/vars";
-
-    div {
-        height: 400px;
-
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-    }
-    h1 {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        font-size: $font-size-very-fucking-big;
-        text-align: center;
-    }
-    p {
-        text-align: center;
-    }
-</style>
\ No newline at end of file
diff --git a/front/src/pages/Cart.svelte b/front/src/pages/Cart.svelte
index b8b87e3..dbb396f 100644
--- a/front/src/pages/Cart.svelte
+++ b/front/src/pages/Cart.svelte
@@ -5,7 +5,7 @@
     import { type CartItem } from "../lib/types";
     import { getPopularToday } from "../lib/test-api";
     import Cart, { cartLoaded } from "../lib/cart";
-    import MenuList from "../components/MenuList.svelte";
+    import MenuItemGrid from "../components/MenuItemGrid.svelte";
     import BasketItem from "../components/BasketItem.svelte";
     import DropDown from "../components/DropDown.svelte";
 
@@ -53,7 +53,7 @@
 {#await popularToday}
     <p>Loading</p>
 {:then popularToday}
-    <MenuList items={popularToday} />
+    <MenuItemGrid items={popularToday} />
 {/await}
 
 <div class="spacer" />
diff --git a/front/src/pages/Index.svelte b/front/src/pages/Index.svelte
index 09d2b11..f288a30 100644
--- a/front/src/pages/Index.svelte
+++ b/front/src/pages/Index.svelte
@@ -7,16 +7,16 @@
     import { getPopularToday } from "../lib/test-api";
     import AnnouncementBanner from "../components/AnnouncementBanner.svelte";
     import LoadingBar from "../components/LoadingBar.svelte";
-    import MenuList from "../components/MenuList.svelte";
+    import MenuItemGrid from "../components/MenuItemGrid.svelte";
 
     let items = getPopularToday();
 
     onMount(() => {
-        let map = L.map('map').setView([50.82304922105467, -0.432780150496344], 13);
-        L.tileLayer(
-            'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-            {maxZoom: 19, attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'}
-        ).addTo(map);
+        const maxZoom = 20;
+        const attribution = "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a>";
+        const map = L.map('map').setView([50.82304922105467, -0.432780150496344], 13);
+
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {maxZoom, attribution}).addTo(map);
         L.marker([50.82304922105467, -0.432780150496344]).addTo(map);
 
     });
@@ -63,7 +63,7 @@
     {#await items}
         <LoadingBar />
     {:then items}
-        <MenuList {items} />
+        <MenuItemGrid {items} />
     {:catch error}
         <p>{error}</p>
     {/await}
diff --git a/front/src/pages/Item.svelte b/front/src/pages/Item.svelte
index 571278b..97b1ce3 100644
--- a/front/src/pages/Item.svelte
+++ b/front/src/pages/Item.svelte
@@ -6,7 +6,7 @@
     import { Labels } from "../lib/types";
     import { getPopularToday, getItemByUUID } from "../lib/test-api";
     import Cart, { cartLoaded } from "../lib/cart";
-    import MenuList from "../components/MenuList.svelte";
+    import MenuItemGrid from "../components/MenuItemGrid.svelte";
     import LoadingBar from "../components/LoadingBar.svelte";
     import LoadingImage from "/assets/MenuItemLoading.svg";
 
@@ -164,7 +164,7 @@
         {#await popularToday}
             <LoadingBar />
         {:then items}
-            <MenuList {items} />
+            <MenuItemGrid {items} />
         {:catch error}
             <p>{error}</p>
         {/await}
diff --git a/front/src/pages/Menu.svelte b/front/src/pages/Menu.svelte
index 29897cf..bac7ca2 100644
--- a/front/src/pages/Menu.svelte
+++ b/front/src/pages/Menu.svelte
@@ -3,7 +3,7 @@
 
     import { getMenuItems } from "../lib/test-api";
     import LoadingBar from "../components/LoadingBar.svelte";
-    import MenuList from "../components/MenuList.svelte";
+    import MenuList from "../components/MenuItemGrid.svelte";
     import DropDown from "../components/DropDown.svelte";
 
     let items = getMenuItems();
diff --git a/front/src/routes.js b/front/src/routes.js
index 740d695..e8ab45f 100644
--- a/front/src/routes.js
+++ b/front/src/routes.js
@@ -2,7 +2,6 @@ import { wrap } from "svelte-spa-router/wrap";
 
 import PageLoading from "./pages/Loading.svelte";
 import Page404 from "./pages/404.svelte";
-import Page500 from "./pages/500.svelte";
 
 const routes = {
     "/": wrap({
@@ -41,22 +40,17 @@ const routes = {
         conditions: [],
         userData: { showNavBar: true, fullWidth: false },
     }),
+    "/cart/checkout": wrap({
+        component: Page404,
+        conditions: [],
+        userData: { showNavBar: false, fullWidth: true },
+    }),
     "/booking": wrap({
         asyncComponent: () => import("./pages/Booking.svelte"),
         loadingComponent: PageLoading,
         conditions: [],
         userData: { showNavBar: true, fullWidth: true },
     }),
-    "/ForOhFor": wrap({
-        component: Page404,
-        conditions: [],
-        userData: { showNavBar: true, fullWidth: false },
-    }),
-    "/ServerError": wrap({
-        component: Page500,
-        conditions: [],
-        userData: { showNavBar: true, fullWidth: false },
-    }),
     "*": wrap({
         component: Page404,
         conditions: [],