Commit Graph

Select branches

Hide Pull Requests

Kommentieren

Kontakt

Registrieren

Warenkorb

develop

feature/Warenkorb

feature/css

feature/scripts_auslagern

main

#1

#10

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#34

#35

#36

#37

#38

#39

#40

#41

#44

#45

#47

#48

#49

#50

#9

v1.0

v2.0

v2.1

Mono Color

• 1ebccfff10 Merge pull request 'develop' (#50) from develop into main v2.1 main Fabian 2025-05-01 14:29:42 +00:00
• f29ff1a3f9 Merge branch 'main' into develop develop Fabian 2025-05-01 14:28:36 +00:00
• 95c2b8a60c Kommentar angepasst. gitfreeking 2025-05-01 15:11:42 +02:00
• 373d655bae - cleaned up and formatted code vextv 2025-05-01 15:07:23 +02:00
• 535d6e0737 - cleaned up and formatted code vextv 2025-05-01 14:55:53 +02:00
• 2fb193bac2 Merge pull request 'feature/scripts' (#49) from feature/scripts into develop Fabian 2025-05-01 10:15:23 +00:00
• 286ffda457 Merge remote-tracking branch 'origin/develop' into login_function vextv 2025-05-01 12:10:41 +02:00
• 79372d6b2e Merge remote-tracking branch 'origin/develop' into feature/scripts vextv 2025-05-01 11:35:29 +02:00
• 2784c0f2c6 Merge pull request 'Route Kommentare hinzugefügt.' (#48) from feature/scripts_auslagern into develop gitfreeking 2025-05-01 07:01:30 +00:00
• bef2da62d4 Route Kommentare hinzugefügt. feature/scripts_auslagern gitfreeking 2025-05-01 09:00:43 +02:00
• b01a2fee0a Css angepasst. Login/Ausloggen funktionen hinzugefügt. gitfreeking 2025-05-01 00:29:00 +02:00
• 52d30233fc - cleaned up unnecessary files - preparation for encryption vex 2025-04-30 21:36:41 +02:00
• 6b4a600b7f Merge pull request 'Css angepasst. Ünnotiges Script gelöscht' (#47) from feature/css into develop gitfreeking 2025-04-30 13:34:18 +00:00
• 4ca9ee39e7 Css angepasst. Ünnotiges Script gelöscht feature/css gitfreeking 2025-04-30 15:33:19 +02:00
• 8c3a6699db Merge pull request 'Css Anpassung' (#45) from feature/css into develop gitfreeking 2025-04-30 09:07:43 +00:00
• a75bd6ee5f Css angepasst. gitfreeking 2025-04-30 11:07:26 +02:00
• 693d87954c Css angepasst. gitfreeking 2025-04-30 11:04:59 +02:00
• c586ce8b9d fixxed localstorage behaviour by logout florianspengler 2025-04-30 10:09:34 +02:00
• e25e2a1d05 Merge pull request 'feature/Warenkorb' (#44) from feature/Warenkorb into develop florianspengler 2025-04-30 06:45:30 +00:00
• 4113f06da3 Bestellformular gefixxed feature/Warenkorb florianspengler 2025-04-30 08:37:41 +02:00
• 6f8f4f65ba Bestellformular gefixxed florianspengler 2025-04-30 08:36:48 +02:00
• 11f007066d Link im Header gitfreeking 2025-04-29 23:31:44 +02:00
• 6c62b1034e Merge pull request 'develop' (#41) from develop into main Fabian 2025-04-29 19:48:44 +00:00
• 9b61ac8633 Merge branch 'main' into develop Fabian 2025-04-29 19:48:35 +00:00
• 8904a7cf90 Merge pull request 'login_function' (#40) from login_function into develop v2.0 Fabian 2025-04-29 19:20:51 +00:00
• c4d922b903 Merge remote-tracking branch 'origin/develop' into login_function vextv 2025-04-29 21:18:10 +02:00
• d88761032a Merge remote-tracking branch 'origin/develop' into login_function vextv 2025-04-29 20:46:24 +02:00
• fca329024a Merge pull request 'kontaktformular' (#39) from kontaktformular into develop Mohamed 2025-04-29 18:42:49 +00:00
• c04a6b0335 Link im Header gitfreeking 2025-04-29 20:41:53 +02:00
• 5bea7b14dd html kontaktformular.html erstellt. msoliman 2025-04-29 20:28:13 +02:00
• 4ee49a70fd html Kontakt spalte hinzugefügt msoliman 2025-04-29 20:02:29 +02:00
• 1da3a53ee5 Merge remote-tracking branch 'origin/develop' into login_function vextv 2025-04-29 19:43:36 +02:00
• c6cf3c39ed reworked warenkorb florianspengler 2025-04-29 14:45:07 +02:00
• ae6f31f982 Merge branch 'feature/Warenkorb' into develop florianspengler 2025-04-29 14:35:47 +02:00
• f99c8d11ab warenkorb überarbeitet florianspengler 2025-04-29 14:29:12 +02:00
• c5b4aca426 Merge remote-tracking branch 'origin/develop' into login_function vex 2025-04-29 13:59:32 +02:00
• a83e97f075 Merge pull request 'Kommentieren' (#35) from Kommentieren into develop gitfreeking 2025-04-29 10:55:10 +00:00
• e796b2eb41 Link im Header Kommentieren gitfreeking 2025-04-29 12:51:45 +02:00
• c6f33b142b - user registration passwords have to match in order to be able to register vex 2025-04-29 12:50:58 +02:00
• e3c6cfe5f5 Link im Header gitfreeking 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 Fabian 2025-04-29 08:09:42 +00:00
• 6605455ce5 Merge branch 'develop' into db_testdata Fabian 2025-04-29 08:07:36 +00:00
• 1eee428e71 Merge pull request 'develop' (#36) from develop into main Fabian 2025-04-29 07:58:18 +00:00
• 44d9fe834c Merge pull request 'Bestellung' (#30) from Bestellung into develop v1.0 florianspengler 2025-04-29 07:42:24 +00:00
• 7eb7321680 repaired /bestellformular und /bestellung florianspengler 2025-04-29 09:39:11 +02:00
• b66c54ff57 reworked bestellformular florianspengler 2025-04-28 14:42:05 +02:00
• c70bc7c4e2 Link im Header gitfreeking 2025-04-28 09:47:06 +02:00
• 39c5e58af4 Code Kommentierung, Bestellformular angepasst. Code Anpassung. gitfreeking 2025-04-28 09:05:28 +02:00
• 7a4f3dd62e Merge remote-tracking branch 'origin/develop' into Bestellung vextv 2025-04-27 20:17:21 +02:00
• d27f7e7d53 Merge pull request 'Registrieren' (#31) from Registrieren into develop Fabian 2025-04-27 18:06:44 +00:00
• a71bc18c91 Finish, ohne Code kommentierug Registrieren gitfreeking 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 vextv 2025-04-27 19:28:26 +02:00
• 60f056b8ec - WIP: order system to save orders and display them to the buyer vextv 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 vextv 2025-04-27 13:37:15 +02:00
• c3636b0166 - added npm start script - modified packages vextv 2025-04-27 12:04:56 +02:00
• 93bf1cf849 html Kontakt spalte hinzugefügt Kontakt msoliman 2025-04-26 21:01:17 +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 vextv 2025-04-26 19:23:04 +02:00
• c4985aae6d Merge remote-tracking branch 'origin/Registrieren' into Registrieren gitfreeking 2025-04-26 18:30:04 +02:00
• 6fbf988c38 Finish, ohne Code kommentierug gitfreeking 2025-04-26 18:29:27 +02:00
• c5ef5d49c0 -bestellvorgang angefangen nicht fertig/funktionierend rgemm 2025-04-26 18:18:04 +02:00
• e2a1fb9151 - changed the categories of the products to fit the theme vextv 2025-04-26 18:16:34 +02:00
• 353087e458 - added the function to login with email and password - removed an unnecessary empty file vextv 2025-04-26 17:08:22 +02:00
• 4ca52e361a Merge remote-tracking branch 'origin/Bestellung' into Bestellung vextv 2025-04-26 16:14:35 +02:00
• 99d727c0a0 - added the function to register a user vextv 2025-04-26 16:14:15 +02:00
• e19015a697 -removed doppelter Login btn im header rgemm 2025-04-26 15:18:11 +02:00
• 9165fb8776 anzeigen der Artikel nr. bei den Produkten im Shop rgemm 2025-04-26 13:37:49 +02:00
• 17522dcd65 Hinzufügen der Finalen Seite der Bestellung rgemm 2025-04-26 13:05:22 +02:00
• 3d05147188 -fixed warenkorb auf startseite rgemm 2025-04-26 12:20:37 +02:00
• 21acc115b8 - fixed a merge error that showed the default site twice vextv 2025-04-26 12:08:21 +02:00
• 8714f3a73d Merge branch 'Registrieren' into develop vextv 2025-04-26 12:02:23 +02:00
• 36f04bc18a Merge pull request 'Warenkorb' (#28) from Warenkorb into develop Fabian 2025-04-26 09:27:47 +00:00
• db5fde4e51 Merge branch 'develop' into Warenkorb Warenkorb Fabian 2025-04-26 09:26:30 +00:00
• 3d92eca334 Bestellformular hinzugefügt rgemm 2025-04-26 11:14:46 +02:00
• 8b6ced83d8 Bestellformular hat im Warenkorb keinen Sinn gemacht. Setze ihn an andere Stelle rgemm 2025-04-25 19:23:30 +02:00
• 310d739bdc Bestellformular Angepasst an Vorgaben -> Bestellen per KundenNr u. Artikel Nr. rgemm 2025-04-24 19:23:22 +02:00
• 57d82e168d . rgemm 2025-04-24 18:47:11 +02:00
• 15a45a07d8 CSS geändert rgemm 2025-04-24 18:18:35 +02:00
• 557ffb2bb7 Bestellformular + CSS hinzugefügt rgemm 2025-04-24 18:08:15 +02:00
• a3362019ac Finish, ohne Code kommentierug gitfreeking 2025-04-23 18:16:12 +02:00
• a254503516 404.html erstellt. Fehler,eldungen hinzugefügt. gitfreeking 2025-04-22 18:23:51 +02:00
• 950b3ba8f6 Merge pull request 'develop' (#26) from develop into main Fabian 2025-04-21 15:14:18 +00:00
• 8f4eec5b9e Merge branch 'main' into develop Fabian 2025-04-21 15:13:54 +00:00
• 63441e8e9a Merge pull request 'db_testdata' (#24) from db_testdata into develop Fabian 2025-04-21 15:11:35 +00:00
• f45d83051d html Kontakt spalte hinzugefügt msoliman 2025-04-19 10:22:50 +02:00
• 2d173f6d25 CSS Kontakt spalte hinzugefügt msoliman 2025-04-19 10:21:31 +02:00
• ce66f54192 Unterkategorien fertig. Finish - Funktionalität gitfreeking 2025-04-15 02:46:24 +02:00
• 81a9ac2ba7 Merge remote-tracking branch 'origin/develop' into db_testdata vextv 2025-04-14 22:46:07 +02:00
• ff594657b0 - deleted unnecessary files - created a new script to fill the databse with random testdata - improved the script to create the databse Fabian 2025-04-14 22:31:24 +02:00
• 263afe76b3 Unterkategorien erstellt. CSS noch WIP. Neue Api + neue Routen erstellte gitfreeking 2025-04-14 20:41:42 +02:00
• 6783aaeb1a README.md aktualisiert Fabian 2025-04-14 17:43:51 +00:00
• 97a1ac4744 fixed create DB script to actually create a database Fabian 2025-04-14 19:22:40 +02:00
• 15ab8a999d Erstellen des Header. Shop Erstellung. Work in Prozess gitfreeking 2025-04-14 18:55:27 +02:00
• 418ed285cf Farben geändert bei Warenkorb rgemm 2025-04-14 18:51:40 +02:00
• 1e0aea7fd5 - added script to fill product table [WIP] vex 2025-04-11 09:26:22 +02:00
• 0482eeec59 - fixed new query script vex 2025-04-11 09:03:30 +02:00
• 009f796c0f startseite.html gitfreeking 2025-04-11 08:55:48 +02:00
• 641d14a2dd - fixed database fill script - added new query script vex 2025-04-11 08:54:50 +02:00
• f31e8081a5 startseite.html gitfreeking 2025-04-11 08:44:49 +02:00
• e7562304c4 Butten Farbe in Warenkrob angepasst rgemm 2025-04-11 08:43:47 +02:00
• 3b743d07ce startseite.html gitfreeking 2025-04-11 08:35:58 +02:00