@ozdao/prometheus-framework 0.2.62 → 0.2.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.62",
+  "version": "0.2.63",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Feed/Feed.vue

@@ -157,7 +157,8 @@ watch(() => props.options, (newVal, oldVal) => {
     newVal.delivery !== oldVal.delivery ||
     newVal.search !== oldVal.search ||
     newVal.status !== oldVal.status ||
-    newVal.hidden !== oldVal.hidden
+    newVal.hidden !== oldVal.hidden ||
+    newVal.type !== oldVal.type
   ) {
     fetchItems();
   }

package/src/modules/products/components/pages/EditLeftover.vue

@@ -1,90 +1,91 @@
 <template>
-  <header class="mn-b-medium gap-small flex-v-center flex-nowrap flex">
-    <h2 class="">{{route.params.leftover ? 'Edit ' : 'Add ' }} Inventory</h2>
-
-    <Select 
-      v-model:select="leftovers.state.current.type" 
-      :options="[
-        'stock-in',
-        'stock-out',
-        'write-off'
-      ]"
-      :placeholder="'Select type'"
-      class="bg-main t-black w-max pd-small t-semi p-big uppercase radius-small"
-    />
-  </header>
-
-  <Block
-    title="Add Position"
-    class="mn-b-semi"
-  >
-    <CardPosition 
-      @add="(item) => globals.actions.add(
-        leftovers.state.current.positions,
-        item 
-      )"
-      :products="Products"
-    />
-  </Block>
-
-  <Block
-    title="Invetory Sheet"
-    placeholder="No positions added yet"
-    class="mn-b-semi"
-  >
-    <CardPosition 
-      v-for="(product, index) in leftovers.state.current.positions" 
-      :key="product._id" 
-      :product="product"
-      :array="leftovers.state.current.positions"
-      :products="Products"
-      @add="(item) => globals.actions.add(
-        leftovers.state.current.positions,
-        item 
-      )"
-      @update="(item) => globals.actions.update(
-        leftovers.state.current.positions,
-        item,
-        index
-      )"
-      @delete="(item) => globals.actions.delete(
-        leftovers.state.current.positions,
-        item,
-        index
-      )"
-    />
-  </Block>
- 
-  <Block class="">
-    <section class="gap-thin flex-v-center flex-nojustify flex">
-      
-      <h3 class="mn-r-auto">
-        In total: {{formatPrice(totalPrice)}}
-      </h3>
-
-      <a 
-        @click="onSubmit()" 
-        class="bg-main button"
-      >
-        Save
-      </a> 
-
-      <a 
-        class="t-white bg-second button"
-        @click="onReset()"
-      >
-        Reset
-      </a>
-
-      <a 
-        v-if="route.params.leftover" 
-        @click="onDelete()" 
-        class="t-white bg-red button"
-      >
-        Delete
-      </a>
-    </section>
-  </Block>
+  <div class="pd-thin">
+    <header class="mn-b-medium gap-small flex-v-center flex-nowrap flex">
+      <h2 class="">{{route.params.leftover ? 'Edit ' : 'Add ' }} Inventory</h2>
+
+      <Select 
+        v-model:select="leftovers.state.current.type" 
+        :options="[
+          'stock-in',
+          'stock-out'
+        ]"
+        :placeholder="'Select type'"
+        class="bg-main t-black w-max pd-small t-semi p-big uppercase radius-small"
+      />
+    </header>
+
+    <Block
+      title="Add Position"
+      class="mn-b-semi"
+    >
+      <CardPosition 
+        @add="(item) => globals.actions.add(
+          leftovers.state.current.positions,
+          item 
+        )"
+        :products="Products"
+      />
+    </Block>
+
+    <Block
+      title="Invetory Sheet"
+      placeholder="No positions added yet"
+      class="mn-b-semi"
+    >
+      <CardPosition 
+        v-for="(product, index) in leftovers.state.current.positions" 
+        :key="product._id" 
+        :product="product"
+        :array="leftovers.state.current.positions"
+        :products="Products"
+        @add="(item) => globals.actions.add(
+          leftovers.state.current.positions,
+          item 
+        )"
+        @update="(item) => globals.actions.update(
+          leftovers.state.current.positions,
+          item,
+          index
+        )"
+        @delete="(item) => globals.actions.delete(
+          leftovers.state.current.positions,
+          item,
+          index
+        )"
+      />
+    </Block>
+   
+    <Block class="">
+      <section class="gap-thin flex-v-center flex-nojustify flex">
+        
+        <h3 class="mn-r-auto">
+          In total: {{formatPrice(totalPrice)}}
+        </h3>
+
+        <a 
+          @click="onSubmit()" 
+          class="bg-main button"
+        >
+          Save
+        </a> 
+
+        <a 
+          class="t-white bg-second button"
+          @click="onReset()"
+        >
+          Reset
+        </a>
+
+        <a 
+          v-if="route.params.leftover" 
+          @click="onDelete()" 
+          class="t-white bg-red button"
+        >
+          Delete
+        </a>
+      </section>
+    </Block>
+   </div>
 </template>
 
 
@@ -101,6 +102,7 @@
   import { useRoute, useRouter } from 'vue-router';
  
   import * as globals from '@pf/src/modules/globals/store/globals';
+  import * as auth from '@pf/src/modules/auth/store/auth';
   import * as leftovers from '@pf/src/modules/products/store/leftovers';
   import * as products from '@pf/src/modules/products/store/products';
 
