New Version Code

ElonMusk2002 · Jun 29, 2023 · 267bcc5 · 267bcc5
1 parent bac291b
commit 267bcc5
Show file tree

Hide file tree

Showing 28 changed files with 663 additions and 198 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -0,0 +1,39 @@
+# Editor-specific files
+.DS_Store
+.vscode/
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Build output
+/dist/
+
+# Node dependencies
+node_modules/
+
+# dotenv environment configurations
+.env
+.env.test
+.env*.local
+
+# Caching files
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+*.sublime-workspace
+
+# Grunt and Bower package manager
+.grunt
+bower_components/
+
+# npm and yarn cache
+.npm/
+.yarn/
+
+# ESLint cache
+.eslintcache
+
+# Stylelint cache
+.stylelintcache
diff --git a/backend/app.js b/backend/app.js
@@ -3,6 +3,7 @@ const cors = require('cors');
 const app = express();
 const config = require('config');
 const PORT = config.get('port') || 3000;
+const { typeText } = require('rewive');
 
 app.use(express.static('public'));
 app.use(express.urlencoded({ extended: true }))
@@ -12,4 +13,6 @@ app.use(cors());
 
 app.use('/', require('./product/router'));
 
-app.listen(PORT, () => console.log(`Back-end has been started! http://localhost:${PORT}`));
+app.listen(PORT, () => {
+    typeText(10, PORT)
+});
diff --git a/backend/models/Cart.js b/backend/models/Cart.js
@@ -0,0 +1,14 @@
+const mongoose = require('./db');
+
+const cartItemSchema = new mongoose.Schema({
+    prodname: { type: String },
+    price: { type: Number },
+    description: { type: String },
+    image: { type: String },
+    quantityInStock: { type: Number },
+    quantityInCart: { type: Number }
+});
+
+const CartItem = mongoose.model('CartItem', cartItemSchema);
+
+module.exports = CartItem;
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -23,10 +23,12 @@
     "express-validator": "^6.15.0",
     "faker": "^5.5.3",
     "gradient-string": "^2.0.2",
+    "js-image-generator": "^1.0.4",
     "jsonwebtoken": "^9.0.0",
     "mongodb": "^5.1.0",
     "mongoose": "^7.0.3",
     "pm2": "^5.3.0",
+    "rewive": "^1.0.0",
     "swagger-ui-express": "^4.6.2",
     "uuid": "^7.0.3"
   },

diff --git a/backend/product/controller.js b/backend/product/controller.js
@@ -1,11 +1,86 @@
 const express = require('express');
 const Product = require('../models/Product');
 const faker = require('faker');
