diff --git a/.gitignore b/.gitignore index 40b2130..0c35320 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ## files generated by popular Visual Studio add-ons. # User-specific files +.vscode .vs */.vs *.suo diff --git a/src/y4f/Pages/Index.razor b/src/y4f/Pages/Index.razor index 5210136..60608ca 100644 --- a/src/y4f/Pages/Index.razor +++ b/src/y4f/Pages/Index.razor @@ -6,6 +6,7 @@ @inject NavigationManager _navigationManager @inject IJSRuntime JSRuntime; + Yummy4Friends @@ -33,6 +34,7 @@ { localStorage.SetItem("kunde", kunde); _navigationManager.NavigateTo("/speisekarte"); + return; } } @@ -42,6 +44,7 @@ protected override async Task OnInitializedAsync() { kunden = await Http.GetFromJsonAsync>("https://localhost:7076/api/kunden"); + // if already logged in navigate to speisekarte if (localStorage.ContainKey("kunde")) { @@ -49,6 +52,7 @@ } + } public class Kunde @@ -60,6 +64,3 @@ } - - - diff --git a/src/y4f/Pages/Speisekarte.razor b/src/y4f/Pages/Speisekarte.razor index 651dc26..c4f76b3 100644 --- a/src/y4f/Pages/Speisekarte.razor +++ b/src/y4f/Pages/Speisekarte.razor @@ -135,3 +135,4 @@ public int Treuepunkte { get; set; } } } + diff --git a/src/y4f/Pages/SpeisekarteCnDetails.razor b/src/y4f/Pages/SpeisekarteCnDetails.razor index 3d28962..4bc965e 100644 --- a/src/y4f/Pages/SpeisekarteCnDetails.razor +++ b/src/y4f/Pages/SpeisekarteCnDetails.razor @@ -137,7 +137,6 @@ allergien = await Http.GetFromJsonAsync>("https://localhost:7076/api/allergien"); bestellungspositions = await Http.GetFromJsonAsync>("https://localhost:7076/api/bestellungspositionen"); - kunden = await Http.GetFromJsonAsync>("https://localhost:7076/api/kunden"); menuitems = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitems"); menuitemkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemkategories"); menuitemueberkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemueberkategories"); diff --git a/src/y4f/Pages/SpeisekarteDrDetails.razor b/src/y4f/Pages/SpeisekarteDrDetails.razor index 6fe3edc..f187c1d 100644 --- a/src/y4f/Pages/SpeisekarteDrDetails.razor +++ b/src/y4f/Pages/SpeisekarteDrDetails.razor @@ -143,7 +143,6 @@ allergien = await Http.GetFromJsonAsync>("https://localhost:7076/api/allergien"); bestellungspositions = await Http.GetFromJsonAsync>("https://localhost:7076/api/bestellungspositionen"); - kunden = await Http.GetFromJsonAsync>("https://localhost:7076/api/kunden"); menuitems = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitems"); menuitemkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemkategories"); menuitemueberkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemueberkategories"); diff --git a/src/y4f/Pages/SpeisekarteEtcDetails.razor b/src/y4f/Pages/SpeisekarteEtcDetails.razor index 602fde5..0773515 100644 --- a/src/y4f/Pages/SpeisekarteEtcDetails.razor +++ b/src/y4f/Pages/SpeisekarteEtcDetails.razor @@ -93,11 +93,6 @@ - - - - - @code { private List kunden = new List(); private Kunde kunde = new Kunde(); @@ -142,9 +137,9 @@ { menuitemIds = localStorage.GetItem>("MenuItemIds"); } + allergien = await Http.GetFromJsonAsync>("https://localhost:7076/api/allergien"); bestellungspositions = await Http.GetFromJsonAsync>("https://localhost:7076/api/bestellungspositionen"); - kunden = await Http.GetFromJsonAsync>("https://localhost:7076/api/kunden"); menuitems = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitems"); menuitemkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemkategories"); menuitemueberkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemueberkategories"); diff --git a/src/y4f/Pages/SpeisekarteJpDetails.razor b/src/y4f/Pages/SpeisekarteJpDetails.razor index c213acf..e7e7485 100644 --- a/src/y4f/Pages/SpeisekarteJpDetails.razor +++ b/src/y4f/Pages/SpeisekarteJpDetails.razor @@ -132,14 +132,13 @@ if (kunde != null && !kunden.Any(k => k.Code == kunde.Code)) _navigationManager.NavigateTo("/"); // kunde login end - if (localStorage.GetItem>("MenuItemIds") != null) { menuitemIds = localStorage.GetItem>("MenuItemIds"); } + allergien = await Http.GetFromJsonAsync>("https://localhost:7076/api/allergien"); bestellungspositions = await Http.GetFromJsonAsync>("https://localhost:7076/api/bestellungspositionen"); - kunden = await Http.GetFromJsonAsync>("https://localhost:7076/api/kunden"); menuitems = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitems"); menuitemkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemkategories"); menuitemueberkategories = await Http.GetFromJsonAsync>("https://localhost:7076/api/Menuitemueberkategories"); diff --git a/src/y4f/Shared/SurveyPrompt.razor b/src/y4f/Shared/SurveyPrompt.razor deleted file mode 100644 index 67b6b62..0000000 --- a/src/y4f/Shared/SurveyPrompt.razor +++ /dev/null @@ -1,16 +0,0 @@ -
- - @Title - - - Please take our - brief survey - - and tell us what you think. -
- -@code { - // Demonstrates how a parent component can supply parameters - [Parameter] - public string? Title { get; set; } -} diff --git a/src/y4f/wwwroot/css/Site.css b/src/y4f/wwwroot/css/Site.css index e6e72ce..a053243 100644 --- a/src/y4f/wwwroot/css/Site.css +++ b/src/y4f/wwwroot/css/Site.css @@ -3,20 +3,29 @@ html, body { margin: 0px; padding: 0px; + overflow: hidden; } #content { background-color: #C7FFD1; - padding: 5%; margin-top: 1%; border-radius: 10px; position: center; } +#button1 { + background-color: #89F9A5; + border-radius: 50px; + margin-bottom: 15px; +} +h1 { + margin: 0px; + padding: 0px; +} .img { height: auto; max-width: 100%; - margin: 10%; + margin: 5%; } form { @@ -26,3 +35,17 @@ form { } +p { + color: grey; +} + +form { + margin-bottom: 20px; + margin-top: 5px; +} + +.form-control { + border-radius: 50px; + margin-bottom: 5px; +} +