diff --git a/src/y4f/Shared/Bestellbestätigung.razor b/src/y4f/Shared/Bestellbestätigung.razor index 0f6354c..760eedf 100644 --- a/src/y4f/Shared/Bestellbestätigung.razor +++ b/src/y4f/Shared/Bestellbestätigung.razor @@ -14,6 +14,7 @@ + diff --git a/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor b/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor new file mode 100644 index 0000000..0a4fc53 --- /dev/null +++ b/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor @@ -0,0 +1,82 @@ +@page "/Bestelluebersicht" +@layout ChefinLayout + +
+
+
+

+
Bestellung eingegangen Bestellung wird zubereitet
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Aktive Bestellungen
#1234   12:30#2345   18:45
#3456   13:00#4567   19:00
#5678   14:30#6789   19:15
#4321   15:15#5432   19:15
#6543   15:30#7654   19:15
#7654   15:30 
#8765   16:00 
#9876   17:30 
+ +
+

Abholzeit

+
+
+ +
+
+ +
+
+ +
+ +
+ + + + + +@code { + +} diff --git a/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor.css b/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor.css new file mode 100644 index 0000000..51bb794 --- /dev/null +++ b/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor.css @@ -0,0 +1,37 @@ +tbody { + border-color: black; +} +td { + text-align:center; + text-decoration: none; +} +table { + border-radius: 50px !important; + margin-left: 50px; +} +td > a { + text-decoration: none; + color: black; +} +#button { + margin-bottom: 35px; + border-radius: 50px; + margin-left: 100px; +} +#text { + margin-top: 50px; + margin-bottom: 45px; + margin-left: 100px; + width: 69%; + padding-top: 2px; + padding-bottom: 2px; + padding: 8px; + color: black; + background-color: #89F9A5; + border-style:none; + text-align: center; +} +thead { + background-color: #89F9A5; + border-color: #89F9A5; +} \ No newline at end of file diff --git a/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor b/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor new file mode 100644 index 0000000..37c6193 --- /dev/null +++ b/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor @@ -0,0 +1,139 @@ +@page "/BestelluebersichtD-Chefin" +@layout ChefinLayout + +
+
+
+ @*Tabelle Ihre Bestellung*@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Ihre Bestellung
+ 1 Nudel mit Hühnerfleisch (groß) +
mit Knoblauchsoße
+ 		9,10€
1 Coca Cola2,50€
Summe11,60€
+ +
+ +
+
+ +
+
+ + + + + + + + + + + + +
+

Abholzeit

+
+
+
+

12:30 Uhr

+
+
+
+ +
+ + + +
+ +
+
+
+
+ + @*Buttons*@ + +
+ + +@*
+ @*Essen Abholen? +
+
+
+
+
*@ +@code { + +} diff --git a/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor.css b/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor.css new file mode 100644 index 0000000..6d50f0a --- /dev/null +++ b/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor.css @@ -0,0 +1,3 @@ +button { + margin: 10px; +} diff --git a/src/y4f/Shared/Chefin/NavChefin.razor b/src/y4f/Shared/Chefin/NavChefin.razor new file mode 100644 index 0000000..60dae47 --- /dev/null +++ b/src/y4f/Shared/Chefin/NavChefin.razor @@ -0,0 +1,25 @@ + + +@code { + +} \ No newline at end of file diff --git a/src/y4f/Shared/ChefinLayout.razor b/src/y4f/Shared/ChefinLayout.razor new file mode 100644 index 0000000..3b2b4bb --- /dev/null +++ b/src/y4f/Shared/ChefinLayout.razor @@ -0,0 +1,14 @@ +@inherits LayoutComponentBase + + +
+ + +
+ + + @Body + +
+ +
diff --git a/src/y4f/Shared/ChefinLayout.razor.css b/src/y4f/Shared/ChefinLayout.razor.css new file mode 100644 index 0000000..9f8256f --- /dev/null +++ b/src/y4f/Shared/ChefinLayout.razor.css @@ -0,0 +1,5 @@ +html, body { + /*background-color: #C7FFD5;*/ + padding: 0px; + margin: 0px; +} diff --git a/src/y4f/Shared/NavStartseite.razor b/src/y4f/Shared/NavStartseite.razor new file mode 100644 index 0000000..81a3ac9 --- /dev/null +++ b/src/y4f/Shared/NavStartseite.razor @@ -0,0 +1,35 @@ + + +@code { + private bool collapseNavMenu = true; + private string? NavBarCssClass => collapseNavMenu ? null : "show"; + private string? NavButtonCssClass => collapseNavMenu ? "collapsed" : null; + + + private void ToggleNavMenu() + { + collapseNavMenu = !collapseNavMenu; + } +} \ No newline at end of file diff --git a/src/y4f/Shared/RegistrierungA.razor b/src/y4f/Shared/RegistrierungA.razor index 403bb75..0dce74c 100644 --- a/src/y4f/Shared/RegistrierungA.razor +++ b/src/y4f/Shared/RegistrierungA.razor @@ -1,16 +1,18 @@ -@page "/RegistrierungA" +@page "/RegistrierungA" @layout Registrierung @inject NavigationManager NavManager @inject Blazored.LocalStorage.ISyncLocalStorageService localStorage

