DopeyCode/marmeladenladen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
irisrb
2022-06-02 20:43:59 +02:00
parent c41a7c69c5
commit 9ab162a8b4
7 changed files with 113 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/footer.html
View File

@@ -4,8 +4,7 @@
<h2 class="h2 text-success border-bottom pb-3 border-light logo">MarmeladenLaden</h2>
<ul class="list-unstyled text-light footer-link-list">
<li>
<i class="fas fa-map-marker-alt fa-fw"></i>
Testadresse 123456
<i class="fas fa-map-marker-alt fa-fw"></i> Testadresse 123456
</li>
<li>
<i class="fa fa-phone fa-fw"></i>
@@ -21,24 +20,22 @@
<div class="col-md-4 pt-5">
<h2 class="h2 text-light border-bottom pb-3 border-light">Produkte</h2>
<ul class="list-unstyled text-light footer-link-list">
<li><a class="text-decoration-none" href="#">Marmeladen</a></li>
<li><a class="text-decoration-none" href="../components/shop.html">Marmeladen</a></li>
<li><a class="text-decoration-none" href="#">XXXX</a></li>
<li><a class="text-decoration-none" href="#">XXXX</a></li>
<li><a class="text-decoration-none" href="#">YYYY</a></li>
<li><a class="text-decoration-none" href="#">ZZZZ</a></li>
<li><a class="text-decoration-none" href="#">AAAA</a></li>
<li><a class="text-decoration-none" href="#">BBBB</a></li>
</ul>
</div>
<div class="col-md-4 pt-5">
<h2 class="h2 text-light border-bottom pb-3 border-light">Navigation</h2>
<ul class="list-unstyled text-light footer-link-list">
<li><a class="text-decoration-none" href="#">Home</a></li>
<li><a class="text-decoration-none" href="#">About Us</a></li>
<li><a class="text-decoration-none" href="#">Shop</a></li>
<li><a class="text-decoration-none" href="#">FAQs</a></li>
<li><a class="text-decoration-none" href="#">Contact</a></li>
<li><a class="text-decoration-none" href="../components/homepage.html">Home</a></li>
<li><a class="text-decoration-none" href="../components/about.html">Über uns</a></li>
<li><a class="text-decoration-none" href="../components/shop.html">Shop</a></li>
<li><a class="text-decoration-none" href="../components/contact.html">Kontakt</a></li>
<li><a class="text-decoration-none" href="../components/imprint.html">Impressum</a></li>
</ul>
</div>
@@ -71,7 +68,7 @@
<div class="row pt-2">
<div class="col-12">
<p class="text-left text-light">
Copyright &copy; 2021 MarmeladenLaden
Copyright &copy; 2022 MarmeladenLaden
</p>
</div>
</div>

49
components/login.html
View File

@@ -1,28 +1,31 @@
<div class="container maincontent">
<form id="loginForm">
<!-- Email input -->
<div class="form-outline mb-4">
<input type="email" class="form-control" name="email" id="emailLogin" placeholder="E-Mail" required>
</div>
<!-- Password input -->
<div class="form-outline mb-4">
<input type="password" class="form-control" name="password" id="passwordLogin" placeholder="Passwort" required>
</div>
<!-- 2 column grid layout for inline styling -->
<div class="row mb-4">
<div class="col d-flex justify-content-center">
<!-- Checkbox -->
<div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="rememberMe" checked />
<label class="form-check-label" for="rememberMe"> Remember me </label>
<form id="loginForm">
<!-- Email input -->
<div class="form-outline mb-4">
<input type="email" class="form-control" name="email" id="emailLogin" placeholder="E-Mail" required>
</div>
</div>
<!-- Password input -->
<div class="form-outline mb-4">
<input type="password" class="form-control" name="password" id="passwordLogin" placeholder="Passwort" required>
</div>
<!-- 2 column grid layout for inline styling -->
<div class="row mb-4">
<div class="col d-flex justify-content-center">
<!-- Checkbox -->
<div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="rememberMe" checked />
<label class="form-check-label" for="rememberMe"> Merken </label>
</div>
</div>
</div>
<!-- Submit button -->
<button type="submit" class="btn btn-success btn-block mb-4 float-end">Einloggen</button>
</form>
<div>
<button type="button" class="btn btn-success float-end" href="../components/register.html">Registrieren</button>
</div>
<!-- Submit button -->
<button type="submit" class="btn btn-success btn-block mb-4 float-end">Sign in</button>
</form>
</div>
<script src="../js/login.js"></script>

14
components/main_nav.html
View File

@@ -15,32 +15,32 @@
<a class="nav-link" type="button" id="homeLink">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" id="aboutLink">About</a>
<a class="nav-link" type="button" id="aboutLink">Über uns</a>
</li>
<li class="nav-item">
<a class="nav-link" type="button" id="shopLink">Shop</a>
</li>
<li class="nav-item">
<a class="nav-link" id="contactLink">Contact</a>
<a class="nav-link" type="button" id="contactLink">Kontakt</a>
</li>
<li class="nav-item">
<a class="nav-link" type="button" id="loginLink">Login</a>
<a class="nav-link" type="button" id="loginLink">Einloggen</a>
</li>
<li class="nav-item">
<a class="nav-link" type="button" id="registerLink">Register</a>
<a class="nav-link" type="button" id="registerLink">Registrierung</a>
</li>
<li class="nav-item">
<a class="nav-link" type="button" id="profileLink">Profile</a>
<a class="nav-link" type="button" id="profileLink">Profil</a>
</li>
<li class="nav-item">
<a class="nav-link" type="button" id="logoutLink">Logout</a>
<a class="nav-link" type="button" id="logoutLink">Ausloggen</a>
</li>
</ul>
</div>
<div class="navbar align-self-center d-flex">
<div class="d-lg-none flex-sm-fill mt-3 mb-4 col-7 col-sm-auto pr-3">
<div class="input-group">
<input type="text" class="form-control" id="inputMobileSearch" placeholder="Search ...">
<input type="text" class="form-control" id="inputMobileSearch" placeholder="Suche ...">
<div class="input-group-text">
<i class="fa fa-fw fa-search"></i>
</div>

