Link im Header

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 12:50:48 +02:00 · 2025-04-29 08:09:42 +00:00 · 2025-04-29 08:07:36 +00:00 · 2025-04-29 07:42:24 +00:00 · 2025-04-29 09:39:11 +02:00 · 2025-04-28 14:42:05 +02:00
2 changed files with 38 additions and 8 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,11 +1,11 @@
 {
-  "name": "sniper",
+  "name": "webshop",
  "version": "1.0.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
-      "name": "sniper",
+      "name": "webshop",
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
@ -15,7 +15,9 @@
        "express-session": "^1.18.1",
        "mysql": "^2.18.1",
        "mysql2": "^3.12.0",
-        "path": "^0.12.7"
+        "node": "^22.15.0",
+        "path": "^0.12.7",
+        "server.js": "^1.0.0"
      }
    },
    "node_modules/accepts": {
@ -674,6 +676,28 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/node": {
+      "version": "22.15.0",
+      "resolved": "https://registry.npmjs.org/node/-/node-22.15.0.tgz",
+      "integrity": "sha512-qrOEL83lNt+Jbh9pekl5xQrZK+QRJz51m2IGGCu2NENgbG6Go0D1QUBvjbejP8jB2eokQpX1AorDLbKQ/FxuYA==",
+      "hasInstallScript": true,
+      "license": "ISC",
+      "dependencies": {
+        "node-bin-setup": "^1.0.0"
+      },
+      "bin": {
+        "node": "bin/node"
+      },
+      "engines": {
+        "npm": ">=5.0.0"
+      }
+    },
+    "node_modules/node-bin-setup": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/node-bin-setup/-/node-bin-setup-1.1.3.tgz",
+      "integrity": "sha512-opgw9iSCAzT2+6wJOETCpeRYAQxSopqQ2z+N6BXwIMsQQ7Zj5M8MaafQY8JMlolRR6R1UXg2WmhKp0p9lSOivg==",
+      "license": "ISC"
+    },
    "node_modules/object-inspect": {
      "version": "1.13.2",
      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
@ -894,6 +918,12 @@
        "node": ">= 0.8.0"
      }
    },
+    "node_modules/server.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/server.js/-/server.js-1.0.0.tgz",
+      "integrity": "sha512-fO4IvzkZ09bBB++XU/gWGuzxJs0OpghSd/34mlW8coMoakLzj/+W5d1pHX+I+7H52GkBKu96UQU0K5vptNjaqg==",
+      "license": "ISC"
+    },
    "node_modules/set-function-length": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
--- a/package.json
+++ b/package.json
@ -1,10 +1,10 @@
 {
-  "name": "sniper",
+  "name": "webshop",
  "version": "1.0.0",
  "main": "index.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node server.js"
+    "start": "npm install && node server.js"
  },
  "keywords": [],
  "author": "",
@ -12,13 +12,13 @@
  "description": "Webshop Autohändler",
  "dependencies": {
    "app-root-path": "^3.1.0",
-    "dotenv": "^16.4.5",
-    "express": "^4.21.1",
    "dotenv": "^16.4.7",
    "express": "^4.21.2",
    "express-session": "^1.18.1",
    "mysql": "^2.18.1",
    "mysql2": "^3.12.0",
-    "path": "^0.12.7"
+    "node": "^22.15.0",
+    "path": "^0.12.7",
+    "server.js": "^1.0.0"
  }
 }
Author	SHA1	Message	Date
gitfreeking	e3c6cfe5f5	Link im Header	2025-04-29 12:50:48 +02:00
Fabian	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
Fabian	6605455ce5	Merge branch 'develop' into db_testdata	2025-04-29 08:07:36 +00:00
florianspengler	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
florianspengler	7eb7321680	repaired /bestellformular und /bestellung	2025-04-29 09:39:11 +02:00
florianspengler	b66c54ff57	reworked bestellformular	2025-04-28 14:42:05 +02:00
vextv	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
Fabian	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
vextv	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
vextv	60f056b8ec	- WIP: order system to save orders and display them to the buyer	2025-04-27 14:11:44 +02:00
vextv	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
vextv	c3636b0166	- added npm start script - modified packages	2025-04-27 12:04:56 +02:00
vextv	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
rgemm	c5ef5d49c0	-bestellvorgang angefangen nicht fertig/funktionierend	2025-04-26 18:18:04 +02:00
vextv	e2a1fb9151	- changed the categories of the products to fit the theme	2025-04-26 18:16:34 +02:00
vextv	353087e458	- added the function to login with email and password - removed an unnecessary empty file	2025-04-26 17:08:22 +02:00
vextv	4ca52e361a	Merge remote-tracking branch 'origin/Bestellung' into Bestellung	2025-04-26 16:14:35 +02:00
vextv	99d727c0a0	- added the function to register a user	2025-04-26 16:14:15 +02:00
rgemm	e19015a697	-removed doppelter Login btn im header	2025-04-26 15:18:11 +02:00
rgemm	9165fb8776	anzeigen der Artikel nr. bei den Produkten im Shop	2025-04-26 13:37:49 +02:00
rgemm	17522dcd65	Hinzufügen der Finalen Seite der Bestellung	2025-04-26 13:05:22 +02:00