la-flowerita 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "la-flowerita",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.2",
     "@fortawesome/free-solid-svg-icons": "^6.1.2",
@@ -11,6 +11,7 @@
     "bootstrap": "^5.2.0",
     "build": "^0.1.4",
     "connect-mongo": "^4.6.0",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
@@ -51,6 +52,7 @@
     "utf8": "^3.0.0",
     "web-vitals": "^2.1.4"
   },
+  "proxy": "http://localhost:5000/",
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
@@ -75,4 +77,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

package/server.js

@@ -11,6 +11,7 @@ require("./src/Models/products");
 require("./src/Models/orderProducts");
 require("./src/Models/shoppinglists");
 require("./src/Models/userShoppinglists");
+require("./src/Models/orders");
 
 const dbConfig = require("./src/Config/db");
 
@@ -20,14 +21,14 @@ const MongoStore = require('connect-mongo');
 const session = expressSession(
     { secret: 'secret', 
     algorithms: ['RS256'], 
-    cookie: { maxAge: 60 * 60 * 24 * 1000 }, 
+    cookie: { maxAge: 60 * 15 * 1000 }, 
     resave: false, 
     saveUninitialized: false,
-    // store: MongoStore.create({
-    //     mongoUrl: 'mongodb://localhost/FlowersShop', //YOUR MONGODB URL
-    //     ttl: 15 * 60 * 1000 ,
-    //     autoRemove: 'native' 
-    // })
+    store: MongoStore.create({
+        mongoUrl: 'mongodb://localhost/FlowersShop', //YOUR MONGODB URL
+        ttl: 15 * 60 * 1000 ,
+        autoRemove: 'native' 
+    })
      })
 app.use(session);
 const passport = require('passport');
@@ -91,7 +92,7 @@ io.on('connection', function(socket) {
     });
 })
 
-const port = 5000;
+const port = process.env.PORT || 5000;
 server.listen(port, () => {
     console.log(`Server Running on port ${port}!`);
 });

package/src/Controllers/order.controller.js

@@ -0,0 +1,68 @@
+const OrderService = require("../Services/OrderService");
+const UserService = require("../Services/UserService");
+const mongoose = require('mongoose');
+const Orders = mongoose.model('Orders');
+const crypto = require('crypto');
+var fs = require('fs');
+const imagesMiddleware = require("../Middleware/uploadImage");
+
+module.exports = class Order {
+  
+static async getOrders(req, res, next){
+    var status = req.body.status;
+    console.log(status);
+    var orders = [];
+    if(status == "All" || !status){
+        console.log("all");
+        orders = await  OrderService.GetALL();
+    } else{
+        orders = await  OrderService.GetOrderByStatus(status);
+    }
+    console.log(orders);
+    return res.json({orders: orders});
+}
+static async getClientOrders(req, res, next){
+    var id = req.user._id;
+    var olduser = await UserService.FindById(id);
+    if(olduser)
+    console.log(id);
+    var orders = [];
+    orders = await  OrderService.GetClientOrders(id);
+    return res.json({orders: orders});
+  }
+static async addNewOrder(req, res, next){
+  var order = req.body.order;
+  order.status = "pending";
+  const newOrder = new Orders(order);
+  await newOrder.save();
+  console.log('Order created:' + newOrder);
+  var id = newOrder._id;
+  console.log(id);
+  return res.json({status: 200, id: id});
+}
+
+static async updateOrder(req, res, next){
+  var oldOrder = await OrderService.FindById(req.body.order._id);
+  if(oldOrder){
+      var newOrder= req.body.order;
+      newOrder = new Orders(newOrder);
+      await OrderService.UpdateById(newOrder._id, newOrder)
+      console.log('order updated:' + newOrder);
+  } else{
+      return res.sendStatus(404);
+  }
+  return res.sendStatus(200);
+}
+static async updateOrderStatus(req, res, next){
+    var oldOrder = await OrderService.FindById(req.body._id);
+    var status = req.body.status
+    if(oldOrder){
+        await OrderService.UpdateStatus(req.body._id,status)
+        console.log('Order status updated:' + req.body._id);
+    } else{
+        return res.sendStatus(404);
+    }
+    return res.sendStatus(200);
+  }
+
+}

