@ozdao/prometheus-framework 0.2.67 → 0.2.69

package/src/modules/orders/orders.client.js

@@ -0,0 +1,67 @@
+// Importing Vue components from the components directory
+
+import Orders from './components/pages/Orders.vue';
+import Order from './components/pages/Order.vue';
+import EditOrder from './components/pages/EditOrder.vue';
+
+// import Favorites from './components/pages/Favorites.vue';
+
+// Importing blocks components
+import CardOrderItem from './components/blocks/CardOrderItem.vue';
+import CardOrder from './components/blocks/CardOrder.vue';
+
+import StatusHistory from './components/blocks/StatusHistory.vue';
+
+import FormOrder from './components/pages/FormOrder.vue';
+
+// Importing sections components
+import FormClientDetails from './components/sections/FormClientDetails.vue';
+import FormPayment from './components/sections/FormPayment.vue';
+import FormDelivery from './components/sections/FormDelivery.vue';
+
+import EmptyState from './components/sections/EmptyState.vue';
+import AskToLogin from './components/sections/AskToLogin.vue';
+import Succes from './components/sections/Succes.vue';
+
+// Importing partials components
+import ShopCart from './components/partials/ShopCart.vue';
+
+// Importing Vuex store modules from the store directory
+import * as ordersStore from './store/orders.js';
+import * as shopcartStore from './store/shopcart.js';
+
+// Importing Vue Router routes from the router directory
+import ordersRoutes from './router/orders.router.js';
+
+// Exporting components, store modules, and routes
+export {
+  // Pages
+  FormOrder,
+  Order,
+  Orders,
+  EditOrder,
+  // Favorites,
+
+  // Blocks
+  CardOrderItem,
+  CardOrder,
+  StatusHistory,
+
+  // Sections
+  FormClientDetails,
+  AskToLogin,
+  FormDelivery,
+  EmptyState,
+  Succes,
+  FormPayment,
+
+  // Partials
+  ShopCart,
+
+  // Store
+  ordersStore,
+  shopcartStore,
+
+  // Router
+  ordersRoutes
+};

package/src/modules/orders/orders.server.js

@@ -0,0 +1,15 @@
+// Importing controllers from the controllers directory
+const ordersController = require('./controllers/orders.controller.js');
+// Importing routes from the routes directory
+const ordersRoutes = require('./routes/orders.routes.js');
+// Models
+const OrderModel = require('./models/order.model.js');
+const CustomerModel = require('./models/customer.model.js');
+
+// Exporting controllers, routes, and models
+module.exports = {
+  ordersController,
+  ordersRoutes,
+  UserModel,
+  CustomerModel
+};

package/src/modules/orders/router/orders.router.js

@@ -19,7 +19,7 @@ const orders = [
           ru: 'Заказ'
         }
       },
