@ozdao/prometheus-framework 0.1.35 → 0.1.37

package/src/modules/products/components/sections/SortProducts.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="pd-medium mn-thin bg-grey radius-big">
+    <div class="flex-nowrap flex flex-v-center">
+      <p class="mn-r-auto p-big t-semi t-transp">2,982 results</p>
+
+      <button 
+        @click="setSort('price')" 
+        class="button-active button-sort button">
+        {{t('sort.price')}}
+      </button>
+      <button 
+        @click="setSort('createdAt')" 
+        class="button-sort button">
+        {{t('sort.newest')}}
+      </button>
+      <button 
+        @click="setSort('popularity')" 
+        class="button-sort button">
+          {{t('sort.popularity')}}
+      </button>
+    </div>
+    
+  </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+
+import { useI18n }    from 'vue-i18n'
+
+
+// Пропсы и данные, которые вы передаёте в компонент
+const props = defineProps({
+  categories: Array,
+  prices: Array,
+  deliveryOptions: Array,
+  selectedFilters: Object
+})
+
+const emit = defineEmits(['updateFilters', 'resetFilters'])
+
+const emitFilterChange = (filterType, value) => {
+  emit('updateFilters', { filterType, value })
+}
+
+const resetFilters = () => {
+  emit('resetFilters')
+}
+
+const text = {
+  locale: 'en',
+  messages: {
+    en: {
+      sort: {
+        price: 'By price',
+        newest: 'By newest',
+        popularity: 'By popularity'
+      }
+    },
+    ru: {
+      sort: {
+        price: 'По цене',
+        newest: 'По новизне',
+        popularity: 'По популярности'
+      },
+    }
+  }
+}
+
+
+const { t } = useI18n(text)
+</script>
+
+<style>
+
+</style>

package/src/modules/products/controllers/leftovers.controller.js

@@ -1,61 +1,69 @@
-const fetch = require('node-fetch')
-
 const controllerFactory = (db) => {
   const Leftover = db.leftover;
 
-  const getAll = (req, res) => {
-    Leftover.find({}).sort({'createdAt': 'desc'}).exec((err, leftoveres) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!leftoveres) {return res.status(404).send({ message: "Leftoveres not found." }); }
-      // If succes
+  const getAll = async (req, res) => {
+    try {
+      const leftoveres = await Leftover.find({}).sort({ 'createdAt': 'desc' }).exec();
+      if (!leftoveres) {
+        return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
+      }
       res.status(200).send(leftoveres);
-    });
+    } catch (err) {
+      res.status(500).send({ message: "ERROR_GET_ALL_LEFTOVERES" });
+    }
   };
 
-  const create = (req, res) => {
-    console.log(req.body)
-    Leftover.create({
-      type: req.body.type,
-      order: req.body.order, 
-      positions: req.body.positions
-    }, (err, leftover) => {
-      if (err) {return res.status(500).send({ message: err }); }
-      if (!leftover) {return res.status(404).send({ message: "Something wrong when updating product. (with files)" }); }
+  const create = async (req, res) => {
+    try {
+      const leftover = await Leftover.create({
+        type: req.body.type,
+        order: req.body.order,
+        positions: req.body.positions
+      });
+      if (!leftover) {
+        return res.status(404).send({ message: "ERROR_CREATING_LEFTOVER" });
+      }
       res.status(200).send(leftover);
-    })
+    } catch (err) {
+      res.status(500).send({ message: "ERROR_CREATE_LEFTOVER" });
+    }
   };
 
-  const get = (req, res) => {
-    Leftover.findOne({ _id: req.params._id }).exec((err, leftover) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!leftover) {return res.status(404).send({ message: "Leftover not found." }); }
-      // If succes
+  const get = async (req, res) => {
+    try {
+      const leftover = await Leftover.findOne({ _id: req.params._id }).exec();
+      if (!leftover) {
+        return res.status(404).send({ message: "LEFTOVER_NOT_FOUND" });
+      }
       res.status(200).send(leftover);
-    });
+    } catch (err) {
+      res.status(500).send({ message: "ERROR_GET_LEFTOVER" });
+    }
   };
 
