From e7562304c4dccc6f654d5f36f86e6260e00bc6c6 Mon Sep 17 00:00:00 2001 From: rgemm Date: Fri, 11 Apr 2025 08:43:47 +0200 Subject: [PATCH 1/7] Butten Farbe in Warenkrob angepasst --- scripts/routes/other/route-index.js | 4 ++++ static/Styles/Warenkorb/warenkorb.css | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/routes/other/route-index.js b/scripts/routes/other/route-index.js index 1d6c308..16d8d17 100644 --- a/scripts/routes/other/route-index.js +++ b/scripts/routes/other/route-index.js @@ -20,4 +20,8 @@ router.get('/registrieren', (req, res) => { router.get('/Warenkorb', (req, res) => { res.sendFile(path.join(__dirname, '../../../public/warenkorb/warenkorb.html')); }) + +router.get('/Bestellformular', (req, res) => { + res.sendFile(path.join(__dirname, '../../../public/bestellformular/bestellformular.html')); +}) module.exports = router; \ No newline at end of file diff --git a/static/Styles/Warenkorb/warenkorb.css b/static/Styles/Warenkorb/warenkorb.css index b1209d4..9fc13d4 100644 --- a/static/Styles/Warenkorb/warenkorb.css +++ b/static/Styles/Warenkorb/warenkorb.css @@ -65,7 +65,7 @@ body { display: block; width: 100%; padding: 12px; - background-color: #4CAF50; + background-color: #ff6600; border: none; color: white; font-size: 16px; From 418ed285cfe6db46d5a61baa279fb7bc994bd7ac Mon Sep 17 00:00:00 2001 From: rgemm Date: Mon, 14 Apr 2025 18:51:40 +0200 Subject: [PATCH 2/7] =?UTF-8?q?Farben=20ge=C3=A4ndert=20bei=20Warenkorb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/Styles/Warenkorb/warenkorb.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/Styles/Warenkorb/warenkorb.css b/static/Styles/Warenkorb/warenkorb.css index 9fc13d4..8c8d6c3 100644 --- a/static/Styles/Warenkorb/warenkorb.css +++ b/static/Styles/Warenkorb/warenkorb.css @@ -43,7 +43,7 @@ body { } .remove { - background-color: #ff4d4f; + background-color: #ff6600; border: none; color: white; padding: 6px 12px; @@ -52,7 +52,7 @@ body { } .remove:hover { - background-color: #e60000; + background-color: #ff6600; } .summary { @@ -75,5 +75,5 @@ body { } .checkout:hover { - background-color: #45a049; + background-color: #ff6600; } From 557ffb2bb7c5903d81bf10e0a36b006cd2f29596 Mon Sep 17 00:00:00 2001 From: rgemm Date: Thu, 24 Apr 2025 18:08:15 +0200 Subject: [PATCH 3/7] =?UTF-8?q?Bestellformular=20+=20CSS=20hinzugef=C3=BCg?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.xml | 8 ++- public/Warenkorb/warenkorb.html | 3 +- public/bestellformular/bestellformular.html | 26 ++++++++++ scripts/routes/other/route-index.js | 2 +- static/Styles/Warenkorb/warenkorb.css | 15 ++++++ .../bestellformular/bestellformular.css | 50 +++++++++++++++++++ 6 files changed, 97 insertions(+), 7 deletions(-) create mode 100644 public/bestellformular/bestellformular.html create mode 100644 static/Styles/bestellformular/bestellformular.css diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 935ffdb..35b7183 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -2,14 +2,12 @@ - mysql.8 + mariadb true - com.mysql.cj.jdbc.Driver - jdbc:mysql://localhost:3306 + org.mariadb.jdbc.Driver + jdbc:mariadb://localhost:3306 - - $ProjectFileDir$ diff --git a/public/Warenkorb/warenkorb.html b/public/Warenkorb/warenkorb.html index 1a51dd8..ab0c188 100644 --- a/public/Warenkorb/warenkorb.html +++ b/public/Warenkorb/warenkorb.html @@ -27,7 +27,8 @@
- + Zur Kasse gehen + diff --git a/public/bestellformular/bestellformular.html b/public/bestellformular/bestellformular.html new file mode 100644 index 0000000..80dda50 --- /dev/null +++ b/public/bestellformular/bestellformular.html @@ -0,0 +1,26 @@ + + + + + Bestellformular + + + +
+
+

Bestellformular

+ + + + + + + + + + + +
+
+ + diff --git a/scripts/routes/other/route-index.js b/scripts/routes/other/route-index.js index 16d8d17..b10bead 100644 --- a/scripts/routes/other/route-index.js +++ b/scripts/routes/other/route-index.js @@ -21,7 +21,7 @@ router.get('/Warenkorb', (req, res) => { res.sendFile(path.join(__dirname, '../../../public/warenkorb/warenkorb.html')); }) -router.get('/Bestellformular', (req, res) => { +router.get('/bestellformular', (req, res) => { res.sendFile(path.join(__dirname, '../../../public/bestellformular/bestellformular.html')); }) module.exports = router; \ No newline at end of file diff --git a/static/Styles/Warenkorb/warenkorb.css b/static/Styles/Warenkorb/warenkorb.css index 8c8d6c3..23fc4b9 100644 --- a/static/Styles/Warenkorb/warenkorb.css +++ b/static/Styles/Warenkorb/warenkorb.css @@ -77,3 +77,18 @@ body { .checkout:hover { background-color: #ff6600; } + +.checkout { + display: inline-block; + background-color: #ff6600; + color: white; + padding: 10px 20px; + margin-top: 20px; + text-align: center; + text-decoration: none; + font-size: 16px; + border-radius: 5px; + transition: background-color 0.3s; +} + + diff --git a/static/Styles/bestellformular/bestellformular.css b/static/Styles/bestellformular/bestellformular.css new file mode 100644 index 0000000..fc2003d --- /dev/null +++ b/static/Styles/bestellformular/bestellformular.css @@ -0,0 +1,50 @@ +body { + font-family: Arial, sans-serif; + padding: 20px; + background-color: #f7f7f7; +} + +.form-container form { + max-width: 600px; + margin: auto; + padding: 20px; + background-color: white; + border: 1px solid #ccc; + border-radius: 8px; +} + +form h2 { + margin-top: 0; + text-align: center; +} + + +label { + display: block; + margin-bottom: 10px; + font-weight: bold; +} + +input[type="text"], +textarea { + width: 100%; + padding: 8px; + margin-bottom: 15px; + border: 1px solid #ccc; + border-radius: 4px; + box-sizing: border-box; +} + +input[type="submit"] { + background-color: #ff6600; + color: white; + padding: 10px 20px; + border: none; + border-radius: 4px; + cursor: pointer; + font-size: 16px; +} + +input[type="submit"]:hover { + background-color: #ff6600; +} From 15a45a07d8ff9a4a4efed947d7e288deb10969e3 Mon Sep 17 00:00:00 2001 From: rgemm Date: Thu, 24 Apr 2025 18:18:35 +0200 Subject: [PATCH 4/7] =?UTF-8?q?CSS=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/bestellformular/bestellformular.html | 17 ++++++++--- .../bestellformular/bestellformular.css | 28 ++++++++++--------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/public/bestellformular/bestellformular.html b/public/bestellformular/bestellformular.html index 80dda50..4da7e81 100644 --- a/public/bestellformular/bestellformular.html +++ b/public/bestellformular/bestellformular.html @@ -8,16 +8,25 @@
-

Bestellformular

+

Bestellformular

- - + + + + + + + + + + + - +
diff --git a/static/Styles/bestellformular/bestellformular.css b/static/Styles/bestellformular/bestellformular.css index fc2003d..3857f2d 100644 --- a/static/Styles/bestellformular/bestellformular.css +++ b/static/Styles/bestellformular/bestellformular.css @@ -1,48 +1,50 @@ body { font-family: Arial, sans-serif; + background-color: #f2f2f2; padding: 20px; - background-color: #f7f7f7; } -.form-container form { +.form-container { max-width: 600px; margin: auto; - padding: 20px; - background-color: white; - border: 1px solid #ccc; + background-color: #ffffff; + padding: 25px; border-radius: 8px; + box-shadow: 0 0 10px rgba(0,0,0,0.1); } form h2 { - margin-top: 0; text-align: center; + margin-bottom: 20px; } - label { display: block; - margin-bottom: 10px; + margin-top: 15px; font-weight: bold; } input[type="text"], +input[type="tel"], textarea { width: 100%; - padding: 8px; - margin-bottom: 15px; + padding: 10px; + margin-top: 5px; border: 1px solid #ccc; border-radius: 4px; box-sizing: border-box; } input[type="submit"] { + margin-top: 20px; background-color: #ff6600; color: white; - padding: 10px 20px; border: none; - border-radius: 4px; - cursor: pointer; + padding: 12px; + border-radius: 5px; font-size: 16px; + cursor: pointer; + width: 100%; } input[type="submit"]:hover { From 57d82e168d5b06fb76e1f190cdca422a47bb8dc3 Mon Sep 17 00:00:00 2001 From: rgemm Date: Thu, 24 Apr 2025 18:47:11 +0200 Subject: [PATCH 5/7] . --- public/startseite/startseite.html | 1 - 1 file changed, 1 deletion(-) diff --git a/public/startseite/startseite.html b/public/startseite/startseite.html index 7e443f4..8c920be 100644 --- a/public/startseite/startseite.html +++ b/public/startseite/startseite.html @@ -80,7 +80,6 @@
- From 310d739bdc1f64c9d804d458b62418eb50d58a9c Mon Sep 17 00:00:00 2001 From: rgemm Date: Thu, 24 Apr 2025 19:23:22 +0200 Subject: [PATCH 6/7] Bestellformular Angepasst an Vorgaben -> Bestellen per KundenNr u. Artikel Nr. --- public/bestellformular/bestellformular.html | 24 +++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/public/bestellformular/bestellformular.html b/public/bestellformular/bestellformular.html index 4da7e81..96c2706 100644 --- a/public/bestellformular/bestellformular.html +++ b/public/bestellformular/bestellformular.html @@ -10,23 +10,29 @@

Bestellformular

- - + + + + + + + + - + - + - + - - + + - - + +
From 8b6ced83d8ca0fa39f1fe396d7e790832bced383 Mon Sep 17 00:00:00 2001 From: rgemm Date: Fri, 25 Apr 2025 19:23:30 +0200 Subject: [PATCH 7/7] Bestellformular hat im Warenkorb keinen Sinn gemacht. Setze ihn an andere Stelle --- public/Warenkorb/warenkorb.html | 3 +- public/bestellformular/bestellformular.html | 41 ----------- static/Styles/Warenkorb/warenkorb.css | 70 +++++++++++++++++++ .../bestellformular/bestellformular.css | 52 -------------- 4 files changed, 71 insertions(+), 95 deletions(-) delete mode 100644 public/bestellformular/bestellformular.html delete mode 100644 static/Styles/bestellformular/bestellformular.css diff --git a/public/Warenkorb/warenkorb.html b/public/Warenkorb/warenkorb.html index ab0c188..5373864 100644 --- a/public/Warenkorb/warenkorb.html +++ b/public/Warenkorb/warenkorb.html @@ -26,8 +26,7 @@
- - Zur Kasse gehen + diff --git a/public/bestellformular/bestellformular.html b/public/bestellformular/bestellformular.html deleted file mode 100644 index 96c2706..0000000 --- a/public/bestellformular/bestellformular.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Bestellformular - - - -
-
-

Bestellformular

- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - diff --git a/static/Styles/Warenkorb/warenkorb.css b/static/Styles/Warenkorb/warenkorb.css index 23fc4b9..eb64110 100644 --- a/static/Styles/Warenkorb/warenkorb.css +++ b/static/Styles/Warenkorb/warenkorb.css @@ -91,4 +91,74 @@ body { transition: background-color 0.3s; } +body { + font-family: Arial, sans-serif; + background-color: #f2f2f2; + padding: 20px; +} + +.form-container { + max-width: 600px; + margin: auto; + background-color: #ffffff; + padding: 25px; + border-radius: 8px; + box-shadow: 0 0 10px rgba(0,0,0,0.1); +} + +form h2 { + text-align: center; + margin-bottom: 20px; +} + +label { + display: block; + margin-top: 15px; + font-weight: bold; +} + +input[type="text"], +input[type="tel"], +textarea { + width: 100%; + padding: 10px; + margin-top: 5px; + border: 1px solid #ccc; + border-radius: 4px; + box-sizing: border-box; +} + +input[type="submit"] { + margin-top: 20px; + background-color: #ff6600; + color: white; + border: none; + padding: 12px; + border-radius: 5px; + font-size: 16px; + cursor: pointer; + width: 100%; +} + +input[type="submit"]:hover { + background-color: #ff6600; +} + +.zurKasse { + display: block; + margin: 20px auto; + background-color: #ff6600; + color: white; + border: none; + padding: 12px 24px; + font-size: 16px; + border-radius: 8px; + cursor: pointer; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); +} + +.zurKasse:hover { + background-color: #ff6600; +} + diff --git a/static/Styles/bestellformular/bestellformular.css b/static/Styles/bestellformular/bestellformular.css deleted file mode 100644 index 3857f2d..0000000 --- a/static/Styles/bestellformular/bestellformular.css +++ /dev/null @@ -1,52 +0,0 @@ -body { - font-family: Arial, sans-serif; - background-color: #f2f2f2; - padding: 20px; -} - -.form-container { - max-width: 600px; - margin: auto; - background-color: #ffffff; - padding: 25px; - border-radius: 8px; - box-shadow: 0 0 10px rgba(0,0,0,0.1); -} - -form h2 { - text-align: center; - margin-bottom: 20px; -} - -label { - display: block; - margin-top: 15px; - font-weight: bold; -} - -input[type="text"], -input[type="tel"], -textarea { - width: 100%; - padding: 10px; - margin-top: 5px; - border: 1px solid #ccc; - border-radius: 4px; - box-sizing: border-box; -} - -input[type="submit"] { - margin-top: 20px; - background-color: #ff6600; - color: white; - border: none; - padding: 12px; - border-radius: 5px; - font-size: 16px; - cursor: pointer; - width: 100%; -} - -input[type="submit"]:hover { - background-color: #ff6600; -}