mirror of
https://github.com/yummy4friends/y4f.git
synced 2024-11-10 08:57:22 +01:00
Revert "Yum04 82 bestelluebersicht detail chefin" (#36)
Revert "Yum04 82 bestelluebersicht detail chefin (#33)"
This reverts commit cc4ffab409
.
This commit is contained in:
parent
e317144914
commit
6c1b7bd336
@ -1,28 +1,20 @@
|
||||
@page "/"
|
||||
@layout Startseite
|
||||
|
||||
<body >
|
||||
|
||||
<PageTitle>Yummy4Friends</PageTitle>
|
||||
|
||||
|
||||
<body style='--blazor-load-percentage: 100%; --blazor-load-percentage-text: "100%"; background-color:#C7FFD5;'>
|
||||
<div class="container col-lg-6 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
<center>
|
||||
<h1>Herzlich Willkommen!</h1>
|
||||
<center><h1>Herzlich Willkommen!</h1></center>
|
||||
|
||||
<img src="assets/Logo_new.png" class="img" title="logo image">
|
||||
|
||||
|
||||
<form id="button1" action="https://qrcodescan.in/">
|
||||
<input type="submit" value="QR-Code einscannen" class="btn">
|
||||
|
||||
<form action="Speisekarte">
|
||||
<input type="submit" value="Zur Speisekarte" class="btn" />
|
||||
</form>
|
||||
|
||||
<input type="text" class="form-control" id="qrcode" placeholder="QR-Code manuell eintragen" name="qrcode">
|
||||
<form id="button1" action="Startseite">
|
||||
<input type="submit" value="Bestätigen" class="btn">
|
||||
</form>
|
||||
</center>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -5,15 +5,6 @@
|
||||
<h5>Vielen Dank für Ihre Bestellung</h5><br>
|
||||
<p class="text">
|
||||
Ihr Essen ist in <b>30 Minuten</b> abholbereit.
|
||||
<<<<<<< HEAD:Shared/Bestellbestätigung.razor
|
||||
Sie erhalten eine Benachrichtigung sobald das Essen fertig ist.
|
||||
Wir würden uns freuen, wenn Sie uns ein <a href="Feedback">Feedback</a> geben.
|
||||
<br><br><br><br>
|
||||
</p>
|
||||
<div class="progress">
|
||||
<div class="progress-bar bg-warning progress-bar-striped progress-bar-animated" style="width:50%"></div>
|
||||
</div>
|
||||
=======
|
||||
Sie erhalten eine Benachrichtigung sobald das Essen fertig ist. Wir würden uns freuen, wenn Sie uns ein <a href="Feedback">Feedback</a> geben.
|
||||
<br><br><br><br>
|
||||
</p>
|
||||
@ -22,7 +13,6 @@
|
||||
<div class="progress-bar bg-warning progress-bar-striped progress-bar-animated" style="width:50%"></div>
|
||||
</div>
|
||||
|
||||
>>>>>>> dev:src/y4f/Shared/Bestellbestätigung.razor
|
||||
<table>
|
||||
<tr class="loadtext">
|
||||
<td>Bestellung eingegangen</td>
|
||||
@ -30,16 +20,6 @@
|
||||
<td class="load3">Essen abholbereit</td>
|
||||
</tr>
|
||||
</table>
|
||||
<<<<<<< HEAD:Shared/Bestellbestätigung.razor
|
||||
<center>
|
||||
<br><br><br><br>
|
||||
|
||||
<form id="button1" action="/">
|
||||
<input type="submit" value="Zur Startseite" class="btn">
|
||||
</form>
|
||||
</center>
|
||||
</div>
|
||||
=======
|
||||
|
||||
<div class="button">
|
||||
<br><br><br><br>
|
||||
@ -50,7 +30,6 @@
|
||||
|
||||
</div>
|
||||
|
||||
>>>>>>> dev:src/y4f/Shared/Bestellbestätigung.razor
|
||||
</body>
|
||||
@code {
|
||||
|
||||
|
@ -19,14 +19,6 @@ img {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:Shared/Bestellbestätigung.razor.css
|
||||
#button1 {
|
||||
background-color: #89F9A5;
|
||||
border-radius: 50px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
=======
|
||||
.button {
|
||||
padding-left: 25%;
|
||||
padding-right: 25%;
|
||||
@ -40,7 +32,6 @@ img {
|
||||
display: inline-block;
|
||||
border-radius: 50px;
|
||||
}
|
||||
>>>>>>> dev:src/y4f/Shared/Bestellbestätigung.razor.css
|
||||
h5 {
|
||||
text-align: center;
|
||||
}
|
||||
@ -53,10 +44,7 @@ h5 {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:Shared/Bestellbestätigung.razor.css
|
||||
=======
|
||||
|
||||
>>>>>>> dev:src/y4f/Shared/Bestellbestätigung.razor.css
|
||||
.loadtext {
|
||||
font-size: 14px;
|
||||
}
|
@ -1,82 +0,0 @@
|
||||
@page "/Bestelluebersicht"
|
||||
@layout ChefinLayout
|
||||
|
||||
<div class="container d-flex flex-column">
|
||||
<div class="row">
|
||||
<div class="col-lg-8">
|
||||
<br /><br />
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">Aktive Bestellungen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><a href="BDetail">#1234 12:30</a></td>
|
||||
<td><a href="BDetail">#2345 18:45</a></td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="BDetail">#3456 13:00</a></td>
|
||||
<td><a href="BDetail">#4567 19:00</a></td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="BDetail">#5678 14:30</a></td>
|
||||
<td><a href="BDetail">#6789 19:15</a></td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="BDetail">#4321 15:15</a></td>
|
||||
<td><a href="BDetail">#5432 19:15</a></td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="BDetail">#6543 15:30</a></td>
|
||||
<td><a href="BDetail">#7654 19:15</a></td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="BDetail">#7654 15:30</a></td>
|
||||
<td> </td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="BDetail">#8765 16:00</a></td>
|
||||
<td> </td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="BDetail">#9876 17:30</a></td>
|
||||
<td> </td>
|
||||
|
||||
</tr>
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<p id="text" readonly >Abholzeit</p>
|
||||
<br />
|
||||
<form id="button" action="Bestelluebersicht">
|
||||
<input type="submit" value="30 Min" class="btn">
|
||||
</form>
|
||||
<form id="button" action="Bestelluebersicht">
|
||||
<input type="submit" value="45 Min" class="btn">
|
||||
</form>
|
||||
<form id="button" action="Bestelluebersicht">
|
||||
<input type="submit" value="1 Std" class="btn">
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@code {
|
||||
|
||||
}
|
@ -1,37 +0,0 @@
|
||||
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;
|
||||
}
|
@ -1,139 +0,0 @@
|
||||
@page "/BestelluebersichtD-Chefin"
|
||||
@layout ChefinLayout
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-lg-6">
|
||||
@*Tabelle Ihre Bestellung*@
|
||||
<div class="tbl-container">
|
||||
<table class="table bdr">
|
||||
<thead class="bg_green">
|
||||
<tr>
|
||||
<td>Ihre Bestellung</td>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="bg_lightgreen" style="background-color:white;">
|
||||
<tr>
|
||||
<td class="br" style="padding-top:20px; padding-bottom:0px; border-bottom-width: 0px;">
|
||||
1 Nudel mit Hühnerfleisch (groß)
|
||||
<div style="font-size:0.7rem;padding-left:15px;">mit Knoblauchsoße</div>
|
||||
</td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="padding-top:20px; padding-bottom:0px; border-style:hidden;">9,10€</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;">1 Coca Cola</td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="padding-top:0px; border-style:hidden;">2,50€</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-bottom-width: 0px; border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-bottom-width: 0px; border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-bottom-width: 0px; border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-bottom-width: 0px; border-style:hidden;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="br" style=" padding-top:0px; border-bottom-width: 0px;"></td>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-bottom-width: 0px; border-style:hidden;"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot class="bg_lightgreen">
|
||||
<tr style="border-top:solid 1px black; background-color:white;">
|
||||
<th class="" style="text-align:right;">Summe</th>
|
||||
<td class="d-flex justify-content-center align-items-center">11,60€</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-sm-12 col-lg-6">
|
||||
|
||||
<div class="d-flex flex-column align-items-center ">
|
||||
<div class="tbl-container w-100">
|
||||
<!-- <== overflow: hidden applied to parent -->
|
||||
<table class="table table-bordered bdr " style=" border-radius: 50px; margin-left: 50px;">
|
||||
<thead class="bg_green">
|
||||
<tr>
|
||||
<td class="d-flex justify-content-center align-items-center" style="border-bottom:0px;">
|
||||
<p>Abholzeit</p>
|
||||
</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody >
|
||||
<tr>
|
||||
<td class="d-flex justify-content-center align-items-center" style="padding-top:0px; background-color:white;">
|
||||
<div style="margin:20px;">
|
||||
<div class="d-flex justify-content-center align-items-center" >
|
||||
<p>12:30 Uhr</p>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="d-flex flex-column" style="align-items: center; margin-left: 100px;">
|
||||
<button class="btn_back w-75">Zurück</button>
|
||||
<button class="btn btn-danger w-75" style="border-radius: 50px; padding-top:12px; padding-bottom:12px; color:black;">Bestellung auflösen</button>
|
||||
<button class="btn_forward w-75">Bestellung abschließen</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@*Buttons*@
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@*<div class="h-100">
|
||||
@*Essen Abholen?
|
||||
<div class="row h-25 w-100">
|
||||
<div class="col">
|
||||
</div>
|
||||
</div>
|
||||
</div>*@
|
||||
@code {
|
||||
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
button {
|
||||
margin: 10px;
|
||||
}
|
@ -1,25 +0,0 @@
|
||||
<nav class="navbar navbar-expand-md navbar-light mb-4 me-5 ms-5 ">
|
||||
<div class="container-fluid">
|
||||
@*<a class="navbar-brand" href="">Yummy4Friends</a>*@
|
||||
<a class="navbar-brand" href="">
|
||||
<img src="assets/Logo_new.png" alt="Yummy4Friends" width="60px" height="auto">
|
||||
</a>
|
||||
|
||||
<ul class="navbar-nav">
|
||||
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="RegistrierungA">
|
||||
#1
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-person-fill" viewBox="0 0 16 16">
|
||||
<path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" />
|
||||
</svg>
|
||||
</NavLink>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@code {
|
||||
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
@inherits LayoutComponentBase
|
||||
|
||||
|
||||
<div >
|
||||
<y4f.Shared.Chefin.NavChefin />
|
||||
|
||||
<main class="container">
|
||||
|
||||
|
||||
@Body
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
@ -1,5 +0,0 @@
|
||||
html, body {
|
||||
/*background-color: #C7FFD5;*/
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
@ -2,18 +2,10 @@
|
||||
|
||||
<div class="container col-lg-5 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
<h4>Vielen Dank für Ihr Feedback. Durch Feedbacks können wir uns stets verbessern.<br></h4>
|
||||
<<<<<<< HEAD:Shared/Feedback/FBestätigung.razor
|
||||
<center>
|
||||
<form id="button1" action="Startseite">
|
||||
<input type="submit" value="Zur Startseite" class="btn">
|
||||
</form>
|
||||
</center>
|
||||
=======
|
||||
|
||||
<form id="button1" action="Startseite">
|
||||
<input type="submit" value="Zur Startseite" class="btn">
|
||||
</form>
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/FBestätigung.razor
|
||||
</div>
|
||||
|
||||
|
||||
|
@ -1,17 +1,9 @@
|
||||
<<<<<<< HEAD:Shared/Feedback/FBestätigung.razor.css
|
||||
h4 {
|
||||
=======
|
||||
|
||||
h4 {
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/FBestätigung.razor.css
|
||||
text-align: center;
|
||||
margin-top: 45%;
|
||||
}
|
||||
|
||||
form {
|
||||
margin-bottom: 45%;
|
||||
<<<<<<< HEAD:Shared/Feedback/FBestätigung.razor.css
|
||||
border-radius: 50px;
|
||||
=======
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/FBestätigung.razor.css
|
||||
}
|
||||
|
@ -2,29 +2,16 @@
|
||||
|
||||
<body>
|
||||
<div class="container col-lg-5 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
<<<<<<< HEAD:Shared/Feedback/Feedback.razor
|
||||
|
||||
<h4 for="feedback">Ihr Feedback: </h4>
|
||||
<center>
|
||||
<textarea class="form-control" rows="10" cols="15" id="feedback" name="text"></textarea>
|
||||
|
||||
|
||||
=======
|
||||
<h4 for="feedback">Ihr Feedback: </h4>
|
||||
<textarea class="form-control" rows="10" id="feedback" name="text"></textarea>
|
||||
|
||||
<div class="button">
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/Feedback.razor
|
||||
<br>
|
||||
<form id="button1" action="FBestätigung">
|
||||
<input type="submit" value="Absenden" class="btn">
|
||||
</form>
|
||||
<<<<<<< HEAD:Shared/Feedback/Feedback.razor
|
||||
</center>
|
||||
=======
|
||||
</div>
|
||||
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/Feedback.razor
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
@ -1,11 +1,7 @@
|
||||
body, html {
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
<<<<<<< HEAD:Shared/Feedback/Feedback.razor.css
|
||||
|
||||
=======
|
||||
margin-bottom: 15px;
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/Feedback.razor.css
|
||||
}
|
||||
|
||||
p {
|
||||
@ -23,28 +19,18 @@ img {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:Shared/Feedback/Feedback.razor.css
|
||||
textarea {
|
||||
width: 100%;
|
||||
=======
|
||||
.button {
|
||||
padding-left: 25%;
|
||||
padding-right: 25%;
|
||||
text-align: center;
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/Feedback.razor.css
|
||||
}
|
||||
|
||||
#button1 {
|
||||
background-color: #89F9A5;
|
||||
<<<<<<< HEAD:Shared/Feedback/Feedback.razor.css
|
||||
border-radius: 50px;
|
||||
text-align: center;
|
||||
=======
|
||||
padding-left: 25%;
|
||||
padding-right: 25%;
|
||||
display: inline-block;
|
||||
border-radius: 50px;
|
||||
>>>>>>> dev:src/y4f/Shared/Feedback/Feedback.razor.css
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,14 +1,12 @@
|
||||
body {
|
||||
background-color: white;
|
||||
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:Shared/Kontoverwaltung.razor.css
|
||||
=======
|
||||
h3 {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
>>>>>>> dev:src/y4f/Shared/Kontoverwaltung.razor.css
|
||||
img {
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
|
@ -1,35 +0,0 @@
|
||||
<nav class="navbar navbar-expand-md navbar-light mb-4 me-5 ms-5 ">
|
||||
<div class="container-fluid">
|
||||
@*<a class="navbar-brand" href="">Yummy4Friends</a>*@
|
||||
|
||||
<button class="navbar-toggler @NavButtonCssClass" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
|
||||
aria-controls="navbarCollapse" aria-label="Toggle navigation" @onclick="ToggleNavMenu">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse justify-content-end @NavBarCssClass" id="navbarCollapse" @onclick="ToggleNavMenu">
|
||||
<ul class="navbar-nav">
|
||||
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="RegistrierungA">
|
||||
Admin
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-person-fill" viewBox="0 0 16 16">
|
||||
<path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" />
|
||||
</svg>
|
||||
</NavLink>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@code {
|
||||
private bool collapseNavMenu = true;
|
||||
private string? NavBarCssClass => collapseNavMenu ? null : "show";
|
||||
private string? NavButtonCssClass => collapseNavMenu ? "collapsed" : null;
|
||||
|
||||
|
||||
private void ToggleNavMenu()
|
||||
{
|
||||
collapseNavMenu = !collapseNavMenu;
|
||||
}
|
||||
}
|
@ -3,10 +3,3 @@
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
<<<<<<< HEAD:Shared/Registrierung.razor.css
|
||||
=======
|
||||
|
||||
li {
|
||||
text-align: right;
|
||||
}
|
||||
>>>>>>> dev:src/y4f/Shared/Registrierung.razor.css
|
||||
|
@ -1,38 +0,0 @@
|
||||
<nav class="navbar navbar-expand-md navbar-light mb-4 me-5 ms-5 ">
|
||||
<div class="container-fluid">
|
||||
@*<a class="navbar-brand" href="">Yummy4Friends</a>*@
|
||||
<a class="navbar-brand" href="">
|
||||
<img src="assets/Logo_new.png" alt="Yummy4Friends" width="60px" height="auto">
|
||||
</a>
|
||||
|
||||
<button class="navbar-toggler @NavButtonCssClass" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
|
||||
aria-controls="navbarCollapse" aria-label="Toggle navigation" @onclick="ToggleNavMenu">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse justify-content-end @NavBarCssClass" id="navbarCollapse" @onclick="ToggleNavMenu">
|
||||
<ul class="navbar-nav">
|
||||
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="RegistrierungA">
|
||||
Admin
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-person-fill" viewBox="0 0 16 16">
|
||||
<path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" />
|
||||
</svg>
|
||||
</NavLink>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@code {
|
||||
private bool collapseNavMenu = true;
|
||||
private string? NavBarCssClass => collapseNavMenu ? null : "show";
|
||||
private string? NavButtonCssClass => collapseNavMenu ? "collapsed" : null;
|
||||
|
||||
|
||||
private void ToggleNavMenu()
|
||||
{
|
||||
collapseNavMenu = !collapseNavMenu;
|
||||
}
|
||||
}
|
@ -1,15 +0,0 @@
|
||||
@inherits LayoutComponentBase
|
||||
|
||||
|
||||
<div >
|
||||
<NavRegistrierung />
|
||||
|
||||
<main class="container">
|
||||
|
||||
|
||||
@Body
|
||||
|
||||
</main>
|
||||
|
||||
<Footer />
|
||||
</div>
|
@ -1,5 +0,0 @@
|
||||
html, body {
|
||||
/*background-color: #C7FFD5;*/
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
@ -1,22 +0,0 @@
|
||||
@page "/RegistrierungA"
|
||||
@layout Registrierung
|
||||
|
||||
<div class="container col-lg-5 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
<p>Benutzername:</p>
|
||||
<center>
|
||||
<input type="text" class="form-control" id="name" name="name">
|
||||
</center>
|
||||
<p>Passwort:</p>
|
||||
<center>
|
||||
<input type="text" class="form-control" id="password" name="password">
|
||||
</center>
|
||||
<center>
|
||||
|
||||
<form id="button" action="Bestelluebersicht">
|
||||
<input type="submit" value="Login" class="btn">
|
||||
</form>
|
||||
</center>
|
||||
</div>
|
||||
@code {
|
||||
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
p {
|
||||
color: grey;
|
||||
margin-bottom:0px;
|
||||
margin-top: 15px;
|
||||
margin-left: 61px;
|
||||
}
|
||||
|
||||
form {
|
||||
margin-top: 20px;
|
||||
border-radius: 50px;
|
||||
}
|
||||
|
||||
input {
|
||||
border-radius: 50px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -1,26 +0,0 @@
|
||||
@page "/RegistrierungK"
|
||||
@layout Registrierung
|
||||
|
||||
<div class="container col-lg-5 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
<form id="button1" action="https://qrcodescan.in/">
|
||||
<input type="submit" value="QR-Code einscannen" class="btn">
|
||||
|
||||
</form>
|
||||
|
||||
<input type="text" class="form-control" id="qrcode" placeholder="QR-Code manuell eintragen" name="qrcode">
|
||||
<form id="button1" action="Startseite">
|
||||
<input type="submit" value="Bestätigen" class="btn">
|
||||
|
||||
</form>
|
||||
<input type="text" class="form-control" id="email" placeholder="Email eintragen" name="email">
|
||||
<form id="button1" action="">
|
||||
<input type="submit" value="Email abschicken" class="btn">
|
||||
|
||||
</form>
|
||||
|
||||
<p>Durch die Eingabe der Email Adresse wird Ihnen ein QR-Code für die Anmeldung zugeschickt.</p>
|
||||
|
||||
</div>
|
||||
@code {
|
||||
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
p {
|
||||
color: grey;
|
||||
}
|
||||
|
||||
form {
|
||||
margin-bottom:20px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
@ -1,26 +0,0 @@
|
||||
@page "/RegistrierungK"
|
||||
@layout Registrierung
|
||||
|
||||
<div class="container col-lg-5 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
<form id="button1" action="https://qrcodescan.in/">
|
||||
<input type="submit" value="QR-Code einscannen" class="btn">
|
||||
|
||||
</form>
|
||||
|
||||
<input type="text" class="form-control" id="qrcode" placeholder="QR-Code manuell eintragen" name="qrcode">
|
||||
<form id="button1" action="Startseite">
|
||||
<input type="submit" value="Bestätigen" class="btn">
|
||||
|
||||
</form>
|
||||
<input type="text" class="form-control" id="email" placeholder="Email eintragen" name="email">
|
||||
<form id="button1" action="">
|
||||
<input type="submit" value="Email abschicken" class="btn">
|
||||
|
||||
</form>
|
||||
|
||||
<p>Durch die Eingabe der Email Adresse wird Ihnen ein QR-Code für die Anmeldung zugeschickt.</p>
|
||||
|
||||
</div>
|
||||
@code {
|
||||
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
p {
|
||||
color: grey;
|
||||
}
|
||||
|
||||
form {
|
||||
margin-bottom:20px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
@ -3,8 +3,6 @@
|
||||
|
||||
<div>
|
||||
|
||||
<NavStartseite />
|
||||
|
||||
<main class="container">
|
||||
|
||||
|
||||
|
@ -1,12 +1,7 @@
|
||||
@page "/Yummy-Punkte"
|
||||
|
||||
<body>
|
||||
<<<<<<< HEAD:Shared/Yummy-Punkte.razor
|
||||
<div class="container col-lg-6 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
<center>
|
||||
=======
|
||||
<div class="container col-lg-5 col-md-9 col-sm-12 d-flex flex-column " id="content">
|
||||
>>>>>>> dev:src/y4f/Shared/Yummy-Punkte.razor
|
||||
<h4><b>Ihre Yummy-Punkte</b></h4>
|
||||
|
||||
<div class="img" >
|
||||
@ -17,23 +12,14 @@
|
||||
<br>
|
||||
</div>
|
||||
|
||||
<<<<<<< HEAD:Shared/Yummy-Punkte.razor
|
||||
<p class="text">Bei einem Mindestbestellwert von 8€ erhalten Sie ein Yummy-Punkt.
|
||||
Ab der 10ten Bestellung gibt es einen Rabatt zu Ihrer nächsten Bestellung.</p>
|
||||
=======
|
||||
<p class="text">Bei einem Mindestbestellwert von 8€ erhalten Sie ein Yummy-Punkt. Ab der 10ten Bestellung gibt es einen Rabatt zu Ihrer nächsten Bestellung.</p>
|
||||
>>>>>>> dev:src/y4f/Shared/Yummy-Punkte.razor
|
||||
|
||||
<div class="button">
|
||||
<form id="button1" action="/">
|
||||
<input type="submit" value="Zurück" class="btn">
|
||||
</form>
|
||||
</div>
|
||||
<<<<<<< HEAD:Shared/Yummy-Punkte.razor
|
||||
</center>
|
||||
=======
|
||||
|
||||
>>>>>>> dev:src/y4f/Shared/Yummy-Punkte.razor
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
@ -19,15 +19,12 @@ img {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:Shared/Yummy-Punkte.razor.css
|
||||
=======
|
||||
.button {
|
||||
padding-left: 25%;
|
||||
padding-right: 25%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
>>>>>>> dev:src/y4f/Shared/Yummy-Punkte.razor.css
|
||||
#button1 {
|
||||
background-color: #F9BE89;
|
||||
padding-left: 25%;
|
||||
@ -35,24 +32,6 @@ img {
|
||||
display: inline-block;
|
||||
border-radius: 50px;
|
||||
}
|
||||
<<<<<<< HEAD:Shared/Yummy-Punkte.razor.css
|
||||
|
||||
/*.button {
|
||||
padding-left: 25%;
|
||||
padding-right: 25%;
|
||||
text-align: center;
|
||||
}*/
|
||||
|
||||
|
||||
/*h4 {
|
||||
text-align: center;
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
|
||||
=======
|
||||
h4 {
|
||||
text-align: center;
|
||||
}
|
||||
>>>>>>> dev:src/y4f/Shared/Yummy-Punkte.razor.css
|
||||
|
@ -3,8 +3,8 @@
|
||||
html, body {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
overflow-y: hidden;
|
||||
}
|
||||
|
||||
#content {
|
||||
background-color: #C7FFD1;
|
||||
padding: 5%;
|
||||
@ -12,26 +12,17 @@ html, body {
|
||||
border-radius: 10px;
|
||||
position: center;
|
||||
}
|
||||
|
||||
.img {
|
||||
height: auto;
|
||||
width: 60%;
|
||||
margin: 4%;
|
||||
text-align: center;
|
||||
max-width: 100%;
|
||||
margin: 10%;
|
||||
}
|
||||
|
||||
form {
|
||||
margin-bottom: 20px;
|
||||
margin-top: 5px;
|
||||
background-color: #89F9A5;
|
||||
text-align: center;
|
||||
width: 70%;
|
||||
}
|
||||
.form-control {
|
||||
width: 70%;
|
||||
background-color: #89F9A5;
|
||||
border-radius: 50px;
|
||||
|
||||
}
|
||||
|
||||
#button1 {
|
||||
border-radius: 50px;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user