@ozdao/prometheus-framework 0.1.36 → 0.1.38

package/src/modules/spots/store/spots.js

@@ -11,8 +11,8 @@ const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true
 $axios.defaults.withCredentials = true
 // State
 const state = reactive({
-  departments: [],
-  department: {
+  spots: [],
+  spot: {
     organization: '',
     profile: {
       photo: '',
@@ -29,18 +29,18 @@ const state = reactive({
     delivery: [],
     payment: [],
     members: [],
-    subdepartments: [],
+    subspots: [],
   },
   error: null,
 });
 
 // Methods
 const actions = {
-  async readOne(departmentID) {
+  async readOne(spotID) {
     await $axios
-      .get(`/api/departments/get/${departmentID}`)
+      .get(`/api/spots/get/${spotID}`)
       .then(response => {
-        state.department = response.data;
+        state.spot = response.data;
         state.error = null;
       })
       .catch(error => {
@@ -49,30 +49,30 @@ const actions = {
   },
   async read(organizationId) {
     await $axios
-      .get(`/api/departments/${organizationId}`)
+      .get(`/api/spots/${organizationId}`)
       .then(response => {
         console.log('Response:', response);
-        state.departments = response.data;
+        state.spots = response.data;
         state.error = null;
       })
       .catch(error => {
         setError(error)
       });
   },
-  async create(organizationId, department) {
+  async create(organizationId, spot) {
     await $axios
-      .post(`/api/departments/${organizationId}/create`, department)
+      .post(`/api/spots/${organizationId}/create`, spot)
       .then(response => {
         state.error = null;
-        state.department = response.data;
+        state.spot = response.data;
       })
       .catch(error => {
         setError(error)
       });
   },
-  async update(organizationId, department) {
+  async update(organizationId, spot) {
     await $axios
-      .post(`/api/departments/${organizationId}/update`, department)
+      .post(`/api/spots/${organizationId}/update`, spot)
       .then(() => {
         state.error = null;
       })
@@ -80,9 +80,9 @@ const actions = {
         setError(error)
       });
   },
-  async delete(organizationId, departmentId) {
+  async delete(organizationId, spotId) {
     await $axios
-      .delete(`/api/departments/${organizationId}/delete`, { data: { _id: departmentId } })
+      .delete(`/api/spots/${organizationId}/delete`, { data: { _id: spotId } })
       .then(() => {
         state.error = null;
       })

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

@@ -154,7 +154,7 @@
 			
 			<Menu 
 				v-if="(auth.state.access.roles && auth.state.user._id === route.params._id) && (auth.state.access.roles.includes('ROLE_MODERATOR') || auth.state.access.roles.includes('ROLE_ADMIN'))"
-				class="bg-black t-white"
+				class="mn-regular bg-black t-white"
 			>
 			  <MenuItem 
 			  	@click="router.push({
@@ -172,7 +172,7 @@
 			  </MenuItem> 
 			</Menu>
 
-			<Menu class="bg-grey">
+			<Menu class="mn-regular bg-grey">
 			  <MenuItem @click="router.push({name: 'User Events', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <IconEvents class="i-semi" :icon="true"/> 
 			    <span>Events</span>
@@ -251,7 +251,6 @@ import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
 import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
 // Org Module
-import ButtonFollow from '@pf/src/modules/organizations/components/elements/ButtonFollow.vue'
 import ButtonToggleMembership from '@pf/src/modules/organizations/components/elements/ButtonToggleMembership.vue'
 // Report Module
 import FormReport from '@pf/src/modules/reports/components/sections/FormReport.vue'   

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

@@ -39,7 +39,7 @@
 		<Feed 
 			v-if="tabOrganization === 'following'"
 	  		:user="auth.state.user._id"
-			:category="'following'"
+			:following="route.params._id"
 		/>
 	</div>
 </template>

package/src/styles/components/block.scss

@@ -11,10 +11,8 @@
 
 	padding: var(--medium);
 
-	background: white;
-	border-radius: var(--thin);
-
-	box-shadow: 0px 4px 16px -8px rgba(var(--dark),0.1);
+	background: rgb(var(--grey));
+	border-radius: var(--big);
 
 	transition: 0.2s;
 }

package/src/modules/backoffice/components/admin/LeftoverAdd.vue

@@ -1,157 +0,0 @@
-<template>
-   <!-- Toolbar -->
-  <section class="br-bot-dark bg-white pd-big">
-    <header class="flex-nojustify flex-bottom flex-nowrap flex">
-      <h1 v-if="!route.params._id" class="mn-r-small">
-        Изменить остатки
-      </h1>
-
-      <h1 v-if="route.params._id" class="mn-r-small">
-        Изменить
-        <!-- {{leftover.type}} -->
-        <span v-if="leftover.type === 'loss'">списание</span>
-         <span v-if="leftover.type === 'inventory'">инвентаризацию</span>
-      </h1>
-    </header>
-  </section>
-
-
-  <section class="br-bot-dark bg-grey pd-big">
-
-    <div v-if="!route.params._id" class="mn-small flex-wrap block">
-      <InputSelect :obj="'leftovers'" :prop="'current.type'" :value="leftover.type" label="Выберите тип">
-        <option value="loss">Списание</option>
-        <option value="inventory">Остаток</option>
-      </InputSelect>
-    </div>
-
-    <LeftoverPositions :order="leftover" :products="Products" />
-      
-  </section>
-
-  <section class="pd-big flex-nojustify flex">
-    <a @click="onSubmit()" class="mn-r-small button">Сохранить</a> 
-    <a v-if="route.params._id" @click="onDelete()" class="t-main br-l-dark bg-white button">Удалить</a>
-  </section>
-</template>
-
-
-<script setup>
-  import InputText    from '@/components/elements/InputText.vue'
-  import InputSelect  from '@/components/elements/InputSelect.vue'
-
-  import LeftoverPositions    from '@/components/blocks/LeftoverPositions.vue'
-
-  import { computed, onMounted, reactive, toRefs,ref } from 'vue'
-  import { useStore } from 'vuex'
-  import { useRoute,useRouter } from 'vue-router'
- 
-  
-  const store = useStore()
-  const route = useRoute()
-  const router = useRouter()
-  console.log( route.params._id)
-  
-  if (route.params._id) await store.dispatch('leftovers/fetch', route.params._id).then(
-
-    succes => { console.log(succes) },
-    error => {  
-      console.log('eror') 
-    }
-  ) 
-
-  if (!route.params._id) store.commit('leftovers/reset')
-
-  await store.dispatch('products/fetchProducts')
-
-  const leftover = computed(() => store.state.leftovers.current)
-  const Products = computed(() => store.state.products.all)
-
-  function onSubmit() {
-    if (route.params._id) {
-      store.dispatch('leftovers/update', store.state.leftovers.current)
-    } else {
-      store.dispatch('leftovers/create', store.state.leftovers.current).then(
-        succes => { 
-          router.push({name: 'Leftovers'})
-        },
-        error => {  
-          console.log('error') 
-        }
-      )
-    }
-  }
-
-  function onDelete() {
-    store.dispatch('leftovers/delete', route.params._id).then(
-        succes => { 
-          router.push({name: 'Leftovers'})
-        },
-        error => {  
-          console.log('error') 
-        }
-      )
-  }
-
-  function productSizes2 (_id) { 
-
-      const productData2 = store.state.products.all.find(product => product._id === _id);
-      
-
-      // console.log(productData2)
-      const computedProduct = computed(() => store.getters['leftovers/getProductSizes'](productData2))
-      return computedProduct.value
-  }
-  function productColors ({_id,size}) { 
-    const productData = store.state.products.all.find(product => product._id === _id);
-    var computedProduct = computed(() => store.getters['leftovers/getProductColors']({productData,size}))
-    return computedProduct.value
-  }
-
-  </script>
-
-<style lang="scss">
-
-.round-stat {
-  padding: 1rem;
-  border-radius: 5rem;
-  width: 3rem;
-  height: 3rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border: 1px solid rgba(0,0,0,0.1);
-
-  &-tab {
-    width: 2rem;
-    height: 2rem;
-  }
-}
-
-
-
-.order-card {
-  border-radius: 0.25rem;
-  overflow: hidden;
-  box-shadow: 0 8px 8px -8px rgb(36 36 36 / 10%);
-  .order-status {
-    color: black;
-    background: #EEF2F6; 
-    width: 100%;
-    padding: 0.75rem 1.5rem;
-    margin: 0;
-  }
-
-  .new {
-    color: white;
-    background: #00ff88;
-  }
-
-  .block {
-    border-radius: 0;
-    border: 0;
-  }
-}
-
-  
-</style>

package/src/modules/backoffice/components/admin/Leftovers.vue

@@ -1,119 +0,0 @@
-<template>
-   <!-- Toolbar -->
-  <section class="br-bot-dark bg-white pd-big">
-    <header class="flex-nojustify flex-bottom flex-nowrap flex">
-      <h1 class="mn-r-small">Остатки</h1>
-      <router-link :to="'/admin/leftovers/add'"  class="i-regular pd-thin button-delete button"><img src="@/assets/icons/plus-white.svg"></router-link>
-     </header>
-  </section>
-
-   <div class="flex-nowrap flex product-tab-header">
-    <button @click="changeTab('all')" :class="{'product-tab-active':data.currentTab === 'all'}" 
-    class="br-right-dark w-100  bg-white flex-center pd-semi-big flex">
-      Все
-    </button>
-    <button @click="changeTab('loss')" :class="{'product-tab-active':data.currentTab === 'loss'}" 
-    class="br-right-dark w-100 bg-white flex-center pd-semi-big flex">
-      Списания
-    </button>
-
-    <button @click="changeTab('inventory')" :class="{'product-tab-active':data.currentTab === 'inventory'}" 
-   class="br-right-dark  w-100 bg-white  flex-center pd-semi-big flex">
-      Инвертаризация
-    </button>
-
-  </div>
-
-
-  <section class="cols-1 bg-grey pd-big">
-    <!-- Empty State -->
-    <p v-if="leftovers.length === 0">У вас еще нет списаний</p>
-    <!-- Objects -->
-    <Leftover v-for="leftover in leftovers" :leftover="leftover"/>
-  </section>
-</template>
-
-
-<script setup>
-  import Leftover from '@/components/blocks/Leftover.vue'
-  
-  import { computed, onMounted, reactive, toRefs,ref } from 'vue'
-  import { useStore } from 'vuex'
-  import { useRoute,useRouter } from 'vue-router'
- 
-  
-  const store = useStore()
-  const route = useRoute()
-   const router = useRouter()
-
-  await store.dispatch('leftovers/fetchAll').then(
-    succes => { console.log('sycces') },
-    error => {  
-      console.log('eror') 
-    }
-  )
-
-  let data = reactive({currentTab: 'all'})
-
-  const leftovers = computed(() => { 
-    if (data.currentTab === 'all') {
-      return store.state.leftovers.all
-    } else {
-
-      const filtered = store.state.leftovers.all.filter(function(leftover, index) {
-        if (leftover.type === data.currentTab) return true; 
-      })
-      
-      return filtered
-    } 
-   
-  }) 
-
-  function changeTab (tab) {data.currentTab = tab; console.log(data.currentTab) }
-  </script>
-
-<style lang="scss">
-
-.round-stat {
-  padding: 1rem;
-  border-radius: 5rem;
-  width: 3rem;
-  height: 3rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border: 1px solid rgba(0,0,0,0.1);
-
-  &-tab {
-    width: 2rem;
-    height: 2rem;
-  }
-}
-
-
-
-.order-card {
-  border-radius: 0.25rem;
-  overflow: hidden;
-  box-shadow: 0 8px 8px -8px rgb(36 36 36 / 10%);
-  .order-status {
-    color: black;
-    background: #EEF2F6; 
-    width: 100%;
-    padding: 0.75rem 1.5rem;
-    margin: 0;
-  }
-
-  .new {
-    color: white;
-    background: #00ff88;
-  }
-
-  .block {
-    border-radius: 0;
-    border: 0;
-  }
-}
-
-  
-</style>

package/src/modules/backoffice/components/admin/Order.vue

@@ -1,199 +0,0 @@
-<template>
-  <section class="br-bot-dark bg-white pd-big">
-    <header class="flex-nojustify flex-bottom flex-nowrap flex">
-      <h1 class="mn-r-small">Заказ #{{order._id.slice(0,8)}}</h1>
-      <TestButton></TestButton>
-     </header>
-  </section>
-
-   <section class="flex-nowrap flex br-bot-dark bg-white ">
-    
-    <div class="br-right-dark w-100 flex  pd-big">
-      <p class="p-big">
-        <span class="t-transp">Статус заказа:</span><br>{{order.status}}
-      
-        
-      </p>
-      <button v-if="order.status ==='Создан'"       @click="confirmOrder('Подтвержден','status')" class="button">Подтвердить заказ</button>
-      <button v-if="order.status ==='Подтвержден'"  @click="confirmOrder('Создан','status')" class="button">Отменить подтверждение</button>
-      <button v-if="order.status ==='Ожидает отправки'"      @click="confirmOrder('Отправлен','status')" class="button">Заказ отправлен</button>
-    </div>
- 
-    <div class="w-100 br-right-dark flex  pd-big">
-      <p class="p-big">Статус оплаты:
-        <br>
-        <span class="t-transp" v-if="payment  && order.payment.type === 'Онлайн' ">{{payment.Status}}</span> 
-        <span class="t-transp" v-if="!payment  && order.payment.type === 'Онлайн' ">Не оплачено</span>
-        <span class="t-transp" v-if=" order.payment.type !== 'Онлайн' ">{{order.payment.status}}</span>
-        
-
-      </p>
-      <button v-if="order.payment.status !=='Оплачено' && order.payment.type !== 'Онлайн' "  @click="confirmOrder({status: 'Оплачено'},'payment')" class="button">Изменить статус оплаты</button>
-      <button v-if="order.payment.status ==='Оплачено' && order.payment.type !== 'Онлайн'"  @click="confirmOrder({status: 'Неоплачено'},'payment')"  class="button">Отменить оплату</button>
-    </div>
-
-     
-  </section>
-
-
-<section class="bg-grey flex-nowrap flex">
-  <section class="br-right-dark  bg-grey br-bot-dark pd-big w-50">
-
-    <h5 class="w-100 mn-small">Информация о заказе</h5>
-    <div class="mn-medium ">
-       <!-- <p class="w-100">Время создания: {{DateToFormattedString(order.createdAt)}}</p> -->
-      <div class="mn-small flex-column flex block">
-          <InputText :obj="'orders'" :prop="'current.phone'" :value="order.phone" label="Телефон"/>
-          <InputText :obj="'orders'" :prop="'current.info.email'" :value="order.info.email" label="Email"/>
-          <div class=" w-100 flex-nowrap flex">
-            <InputText class="mn-r-small" :obj="'orders'" :prop="'current.info.name'" :value="order.info.name" label="Имя"/>
-            <InputText :obj="'orders'" :prop="'current.info.surname'" :value="order.info.surname" label="Фамилия"/>
-          </div>
-      </div>
-
-       <div class="col flex-column flex block">
-          <div class=" w-100 flex-nowrap flex">
-            <InputText :obj="'orders'" :prop="'current.info.city'" :value="order.info.city" label="Город"/>
-           
-          </div>
-
-           <InputText :obj="'orders'" :prop="'current.info.adress'" :value="order.info.adress" label="Адрес"/>
-          <InputSelect :obj="'orders'" :prop="'current.info.delivery'" :value="order.info.delivery" label="Выберите тип доставки">
-            <option v-if="order.info.city === 'Москва'" value="Самовывоз">Самовывоз</option>
-            <option  v-if="order.info.city === 'Москва'" value="Курьером">Курьером</option>
-            <option  v-if="order.info.city !== 'Москва'" value="Почтой">Почтой</option>
-          </InputSelect>
-
-           <InputSelect :obj="'orders'" :prop="'current.payment.type'" :value="order.payment.type" label="Выберите тип оплаты">
-            <option v-if="order.info.delivery === 'Курьером' || order.info.delivery === 'Самовывоз'" value="Наличные" :selected="order.payment.type === 'Наличные'">Наличные</option>
-            <option v-if="order.info.delivery === 'Курьером'" value="Курьеру картой" :selected="order.payment.type === 'Курьеру картой'">Курьеру картой</option>
-            <option value="Онлайн" :selected="order.payment.type === 'Онлайн'">Онлайн</option>
-          </InputSelect>
-        </div>
-
-         
-    </div> 
-     <div class="mn-medium block">
-      <p class="w-100">
-        Комментарий: {{order.info.comment}} 
-      </p>
-    </div>
-    <button @click="confirmOrder('Отправлен','status')" class="button">Обновить заказ</button>
-</section>
-
-  <section class="bg-navy w-50 br-bot-dark pd-big">
-    
-    <Positions :order="order" :products="Products" />
-
-    
-  </section>
-</section>
-
-
-
-
-<!--  <section class="flex-nowrap flex br-bot-dark">
-    
-    <div class="br-right-dark w-100 section-subsection section">
-      <p class="mn-semi p-big">Сумма к оплате:  
-        <span v-if="order.info.delivery === 'Самовывоз'" class="p-big t-semi">{{ orderTotalPrice / 100 }} ₽</span>
-        <span v-if="order.info.delivery === 'Курьером'" class="p-big t-semi">{{ orderTotalPrice / 100 + 350 }} ₽</span>
-        <span v-if="order.info.delivery === 'Почтой'" class="p-big t-semi">{{ orderTotalPrice / 100 + 550 }} ₽</span>
-        ({{orderTotalPrice}} + 
-        <span v-if="order.info.delivery === 'Самовывоз'" >0</span>
-        <span v-if="order.info.delivery === 'Курьером'" >350</span>
-        <span v-if="order.info.delivery === 'Почтой'">550</span>
-        ₽)  
-      </p>
-
-      <button class="button">Запросить онлайн</button>
-    </div>
-    <div class="w-100  section-subsection section">
-      <p class="mn-semi p-big">Статус оплаты: {{order.payment.status}}</p>
-      <button class="button">Изменить статус оплаты</button>
-    </div>
-  </section> -->
-
-
-</template>
-
-<script setup="props">
-  // GLOBAL
-  import InputText    from '@/components/elements/InputText.vue'
-  import InputSelect  from '@/components/elements/InputSelect.vue'
-  // BLOCKS
-  import Positions    from '@/components/blocks/Positions.vue'
-  // fport libs
-  import { computed, ref, onMounted,onBeforeUpdate, reactive, toRefs } from 'vue'
-  import { useStore } from 'vuex'
-  import { useRoute } from 'vue-router'
-  // Import components
-  // Accessing router and store
-  const store = useStore()
-  const route = useRoute()
-  // On Mounted
-  // onMounted(() => {
-      
-  //   store.dispatch('payment/getStatus', route.params)
-  //   store.dispatch('rent/getStatus', route.params).then(() => {
-  //     if ((store.state.rent.current.Status === 'Начата') && !(store.state.rent.current.Status === 'Закрыта'))
-  //       setTimer(getYourTime())
-  //   })
-
-  //  })
-
-  // Data prefetching
-  await store.dispatch('products/fetchProductsPublished')
-  await store.dispatch('orders/fetchOrder', route.params._id).then(
-    succes => { 
-      console.log('succes order')
-      store.dispatch('payments/getStatus', route.params._id)
-    },
-    error => {  
-      console.log('eror') 
-    }
-  )
-  // Accessing state
-  const order = computed(() => store.state.orders.current)
-  const Products = computed(() => store.state.products.all)
-
-
-  const props = defineProps(['showProduct'])
-  props.showProduct = [];
-
- 
-
-  const payment = computed(() => store.state.payments.current)
-  
-  function confirmOrder(status, prop) {
-    // alert(status)
-    if (status === 'Подтвержден') {
-      store.dispatch('leftovers/create', {type: 'loss', order: route.params._id, positions: store.state.orders.current.items} )
-    }
-
-    if (status === 'Создан') {
-      store.dispatch('leftovers/delete', route.params._id)
-    }
-    
-    store.dispatch('orders/confirmOrder', {_id: route.params._id, status: status,  prop: prop} )
-  }
-
-  function changePaymentStatus() {
-    store.dispatch('orders/changePaymentStatus', route.params._id)
-  }
-
-  
-
-</script>
-
-<style lang="scss">
-
-.vue-select {
-  width: inherit;
-
-  margin-right: 1rem;
-}
-.vue-select-header {
-  height: 3rem;
-}
-</style>

package/src/modules/backoffice/components/admin/Product.vue

@@ -1,28 +0,0 @@
-<template>
-  <section class="section">
-    <h1>{{product.name}}</h1>
-    <p>{{product.description}}</p>
-    <p>{{product.price}} рублей</p>
-    <button @click="test()">test</button> 
-    <button @click="test()" class="button">Редактировать</button> 
-  </section>  
-</template>
-
-<script setup>
-  // Import libs
-  import { computed, onMounted } from 'vue'
-  import { useStore } from 'vuex'
-  import { useRoute } from 'vue-router'
-  // Import components
-  // Accessing router and store
-  const store = useStore()
-  const route = useRoute()
-  // Data prefetching
-  await store.dispatch('fetchProduct', route.params._id)
-  // Accessing state
-  const product = computed(() => store.state.product)
-</script>
-
-<style lang="scss">
-
-</style>