From e0abea8cef092a5efd9e18765b75ede61ab957d2 Mon Sep 17 00:00:00 2001
From: Fluffy <michal-gdula@protonmail.com>
Date: Mon, 20 May 2024 07:57:26 +0100
Subject: [PATCH] Format numbers with leading 0s Grow map on checkout Correct
 some typos

---
 front/src/components/BasketItem.svelte |  2 +-
 front/src/components/MenuItem.svelte   |  2 +-
 front/src/pages/Cart.svelte            |  4 ++--
 front/src/pages/Checkout.svelte        | 32 ++++++++++++++++++++------
 front/src/pages/Item.svelte            |  2 +-
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/front/src/components/BasketItem.svelte b/front/src/components/BasketItem.svelte
index 9d574ff..383ef88 100644
--- a/front/src/components/BasketItem.svelte
+++ b/front/src/components/BasketItem.svelte
@@ -46,7 +46,7 @@
                 <hr>
                 <button class="button evil" on:click={yeet}><Trash /></button>
             </li>
-            <li class="basket-item-price">£{item.data.price * item.amount} (£{item.data.price})</li>
+            <li class="basket-item-price">£{(item.data.price * item.amount).toFixed(2)} (£{item.data.price.toFixed(2)})</li>
         </ul>
 
         <ul class="basket-item-labels">
diff --git a/front/src/components/MenuItem.svelte b/front/src/components/MenuItem.svelte
index e7845ad..040a3e4 100644
--- a/front/src/components/MenuItem.svelte
+++ b/front/src/components/MenuItem.svelte
@@ -50,6 +50,6 @@
     </ul>
 
     <a class="menu-item-link" href="/item/{item.uuid}" use:link>View&nbsp;<ArrowUpRight /></a>
-    <ul class="menu-item-detail"><li>£{item.price} | {item.name}</li></ul>
+    <ul class="menu-item-detail"><li>£{item.price.toFixed(2)} | {item.name}</li></ul>
 </div>
 
diff --git a/front/src/pages/Cart.svelte b/front/src/pages/Cart.svelte
index 28dfae2..c59b6c3 100644
--- a/front/src/pages/Cart.svelte
+++ b/front/src/pages/Cart.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { link } from 'svelte-spa-router';
-    import {ArrowLeft, ArrowRight, Basket} from "phosphor-svelte";
+    import { ArrowRight, Basket } from "phosphor-svelte";
 
     import { type CartItem } from "../lib/types";
     import { getPopularToday } from "../lib/test-api";
@@ -32,7 +32,7 @@
         <h1>Cart</h1>
 
         <a id="checkout-button" href="/cart/checkout" use:link>Checkout&nbsp;<ArrowRight /></a>
-        <h2>Order total: £{totalPrice}</h2>
+        <h2>Order total: £{totalPrice.toFixed(2)}</h2>
 
         {#each items as [_, item]}
             <div class="basket-item">
diff --git a/front/src/pages/Checkout.svelte b/front/src/pages/Checkout.svelte
index 175113e..d24d7f1 100644
--- a/front/src/pages/Checkout.svelte
+++ b/front/src/pages/Checkout.svelte
@@ -56,7 +56,10 @@
     }
     $: if (!CheckoutData.delivery) {
         // Rendering maybe off-centered since map was initialized when div was hidden
-        setTimeout(() => { leafletMap.invalidateSize() }, 1);
+        setTimeout(() => {
+            leafletMap.invalidateSize();
+            leafletMap.panTo([50.82304922105467, -0.432780150496344]);
+        }, 305);
         totalPrice = 1.50 + Cart.getTotalPrice();
     }
 
@@ -147,7 +150,7 @@
             <ul id="delivery-option">
                 <li class:checked={CheckoutData.delivery}>
                     <button on:click={() => { CheckoutData.delivery = true }} type="button">
-                        Deliver
+                        Delivery
                     </button>
                 </li>
                 <li class:checked={!CheckoutData.delivery}>
@@ -227,26 +230,26 @@
                 </div>
             {/if}
             <div class="header">
-                <h2>Total: ${totalPrice}</h2>
+                <h2>Total: £{totalPrice.toFixed(2)}</h2>
             </div>
             <div class="table">
                 <table>
                     <tr><th>Price (each)</th><th>Item Name</th><th>#</th></tr>
                     {#each items as [_, item]}
                         <tr class:table-row-error={!item.data.availability}>
-                            <td>£{item.data.price * item.amount} (£{item.data.price})</td>
+                            <td>£{(item.data.price * item.amount).toFixed(2)} (£{item.data.price.toFixed(2)})</td>
                             <td>{item.data.name}</td>
                             <td>{item.amount}</td>
                         </tr>
                     {/each}
                     <tr class="table-row-border">
-                        <td>£1.50</td>
+                        <td>£{1.50.toFixed(2)}</td>
                         <td>Online order Fee</td>
                         <td></td>
                     </tr>
                     {#if CheckoutData.delivery}
                         <tr>
-                            <td>£3.00</td>
+                            <td>£{3.00.toFixed(2)}</td>
                             <td>Delivery fee</td>
                             <td></td>
                         </tr>
@@ -367,7 +370,8 @@
     #map {
         width: 100%;
         max-width: 550px;
-        height: 400px;
+        //height: 400px;
+        height: 0;
 
         display: none;
 
@@ -376,6 +380,16 @@
 
         &.show-map {
             display: block;
+            animation: growMap forwards 0.3s;
+        }
+    }
+
+    @keyframes growMap {
+        0% {
+            height: 0;
+        }
+        100% {
+            height: 400px;
         }
     }
 
@@ -500,5 +514,9 @@
             max-width: unset;
             position: unset;
         }
+
+        #map {
+            max-width: 100%;
+        }
     }
 </style>
diff --git a/front/src/pages/Item.svelte b/front/src/pages/Item.svelte
index a88cb30..5c3513b 100644
--- a/front/src/pages/Item.svelte
+++ b/front/src/pages/Item.svelte
@@ -98,7 +98,7 @@
 
         <div id="info">
             <h2>{item.name}</h2>
-            <p>£{item.price}</p>
+            <p>£{item.price.toFixed(2)}</p>
 
             <div class="spacer" />