diff --git a/front/public/BannerLoading.svg b/front/public/BannerLoading.svg new file mode 100644 index 0000000..a49c7bd --- /dev/null +++ b/front/public/BannerLoading.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/front/public/dab.jpg b/front/public/dab.jpg new file mode 100644 index 0000000..1c85d5b Binary files /dev/null and b/front/public/dab.jpg differ diff --git a/front/src/App.svelte b/front/src/App.svelte index 8be8961..ced7813 100644 --- a/front/src/App.svelte +++ b/front/src/App.svelte @@ -3,6 +3,7 @@ import { replace } from 'svelte-spa-router'; import routes from '%/routes.js'; import NavigationBar from "%/pages/components/NavigationBar.svelte"; + import FooterBar from "%/pages/components/FooterBar.svelte"; let oldLocation = undefined; let showNavBar = false; @@ -37,6 +38,4 @@ on:conditionsFailed={conditionFailure} /> - + diff --git a/front/src/pages/Page404.svelte b/front/src/pages/Page404.svelte index 5dbedc6..da22b26 100644 --- a/front/src/pages/Page404.svelte +++ b/front/src/pages/Page404.svelte @@ -4,5 +4,31 @@ export let params = {}; -

404

-

Could not find resource you've searched for. Go Back

+
+

404

+

Could not find resource you've searched for. Go Back

+
+ + \ No newline at end of file diff --git a/front/src/pages/PageShoppingCart.svelte b/front/src/pages/PageCart.svelte similarity index 100% rename from front/src/pages/PageShoppingCart.svelte rename to front/src/pages/PageCart.svelte diff --git a/front/src/pages/PageIndex.svelte b/front/src/pages/PageIndex.svelte index d060bfb..5e75497 100644 --- a/front/src/pages/PageIndex.svelte +++ b/front/src/pages/PageIndex.svelte @@ -1,38 +1,93 @@ - -Learn More +
+ + Learn More +
-
+

Popular Today

+ + See All +
-

Menu

- -See All - -
- -

About Us

-

Want to know the story of the restaurant?

-Continue reading +

About Us

+

Want to know the story of the restaurant?

+ Continue reading +
diff --git a/front/src/pages/PageMenu.svelte b/front/src/pages/PageMenu.svelte new file mode 100644 index 0000000..2911364 --- /dev/null +++ b/front/src/pages/PageMenu.svelte @@ -0,0 +1,86 @@ + + +

Menu

+ +
+ +

Menu

+ +
+ +

Menu

+ + + \ No newline at end of file diff --git a/front/src/pages/components/AnnouncementBanner.svelte b/front/src/pages/components/AnnouncementBanner.svelte index 92f298f..11c34a2 100644 --- a/front/src/pages/components/AnnouncementBanner.svelte +++ b/front/src/pages/components/AnnouncementBanner.svelte @@ -1,7 +1,9 @@
+
diff --git a/front/src/pages/components/FooterBar.svelte b/front/src/pages/components/FooterBar.svelte new file mode 100644 index 0000000..b4290f5 --- /dev/null +++ b/front/src/pages/components/FooterBar.svelte @@ -0,0 +1,83 @@ + + +
+
+

TastyBites is not a real restaurant

+

gwagwa

+
+
+

Find us on:

+
    +
    • +
    • +
    • +
    • +
+
+
+ + diff --git a/front/src/pages/components/MenuItem.svelte b/front/src/pages/components/MenuItem.svelte index e73238d..a50c392 100644 --- a/front/src/pages/components/MenuItem.svelte +++ b/front/src/pages/components/MenuItem.svelte @@ -1,21 +1,21 @@
- + {#if !image} + + {:else} + + {/if}
    @@ -34,7 +34,7 @@ {/if} {/each}
- View + View
    @@ -42,3 +42,4 @@
  • £{price}
+ diff --git a/front/src/pages/components/MenuList.svelte b/front/src/pages/components/MenuList.svelte index 4c529e3..1f56cde 100644 --- a/front/src/pages/components/MenuList.svelte +++ b/front/src/pages/components/MenuList.svelte @@ -6,7 +6,15 @@
    {#each items as item} -
    • +
  • + +
    • {/each}
diff --git a/front/src/routes.js b/front/src/routes.js index f97b2b1..7a37fbf 100644 --- a/front/src/routes.js +++ b/front/src/routes.js @@ -9,6 +9,12 @@ const routes = { conditions: [], userData: { showNavBar: true }, }), + "/menu": wrap({ + asyncComponent: () => import("%/pages/PageMenu.svelte"), + loadingComponent: PageLoading, + conditions: [], + userData: { showNavBar: true }, + }), "/contact": wrap({ asyncComponent: () => import("%/pages/PageContact.svelte"), loadingComponent: PageLoading, @@ -22,7 +28,7 @@ const routes = { userData: { showNavBar: true }, }), "/cart": wrap({ - asyncComponent: () => import("%/pages/PageShoppingCart.svelte"), + asyncComponent: () => import("%/pages/PageCart.svelte"), loadingComponent: PageLoading, conditions: [], userData: { showNavBar: true }, diff --git a/front/src/styles/_navigation_bar.scss b/front/src/styles/_navigation_bar.scss index 0594b05..4928148 100644 --- a/front/src/styles/_navigation_bar.scss +++ b/front/src/styles/_navigation_bar.scss @@ -13,8 +13,10 @@ nav { justify-content: center; align-items: center; + border-bottom: 2px solid $color-primary; background-color: $color-dark; color: $color-light; + z-index: 9999999; ul {