-  const update = (req, res) => {
-
-    Leftover.findOneAndUpdate({ _id: req.params._id }, req.body, { new: true, upsert: true}).exec((err, leftover) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!leftover) {return res.status(404).send({ message: "Leftover not found." }); }
-      // If succes
+  const update = async (req, res) => {
+    try {
+      const leftover = await Leftover.findOneAndUpdate({ _id: req.params._id }, req.body, { new: true, upsert: true }).exec();
+      if (!leftover) {
+        return res.status(404).send({ message: "LEFTOVER_NOT_FOUND" });
+      }
       res.status(200).send(leftover);
-    });
+    } catch (err) {
+      console.log(err)
+      res.status(500).send({ message: "ERROR_UPDATING_LEFTOVER" });
+    }
   };
 
-  const deleteLeftover = (req, res) => {
-    Leftover.findOneAndDelete({_id: req.params._id}, (err, leftover) => {
-      if (err) {return res.status(500).send({ message: err }); }
-      if (!leftover) {return res.status(404).send({ message: "Something wrong when deleting leftover." }); }
+  const deleteLeftover = async (req, res) => {
+    try {
+      const leftover = await Leftover.findOneAndDelete({ _id: req.params._id });
+      if (!leftover) {
+        return res.status(404).send({ message: "ERROR_DELETING_LEFTOVER" });
+      }
       res.status(200).send(leftover);
-    })
+    } catch (err) {
+      res.status(500).send({ message: "ERROR_DELETE_LEFTOVER" });
+    }
   };
 
   return {
@@ -63,10 +71,8 @@ const controllerFactory = (db) => {
     create,
     get,
     update,
-    delete: deleteLeftover 
+    delete: deleteLeftover
   };
 };
 
 module.exports = controllerFactory;
-
-

package/src/modules/products/controllers/modifications.controller.js

@@ -0,0 +1,66 @@
+// Update modifications
+ app.post(
+  "/products/:_id/modifications",
+  controller.updateModifications
+);
+
+// If success
+for (let product of products) {
+  // Find modifications
+  const modifications = await Modification.find({ product: product._id });
+  
+  for (let modification of modifications) {
+    // Find leftovers for each modification
+    const leftovers = await Leftover.find({ 'positions._id': modification._id });
+    modification.leftovers = leftovers.map(leftover => leftover.positions.find(position => position._id == modification._id));
+  }
+
+  product.modifications = modifications;
+}
+
+const updateModifications = (req, res) => {
+    var updatedID = req.body.map(function(modID, index) {
+      if (modID._id) {
+        return modID._id
+      }
+    })
+    console.log(updatedID)
+
+    Modification.find({ 'product._id': req.params._id, _id: { $nin: updatedID }}, function(err, response) {
+      if (err) { console.log(err) }
+
+      if (response.length > 0) {
+        response.forEach(modification => { 
+          Modification.deleteMany({ 'product._id': req.params._id, _id: { $nin: updatedID }}, function(err, response) {
+                if (err) { console.log(err) }
+                 console.log(response); 
+              });;
+        })
+       // 
+       }
+    });
+
+    req.body.forEach(modification => { 
+          console.log(modification)
+
+          modification = {
+            _id:             modification._id || uuidv4(),
+            name:           modification.name || 'New modification',
+            product:        modification.product || {_id: req.params._id},
+            quantity:       modification.quantity || 0, 
+            // dups: {type: Array},  
+            characteristics: modification.characteristics
+          }
+          console.log(modification)
+          Modification.findOneAndUpdate({ _id: modification._id },{$set:modification},{ upsert: true, new: true, setDefaultsOnInsert: true}).exec((err, modificationUpdated) => {
+            // If error
+            if (err) {console.log(err) }
+            // If not found
+            if (!modificationUpdated) {console.log("Something wrong when updating modification."); }
+            // If succe
+            
+            // res.status(200).send(modificationUpdated);
+            console.log(modificationUpdated)
+          });
+    });
+  };

package/src/modules/products/controllers/products.controller.js

@@ -1,14 +1,12 @@
-const fetch = require('node-fetch')
-const path = require('path');
 const {v1: uuidv1, v4: uuidv4, } = require('uuid');
 // Factory
 const controllerFactory = (db) => {
   const Product = db.product;
   const Modification = db.modification;
   const Leftover = db.leftover;
+
   // Create product
-  const create = async (req, res) => {
-    console.log('create product')
+  const Create = async (req, res) => {
     try {
       const newProduct = new Product(req.body);
 
@@ -21,7 +19,7 @@ const controllerFactory = (db) => {
     }
   };
   // Read products
-  const read = async (req, res) => {
+  const Read = async (req, res) => {
     try {
     
       let query = {};
@@ -36,38 +34,79 @@ const controllerFactory = (db) => {
         query._id = req.query._id;
       }
 
+      if (req.status) {
+        query.status = req.query.status;
+      }
+
       // Handle pagination
-      // options.skip = parseInt(req.query.skip) || 0;
-      // options.limit = parseInt(req.query.limit) || 10;
+      options.skip = parseInt(req.query.skip);
+      options.limit = parseInt(req.query.limit);
+      
       options.sort = { createdAt: -1 };
 
+      console.log(query)
       const products = await Product.find(query, null, options);
 
       // If not found
       if (!products) {
         return res.status(404).send({ message: "Products not found." });
       }
-
-      // If success
-      // for (let product of products) {
-      //   // Find modifications
-      //   const modifications = await Modification.find({ product: product._id });
-        
-      //   for (let modification of modifications) {
-      //     // Find leftovers for each modification
-      //     const leftovers = await Leftover.find({ 'positions._id': modification._id });
-      //     modification.leftovers = leftovers.map(leftover => leftover.positions.find(position => position._id == modification._id));
-      //   }
-
-      //   product.modifications = modifications;
-      // }
-
+      console.log(products)
       res.status(200).send(products);
     } catch (err) {
       // If error
       return res.status(500).send({ message: err });
     }
   };
+
+  const Update = async (req, res) => {
+    try {
+      const { _id } = req.params;
+      console.log(_id);
+
+      const updatedProduct = await Product.findOneAndUpdate(
+        { _id },
+        {
+          name: req.body.name,
+          status: req.body.status,
+          description: req.body.description,
+          price: req.body.price,
+          sale: req.body.sale,
+          category: req.body.category,
+          images: req.body.images,
+          information: req.body.information,
+          localization: req.body.localization,
+          quantity: req.body.quantity,
+        },
+        { new: true }
+      );
+
+      if (!updatedProduct) {
+        return res.status(404).send({ message: "Something wrong when updating product." });
+      }
+
+      res.status(200).send(updatedProduct);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  const Delete = async (req, res) => {
+    try {
+      const { _id } = req.params;
+      const deletedProduct = await Product.findOneAndDelete({ _id });
+
+      if (!deletedProduct) {
+        return res.status(404).send({ message: "Product not found for deletion." });
+      }
+
+      res.status(200).send(deletedProduct);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+
   const getProducts = (req, res) => {
 
     Product.aggregate([{
@@ -257,100 +296,17 @@ const controllerFactory = (db) => {
     console.log(product)
     }); 
   };
-  const updateProduct = (req, res) => {
-    console.log(req.params._id)
-    Product.findOneAndUpdate({ _id: req.params._id }, {
-      name: req.body.name,
-      status: req.body.status,
-      description: req.body.description,
-      price: req.body.price,
-      sale: req.body.sale,
-      category: req.body.category,
-      images: req.body.images,
-      information: req.body.information,
-      localization: req.body.localization,
-      quantity: req.body.quantity,
-    },{ new: true})
-    .exec((err, product) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!product) {return res.status(404).send({ message: "Something wrong when updating category." }); }
-      // If succes
-      res.status(200).send(product);
-    });
-  };
-  const updateModifications = (req, res) => {
-    var updatedID = req.body.map(function(modID, index) {
-      if (modID._id) {
-        return modID._id
-      }
-    })
-    console.log(updatedID)
-
-    Modification.find({ 'product._id': req.params._id, _id: { $nin: updatedID }}, function(err, response) {
-      if (err) { console.log(err) }
-
-      if (response.length > 0) {
-        response.forEach(modification => { 
-          Modification.deleteMany({ 'product._id': req.params._id, _id: { $nin: updatedID }}, function(err, response) {
-                if (err) { console.log(err) }
-                 console.log(response); 
-              });;
-        })
-       // 
-       }
-    });
-
-    req.body.forEach(modification => { 
-          console.log(modification)
-
-          modification = {
-            _id:             modification._id || uuidv4(),
-            name:           modification.name || 'New modification',
-            product:        modification.product || {_id: req.params._id},
-            quantity:       modification.quantity || 0, 
-            // dups: {type: Array},  
-            characteristics: modification.characteristics
-          }
-          console.log(modification)
-          Modification.findOneAndUpdate({ _id: modification._id },{$set:modification},{ upsert: true, new: true, setDefaultsOnInsert: true}).exec((err, modificationUpdated) => {
-            // If error
-            if (err) {console.log(err) }
-            // If not found
-            if (!modificationUpdated) {console.log("Something wrong when updating modification."); }
-            // If succe
-            
-            // res.status(200).send(modificationUpdated);
-            console.log(modificationUpdated)
-          });
-    });
-  };
-  // Delete product
-  const deleteProduct = (req, res) => {
-    Product.findOneAndDelete({ _id: req.params._id }).exec((err, product) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!product) {return res.status(404).send({ message: "Product is not deleted." }); }
-      // If succes
-      res.status(200).send(product);
-    });
-  };
+  
   return {
-    create,
-    read,
+    Create,
+    Read,
+    Update,
+    Delete,
     getProducts,
     getProductsPopular,
     getProduct,
-    updateProduct,
-    updateModifications,
-    deleteProduct
   };
 };
 
 
-module.exports = controllerFactory;
-
-
-
+module.exports = controllerFactory;

package/src/modules/products/models/leftover.model.js

@@ -3,9 +3,12 @@ module.exports = (mongoose) => {
     organization: {
       type: Object
     },
-    type:   {
-      type: String 
-    }, 
+    type: {
+      type: String,
+      enum: ['stock-in','stock-out','write-off'], 
+      default: 'stock-in',
+      required: true,
+    },
     order: {
       type: String
     }, 
@@ -19,14 +22,14 @@ module.exports = (mongoose) => {
       name: {
         type: String
       },
-      size: {
-        type: String
-      },
-      color: {
-        type: String
-      },
       quantity: {
         type: Number
+      },
+      price: {
+        type: Number
+      },
+      type: {
+        type: String
       }
     }]
   }, {

package/src/modules/products/models/product.model.js

@@ -8,6 +8,7 @@ module.exports = (mongoose) => {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'Organization',
         },
+        
         status:         {type: String}, 
         name:           {type: String}, 
         category:       {type: Array},

package/src/modules/products/router/products.router.js

@@ -0,0 +1,46 @@
+import layoutProducts from '../components/layouts/Products.vue'
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
+const productsRoutes = [{
+  path: 'products',
+  component: layoutProducts,
+  beforeEnter: [
+    validationAuth.requiresAdmin,
+  ],
+  children: [{
+    path: ':_id',
+    name: 'Products',
+    meta: {
+      title: {
+        en: 'Products',
+        ru: 'Товары'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'ProductsGallery' */ '../components/pages/Dashboard.vue'),
+  },{
+    path: 'products',
+    name: 'Products',
+    meta: {
+      title: {
+        en: 'Products',
+        ru: 'Товары'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'ProductsProducts' */ '@pf/src/modules/products/components/pages/ProductsProducts.vue'),
+  },{
+    path: 'leftovers',
+    name: 'Leftovers',
+    meta: {
+      title: {
+        en: 'Leftovers',
+        ru: 'Остатки'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'ProductsLeftovers' */ '@pf/src/modules/products/components/pages/Leftovers.vue'),
+  }]
+}];
+
+export default productsRoutes;

package/src/modules/products/routes/products.routes.js

@@ -14,22 +14,22 @@ module.exports = function(app, db) {
   // (C) Create product
   app.post(
     "/products/create",
-    controller.create
+    controller.Create
   );
   // (R) Read products
   app.get(
     "/products/read",
-    controller.read
+    controller.Read
   );
   // (U) Update product
   app.post(
     "/products/:_id",
-    controller.updateProduct
+    controller.Update
   );
   // (D) Delete product
   app.delete(
     "/products/:_id",
-    controller.deleteProduct
+    controller.Delete
   );
   // Get products
   // app.get(
@@ -50,10 +50,5 @@ module.exports = function(app, db) {
   //   "/products/:_id",
   //   controller.getProduct
   // );
-  // // Update modifications
-  //  app.post(
-  //   "/products/:_id/modifications",
-  //   controller.updateModifications
-  // );
 };