diff --git a/components/ftProducts.html b/components/ftProducts.html deleted file mode 100644 index ddb5687..0000000 --- a/components/ftProducts.html +++ /dev/null @@ -1,87 +0,0 @@ -
-
-
-
-

Featured Product

-

- Reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. - Excepteur sint occaecat cupidatat non proident. -

-
-
-
-
-
- - ... - -
-
    -
  • - - - - - -
    • -
  • $240.00
    • -
- Gym Weight -

- Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt in culpa qui officia deserunt. -

-

Reviews (24)

-
-
-
-
-
- - ... - -
-
    -
  • - - - - - -
    • -
  • $480.00
    • -
- Cloud Nike Shoes -

- Aenean gravida dignissim finibus. Nullam ipsum diam, posuere vitae pharetra sed, commodo ullamcorper. -

-

Reviews (48)

-
-
-
-
-
- - ... - -
-
    -
  • - - - - - -
    • -
  • $360.00
    • -
- Summer Addides Shoes -

- Curabitur ac mi sit amet diam luctus porta. Phasellus pulvinar sagittis diam, et scelerisque ipsum lobortis nec. -

-

Reviews (74)

-
-
-
-
-
-
\ No newline at end of file diff --git a/components/banner.html b/components/homepage.html similarity index 56% rename from components/banner.html rename to components/homepage.html index 2243ceb..feded73 100644 --- a/components/banner.html +++ b/components/homepage.html @@ -92,4 +92,91 @@ data-bs-slide="next"> - \ No newline at end of file + +
+
+
+
+

Featured Product

+

+ Reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident. +

+
+
+
+
+
+ + ... + +
+
    +
  • + + + + + +
    • +
  • $240.00
    • +
+ Gym Weight +

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt in culpa qui officia deserunt. +

+

Reviews (24)

+
+
+
+
+
+ + ... + +
+
    +
  • + + + + + +
    • +
  • $480.00
    • +
+ Cloud Nike Shoes +

+ Aenean gravida dignissim finibus. Nullam ipsum diam, posuere vitae pharetra sed, commodo ullamcorper. +

+

Reviews (48)

+
+
+
+
+
+ + ... + +
+
    +
  • + + + + + +
    • +
  • $360.00
    • +
+ Summer Addides Shoes +

+ Curabitur ac mi sit amet diam luctus porta. Phasellus pulvinar sagittis diam, et scelerisque ipsum lobortis nec. +

+

Reviews (74)

+
+
+
+
+
+
\ No newline at end of file diff --git a/components/login.html b/components/login.html new file mode 100644 index 0000000..be7ac02 --- /dev/null +++ b/components/login.html @@ -0,0 +1,29 @@ +
+
+ +
+ + +
+ + +
+ + +
+ + +
+
+ +
+ + +
+
+
+ + + +
+
\ No newline at end of file diff --git a/components/loginModal.html b/components/loginModal.html deleted file mode 100644 index ed11e47..0000000 --- a/components/loginModal.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
-
\ No newline at end of file diff --git a/components/main_nav.html b/components/main_nav.html index 77f1781..da41df0 100644 --- a/components/main_nav.html +++ b/components/main_nav.html @@ -12,16 +12,22 @@
@@ -41,7 +47,7 @@ 7 - + diff --git a/components/register.html b/components/register.html new file mode 100644 index 0000000..1b65ac4 --- /dev/null +++ b/components/register.html @@ -0,0 +1,62 @@ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ + +
+ +
\ No newline at end of file diff --git a/components/registerModal.html b/components/registerModal.html deleted file mode 100644 index 69ae984..0000000 --- a/components/registerModal.html +++ /dev/null @@ -1,71 +0,0 @@ -
-
-
- - -
-
-
-
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
- - -
- -
-
-
- \ No newline at end of file diff --git a/index.html b/index.html index 9a2dd52..8b9a3aa 100644 --- a/index.html +++ b/index.html @@ -30,28 +30,11 @@ - - - - - - - - - -
- -
-
diff --git a/js/app.ts b/js/app.ts index 621643d..524fb89 100644 --- a/js/app.ts +++ b/js/app.ts @@ -1,11 +1,20 @@ + + $(document).ready(function() { + $('#mmlMainContent').load('../components/homepage.html'); $('#top_nav_bar').load('../components/top_nav.html'); - $('#main_nav_bar').load('../components/main_nav.html'); - $('#mmlcarousel').load('../components/banner.html'); + $('#main_nav_bar').load('../components/main_nav.html', function() { + document.getElementById('registerLink')?.addEventListener('click', function() { + $('#mmlMainContent').load('../components/register.html'); + },); + document.getElementById('homeLink')?.addEventListener('click', function() { + $('#mmlMainContent').load('../components/homepage.html'); + },); + document.getElementById('loginLink')?.addEventListener('click', function() { + $('#mmlMainContent').load('../components/login.html'); + },); + }); $('#mmlMainContent').load('../components/ftProducts.html'); $('#marmeladenladen_footer').load('../components/footer.html'); $('#marmeladenladen_search').load('../components/modal.html'); - $('#marmeladenladenLogin').load('../components/loginModal.html'); - $('#marmeladenladenRegister').load('../components/registerModal.html'); }); - diff --git a/js/registration.js b/js/registration.js index a0868cf..198ef06 100644 --- a/js/registration.js +++ b/js/registration.js @@ -2,20 +2,38 @@ const email = document.getElementById('email'); const password = document.getElementById('password'); const password2 = document.getElementById('password2'); password2.addEventListener('change', checkPassword); - +const form = document.getElementById('marmeladenLadenRegisterForm'); +form.addEventListener('submit', register); function register() { - if (!checkPassword()) { - return; - } - const form = document.querySelector('#marmeladenLadenRegisterForm'); + + + $.ajax({ + url: 'php/registration.php', + type: 'POST', + data: { + email: email.value, + password: password.value, + password2: password2.value + }, + success: function (data) { + if (data == 'success') { + window.location.href = 'index.html'; + } else { + alert(data); + } + } + }); + return false; +} + var formData = new FormData(form); const jSONdata = JSON.stringify(Object.fromEntries(formData)); //print elements of jSONdata console.log(jSONdata); -} + function checkPassword() { if (password.value != password2.value) { @@ -25,4 +43,14 @@ function checkPassword() { password2.setCustomValidity(''); return true; } +} + +function checkemail() { + if (email.value != '') { + email.setCustomValidity(''); + return true; + } else { + email.setCustomValidity('Email is required'); + return false; + } } \ No newline at end of file diff --git a/res/css/style.css b/res/css/style.css index 9e7e496..3ce3106 100644 --- a/res/css/style.css +++ b/res/css/style.css @@ -54,6 +54,12 @@ font-size: 2.8em !important; } +/* MainContent */ +.maincontent { + padding-top: 5em; + padding-bottom: 5em; +} + /* Medium devices */ @media (min-width: 768px) { #main_nav_bar .navbar-nav {max-width: 450px;}