95c2b8a60c
Kommentar angepasst.
2025-05-01 15:11:42 +02:00
373d655bae
- cleaned up and formatted code
2025-05-01 15:07:23 +02:00
535d6e0737
- cleaned up and formatted code
2025-05-01 14:55:53 +02:00
2fb193bac2
Merge pull request 'feature/scripts' ( #49 ) from feature/scripts into develop
...
Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/49
2025-05-01 10:15:23 +00:00
286ffda457
Merge remote-tracking branch 'origin/develop' into login_function
...
# Conflicts:
# public/registrieren/registrieren.html
- Cleaned up code
- Passwords are now encrypted in the database. Passwords of all pregenerated useres is "changeme"
2025-05-01 12:10:41 +02:00
79372d6b2e
Merge remote-tracking branch 'origin/develop' into feature/scripts
2025-05-01 11:35:29 +02:00
2784c0f2c6
Merge pull request 'Route Kommentare hinzugefügt.' ( #48 ) from feature/scripts_auslagern into develop
...
Reviewed-on: #48
2025-05-01 07:01:30 +00:00
bef2da62d4
Route Kommentare hinzugefügt.
2025-05-01 09:00:43 +02:00
b01a2fee0a
Css angepasst. Login/Ausloggen funktionen hinzugefügt.
2025-05-01 00:29:00 +02:00
52d30233fc
- cleaned up unnecessary files
...
- preparation for encryption
2025-04-30 21:36:41 +02:00
6b4a600b7f
Merge pull request 'Css angepasst. Ünnotiges Script gelöscht' ( #47 ) from feature/css into develop
...
Reviewed-on: #47
2025-04-30 13:34:18 +00:00
4ca9ee39e7
Css angepasst. Ünnotiges Script gelöscht
2025-04-30 15:33:19 +02:00
8c3a6699db
Merge pull request 'Css Anpassung' ( #45 ) from feature/css into develop
...
Reviewed-on: #45
2025-04-30 09:07:43 +00:00
a75bd6ee5f
Css angepasst.
2025-04-30 11:07:26 +02:00
693d87954c
Css angepasst.
2025-04-30 11:04:59 +02:00
c586ce8b9d
fixxed localstorage behaviour by logout
2025-04-30 10:09:34 +02:00
e25e2a1d05
Merge pull request 'feature/Warenkorb' ( #44 ) from feature/Warenkorb into develop
...
Reviewed-on: #44
2025-04-30 06:45:30 +00:00
4113f06da3
Bestellformular gefixxed
2025-04-30 08:37:41 +02:00
6f8f4f65ba
Bestellformular gefixxed
2025-04-30 08:36:48 +02:00
11f007066d
Link im Header
2025-04-29 23:31:44 +02:00
9b61ac8633
Merge branch 'main' into develop
2025-04-29 19:48:35 +00:00
8904a7cf90
Merge pull request 'login_function' ( #40 ) from login_function into develop
...
Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/40
2025-04-29 19:20:51 +00:00
c4d922b903
Merge remote-tracking branch 'origin/develop' into login_function
...
# Conflicts:
# public/registrieren/registrieren.html
- Cleaned up code
- Added a specific error if e-mail that are already registered are tried to register again
- fields in the registration form cant be empty
- email input in registration form is now html type email
- fields in login form cant be empty
- email input on login form is now html type email
2025-04-29 21:18:10 +02:00
d88761032a
Merge remote-tracking branch 'origin/develop' into login_function
2025-04-29 20:46:24 +02:00
fca329024a
Merge pull request 'kontaktformular' ( #39 ) from kontaktformular into develop
...
Reviewed-on: #39
2025-04-29 18:42:49 +00:00
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
1da3a53ee5
Merge remote-tracking branch 'origin/develop' into login_function
...
# Conflicts:
# public/registrieren/registrieren.html
- Login / Logout button in header now acts as expected
2025-04-29 19:43:36 +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
c5b4aca426
Merge remote-tracking branch 'origin/develop' into login_function
...
# Conflicts:
# public/registrieren/registrieren.html
2025-04-29 13:59:32 +02:00
a83e97f075
Merge pull request 'Kommentieren' ( #35 ) from Kommentieren into develop
...
Reviewed-on: #35
2025-04-29 10:55:10 +00:00
e796b2eb41
Link im Header
2025-04-29 12:51:45 +02:00
c6f33b142b
- user registration passwords have to match in order to be able to register
2025-04-29 12:50:58 +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
1eee428e71
Merge pull request 'develop' ( #36 ) from develop into main
...
Reviewed-on: #36
2025-04-29 07:58:18 +00:00
44d9fe834c
Merge pull request 'Bestellung' ( #30 ) from Bestellung into develop
...
Reviewed-on: #30
Funktionen von /bestellformular erweitert und /bestellung gefixed
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
