From 6c6e850ede457206767534c6cf5cce514bf6ba73 Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Fri, 5 Apr 2019 09:14:44 +0200 Subject: [PATCH] Merge + Bestellinformationen Signed-off-by: Johannes Theiner --- src/main/webapp/preview/confirmation.html | 16 +- src/main/webapp/preview/css/custom.css | 12 +- src/main/webapp/preview/detailpage.html | 127 +++++--- src/main/webapp/preview/index.html | 3 +- src/main/webapp/preview/login.html | 127 +++++--- src/main/webapp/preview/orderinfo.html | 358 ++++++++++++++++++++++ src/main/webapp/preview/register.html | 127 +++++--- src/main/webapp/preview/shoppingcart.html | 234 ++++++++++++++ src/main/webapp/preview/start.html | 19 +- 9 files changed, 905 insertions(+), 118 deletions(-) create mode 100644 src/main/webapp/preview/orderinfo.html create mode 100644 src/main/webapp/preview/shoppingcart.html diff --git a/src/main/webapp/preview/confirmation.html b/src/main/webapp/preview/confirmation.html index 418faea..28545cd 100644 --- a/src/main/webapp/preview/confirmation.html +++ b/src/main/webapp/preview/confirmation.html @@ -67,6 +67,20 @@
+
+
+

Addresse:

+ Max Mustermann
+ Musterstraße 42
+ 12345 Musterstadt +
+
+

Konto

+ IBAN: 12345••••••••••••••••••••••••111
+ Inhaber: Max Mustermann
+
+
+
Buchcover @@ -103,7 +117,7 @@
-

99,95 €

+

Summe: 99,95 €