package/src/Controllers/shoppinglist.controller.js

@@ -3,6 +3,7 @@ const mongoose = require('mongoose');
 const Shoppinglists = mongoose.model('Shoppinglists');
 const Users = mongoose.model('Users');
 const Products = mongoose.model('Products');
+const Orders = mongoose.model('Orders');
 
 module.exports = class Shoppinglist {
   static async addNewProductToCart(req, res, next) {
@@ -178,7 +179,21 @@ module.exports = class Shoppinglist {
   }
   static async payNow(req, res, next) {
     if (req.user) {
+      var cart = await ShoppinglistsService.GetCurrentCart(req.user._id);
       await ShoppinglistsService.CartPaid(req.user._id);
+      cart.products = await ShoppinglistsService.GetProductsDetails(
+        cart.products
+      );
+      console.log("cart" + cart);
+      var totalPrice = cart.products.reduce((acc, item) => acc + item.price * item.quantity,0);
+      console.log(totalPrice);
+      var order = new Orders({userId: req.user._id, 
+                            products:cart.products, 
+                            totalPrice: totalPrice,
+                            date: Date.now(),
+                            status:"Pending"
+                          })
+      await order.save();
       return res.sendStatus(200);
     }
     return res.sendStatus(404);

package/src/Controllers/user.controller.js

@@ -26,26 +26,29 @@ module.exports = class User {
           return res.sendStatus(400);
           }
         }
-
-        req.logIn(user, function (err) {
-          if (err) {
-            return next(err);
-            // return res.status(404).send("Username or password incorrect");
-          }
-        });
-        console.log(req.session.cart);
-        if(req.session.cart && req.session.cart.products != []){
-          ShoppinglistsService.AddProductsFromSession(req.user._id, req.session.cart.products)
-         } 
-         if(req.session.wishlist && req.session.wishlist.products != []){
-         WishlistService.AddProductsFromSession(req.user._id, req.session.wishlist.products)
-          } 
-          req.session.cart = {products:[]}
-          req.session.wishlist = {products:[]}
-          req.session.save((err) => {
-              console.log(err);
-            });
+        var cart = req.session.cart;
+        var wishlist = req.session.wishlist;
+        req.logIn(user, function(err) {
+          if (err) return next(err);
+        
+          console.log('is authenticated?: ' + req.isAuthenticated());
+          console.log(req.session);
+          if(cart && cart.products != []){
+            ShoppinglistsService.AddProductsFromSession(req.user._id, cart.products)
+           } 
+           if(wishlist && wishlist.products != []){
+           WishlistService.AddProductsFromSession(req.user._id, wishlist.products)
+            } 
+            // req.session.cart = {products:[]}
+            // req.session.wishlist = {products:[]}
+            // req.session.save((err) => {
+            //     console.log(err);
+            //   });
           return res.sendStatus(200);
+          }
+        );
+        
+          
       })(req, res, next);
     } else {
       return res.sendStatus(404);
@@ -65,8 +68,10 @@ module.exports = class User {
 
   static async logout(req, res, next) {
     console.log("logout");
-    req.logout();
-    return res.sendStatus(200);
+    req.logout(function(err) {
+      if (err) { return next(err); }
+      return res.sendStatus(200);
+        });    
   }
 
   static async emailForResetPassword(req, res, next) {
@@ -152,6 +157,7 @@ module.exports = class User {
     }
     const newUser = new Users(user);
     newUser.setPassword(user.password);
+    newUser.isActivate = true;
     newUser.isApproved = user.degree != "Customer" ? false: true;
     await newUser.save();
     console.log("user added successfullly");
@@ -180,7 +186,58 @@ static async getProfileImage(req, res, next){
   return res.json({profileImage:user.profileImage});
 }
 
-static async isLogged(req, res, next){
+
+
+static async getUsers(req, res, next){
+  var type = req.body.type;
+  console.log(type);
+  var users = [];
+  if(type == "All" || !type){
+      console.log("all");
+      users = await  UserService.GetALL();
+  } else{
+      console.log(type);
+      users = await  UserService.GetUserBydegree(type);
+  }
+  return res.json({users: users});
+}
+static async addNewUser(req, res, next){
+  var user = req.body.user;
+  user.isActivate = true;
+  const newUser = new User(user);
+  await newUser.save();
+  console.log('User created:' + newUser);
+  var id = newUser._id;
+  console.log(id);
+  return res.json({status: 200, id: id});
+}
+
+static async updateUser(req, res, next){
+  var oldUser = await UserService.FindById(req.body.user._id);
+  var exists = await UserService.FindByEmail(req.body.user.email)
+  if(exists && exists._id != req.body.user._id){
+    return res.sendStatus(400);
+  }
+  if(oldUser){
+      var newUser = req.body.user;
+      await UserService.UpdateById(req.body.user._id, newUser)
+      console.log('user updated:' + newUser);
+  } else{
+      return res.sendStatus(404);
+  }
+  return res.sendStatus(200);
+}
+static async deleteUser(req, res, next){
+  var oldUser = await UserService.FindById(req.body.id);
+  if(oldUser){
+      await UserService.REMOVE(req.body.id)
+      console.log('User deleted:' + req.body.id);
+  } else{
+      return res.sendStatus(404);
+  }
+  return res.sendStatus(200);
+}
+  static async isLogged(req, res, next){
   if(req.user)
     return res.sendStatus(200);
   return res.sendStatus(404);

package/src/Models/orders.js

@@ -0,0 +1,12 @@
+const mongo = require("mongoose");
+const { Schema } = mongo;
+
+const OrderSchema = new Schema({
+      userId: String,
+      products: Array,
+      totalPrice: Number,
+      date: Date,
+      status: String,
+    }, { autoIndex: false });
+
+    mongo.model('Orders', OrderSchema, 'Orders'); // if model name as lowercase with suffix "s" === collection name: User => users

package/src/Routes/indexRouter.js

@@ -3,8 +3,12 @@ const router = express.Router();
 const UserCtrl = require("../Controllers/user.controller");
 const CatalogCtrl = require("../Controllers/catalog.controller");
 const ShoppinglistCtrl = require("../Controllers/shoppinglist.controller");
+
+const OrderCtrl = require("../Controllers/order.controller");
+
 const WishlistCtrl = require("../Controllers/wishlist.controller");
 
+
 var bodyParser = require("body-parser");
 var jsonParser = bodyParser.json();
 const auth = require('./auth');
@@ -18,12 +22,20 @@ router.post("/updatePassword", jsonParser, UserCtrl.updatePassword);
 router.post("/signup", jsonParser, UserCtrl.signup);
 router.get("/getProfileImage", jsonParser, UserCtrl.getProfileImage);
 router.post("/addUserProfile", jsonParser, UserCtrl.addUserProfile);
+router.post("/getUsers", jsonParser, UserCtrl.getUsers);
+router.post("/addNewUser", jsonParser, UserCtrl.addNewUser);
+router.post("/updateUser", jsonParser, UserCtrl.updateUser);
+router.post("/deleteUser", jsonParser, UserCtrl.deleteUser);
 router.post("/getCatalog", jsonParser, CatalogCtrl.getCatalog);
 router.post("/addNewProduct", jsonParser, CatalogCtrl.addNewProduct);
 router.post("/addProductPicture", jsonParser, CatalogCtrl.addProductPicture);
 router.post("/updateProduct", jsonParser, CatalogCtrl.updateProduct);
 router.post("/deleteProduct", jsonParser, CatalogCtrl.deleteProduct);
-// router.post("addProductToCart", jsonParser, ShoppinglistCtrl.addProduct);
+router.post("/getOrders", jsonParser, OrderCtrl.getOrders);
+router.post("/getClientOrders", jsonParser, OrderCtrl.getClientOrders);
+router.post("/addNewOrder", jsonParser, OrderCtrl.addNewOrder);
+router.post("/updateOrder", jsonParser, OrderCtrl.updateOrder);
+router.post("/updateOrderStatus", jsonParser, OrderCtrl.updateOrderStatus);
 router.get("/getCurrentCart", jsonParser, ShoppinglistCtrl.getCurrentCart);
 router.get("/getCurrentWishlist", jsonParser, WishlistCtrl.getCurrentWishlist);
 router.get("/isLogged", jsonParser, UserCtrl.isLogged);
@@ -37,4 +49,5 @@ router.get("/getSession", jsonParser, UserCtrl.getSession);
 router.get("/payNow",jsonParser, ShoppinglistCtrl.payNow)
 
 
+
 module.exports =  router;

package/src/Services/OrderService.js

@@ -0,0 +1,46 @@
+require("../Models/orders");
+var mongoose = require("mongoose");
+const Order = mongoose.model('Orders');
+
+module.exports = class OrderService {
+  static async CREATE(order) {
+    return Order.create({
+     userId: order.userId,
+     products: order.products,
+     totalPrice: order.totalPrice,
+     date:order.date,
+     status: order.status,
+    });
+  }
+
+  static async GetALL() {
+    return Order.find({ }).exec();
+  }
+  static async GetOrderByStatus(s) {
+    return Order.find({ status: s }).exec();
+  }
+  static async GetClientOrders(id) {
+    return Order.find({ userId: id }).exec();
+  }
+  
+  static async FindById(id) {
+    console.log("finding order:" + id);
+    return Order.findOne({ _id: id });
+  }
+
+  static async UpdateStatus(id, s) {
+    return Order.updateOne(
+      { _id: id },
+      { $set: { status: s } }
+    ).exec();
+  }
+  
+  static async UpdateById(id, order) {
+    return Order.updateOne(
+      { _id: id },
+      { $set: { userId: order.userId, products: order.products, totalPrice: order.totalPrice, status: order.status, date : order.date} }
+    ).exec();
+  }
+
+
+};

package/src/Services/ShoppinglistService.js

@@ -33,7 +33,7 @@ module.exports = class ProductService {
     console.log("got order product")
     var product = await Products.findById(orderProduct.productId)
     console.log("got product")
-    var result = {id: product._id, name:product.name, price: product.price, quantity: orderProduct.quantity, image: product.image}
+    var result = {id: product._id, name:product.name, price: product.price, quantity: orderProduct.quantity, image: product.image, sellerId:product.sellerId}
     return result;
   }
 
@@ -77,7 +77,7 @@ module.exports = class ProductService {
     if(orderProduct){
       console.log("update quantity")
       await OrderProducts.updateOne(
-        { productId:product.id },
+        { _id:orderProduct._id },
         { $set: { quantity:  orderProduct.quantity + product.quantity } }
       );
       return;

package/src/Services/UserService.js

@@ -20,8 +20,8 @@ module.exports = class UserService {
   static async GetALL() {
     return User.find({ isApproved:true, isActivate: true }).exec();
   }
-  static async GetClients() {
-    return User.find({ isActivate: true, degree: "client" }).exec();
+  static async GetUserBydegree(deg) {
+    return User.find({isApproved:true ,isActivate: true, degree: deg }).exec();
   }
   static async FindById(id) {
     console.log("finding user:" + id);
@@ -36,9 +36,15 @@ module.exports = class UserService {
     return await User.findOne({ email: e, password: p, isApproved: true, isActivate:true});
   }
 
-  static async REMOVE(e, p) {
+  //static async REMOVE(e, p) {
+    //return User.updateOne(
+      //{ email: e, password: p },
+      //{ $set: { isActivate: false } }
+    //).exec();
+  //}
+  static async REMOVE(id) {
     return User.updateOne(
-      { email: e, password: p },
+      { _id: id },
       { $set: { isActivate: false } }
     ).exec();
   }
@@ -53,7 +59,7 @@ module.exports = class UserService {
   static async UpdateById(id, user) {
     return User.updateOne(
       { _id: id },
-      { $set: { email: user.email, hash: user.hash, salt:user.salt, degree: user.degree, profileImage: user.profileImage } }
+      { $set: { email: user.email, degree: user.degree, profileImage: user.profileImage,phone:user.phone, name:user.name} }
     ).exec();
   }
 

package/src/components/ManageOrders.js

@@ -0,0 +1,109 @@
+import {React, Component} from 'react';
+import sampleImage from '../logo.svg';
+import '../css/shoppingCart.css';
+import { FaHeart, FaRegHeart, FaShoppingCart, FaEye } from "react-icons/fa";
+import Order from "./Order.js"
+import swal from "sweetalert";
+import { Container, Table, Row, Button } from "react-bootstrap";
+
+class ManageOrders extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      orders: [],
+      status: false,
+    };
+  }
+  componentDidMount = async () => {
+    var status = this.state.status ? this.state.status : "All";
+    var options = {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body:JSON.stringify({status: status})
+    };
+    console.log(status);
+    await fetch("/getOrders", options).then(res => res.json())
+    .then((result) => {
+      console.log(result); 
+      this.setState({ orders: result.orders });
+    });
+  }
+
+  componentDidUpdate = async(prevProps,prevState) =>  {
+    if (this.state.status !== prevState.status) {
+    console.log('type changed');
+    var status = this.state.status ? this.state.status : "All";
+    var options = {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body:JSON.stringify({status: status})
+    };
+    console.log(status);
+    await fetch("/getOrders", options).then(res => res.json())
+    .then((result) => {
+      console.log("hi");
+      this.setState({ orders: result.orders });
+      console.log(this.state.orders);
+    });
+ }
+}
+  refreshPage() {
+    window.location.reload(false);
+  }
+
+  async changeType(e){
+    var status = e.target.value;
+    this.setState({status:status});
+  }
+
+  
+
+  render() {
+    return (
+      <div className="productSlider mb-5 mt-5">
+        <Container>
+          <h5 className="text-left mb-4 ps-2">Order List</h5>
+          <div style={{"marginTop":"inherit"}} class="btn-group" role="group" aria-label="Basic example">
+          <button type="button" onClick={(e) => this.changeType(e)} value="Pending" className="button-17">Pending</button>
+          <button type="button" onClick={(e) => this.changeType(e)} value="InProcess" className="button-17">In process</button>
+          <button type="button" onClick={(e) => this.changeType(e)} value="Completed" className="button-17">Completed</button>
+          <button type="button" onClick={(e) => this.changeType(e)} value="All" className="button-17">All</button>
+          <button type="button" onClick={() => this.refreshPage()} style={{"width":"10%","height":"5%",margin:"20px"}}>
+            <span><img src="images/refresh.png" style={{"height":"auto",width:"20%"}}/></span>&nbsp;Refresh
+          </button>
+          </div>
+          <Row>
+            <div className="col-9 cartShow">
+              <Table bordered hover responsive="sm">
+                <thead>
+                  <tr>
+                    <th>Order </th>
+                    <th>Date </th>
+                    <th>Products </th>
+                    <th>Sub Total</th>
+                    <th>Status</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {this.state.orders.map((order, idx) => (
+                    <Order
+                      key={order._id}
+                      _id = {order._id}
+                      userId =  {order.userId}
+                      products = {order.products} 
+                      totalPrice =  {order.totalPrice}
+                      date = {order.date}
+                      status = {order.status}
+                    />
+                  ))}
+                </tbody>
+              </Table>
+            </div>
+          </Row>
+        </Container>
+      </div>
+    );
+  }
+}
+
+export default ManageOrders;