This commit is contained in:
irisrb
2022-06-04 08:37:40 +02:00
10 changed files with 170 additions and 115 deletions

8
components/about.html Normal file
View File

@@ -0,0 +1,8 @@
<div class="container maincontent" id="aboutLink">
<h1>Über uns</h1>
<p>
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis,
sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus.
Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a,
</p>
</div>

15
components/contact.html Normal file
View File

@@ -0,0 +1,15 @@
<div class="container maincontent" id="contactLink">
<h1>Kontakt
</h1>
<h5>Wenn dir unsere Produkte gefallen, kannst du dich gerne hier an uns wenden:</h5>
<address>
<p>Telefon
<a href="tel:+43100200340"></a>010-200-340</a><br>
</p>
<p>E-mail: <a href="mailto: info@marmeladenladen.com">info@marmeladenladen.com</a></p>
<p>Adresse:<br>
Testadresse 1234<br>
1010 Wien<br>
</p>
</address>
</div>

View File

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

34
components/imprint.html Normal file
View File

@@ -0,0 +1,34 @@
<div class="container maincontent" id="imprintLink">
<h1>Impressum</h1>
<p>Offenlegungspflicht gemäß § 25 Mediengesetz und Informationspflicht gemäß § 5 E-Commerce-Gesetz</p>
<h3>Medieninhaber und Herausgeber</h3>
<div class="container border w-75 rounded shadow-lg text-center align-items-center">
<h4>MarmeladenLaden</h4>
<h5>Gesellschaft mit beschränkter Haftung</h5>
<address>
Testadresse 1234<br>
1010 Wien<br>
Tel: <a href="tel:+43100200340"></a>+43 10 020 0340</a><br>
E-mail: <a href="mailto: info@marmeladenladen.com">info@marmeladenladen.com</a>
</address>
</div>
<br><br>
<h2>Unternehmensdaten</h2>
<strong>UID-Nummer</strong>: ATU12345678<br><br>
<strong>Firmenbuchnummer</strong>: 123456<br>
<strong>Gewerbeordnung idgF</strong>: <a href="https://www.ris.bka.gv.at/GeltendeFassung.wxe?Abfrage=Bundesnormen&Gesetzesnummer=10007517" target="_blank">www.ris.bka.gv.at</a><br>
<strong>Firmenbuchgericht</strong>: Handelsgericht Wien, 1030 Wien, Österreich<br><br> Mitglied der WKÖ<br><br>
<strong>Gewerbeberechtigungen</strong>: Gastgewerbe gem. § 142 (1) Z. 2-4 GewO 1994<br>
<strong>Unternehmensgegenstand</strong>: Erzeugung und Vertrieb von Nahrungs- und Genussmittel<br><br>
<h3>Beschwerden</h3>
Verbraucher haben die Möglichkeit, Beschwerden an die Onlines-Streitbeilegungsplattform der EU zu richten:
<a href="https://www.ec.europa.eu/consumers/odr" target="_blank">European Commission Online Dispute Resolution</a><br> Sie können allfällige Beschwerde auch an die oben angegebene E-Mail-Adresse richten.<br><br>
<h3>Haftungshinweise</h3>
Sämtliche Texte auf der Website wurden sorgfältig geprüft. Dessen ungeachtet kann keine Garantie für Richtigkeit, Vollständigkeit und Aktualität der Angaben übernommen werden. Die Klaab Hotelverwaltung GmbH übernimmt keine Verantwortung für die Inhalte
von externen Websites, die über Links von dieser Website erreicht werden können oder die ihrerseits auf diese Website verweisen und übernimmt keinerlei Verantwortung für den Inhalt solcher Websites oder deren Richtigkeit, Vollständigkeit oder Gesetzeskonformität.
Für Inhalte übernehmen wir keine Gewähr. Preisänderungen vorbehalten.<br><br> Diese Website benutzt Google Analytics, einen Webanalysedienst der Google Inc. („Google“). Google Analytics verwendet sog. „Cookies“, Textdateien, die auf Ihrem Computer
gespeichert werden und die eine Analyse der Benutzung der Website durch Sie ermöglicht. Die durch den Cookie erzeugten Informationen über Ihre Benutzung diese Website (einschließlich Ihrer IP-Adresse) wird an einen Server von Google in den USA übertragen
und dort gespeichert. Google wird diese Informationen benutzen, um Ihre Nutzung der Website auszuwerten, um Reports über die Websiteaktivitäten für die Websitebetreiber zusammenzustellen und um weitere mit der Websitenutzung und der Internetnutzung
verbundene Dienstleistungen zu erbringen. Auch wird Google diese Informationen gegebenenfalls an Dritte übertragen, sofern dies gesetzlich vorgeschrieben oder soweit Dritte diese Daten im Auftrag von Google verarbeiten.
</p>
</div>

View File

@@ -1,28 +1,31 @@
<div class="container maincontent"> <div class="container maincontent">
<form id="loginForm"> <form id="loginForm">
<!-- Email input --> <!-- Email input -->
<div class="form-outline mb-4"> <div class="form-outline mb-4">
<input type="email" class="form-control" name="email" id="emailLogin" placeholder="E-Mail" required> <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>
</div> </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> </div>
<!-- Submit button -->
<button type="submit" class="btn btn-success btn-block mb-4 float-end">Sign in</button>
</form>
</div> </div>
<script src="../js/login.js"></script> <script src="../js/login.js"></script>

View File

@@ -15,32 +15,32 @@
<a class="nav-link" type="button" id="homeLink">Home</a> <a class="nav-link" type="button" id="homeLink">Home</a>
</li> </li>
<li class="nav-item"> <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>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" type="button" id="shopLink">Shop</a> <a class="nav-link" type="button" id="shopLink">Shop</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="contactLink">Contact</a> <a class="nav-link" type="button" id="contactLink">Kontakt</a>
</li> </li>
<li class="nav-item"> <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>
<li class="nav-item"> <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>
<li class="nav-item"> <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>
<li class="nav-item"> <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> </li>
</ul> </ul>
</div> </div>
<div class="navbar align-self-center d-flex"> <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="d-lg-none flex-sm-fill mt-3 mb-4 col-7 col-sm-auto pr-3">
<div class="input-group"> <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"> <div class="input-group-text">
<i class="fa fa-fw fa-search"></i> <i class="fa fa-fw fa-search"></i>
</div> </div>

View File

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

View File

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

View File

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

View File

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