diff --git a/src/main/webapp/preview/css/custom.css b/src/main/webapp/preview/css/custom.css index 4207907..4b80bcb 100644 --- a/src/main/webapp/preview/css/custom.css +++ b/src/main/webapp/preview/css/custom.css @@ -43,4 +43,14 @@ .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch { right: 0px; background-color: #27A1CA; -} \ No newline at end of file +} + +label, input { display:block; } +input.text { margin-bottom:12px; width:95%; padding: .4em; } +fieldset { padding:0; border:0; margin-top:25px; } +h1 { font-size: 1.2em; margin: .6em 0; } +div#users-contain { width: 350px; margin: 20px 0; } +div#users-contain table { margin: 1em 0; border-collapse: collapse; width: 100%; } +div#users-contain table td, div#users-contain table th { border: 1px solid #eee; padding: .6em 10px; text-align: left; } +.ui-dialog .ui-state-error { padding: .3em; } +.validateTips { border: 1px solid transparent; padding: 0.3em; } \ No newline at end of file diff --git a/src/main/webapp/preview/detailpage.html b/src/main/webapp/preview/detailpage.html index c16622f..283bb9a 100644 --- a/src/main/webapp/preview/detailpage.html +++ b/src/main/webapp/preview/detailpage.html @@ -3,24 +3,13 @@ Amazon light - - + + @@ -30,15 +19,48 @@
@@ -136,44 +158,79 @@
-

Your Brand

+

Hilfe

-

Download

+

Zahlung

-

Contact

+

Amazon light

-

Blog

+

Rechtliches

-

Your Brand. Copyright © You, - 2017. All rights reserved.

+

Amazon light. Copyright © B1, + 2019. All rights reserved.

+ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/preview/index.html b/src/main/webapp/preview/index.html index 638daa0..1e35b4f 100644 --- a/src/main/webapp/preview/index.html +++ b/src/main/webapp/preview/index.html @@ -4,4 +4,5 @@ Registrierung
Bücherliste
Buchdetails
-Bestätigung
\ No newline at end of file +Bestätigung
+Warenkorb
\ No newline at end of file diff --git a/src/main/webapp/preview/login.html b/src/main/webapp/preview/login.html index 9b70f8f..623393a 100644 --- a/src/main/webapp/preview/login.html +++ b/src/main/webapp/preview/login.html @@ -3,24 +3,13 @@ Amazon light - - + + @@ -30,15 +19,48 @@
@@ -88,44 +110,79 @@
-

Your Brand

+

Hilfe

-

Download

+

Zahlung

-

Contact

+

Amazon light

-

Blog

+

Rechtliches

-

Your Brand. Copyright © You, - 2017. All rights reserved.

+

Amazon light. Copyright © B1, + 2019. All rights reserved.

+ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/preview/orderinfo.html b/src/main/webapp/preview/orderinfo.html new file mode 100644 index 0000000..16665f8 --- /dev/null +++ b/src/main/webapp/preview/orderinfo.html @@ -0,0 +1,358 @@ + + + + Amazon light + + + + + + + + + + + + + + + + +
+

All form fields are required.

+ +
+
+ + + + + + + + + +
+
+
+ +
+

All form fields are required.

+ +
+
+ + + + + + + + + +
+
+
+ +
+ +
+ +
+ +
+

Addresse

+
+
+
+ Max Mustermann
+ Musterstraße 42
+ 12345 Musterstadt +
+
+
+
+ Max Mustermann
+ Musterstraße 43
+ 12345 Musterstadt +
+
+
+
+ Max Mustermann
+ Musterstraße 45
+ 12345 Musterstadt +
+
+
+
+ Max Mustermann
+ Musterstraße 1
+ 12345 Musterstadt +
+
+
+
+
+
+ Max Mustermann
+ Musterstraße 30
+ 12345 Musterstadt +
+
+
+
+ +
+
+
+ +

Zahlungsart

+ +
+
+
+ PayPal
+ m••••••@•••••.de +
+
+
+
+ Bankeinzug
+ IBAN: 12345••••••••••••••••••••••••111
+ Inhaber: Max Mustermann +
+
+
+
+ +
+
+ +
+ +
+ +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/preview/register.html b/src/main/webapp/preview/register.html index fb26bdd..8fb71cd 100644 --- a/src/main/webapp/preview/register.html +++ b/src/main/webapp/preview/register.html @@ -3,24 +3,13 @@ Amazon light - - + + @@ -30,15 +19,48 @@
@@ -95,44 +117,79 @@
-

Your Brand

+

Hilfe

-

Download

+

Zahlung

-

Contact

+

Amazon light

-

Blog

+

Rechtliches

-

Your Brand. Copyright © You, - 2017. All rights reserved.

+

Amazon light. Copyright © B1, + 2019. All rights reserved.

+ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/preview/shoppingcart.html b/src/main/webapp/preview/shoppingcart.html new file mode 100644 index 0000000..ccd201c --- /dev/null +++ b/src/main/webapp/preview/shoppingcart.html @@ -0,0 +1,234 @@ + + + + Amazon light + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+
+
+ Buchcover +
+
+

Your soul is a river - Nikita Gill

+
+
+
+

19,99 €

+
+
+
+ +
+
+
+
+ Entfernen +
+
+
+
+
+
+ Buchcover +
+
+

Your soul is a river - Nikita Gill

+
+
+
+

19,99 €

+
+
+
+ +
+
+
+
+ Entfernen +
+
+
+
+
+
+ Buchcover +
+
+

Your soul is a river - Nikita Gill

+
+
+
+

19,99 €

+
+
+
+ +
+
+
+
+ Entfernen +
+
+
+
+ +
+
+

Summe(3 Items): 99,95 €

+
+
+ +
+
+ Jetzt Kaufen +
+
+
+ +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/preview/start.html b/src/main/webapp/preview/start.html index 0e62712..b8ba79f 100644 --- a/src/main/webapp/preview/start.html +++ b/src/main/webapp/preview/start.html @@ -29,15 +29,13 @@
  1. Katalog
    2. -
  2. (1) Warenkorb
    3. +
  3. Warenkorb
  1. - Mein Account + Anmelden
      -
    1. Meine Bestellungen
      2. -
    2. Adressen & Konten
      3. -
    3. Abmelden
      4. +
    4. Registrieren
@@ -70,7 +68,7 @@
-

Amazon light

+

Amazon light

Sie haben noch nie ein richtig gutes Buch gelesen ?

@@ -80,7 +78,7 @@

-
+
Zum Katalog @@ -217,16 +215,17 @@ function changeTheme() { if(document.getElementById('myonoffswitch').checked) { - swapStyleSheet("dark", "#22272e"); + swapStyleSheet("dark", "#22272e", "8muUTAmcWU4"); }else { - swapStyleSheet("light", "#cb4b16"); + swapStyleSheet("light", "#cb4b16", "o0Qqw21-0NI"); } } - function swapStyleSheet(sheet, color) { + function swapStyleSheet(sheet, color, image) { document.getElementById("pagestyle").setAttribute("href", "css/m-" + sheet + ".css"); document.getElementById("pagecolor").setAttribute("content", color); + document.getElementById("m-landing-image").style.backgroundImage = "url('https://source.unsplash.com/" + image + "/1920x1280')"; } $(document).ready(function () {