@@ -155,6 +157,16 @@
         (error) => console.error('error')
       );
     } else {
+      leftovers.state.current.creator = {
+        type: 'user',
+        target: auth.state.user._id
+      }
+      leftovers.state.current.owner = {
+        type: 'organization',
+        target: route.params._id
+      }
+
+      console.log('leftover state is', leftovers.state.current)
       leftovers.actions.create(leftovers.state.current).then(
         () => router.push({ name: 'Leftovers', params: {_id: route.params._id} }),
         (error) => console.error('error')

package/src/modules/products/components/pages/Leftovers.vue

@@ -41,8 +41,7 @@
       :tabs="[
         { name: 'All',        value: 'all' },
         { name: 'Stock-In',   value: 'stock-in' },
-        { name: 'Stock-Out',  value: 'stock-out' }, 
-        { name: 'Write-Off',  value: 'write-off' }, 
+        { name: 'Stock-Out',  value: 'stock-out' }
       ]"
       class="mn-b-small o-hidden h5 radius-big bg-grey"
     />
@@ -59,7 +58,8 @@
       }"
       :options="{
         limit: 15,
-        organization: route.params._id
+        organization: route.params._id,
+        ...(tab !== 'all' && { type: tab })
         // user: user
       }"
       v-slot="{ 

package/src/modules/products/components/pages/Product.vue

@@ -1,12 +1,12 @@
 <template>
 	<div class="flex flex-column w-100 o-hidden gap-thin pd-thin">
 		<!-- <Breadcrumbs class="bg-grey radius-big pd-small"/> -->
-		{{product.quantity}}
+		<!-- {{product.quantity}}
 		<div v-if="product.ingredients">
 			{{product?.ingredients[0]?._id}}
 			{{product?.ingredients[0]?.quantity}}
 			{{product?.ingredients[1]?.quantity}}
-		</div>
+		</div> -->
 		<SectionProduct v-if="product" :product="product" :user="auth.state.user" class="pos-relative"/>
 
 		<PopularProducts />

package/src/modules/products/components/pages/Products.vue

@@ -1,4 +1,5 @@
 <template>
+  <div class="pd-thin">
   <header 
     v-if="route.name !== 'Organization'"
     class="mn-b-medium flex-v-center flex-nowrap flex"
@@ -6,16 +7,16 @@
     <h2 class="mn-r-medium">Products</h2>
     <button 
       @click="$router.push({
-        name: 'AddProduct'
+        name: 'ProductAdd'
       })" 
       class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
         +
     </button>
   </header>
-<!-- 
+
   <Tab 
     v-if="route.name !== 'Organization'"
-    v-model:selected="tab"
+    v-model:selected="tabProducts"
     :tabs="[
       { name: 'All',          value: 'all' },
       { name: 'Published',    value: 'published' },
@@ -24,7 +25,7 @@
     ]"
     class="mn-b-small o-hidden h5 radius-big bg-grey"
   />
- -->
+
   <div class="cols-2-1_3 bg-grey pd-thin radius-big gap-thin">
 
     <FilterProducts
@@ -37,7 +38,6 @@
         placeholder="Enter product name"
         class="bg-white mn-b-thin"
       />
-      {{tab}}
       <Feed
         :states="{
           empty: {
@@ -56,7 +56,7 @@
           prices: route.query.prices,
           delivery: route.query.delivery,
           search: route.query.search,
-          status: tab === 'all' ? '' : tab ? tab : ''
+          ...(tabProducts !== 'all' && { status: tabProducts })
           // user: user
         }"
         v-slot="{ 
@@ -80,6 +80,7 @@
       </Feed>
     </div>
   </div>
+</div>
 </template>
 
 
@@ -104,13 +105,13 @@
   const router = useRouter()
 
   // Tab logic
-  // const tab = ref(route.query.tab ? route.query.tab : 'all')
+  const tabProducts = ref(route.query.tabProducts ? route.query.tabProducts : 'all')
 
-  // route.query.tab = tab.value
+  route.query.tabProducts = tabProducts.value
 
-  // watch(tab, (newValue) => {
-  //   router.replace({ query: { ...route.query, tab: newValue } });
-  // });
+  watch(tabProducts, (newValue) => {
+    router.replace({ query: { ...route.query, tabProducts: newValue } });
+  });
   
   function updateSearch(search) {
     let query = { ...route.query}

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

@@ -12,6 +12,10 @@ const controllerFactory = (db) => {
         query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
       }
 
+      if (req.query.type) {
+        query.type = req.query.type;
+      }
+
       console.log(query);
 
       const leftoveres = await Leftover.find(query, null, options)
@@ -31,17 +35,22 @@ const controllerFactory = (db) => {
 
   const create = async (req, res) => {
     try {
+
+      console.log(req.body)
       const leftover = await Leftover.create({
         organization: req.body.organization,
         type: req.body.type,
         order: req.body.order,
-        positions: req.body.positions
+        positions: req.body.positions,
+        creator: req.body.creator,
+        owner: req.body.owner
       });
       if (!leftover) {
         return res.status(404).send({ message: "ERROR_CREATING_LEFTOVER" });
       }
       res.status(200).send(leftover);
     } catch (err) {
+      console.log(err)
       res.status(500).send({ message: "ERROR_CREATE_LEFTOVER" });
     }
   };

package/src/modules/products/store/leftovers.js

@@ -41,9 +41,9 @@ const actions = {
     }
   },
 
-  async create({ organization, type, order, positions }) {
+  async create({ organization, type, order, positions, creator, owner }) {
     try {
-      const response = await $axios.post('/leftovers', { organization, type, order, positions });
+      const response = await $axios.post('/leftovers', { organization, type, order, positions, creator, owner });
       state.all.push(response.data);
       return response.data;
     } catch (error) {