diff --git a/front/public/item_images/cupcake.jpg b/front/public/item_images/cupcake.jpg new file mode 100644 index 0000000..c1abfa5 Binary files /dev/null and b/front/public/item_images/cupcake.jpg differ diff --git a/front/src/components/BasketItem.svelte b/front/src/components/BasketItem.svelte index f31c457..d8e0098 100644 --- a/front/src/components/BasketItem.svelte +++ b/front/src/components/BasketItem.svelte @@ -1,6 +1,6 @@
+ {#if !item.data.availability} +
+   Item is no-longer for sale +
+ {/if} + {#if item.data.images && item.data.images[0]} Item {:else} @@ -63,6 +69,8 @@ @import "../styles/vars"; .container { + position: relative; + display: flex; flex-direction: row; @@ -71,6 +79,25 @@ overflow: hidden; } + .basket-item-notice { + width: 100%; + height: 30px; + + position: absolute; + top: 0; + left: 0; + + display: flex; + justify-content: center; + align-items: center; + + font-size: $font-size-p; + + background: $color-error; + color: $color-on-error; + + box-shadow: 0 1px 0.5px rgba(#000, 0.3); + } .basket-item-image { margin: $spacing-small; diff --git a/front/src/components/ImageWithText.svelte b/front/src/components/ImageWithText.svelte index 9f9f6b3..44a61c2 100644 --- a/front/src/components/ImageWithText.svelte +++ b/front/src/components/ImageWithText.svelte @@ -26,6 +26,8 @@ max-height: 350px; border-radius: $border-radius-large; + + box-shadow: 0 1px 0.5px rgba(#000, 0.3); } > .container { diff --git a/front/src/components/MenuItem.svelte b/front/src/components/MenuItem.svelte index 7777203..21f7682 100644 --- a/front/src/components/MenuItem.svelte +++ b/front/src/components/MenuItem.svelte @@ -1,7 +1,7 @@ + + + Back +

Cart

+ +

Order total: £Balls

+ + + \ No newline at end of file diff --git a/front/src/pages/Index.svelte b/front/src/pages/Index.svelte index f288a30..b031c73 100644 --- a/front/src/pages/Index.svelte +++ b/front/src/pages/Index.svelte @@ -101,6 +101,7 @@ #map { min-width: 550px; border-radius: $border-radius-normal; + box-shadow: 0 1px 0.5px rgba(#000, 0.3); } #contact { diff --git a/front/src/pages/Item.svelte b/front/src/pages/Item.svelte index 97b1ce3..a88cb30 100644 --- a/front/src/pages/Item.svelte +++ b/front/src/pages/Item.svelte @@ -184,6 +184,9 @@ max-width: $sizing-default-width; height: 45px; + position: sticky; + top: calc($spacing-small + $sizing-navigation-height); + display: flex; justify-content: center; align-items: center; @@ -194,6 +197,8 @@ background: $color-dark; color: $color-on-dark; + box-shadow: 0 1px 0.5px rgba(#000, 0.3); + &.error { background: $color-error; color: $color-on-error; diff --git a/front/src/pages/Menu.svelte b/front/src/pages/Menu.svelte index cb7eee6..0c882d4 100644 --- a/front/src/pages/Menu.svelte +++ b/front/src/pages/Menu.svelte @@ -141,14 +141,16 @@ {#await items} {:then items} - {#each items as section} + {#each items as section, i}

{section.name}

{#if section.items.length > 0} {:else}

No results

{/if} -
+ {#if i !== items.length -1} +
+ {/if} {/each} {:catch error}

{error}

diff --git a/front/src/routes.js b/front/src/routes.js index e8ab45f..e07a4e5 100644 --- a/front/src/routes.js +++ b/front/src/routes.js @@ -41,9 +41,10 @@ const routes = { userData: { showNavBar: true, fullWidth: false }, }), "/cart/checkout": wrap({ - component: Page404, + asyncComponent: () => import("./pages/Checkout.svelte"), + loadingComponent: PageLoading, conditions: [], - userData: { showNavBar: false, fullWidth: true }, + userData: { showNavBar: true, fullWidth: true }, }), "/booking": wrap({ asyncComponent: () => import("./pages/Booking.svelte"), diff --git a/front/src/styles/_announcement_banner.scss b/front/src/styles/_announcement_banner.scss index 814f75d..57b8cfa 100644 --- a/front/src/styles/_announcement_banner.scss +++ b/front/src/styles/_announcement_banner.scss @@ -1,10 +1,11 @@ .announcement-banner { position: relative; - border-radius: $border-radius-normal; + border-radius: $border-radius-large; background-color: $color-light; color: $color-on-light; + box-shadow: 0 1px 0.5px rgba(#000, 0.3); overflow: hidden; img { @@ -13,7 +14,6 @@ display: block; - //aspect-ratio: 16 / 7; object-fit: cover; } } @@ -26,7 +26,6 @@ img { height: 250px; - //aspect-ratio: 16 / 9; aspect-ratio: unset; } } diff --git a/front/src/styles/_calendar.scss b/front/src/styles/_calendar.scss index 42f1adf..de37e83 100644 --- a/front/src/styles/_calendar.scss +++ b/front/src/styles/_calendar.scss @@ -117,15 +117,11 @@ font-weight: $font-weight-black; text-decoration: underline; color: $color-on-light; - //background-color: $color-primary; - //color: $color-on-primary; } } &.selected { > button { - //background-color: $color-dark; - //color: $color-on-dark; background-color: $color-primary; color: $color-on-primary; } diff --git a/front/src/styles/_container.scss b/front/src/styles/_container.scss index f49b865..3e63f6c 100644 --- a/front/src/styles/_container.scss +++ b/front/src/styles/_container.scss @@ -7,6 +7,8 @@ background-color: $color-light; color: $color-on-light; + box-shadow: 0 1px 0.5px rgba(#000, 0.3); + .header { padding: $spacing-normal; display: flex; diff --git a/front/src/styles/_menu_item.scss b/front/src/styles/_menu_item.scss index 83a95eb..a662c2e 100644 --- a/front/src/styles/_menu_item.scss +++ b/front/src/styles/_menu_item.scss @@ -3,12 +3,35 @@ position: relative; - border-radius: $border-radius-large; + border-radius: $border-radius-normal; background-color: $color-dark; + box-shadow: 0 1px 0.5px rgba(#000, 0.3); overflow: hidden; } +.menu-item-notice { + padding: $spacing-small; + width: 100%; + min-height: 40px; + + position: absolute; + bottom: 0; + left: 0; + + display: flex; + justify-content: center; + align-items: center; + + font-size: $font-size-p; + text-align: center; + + background: $color-error; + color: $color-on-error; + + box-shadow: 0 1px 0.5px rgba(#000, 0.3); + z-index: 3; +} .menu-item-image { width: 100%; height: 100%; diff --git a/front/src/styles/_navigation_bar.scss b/front/src/styles/_navigation_bar.scss index 4b31bd3..5178b18 100644 --- a/front/src/styles/_navigation_bar.scss +++ b/front/src/styles/_navigation_bar.scss @@ -51,8 +51,8 @@ nav { .nav-basket { padding: 0 $spacing-xsmall; - min-width: 17px; - min-height: 17px; + min-width: 18px; + min-height: 18px; display: inline-block;