+const CartItem = require('../models/Cart');
+
+module.exports.getCart = async (req, res) => {
+    try {
+        const cart = await CartItem.find();
+        res.status(200).json(cart);
+    } catch (err) {
+        console.log(err);
+        res.status(500).json({ error: err.message });
+    }
+}
+
+module.exports.addToCart = async (req, res) => {
+    try {
+        const { productId, quantity } = req.body;
+
+        // Найти товар по ID
+        const product = await Product.findById(productId);
+
+        // Проверить, есть ли товар уже в корзине
+        const existingCartItem = await CartItem.findOne({ prodname: product.prodname });
+
+        if (existingCartItem) {
+            // Обновить количество товара в корзине
+            existingCartItem.quantityInCart += quantity;
+            await existingCartItem.save();
+            res.status(200).json({ message: 'Product quantity updated' });
+        } else {
+            // Создать новый элемент корзины
+            const cartItem = new CartItem({
+                prodname: product.prodname,
+                price: product.price,
+                description: product.description,
+                image: product.image,
+                quantityInStock: product.quantityInStock,
+                quantityInCart: quantity
+            });
+
+            // Сохранить элемент корзины
+            await cartItem.save();
+
+            res.status(201).json({ message: 'Product added to cart' });
+        }
+    } catch (err) {
+        console.log(err);
+        res.status(500).json({ error: err.message });
+    }
+}
+
+module.exports.removeFromCart = async (req, res) => {
+    try {
+        const { id } = req.params;
+
+        // Найти элемент корзины по ID и удалить его
+        await CartItem.findByIdAndDelete(id);
+
+        res.status(200).json({ message: 'Product removed from cart' });
+    } catch (err) {
+        console.log(err);
+        res.status(500).json({ error: err.message });
+    }
+}
+
+module.exports.clearCart = async (req, res) => {
+    try {
+        // Очистить корзину
+        await CartItem.deleteMany({});
+
+        res.status(200).json({ message: 'Cart cleared' });
+    } catch (err) {
+        console.log(err);
+        res.status(500).json({ error: err.message });
+    }
+}
+
 
 module.exports.createProduct = async (req, res) => {
     try {
         const { prodname, subprodname, price, description, quantityInStock, reviews } = req.body;
-        
+
         const newProduct = new Product({
             prodname: prodname || faker.commerce.product(),
             subprodname: subprodname || faker.commerce.productName(),
@@ -39,11 +114,11 @@ module.exports.createProduct = async (req, res) => {
             price: faker.commerce.price(),
             description: faker.commerce.productDescription(),
             image: faker.image.fashion(),
-            quantityInStock: faker.datatype.number({min: 0, max: 100}),
-            reviews: Array.from({length: faker.datatype.number({min: 0, max: 10})}, () => ({
+            quantityInStock: faker.datatype.number({ min: 0, max: 100 }),
+            reviews: Array.from({ length: faker.datatype.number({ min: 0, max: 10 }) }, () => ({
                 avatar: faker.image.avatar(),
                 nickname: faker.internet.userName(),
-                stars: faker.datatype.number({min: 1, max: 5}),
+                stars: faker.datatype.number({ min: 1, max: 5 }),
                 text: faker.lorem.sentences(),
                 image: faker.datatype.boolean ? faker.image.image() : undefined
             }))
@@ -53,7 +128,7 @@ module.exports.createProduct = async (req, res) => {
         res.status(201).json(newProduct);
     } catch (err) {
         console.log(err);
-        res.status(500).json({error: err.message});
+        res.status(500).json({ error: err.message });
     }
 }
 
@@ -64,7 +139,7 @@ module.exports.readProduct = async (req, res) => {
         res.status(200).json(products);
     } catch (err) {
         console.log(err);
-        res.status(500).json({error: err.message});
+        res.status(500).json({ error: err.message });
     }
 }
 
@@ -75,27 +150,38 @@ module.exports.updateProduct = async (req, res) => {
         res.status(200).json(updatedProduct);
     } catch (err) {
         console.log(err);
-        res.status(500).json({error: err.message});
+        res.status(500).json({ error: err.message });
     }
 }
 
 module.exports.deleteProduct = async (req, res) => {
     try {
         const { id } = req.params;
         await Product.findByIdAndDelete(id);
-        res.status(200).json({message: "Success"});
+        res.status(200).json({ message: "Success" });
     } catch (err) {
         console.log(err);
-        res.status(500).json({error: err.message});
+        res.status(500).json({ error: err.message });
     }
 }
 
 module.exports.deleteAllProducts = async (req, res) => {
     try {
         await Product.deleteMany({});
-        res.status(200).json({message: "Success"});
+        res.status(200).json({ message: "Success" });
     } catch (err) {
         console.log(err);
-        res.status(500).json({error: err.message});
+        res.status(500).json({ error: err.message });
+    }
+}
+
+module.exports.getCartItem = async (req, res) => {
+    try {
+        const cartItems = await CartItem.find();
+        const totalQuantity = cartItems.reduce((total, item) => total + item.quantityInCart, 0);
+        res.status(200).json({ totalQuantity });
+    } catch (err) {
+        console.log(err);
+        res.status(500).json({ error: err.message });
     }
 }
diff --git a/backend/product/router.js b/backend/product/router.js
@@ -2,10 +2,16 @@ const express = require('express');
 const router = express.Router();
 const controller = require('./controller');
 
-router.post('/api/product/', controller.createProduct); //добавить новый продукт (товар)
-router.get('/api/product/', controller.readProduct); //запросить все существующие продукты (товары)
-router.put('/api/product/:id', controller.updateProduct); //обновить информацию о продукте (товаре)
-router.delete('/api/product/', controller.deleteAllProducts); //удалить все продукты (товары) из БД
-router.delete('/api/product/:id', controller.deleteProduct); //удалить конкретный продукт (товар) из БД по ID
+router.post('/api/product/', controller.createProduct);
+router.get('/api/product/', controller.readProduct);
+router.put('/api/product/:id', controller.updateProduct);
+router.delete('/api/product/', controller.deleteAllProducts);
+router.delete('/api/product/:id', controller.deleteProduct);
+
+router.post('/api/cart/', controller.addToCart);
+router.get('/api/cart/', controller.getCart);
+router.get('/api/cart/item', controller.getCartItem);
+router.delete('/api/cart/:id', controller.removeFromCart);
+router.delete('/api/cart/', controller.clearCart);
 
 module.exports = router;
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -0,0 +1,39 @@
+# Editor-specific files
+.DS_Store
+.vscode/
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Build output
+/dist/
+
+# Node dependencies
+node_modules/
+
+# dotenv environment configurations
+.env
+.env.test
+.env*.local
+
+# Caching files
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+*.sublime-workspace
+
+# Grunt and Bower package manager
+.grunt
+bower_components/
+
+# npm and yarn cache
+.npm/
+.yarn/
+
+# ESLint cache
+.eslintcache
+
+# Stylelint cache
+.stylelintcache