Benutzername:

+

Passwort:

+
@code { diff --git a/src/y4f/Shared/RegistrierungA.razor.css b/src/y4f/Shared/RegistrierungA.razor.css index 6d3d119..32856d4 100644 --- a/src/y4f/Shared/RegistrierungA.razor.css +++ b/src/y4f/Shared/RegistrierungA.razor.css @@ -2,10 +2,16 @@ color: grey; margin-bottom:0px; margin-top: 15px; + margin-left: 61px; } form { margin-top: 20px; + border-radius: 50px; +} + +input { + border-radius: 50px; } diff --git a/src/y4f/Shared/Startseite.razor b/src/y4f/Shared/Startseite.razor index 7408ca2..cd2ab05 100644 --- a/src/y4f/Shared/Startseite.razor +++ b/src/y4f/Shared/Startseite.razor @@ -3,6 +3,8 @@
+ +
diff --git a/src/y4f/Shared/Yummy-Punkte.razor b/src/y4f/Shared/Yummy-Punkte.razor index 2bae366..b8930fc 100644 --- a/src/y4f/Shared/Yummy-Punkte.razor +++ b/src/y4f/Shared/Yummy-Punkte.razor @@ -1,29 +1,105 @@ @page "/Yummy-Punkte" +@inject HttpClient Http +@inject Blazored.LocalStorage.ISyncLocalStorageService localStorage -
-

Ihre Yummy-Punkte

- -
- @for(int i = 0; i < 10; i++) - { - - } -
-
- -

Bei einem Mindestbestellwert von 8€ erhalten Sie ein Yummy-Punkt. Ab der 10ten Bestellung gibt es einen Rabatt zu Ihrer nächsten Bestellung.

- -
-
- -
-
+
+

Ihre Yummy-Punkte

-
+
+ @for (int i = 0; i < 10; i++) + { + @*if kunde hat treuepunkte*@ + @if (kunde.Treuepunkte > i) + { + + } + else + { + + } + } +
+
+

Bei einem Mindestbestellwert von 8€ erhalten Sie ein Yummy-Punkt. Ab der 10ten Bestellung gibt es einen Rabatt zu Ihrer nächsten Bestellung.

+

Aktueller Rabatt: @rabatt.Prozent %

+ +
+
+ +
+ @*reset button to set the treuepunkte to null*@ + +
+ +
+ @code { - + // allergien, bestellungsposition, kunde, menuitem, menuitemkategorie, menuitemueberkategorie, rabatt + + private List kunden = new List(); + private Kunde kunde = new Kunde(); + + private List rabatte = new List(); + private Rabatt rabatt = new Rabatt(); + + + public void resetTreuepunkte() + { + if (kunde.Treuepunkte == 10) + { + kunde.Treuepunkte = 0; + // API change treupunkte to 0 if kunde has 10 treuepunkte + Http.PutAsJsonAsync("https://localhost:7076/api/kunden/" + kunde.Idkunde, kunde); + } + } + + protected override async Task OnInitializedAsync() + { + kunden = await Http.GetFromJsonAsync>("https://localhost:7076/api/kunden"); + rabatte = await Http.GetFromJsonAsync>("https://localhost:7076/api/Rabatte"); + + kunde = kunden[0]; + + // get the most recent rabatt, that are still valid (GueltigkeitBis) + // if there is no rabatt, set the rabatt to null + if (rabatte.Count == 0) + { + rabatt = null; + } + else + { + for (int i = 0; i < rabatte.Count; i++) + { + if (rabatte[i].GueltigkeitBis > DateTime.Now) + { + rabatt = rabatte[i]; + } + } + } + //rabatt = rabatte[rabatte.Count - 1]; + + + } + + public class Kunde + { + public int Idkunde { get; set; } + public string Code { get; set; } + public int Treuepunkte { get; set; } + } + public class Rabatt + { + public int Idrabatt { get; set; } + + public decimal Prozent { get; set; } + + public DateTime GueltigkeitVon { get; set; } + + public DateTime GueltigkeitBis { get; set; } + + } } diff --git a/src/y4f/wwwroot/assets/Point-Circle.png b/src/y4f/wwwroot/assets/Point-Circle.png new file mode 100644 index 0000000..6d661a3 Binary files /dev/null and b/src/y4f/wwwroot/assets/Point-Circle.png differ diff --git a/src/y4f/wwwroot/favicon.png b/src/y4f/wwwroot/favicon.png index 8422b59..eb8b03f 100644 Binary files a/src/y4f/wwwroot/favicon.png and b/src/y4f/wwwroot/favicon.png differ diff --git a/src/y4f/wwwroot/icon-192.png b/src/y4f/wwwroot/icon-192.png index 166f56d..9ebd225 100644 Binary files a/src/y4f/wwwroot/icon-192.png and b/src/y4f/wwwroot/icon-192.png differ diff --git a/src/y4f/wwwroot/icon-512.png b/src/y4f/wwwroot/icon-512.png index c2dd484..ce1dc4e 100644 Binary files a/src/y4f/wwwroot/icon-512.png and b/src/y4f/wwwroot/icon-512.png differ