-      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/FormOrder.vue')
+      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/OrderCreate.vue')
     },{
       path: ':order',
       name: 'Order Status',

package/src/modules/orders/store/orders.js

@@ -22,11 +22,11 @@ const state = reactive({
     },
     
     creator: {
-      type: 'client',
+      type: 'customer',
       target: null,
     },
 
-    client: {
+    customer: {
       name: null,
       phone: null,
       messenger: {
@@ -122,6 +122,20 @@ const actions = {
   },
 }
 
+// const getters = {
+//   getTotal(positions) {
+//     
+//   }
+// }
+
+const getters = {
+  getTotal(positions) {
+    return positions.reduce((total, product) => { 
+      return total + product.price * product.quantity;
+    }, 0)
+  },
+}
+
 function set(eventData, property) { 
   state[property] = eventData
 }
@@ -137,4 +151,5 @@ watch(state, (newState, oldState) => {
 export {
   state,
   actions,
+  getters
 }

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

@@ -77,6 +77,7 @@ const controllerFactory = (db) => {
         organization: req.body.organization,
         type: req.body.type,
         order: req.body.order,
+        comment: req.body.comment,
         positions: req.body.positions,
         creator: req.body.creator,
         owner: req.body.owner

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

@@ -13,6 +13,7 @@ const state = reactive({
   current: {
     organization: "",
     type: "",
+    comment: null,
     order: null,
     positions: [],
   },
@@ -41,9 +42,9 @@ const actions = {
     }
   },
 
-  async create({ organization, type, order, positions, creator, owner }) {
+  async create({ organization, type, order, positions, creator, owner, comment }) {
     try {
-      const response = await $axios.post('/leftovers', { organization, type, order, positions, creator, owner });
+      const response = await $axios.post('/leftovers', { organization, type, order, positions, creator, owner, comment });
       state.all.push(response.data);
       return response.data;
     } catch (error) {

package/src/modules/users/components/pages/Profile.vue

@@ -15,11 +15,14 @@
 			_id="dash" 
 			class="pd-b-extra pd-thin w-100"
 		>
-			<ProfileCompletion 
+			<Completion 
 				v-if="route.params._id === auth.state.user._id && show" 
 		    :user="auth.state.user._id"
 		    :target="users.state.current"
 		    :cta="true" 
+		    text_cta="Fill Profile"
+		    text="Profile completed at"
+		    class="mn-b-medium"
 			/>
 
 			<section 
@@ -157,7 +160,7 @@
 			<Menu class="mn-b-regular bg-grey">
 
 			  <MenuItem @click="router.push({name: 'User Events', params: {_id: route.params._id}})" class="cursor-pointer">
-			    <IconEvents class="i-semi" :icon="true"/> 
+			    <IconEvents class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 			    <span>Events</span>
 			  </MenuItem> 
 
@@ -237,6 +240,7 @@
 import Field         from '@pf/src/components/Field/Field.vue'
 import Button        from '@pf/src/components/Button/Button.vue'
 import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
+import Completion from '@pf/src/components/Completion/Completion.vue'
 // Mobile Module
 import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
 import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
@@ -247,8 +251,6 @@ import FormReport from '@pf/src/modules/reports/components/sections/FormReport.v
 // Community Module 
 import Activity from '@pf/src/modules/community/components/blocks/Activity.vue'; 
 import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
-// Users Module
-import ProfileCompletion from '@pf/src/modules/users/components/sections/ProfileCompletion.vue'
 // Icons Module
 import IconEvents from '@pf/src/modules/icons/entities/IconEvents.vue'
 import IconGroups from '@pf/src/modules/icons/entities/IconGroups.vue'

package/src/modules/users/components/sections/ProfileCompletion.vue

@@ -1,19 +1,31 @@
 <template>
   <section class="w-100 mn-b-semi radius-medium pd-medium bg-main t-black">
-    <h3>
-      Profile completed at {{ completionPercentage }}%
-    </h3>
-
-    <router-link
-      v-if="cta"
-      :to="{
-        name: 'User Edit Profile',
-        params: { _id: user }
-      }"
-      class="mn-t-regular t-black bg-white w-100 button"
-    >
-      Fill Profile
-    </router-link>
+    <div class="mn-b-thin flex-v-center flex-nowrap flex">    
+      <h4>
+        {{text}}
+      </h4>
+
+      <h4 class="mn-l-thin uppercase radius-big t-semi t-medium t-white bg-black w-max pd-thin">
+        {{ percentage || completionPercentage }}%
+      </h4>
+
+      <router-link
+        v-if="cta"
+        :to="{
+          name: 'User Edit Profile',
+          params: { _id: user }
+        }"
+        class="mn-l-auto uppercase radius-big t-semi t-medium t-white bg-black w-max pd-thin"
+      >
+        {{text_cta}}
+      </router-link>
+    </div> 
+
+    <div class=" w-100 h-2r pos-relative pd-nano bg-black radius-big">
+      <div :style="`width: ${completionPercentage}%`"class="h-100 bg-main mn-b-thin radius-big">
+      </div>
+    </div>
+   
   </section>
 </template>
 
@@ -23,7 +35,10 @@ import { ref, onMounted } from 'vue'
 const { user, cta, target} = defineProps({
   user: Object,
   target: Object,
-  cta: Boolean
+  cta: Boolean,
+  percentage: Number,
+  text: String,
+  text_cta: String,
 })
 
 const completionPercentage = ref(0)

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

@@ -67,8 +67,6 @@ const controllerFactory = (db) => {
     console.log(query)
     console.log(req.body)
 
-
-
     try {
       const users = await User.aggregate(query);
       if (!users || users.length === 0) {

package/src/modules/users/models/user.model.js

@@ -1,16 +1,17 @@
-module.exports = (mongoose) => {
+module.exports = (db) => {
 
-  const UserSchema = new mongoose.Schema({ 
+  const UserSchema = new db.mongoose.Schema({ 
     username: String,
     
     phone: String,
     email: String,
+
     apple_id: String,
     password: String,
 
     status: {
       type: String,
-      enum: ['active','banned','removed'], 
+      enum: ['active','banned','removed','inactive'], 
       default: 'active',
       required: true,
     },
@@ -54,7 +55,7 @@ module.exports = (mongoose) => {
 
     roles: [
       {
-        type: mongoose.Schema.Types.ObjectId,
+        type: db.mongoose.Schema.Types.ObjectId,
         ref: "Role"
       }
     ]
@@ -65,7 +66,7 @@ module.exports = (mongoose) => {
 
   });
 
-  const User = mongoose.model("User", UserSchema);
+  const User = db.mongoose.model("User", UserSchema);
 
   return User;
 }

package/src/modules/users/users.server.js

@@ -4,6 +4,7 @@ const usersController = require('./controllers/users.controller.js');
 const usersRoutes = require('./routes/users.routes.js');
 // Models
 const UserModel = require('./models/user.model.js');
+const ClientModel = require('./models/client.model.js');
 
 // Exporting controllers, routes, and models
 module.exports = {

package/src/styles/base/borders.scss

@@ -1,5 +1,7 @@
 body { 
-	// Border Clasess
+
+
+// Border Clasess
 	.br-1px { border-width: 1px; }
 	.br-2px { border-width: 2px; }
 	/* Border style */
@@ -9,6 +11,8 @@ body {
 	.br-t { border-top-width: 1px; }
 	.br-r { border-right-width: 1px; }
 	.br-b { border-bottom-width: 1px; }
+	.br-b-2px { border-bottom-width: 2px; }
+	.br-b-3px { border-bottom-width: 3px; }
 	.br-l { border-left-width: 1px; }
 	/* Border colors */
 	.br-black 				{ border-color: rgba(var(--black), 	1.00); }
@@ -63,7 +67,6 @@ body {
 	.br-white-transp-90 	{ border-color: rgba(var(--white), 0.90); }
 	.br-white-transp-95 	{ border-color: rgba(var(--white), 0.95); }
 	.br-white-transp-100 	{ border-color: rgba(var(--white), 1.00); }
-
 	/* Social media brand borders */
 	.br-youtube 	{ border-color: rgba(var(--youtube), 1);; }
 	.br-telegram 	{ border-color: rgba(var(--telegram), 1);; }

package/src/styles/config.scss

@@ -52,8 +52,7 @@
         }
         // Генерация отрицательных классов с модификаторами
         .#{$class-name}-#{$modifier}-#{$value-key}-negative {
-          #{$css-property}-#{$css-modifier}: -$value;
-          // #{$css-property}-#{$css-modifier}: calc(#{$value} * -1);
+          #{$css-property}-#{$css-modifier}: calc(#{$value} * -1);
         }
       }
     }
@@ -67,7 +66,7 @@
 	////////////////////////////////////////
 	// 1.COLORS VARIABLES 
 	///////////////////////////////////////
-	--main: 	0,255,136;
+	--main: 	10,250,125;;
 	@include 	generate-vars-color('main');
 	--second:	34,102,255;
 	@include 	generate-vars-color('second');
@@ -78,7 +77,7 @@
 	--fifth:	255,216,10;
 	@include 	generate-vars-color('fifth');
 	// Black and white colors
-	--black:  10,10,10;
+	--black:  0,0,0;
 	@include 	generate-vars-color('black');
 	--dark:   36,36,36; 	
 	@include 	generate-vars-color('dark');

package/src/modules/applications/applications.client.js

@@ -1 +0,0 @@
-import SubscribeNewsletter from './components/sections/SubscribeNewsletter.vue';

package/src/modules/orders/components/blocks/Positions.vue

@@ -1,177 +0,0 @@
-<template>
-  <div class="order-list">
-    <div class="flex">
-      <h5 class="mn-b-small">
-        Состав заказа
-         
-      </h5>
-      <div>
-
-        <a v-if="showAddNew === false" class="t-main h5" @click="changeAdd()">Добавить</a>
-        <a v-else class="t-main h5" @click="changeAdd()">Закрыть</a>
-        <a v-if="showAddNew === false" class="mn-l-small t-main h5" @click="reserOrderList()">Сбросить</a>
-        <a v-if="showAddNew === false" class="mn-l-small t-main h5" @click="saveItemList()">Сохранить</a> 
-        
-      </div>
-
-    </div>
-     
-    <div v-if="showAddNew !== false" class="mn-b-small w-100 block">
-      <vue-select :options="products"  v-model="techStack" :label-by="'name'"  searchable clear-on-close :close-on-select="true"> </vue-select>
-      <button @click="addProductToOrder()" class="w-25 button">Добавить в заказ</button>
-    </div>
-
-    <ul  class="mn-b-semi">
-      <li v-for="(product, index) in orderProducts" :key="product._id" class="shop-cart-item mn-b-small ">
-        <!-- <img v-if="product.images" :src="(FILE_SERVER_URL || '') + require( `@/assets/images/products/${product.images.links[0]}`)"> -->
-        <!-- <img v-if="!product.images" :src="(FILE_SERVER_URL || '') + require( `@/assets/icons/photo.svg`)"> -->
-        <div class="text-left">
-          <p class="name">{{ product.name }}</p>
-          
-          <div class="mn-b-small flex">
-            <div class="small-underline variant">
-              <span v-if="!product.size && !product.color" class="">One-size</span>
-              <span v-if="product.size" class="">{{ product.size}}</span>
-              <span v-if="product.color && product.size" class="">, </span>
-              <span v-if="product.color" class="">{{ product.color}}</span>
-              <div v-if="product.edit">{{product.edit}}</div>
-            </div>
-            
-            <p  class="t-demi">{{product.quantity}} x $ {{product.price}}</p>
-          </div>
-
-          <div v-if="data[index]" class="flex-nowrap flex w-100">
-            <select 
-                v-if="product.size"
-                @input="updateInputText('orders', 'current.positions[' + index + '].size', $event)" 
-                :value="product.size"  
-                placeholder="hello@example.com"
-                class="mn-r-small mn-b-small input-text input" 
-              >
-              <option v-for="size in productSizes(product)" :value="size" >{{size}}</option>
-            </select>
-
-            <select 
-                v-if="product.color"
-               
-                @input="updateInputText('orders', 'current.positions[' + index + '].color', $event)"
-                placeholder="hello@example.com"
-                class="mn-r-small mn-b-small input-text input" 
-              >
-
-              <option :value="product.color" selected disabled>{{product.color}}</option>
-              <option v-for="(color, index) in productColors(product)" :value="color" >{{color}}</option>
-            </select>
-
-
-            <input 
-              @input="updateInputText('orders', 'current.positions[' + index + '].quantity', $event)" 
-              :value="product.quantity" 
-              placeholder="Маргарита"
-              class="mn-b-small input-text input" 
-            />
-          </div>
-          <a v-if="!data[index]" @click="changeEdit(index)">Редактировать</a>
-          <a v-if="data[index]" @click="deleteItem(product)">Удалить</a>
-          <a v-if="data[index]" @click="changeEdit(index)">Закрыть</a>
-        </div>
-      </li>
-    </ul>
-  
-
-    <div class=" w-100 flex-center flex block">
-      <p class="p-big">Сумма к оплате:<br> 
-        <span v-if="order.info.delivery === 'Самовывоз'" class="p-big t-semi">$ {{ orderTotalPrice }}</span>
-        <span v-if="order.info.delivery === 'Курьером'" class="p-big t-semi">$ {{ orderTotalPrice + 10 }}</span>
-        <span v-if="order.info.delivery === 'Почтой'" class="p-big t-semi">$ {{ orderTotalPrice + 20 }}</span>
-        (Заказ $ {{orderTotalPrice}} + доставка
-        <span v-if="order.info.delivery === 'Самовывоз'" >0</span>
-        <span v-if="order.info.delivery === 'Курьером'" >10</span>
-        <span v-if="order.info.delivery === 'Почтой'">20</span>
-        ₽)  
-      </p>
-    </div>
-  </div>
-</template>
-
-
-<script setup="props">
-    // GLOBAL
-  import InputText    from '@/components/elements/InputText.vue'
-  import InputSelect  from '@/components/elements/InputSelect.vue'
-
-	import {ref,computed,reactive,toRefs } from 'vue'
-	
-	import { useRouter,useRoute } from 'vue-router'
-
-	const store = useStore()
-	const router = useRouter()
-  const route = useRoute()
-
-	const props = defineProps({
-	  order: Object,
-    products: Array,
-	});
-
-  const orderTotalPrice = computed(() => store.getters['orders/orderTotalPrice'])
-  const orderProducts = computed(() => store.getters['orders/orderProducts'])
-
-  let data = reactive([])
-  let reactiveData = toRefs(data)
-
-  const techStack = ref(null)
-
-  function test () {
-     console.log(techStack)
-  }
-	
-  function addProductToOrder () {
-     store.dispatch('orders/addProductToOrder', techStack)
-     showAddNew.value = !showAddNew.value;
-  }
-
-   function deleteItem (item) {
-     store.commit('orders/deleteItemFromOrder', item)
-   }
-
-   function saveItemList () {
-     store.dispatch('orders/updateOrderpositions', route.params._id)
-   }
-
-  
-  function changeEdit (index) {
-     data[index] = !data[index];
-  }
-
-  var showAddNew = ref(false)
-  // const reactshowAddNew = toRefs(showAddNew)
-  
-  function reserOrderList () {
-    store.dispatch('orders/fetchOrder', route.params._id)
-  }
-
-  function changeAdd () {
-   showAddNew.value = !showAddNew.value;
-  }
-
-  function productSizes (product) { 
-    const productData = store.state.products.all.find(p => p._id === product._id)
-    var computedProduct = computed(() => store.getters['orders/getProductSizes'](productData))
-    return computedProduct.value
-  }
-  function productColors (product) { 
-    const productData = store.state.products.all.find(p => p._id === product._id)
-    var computedProduct = computed(() => store.getters['orders/getProductColors']({product, productData}))
-    return computedProduct.value
-  }
-
-</script>
-
-<style lang="scss" scoped>
-.shop-cart-item {
-	&:first-of-type { padding-top: 0;}
-}
-
-</style>
-
-

package/src/modules/users/models/client.model.js

@@ -1,60 +0,0 @@
-module.exports = (mongoose) => {
-
-  const ClientSchema = new mongoose.Schema({ 
-    phone: String,
-    email: String,
-
-    status: {
-      type: String,
-      enum: ['new','lost','converted'], 
-      default: 'new',
-      required: true,
-    },
-    
-    profile: {
-      photo: {
-          type: String,
-          default: ''
-      },
-      name: {
-          type: String,
-          default: ''
-      },
-      description: {
-          type: String,
-          default: ''
-      },
-      birthday: {
-          type: Date,
-      }
-    },
-
-    socials: {
-      telegram: {
-        type: String,
-        default: ''
-      },
-      twitter: {
-        type: String,
-        default: ''
-      },
-      facebook: {
-        type: String,
-        default: ''
-      },
-      instagram: {
-        type: String,
-        default: ''
-      }
-    },
-    },{
-      // Creation Date
-      timestamps: { currentTime: () => Date.now() 
-    }
-
-  });
-
-  const Client = mongoose.model("Client", ClientSchema);
-
-  return Client;
-}