Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement MenuItemComponent for Lyche #710

Merged
merged 20 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions frontend/src/Components/MenuItem/MenuItem.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
max-width: 600px;
margin: 0 auto;
color: white;

margin-bottom: 2em;
}

.item_name {
Expand All @@ -19,28 +19,23 @@
font-size: 1.25em;
margin-bottom: 5px;
text-transform: uppercase;
font-family: 'LemonMilkLight', sans-serif;
font-family: $lyche-title-font;
}

.item_price {
font-size: .75em;
font-size: 0.75em;
margin-left: 20px;
margin-top: .25em;
font-family: 'Lora', sans-serif;
color: white;
margin-top: 0.25em;
}

.item_description {
color: dimgray;
font-family: 'Lora', sans-serif;
}

.item_allergens {
color: dimgray;
font-family: 'Lora', sans-serif;
}

.item_recommendations {
color: dimgray;
font-family: 'Lora', sans-serif;
}
3 changes: 2 additions & 1 deletion frontend/src/Components/SultenPage/SultenPage.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
min-width: 100%;
min-height: calc(100vh - 200px);
z-index: 10;
padding: calc($sulten-navbar-height / 2) 0 calc($sulten-navbar-height / 2) 0;
padding-top: $sulten-navbar-height;
@include for-mobile-down {
flex-direction: column;
padding: 0%;
padding-top: $sulten-navbar-height;
}
}

Expand Down
67 changes: 31 additions & 36 deletions frontend/src/Pages/LycheMenuPage/LycheMenuPage.tsx
Original file line number Diff line number Diff line change
@@ -1,48 +1,43 @@
import { LycheFrame } from '~/Components/LycheFrame';
import { MenuItem } from '~/Components/MenuItem';
import { SultenPage } from '~/Components/SultenPage';

export function LycheMenuPage() {
return (
<SultenPage>
robines marked this conversation as resolved.
Show resolved Hide resolved
<MenuItem
dishTitle="LYCHEBRØD"
dishDescription="Serveres med en skål aioli på siden."
allergens="Allergener: Gluten (hvete), sulfitt og egg (aioli)"
price="19,- / 29,-"
/>
<LycheFrame>
<MenuItem
dishTitle="LYCHEBRØD"
dishDescription="Serveres med en skål aioli på siden."
allergens="Allergener: Gluten (hvete), sulfitt og egg (aioli)"
price="19,- / 29,-"
/>

<br></br>
<br></br>
<MenuItem
dishTitle="LYCHESNITTER"
dishDescription="Lychebrød med rødbethummus, ruccula, mango og pistou. "
allergens="Allergener: Gluten (hvete), melk (pistou), sesam (hummus). Kan inneholde spor av peanøtter: hummus"
price="40,- / 49,-"
/>

<MenuItem
dishTitle="LYCHESNITTER"
dishDescription="Lychebrød med rødbethummus, ruccula, mango og pistou. "
allergens="Allergener: Gluten (hvete), melk (pistou), sesam (hummus). Kan inneholde spor av peanøtter: hummus"
price="40,- / 49,-"
/>
<MenuItem
dishTitle="LYCHEBURGER"
dishDescription="Okse og n’duja kjøtt, servert med løkkompott, bacon,
tomater, aioli, cheddar, salat og potet på siden.
Burgeren kan serveres med glutenfritt brød, og kan serveres uten ost og pistou (melkeallergi)"
allergens="Allergener: Egg, sennep, sulfitt. Det er svinekjøtt i selve burgerkaken. "
recommendations="Baren anbefaler: Hacienda lopez De Haro (rød)"
price="129,- / 154,-"
/>

<br></br>
<br></br>

<MenuItem
dishTitle="LYCHEBURGER"
dishDescription="Okse og n’duja kjøtt, servert med løkkompott, bacon,
tomater, aioli, cheddar, salat og potet på siden.
Burgeren kan serveres med glutenfritt brød, og kan serveres uten ost og pistou (melkeallergi)"
allergens="Allergener: Egg, sennep, sulfitt. Det er svinekjøtt i selve burgerkaken. "
recommendations="Baren anbefaler: Hacienda lopez De Haro (rød)"
price="129,- / 154,-"
/>

<br></br>

<MenuItem
dishTitle="SOPPAI"
dishDescription="Kremet soppai med feta, toppes med ruccula. Vegetar."
allergens="Allergener: Melk og gluten"
recommendations="Baren anbefaler: jue de vie"
price="99,- / 119,-"
/>
<MenuItem
dishTitle="SOPPAI"
dishDescription="Kremet soppai med feta, toppes med ruccula. Vegetar."
allergens="Allergener: Melk og gluten"
recommendations="Baren anbefaler: jue de vie"
price="99,- / 119,-"
/>
</LycheFrame>
</SultenPage>
);
}
5 changes: 2 additions & 3 deletions frontend/src/_constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,9 @@ $theme-dark: 'theme-dark'; // Must match THEME.DARK
$theme-light: 'theme-light'; // Must match THEM.LIGHT

//Lyche
$lyche-title-font:'LemonMilkLight', sans-serif;
$lyche-title-font: 'LemonMilkLight', sans-serif;
$lyche-primary-font: 'Lora', sans-serif;

//Assets
$lyche-menu-divider-left: url('~/assets/lyche/menu-detail-left.png');
$lyche-menu-divider-right: url('~/assets/lyche/menu-detail-right.png');


Loading