diff --git a/front/src/components/BasketItem.svelte b/front/src/components/BasketItem.svelte
index d8e0098..e2aa809 100644
--- a/front/src/components/BasketItem.svelte
+++ b/front/src/components/BasketItem.svelte
@@ -23,61 +23,67 @@
}
-
- {#if !item.data.availability}
-
- Item is no-longer for sale
-
- {/if}
- {#if item.data.images && item.data.images[0]}
-
- {:else}
-
- {/if}
+
+
+ {#if !item.data.availability}
+
+ Item is no-longer for sale
+
+ {/if}
-
- {item.data.name}
-
-
- {item.amount}
- = 99} on:click={add}>
-
-
-
- £{item.data.price * item.amount} (£{item.data.price})
-
+ {#if item.data.images && item.data.images[0]}
+
+ {:else}
+
+ {/if}
-
- {#each item.data.labels as label}
- {#if label === Labels.vegan}
-
- {:else if label === Labels.fish}
-
- {:else if label === Labels.nut}
-
- {:else if label === Labels.gluten}
-
- {:else if label === Labels.spicy}
-
- {/if}
- {/each}
-
+
+ {item.data.name}
+
+
+ {item.amount}
+ = 99} on:click={add}>
+
+
+
+ £{item.data.price * item.amount} (£{item.data.price})
+
+
+
+ {#each item.data.labels as label}
+ {#if label === Labels.vegan}
+
+ {:else if label === Labels.fish}
+
+ {:else if label === Labels.nut}
+
+ {:else if label === Labels.gluten}
+
+ {:else if label === Labels.spicy}
+
+ {/if}
+ {/each}
+
+
\ No newline at end of file
diff --git a/front/src/pages/Checkout/LeFinal.svelte b/front/src/pages/Checkout/LeFinal.svelte
new file mode 100644
index 0000000..9ea48b2
--- /dev/null
+++ b/front/src/pages/Checkout/LeFinal.svelte
@@ -0,0 +1,74 @@
+
+
+
Checkout > Order
+
+
+
+
+ Price (each) Item Name Amount
+ {#each items as [_, item]}
+
+ £{item.data.price * item.amount} (£{item.data.price})
+ {item.data.name}
+ {item.amount}
+
+ {/each}
+
+
+
+
+
Total: ${totalPrice}
+
+
+
+
\ No newline at end of file
diff --git a/front/src/pages/Checkout/PaymentForm.svelte b/front/src/pages/Checkout/PaymentForm.svelte
new file mode 100644
index 0000000..72c84b3
--- /dev/null
+++ b/front/src/pages/Checkout/PaymentForm.svelte
@@ -0,0 +1,66 @@
+
+
+
Checkout > Payment
+
+
+
\ No newline at end of file
diff --git a/front/src/pages/Contact.svelte b/front/src/pages/Contact.svelte
index 796fc4d..77152e2 100644
--- a/front/src/pages/Contact.svelte
+++ b/front/src/pages/Contact.svelte
@@ -7,7 +7,7 @@
const minMessageLength = 150;
- let formMessage: Promise
;
+ let formMessage: Promise;
let name = "";
let email = "";
diff --git a/front/src/routes.js b/front/src/routes.js
index e07a4e5..571ce94 100644
--- a/front/src/routes.js
+++ b/front/src/routes.js
@@ -40,11 +40,11 @@ const routes = {
conditions: [],
userData: { showNavBar: true, fullWidth: false },
}),
- "/cart/checkout": wrap({
+ "/cart/checkout/:progress?": wrap({
asyncComponent: () => import("./pages/Checkout.svelte"),
loadingComponent: PageLoading,
conditions: [],
- userData: { showNavBar: true, fullWidth: true },
+ userData: { showNavBar: true, fullWidth: false },
}),
"/booking": wrap({
asyncComponent: () => import("./pages/Booking.svelte"),
diff --git a/front/src/styles/_container.scss b/front/src/styles/_container.scss
index 3e63f6c..3256d58 100644
--- a/front/src/styles/_container.scss
+++ b/front/src/styles/_container.scss
@@ -9,7 +9,7 @@
box-shadow: 0 1px 0.5px rgba(#000, 0.3);
- .header {
+ > .header {
padding: $spacing-normal;
display: flex;
flex-direction: row;
@@ -20,8 +20,4 @@
padding-bottom: 0;
}
}
-
- .section {
- padding: $spacing-normal;
- }
}
diff --git a/front/src/styles/_menu_item.scss b/front/src/styles/_menu_item.scss
index a662c2e..d6e8b03 100644
--- a/front/src/styles/_menu_item.scss
+++ b/front/src/styles/_menu_item.scss
@@ -23,7 +23,7 @@
justify-content: center;
align-items: center;
- font-size: $font-size-p;
+ font-size: $font-size-small;
text-align: center;
background: $color-error;
@@ -120,7 +120,7 @@
}
.menu-item-detail {
- padding: $spacing-normal;
+ padding: $spacing-small;
width: 100%;
@@ -131,9 +131,12 @@
display: flex;
flex-direction: column;
- font-weight: 800;
+ font-size: $font-size-xsmall;
+ font-weight: $font-weight-bolder;
- background-image: linear-gradient(0deg, $color-dark, rgba($color-dark, 0));
+ //border-radius: $border-radius-large $border-radius-large 0 0;
+ //background-image: linear-gradient(0deg, rgba($color-dark, 1), rgba($color-dark, 0.6));
+ background-color: rgba($color-dark, 0.7);
color: $color-light;
z-index: 2;
diff --git a/front/src/styles/_reset.scss b/front/src/styles/_reset.scss
index a9905f7..d038e5c 100644
--- a/front/src/styles/_reset.scss
+++ b/front/src/styles/_reset.scss
@@ -107,6 +107,20 @@ button {
}
}
+.section {
+ padding: $spacing-normal;
+
+ &.large {
+ padding: $spacing-large;
+ }
+ &.small {
+ padding: $spacing-small;
+ }
+ &.xsmall {
+ padding: $spacing-xsmall;
+ }
+}
+
main {
margin-left: auto;
margin-right: auto;