62
components/profile.html
View File

@@ -1,5 +1,7 @@
<div class="container registerform maincontent">
<h1> Hello <p id="usernameHeader"></p></h1>
<h1> Profil
<p id="usernameHeader"></p>
</h1>
<form id="userProfile">
<div class="row">
<div class="col-3">
@@ -16,33 +18,33 @@
<div class="col-12">
<input type="text" class="form-control" name="street" id="street" placeholder="Straße" required>
</div>
<div>
<div class="row">
<div class="col-4">
<input type="text" class="form-control" name="postalcode" id="postalcode" placeholder="PLZ" required>
</div>
<div class="col-8">
<input type="text" class="form-control" name="city" id="city" placeholder="Stadt" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="email" class="form-control" name="email" id="email" placeholder="E-Mail" readonly>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="phone" id="phone" placeholder="Telefon" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="password" class="form-control" name="password" id="password" placeholder="Passwort" required>
</div>
</div>
<div class="modal-footer d-block">
<button type="submit" class="btn btn-success float-end" id="changeData" >Daten ändern</button>
</div>
<div>
<div class="row">
<div class="col-4">
<input type="text" class="form-control" name="postalcode" id="postalcode" placeholder="PLZ" required>
</div>
<div class="col-8">
<input type="text" class="form-control" name="city" id="city" placeholder="Stadt" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="email" class="form-control" name="email" id="email" placeholder="E-Mail" readonly>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="phone" id="phone" placeholder="Telefon" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="password" class="form-control" name="password" id="password" placeholder="Passwort" required>
</div>
</div>
<div class="modal-footer d-block">
<button type="submit" class="btn btn-success float-end" id="changeData">Daten ändern</button>
</div>
</form>
</div>
<script src="../js/datachange.js"></script>
</div>
<script src="../js/datachange.js"></script>

70
components/register.html
View File

@@ -19,39 +19,39 @@
<div class="col-12">
<input type="text" class="form-control" name="street" id="street" placeholder="Straße" required>
</div>
<div>
<div class="row">
<div class="col-4">
<input type="text" class="form-control" name="postalcode" id="postalcode" placeholder="PLZ" required>
</div>
<div class="col-8">
<input type="text" class="form-control" name="city" id="city" placeholder="Stadt" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="email" class="form-control" name="email" id="email" placeholder="E-Mail" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="password" class="form-control" name="password" id="password" placeholder="Passwort" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="password" class="form-control" name="password2" id="password2" placeholder="Passwort wiederholen" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="phone" id="phone" placeholder="Telefon" required>
</div>
</div>
<div class="modal-footer d-block">
<button type="reset" class="btn btn-secondary float-start" id="cancelButton">Reset</button>
<button type="submit" class="btn btn-success float-end" id="registration" >Registrieren</button>
</div>
<div>
<div class="row">
<div class="col-4">
<input type="text" class="form-control" name="postalcode" id="postalcode" placeholder="PLZ" required>
</div>
<div class="col-8">
<input type="text" class="form-control" name="city" id="city" placeholder="Stadt" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="email" class="form-control" name="email" id="email" placeholder="E-Mail" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="password" class="form-control" name="password" id="password" placeholder="Passwort" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="password" class="form-control" name="password2" id="password2" placeholder="Passwort wiederholen" required>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="phone" id="phone" placeholder="Telefon" required>
</div>
</div>
<div class="modal-footer d-block">
<button type="reset" class="btn btn-secondary float-start" id="cancelButton">Zurücksetzen</button>
<button type="submit" class="btn btn-success float-end" id="registration">Registrieren</button>
</div>
</form>
</div>
<script src="../js/registration.js"></script>
</div>
<script src="../js/registration.js"></script>

2
components/shop.html
View File

@@ -1,6 +1,6 @@
<div class="container wrapper maincontent shoppingpage">
<div class="alert alert-success fade show" role="alert" id="productAddedAlert">
</div>
</div>
<div class="container" id="productOverview">
<div class="row g-1" id="productOverviewDiv">
</div>

12
index.html
View File

@@ -10,8 +10,7 @@
<meta name="description" content="Dieser MarmeladenLaden wird aktuell für die LV WebScripting umgesetzt.">
<meta name="author" content="Iris Raab & Philip Stockerer">
<!--Einbinden der genutzten Frameworks-->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.0/font/bootstrap-icons.css">
<link rel="stylesheet" href="../res/css/style.css">
<title>MarmeladenLaden</title>
@@ -31,11 +30,10 @@
<!-- End Main Navbar-->
<!-- Start Search Modal-->
<div class="modal fade bg-white" id="marmeladenladen_search" tabindex="-1" role="dialog"
aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal fade bg-white" id="marmeladenladen_search" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
</div>
<!-- End Modal-->
<!-- Start Main Content -->
<div id="mmlMainContent">
@@ -43,9 +41,7 @@
</body>
<!-- End Content -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/7321626d2e.js" crossorigin="anonymous"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="../js/app.js"></script>