112 Commits

Author SHA1 Message Date
c04a6b0335 Link im Header 2025-04-29 20:41:53 +02:00
5bea7b14dd html kontaktformular.html erstellt. 2025-04-29 20:28:13 +02:00
4ee49a70fd html Kontakt spalte hinzugefügt 2025-04-29 20:02:29 +02:00
c6cf3c39ed reworked warenkorb 2025-04-29 14:45:07 +02:00
ae6f31f982 Merge branch 'feature/Warenkorb' into develop 2025-04-29 14:35:47 +02:00
f99c8d11ab warenkorb überarbeitet 2025-04-29 14:29:12 +02:00
a83e97f075 Merge pull request 'Kommentieren' (#35) from Kommentieren into develop
Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/35
2025-04-29 10:55:10 +00:00
e796b2eb41 Link im Header 2025-04-29 12:51:45 +02:00
e3c6cfe5f5 Link im Header 2025-04-29 12:50:48 +02:00
482d7559d8 Merge pull request '- changed the categories of the products to fit the theme' (#37) from db_testdata into develop
Reviewed-on: #37
2025-04-29 08:09:42 +00:00
6605455ce5 Merge branch 'develop' into db_testdata 2025-04-29 08:07:36 +00:00
44d9fe834c Merge pull request 'Bestellung' (#30) from Bestellung into develop
Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/30

Funktionen von /bestellformular erweitert und /bestellung gefixed
v1.0
2025-04-29 07:42:24 +00:00
7eb7321680 repaired /bestellformular und /bestellung 2025-04-29 09:39:11 +02:00
b66c54ff57 reworked bestellformular 2025-04-28 14:42:05 +02:00
c70bc7c4e2 Link im Header 2025-04-28 09:47:06 +02:00
39c5e58af4 Code Kommentierung, Bestellformular angepasst. Code Anpassung. 2025-04-28 09:05:28 +02:00
7a4f3dd62e Merge remote-tracking branch 'origin/develop' into Bestellung
# Conflicts:
#	public/login/login.html
#	public/registrieren/registrieren.html
#	public/shop/shop_lkw.html
#	public/shop/shop_motorrad.html
#	public/shop/shop_oldtimer.html
#	public/shop/shop_sportwagen.html
2025-04-27 20:17:21 +02:00
d27f7e7d53 Merge pull request 'Registrieren' (#31) from Registrieren into develop
Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/31
2025-04-27 18:06:44 +00:00
a71bc18c91 Finish, ohne Code kommentierug 2025-04-27 20:05:46 +02:00
c9c0608898 - WIP: order system to save orders and display them to the buyer
- fixed an error so the summary of an order can now be shown but is still empty
2025-04-27 19:28:26 +02:00
60f056b8ec - WIP: order system to save orders and display them to the buyer 2025-04-27 14:11:44 +02:00
34907bbdb5 - added redirect after registration
- WIP: order system to save orders and display them to the buyer
2025-04-27 13:37:15 +02:00
c3636b0166 - added npm start script
- modified packages
2025-04-27 12:04:56 +02:00
40e5db6551 - WIP: reworked the order function and added error handling for it
- added a function to save the user_id in the sessionStorage of the browser
2025-04-26 19:23:04 +02:00
c4985aae6d Merge remote-tracking branch 'origin/Registrieren' into Registrieren
# Conflicts:
#	public/header_footer/header.html
2025-04-26 18:30:04 +02:00
6fbf988c38 Finish, ohne Code kommentierug 2025-04-26 18:29:27 +02:00
c5ef5d49c0 -bestellvorgang angefangen nicht fertig/funktionierend 2025-04-26 18:18:04 +02:00
e2a1fb9151 - changed the categories of the products to fit the theme 2025-04-26 18:16:34 +02:00
353087e458 - added the function to login with email and password
- removed an unnecessary empty file
2025-04-26 17:08:22 +02:00
4ca52e361a Merge remote-tracking branch 'origin/Bestellung' into Bestellung 2025-04-26 16:14:35 +02:00
99d727c0a0 - added the function to register a user 2025-04-26 16:14:15 +02:00
e19015a697 -removed doppelter Login btn im header 2025-04-26 15:18:11 +02:00
9165fb8776 anzeigen der Artikel nr. bei den Produkten im Shop 2025-04-26 13:37:49 +02:00
17522dcd65 Hinzufügen der Finalen Seite der Bestellung 2025-04-26 13:05:22 +02:00
3d05147188 -fixed warenkorb auf startseite 2025-04-26 12:20:37 +02:00
21acc115b8 - fixed a merge error that showed the default site twice 2025-04-26 12:08:21 +02:00
8714f3a73d Merge branch 'Registrieren' into develop
# Conflicts:
#	public/startseite/startseite.html
#	scripts/routes/other/route-index.js
2025-04-26 12:02:23 +02:00
36f04bc18a Merge pull request 'Warenkorb' (#28) from Warenkorb into develop
Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/28
2025-04-26 09:27:47 +00:00
db5fde4e51 Merge branch 'develop' into Warenkorb 2025-04-26 09:26:30 +00:00
3d92eca334 Bestellformular hinzugefügt 2025-04-26 11:14:46 +02:00
8b6ced83d8 Bestellformular hat im Warenkorb keinen Sinn gemacht. Setze ihn an andere Stelle 2025-04-25 19:23:30 +02:00
310d739bdc Bestellformular Angepasst an Vorgaben -> Bestellen per KundenNr u. Artikel Nr. 2025-04-24 19:23:22 +02:00
57d82e168d . 2025-04-24 18:47:11 +02:00
15a45a07d8 CSS geändert 2025-04-24 18:18:35 +02:00
557ffb2bb7 Bestellformular + CSS hinzugefügt 2025-04-24 18:08:15 +02:00
a3362019ac Finish, ohne Code kommentierug 2025-04-23 18:16:12 +02:00
a254503516 404.html erstellt. Fehler,eldungen hinzugefügt. 2025-04-22 18:23:51 +02:00
8f4eec5b9e Merge branch 'main' into develop 2025-04-21 15:13:54 +00:00
63441e8e9a Merge pull request 'db_testdata' (#24) from db_testdata into develop
Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/24
2025-04-21 15:11:35 +00:00
ce66f54192 Unterkategorien fertig. Finish - Funktionalität 2025-04-15 02:46:24 +02:00