@ozdao/prometheus-framework 0.2.57 → 0.2.58

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

@@ -1,4 +1,30 @@
 <template>
+  <header 
+    v-if="route.name !== 'Organization'"
+    class="mn-b-medium flex-v-center flex-nowrap flex"
+  >
+    <h2 class="mn-r-medium">Products</h2>
+    <button 
+      @click="$router.push({
+        name: 'AddProduct'
+      })" 
+      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"
+    :tabs="[
+      { name: 'All',          value: 'all' },
+      { name: 'Published',    value: 'published' },
+      { name: 'Unpublished',  value: 'unpublished' }, 
+      { name: 'Archivied',    value: 'archivied' } 
+    ]"
+    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
@@ -29,7 +55,8 @@
           categories: route.query.categories,
           prices: route.query.prices,
           delivery: route.query.delivery,
-          search: route.query.search
+          search: route.query.search,
+          status: tab === 'all' ? '' : tab ? tab : ''
           // user: user
         }"
         v-slot="{ 
@@ -58,21 +85,33 @@
 
 <script setup="props">
   // Import libs
-  import { computed, onMounted } from 'vue'
-
+  import { computed, watch, onMounted, ref } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
   // Import components
+  import Tab from '@pf/src/components/Tab/Tab.vue'
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+
   import FilterProducts from '@pf/src/modules/products/components/sections/FilterProducts.vue'
   import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
-  
 
-  import Feed from '@pf/src/components/Feed/Feed.vue'
   import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
 
   // Accessing router and store
   import * as products from '@pf/src/modules/products/store/products';
 
+  const route = useRoute()
+  const router = useRouter()
+
+  // Tab logic
+  const tab = ref(route.query.tab ? route.query.tab : 'all')
+
+  route.query.tab = tab.value
+
+  watch(tab, (newValue) => {
+    router.replace({ query: { ...route.query, tab: newValue } });
+  });
+  
   function updateSearch(search) {
     let query = { ...route.query}
     
@@ -80,9 +119,6 @@
     
     router.push({ query });
   }
-
-  const route = useRoute()
-  const router = useRouter()
 </script>
 
 <style lang="scss">

package/src/modules/products/products.client.js

@@ -26,12 +26,6 @@ import THC from './components/elements/THC.vue';
 
 import Product from './components/pages/Product.vue';
 
-// import OrganizationDetails from './components/pages/OrganizationDetails.vue';
-// import OrganizationDocuments from './components/pages/OrganizationDocuments.vue';
-// import OrganizationPeople from './components/pages/OrganizationPeople.vue';
-// import OrganizationCreate from './components/pages/OrganizationCreate.vue';
-
-import ProductsBackoffice from './components/pages/ProductsBackoffice.vue';
 import ProductEdit from './components/pages/ProductEdit.vue';
 import EditLeftover from './components/pages/EditLeftover.vue';
 import ProductRecommendation from './components/pages/ProductRecommmendation.vue'; // Исправленная опечатка
@@ -72,13 +66,6 @@ export {
   THC,
 
   Product,
-
-  // OrganizationDetails,
-  // OrganizationDocuments,
-  // OrganizationPeople,
-  // OrganizationCreate,
-
-  ProductsBackoffice,
   ProductEdit,
   EditLeftover,
   ProductRecommendation,

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

@@ -0,0 +1,24 @@
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
+const categoriesRoutes = [{
+  path: 'categories',
+  name: 'Categories Organization',
+  meta: {
+    title: {
+      en: 'Category',
+      ru: 'Категория'
+    }
+  },
+  component: () => import('@pf/src/modules/products/components/pages/Categories.vue')
+}, {
+  path: 'categories/add',
+  name: 'CategoryAdd',
+  component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
+},{
+  path: 'categories/:category/edit',
+  name: 'CategoryEdit',
+  beforeEnter: [validationAuth.requiresAuth],
+  component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
+}];  
+
+export default categoriesRoutes;

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

@@ -0,0 +1,38 @@
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
+const productRoutes = [{
+  path: 'leftovers',
+  name: 'Leftovers',
+  meta: {
+    title: {
+      en: 'Leftovers',
+      ru: 'Остатки'
+    },
+    authorize: []
+  },
+  component: () => import(/* webpackChunkName: 'ProductsLeftovers' */ '@pf/src/modules/products/components/pages/Leftovers.vue'),
+},{
+  path: 'leftovers/add',
+  name: 'LeftoverAdd',
+  meta: {
+    title: {
+      en: 'Leftovers Add',
+      ru: 'Управление Остатками'
+    },
+    authorize: []
+  },
+  component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
+},{
+  path: 'leftovers/:leftover',
+  name: 'LeftoverEdit',
+  meta: {
+    title: {
+      en: 'Leftovers Edit',
+      ru: 'Управление Остатками'
+    },
+    authorize: []
+  },
+  component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
+}];  
+
+export default productRoutes;

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

@@ -0,0 +1,35 @@
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
+const productRoutes = [{
+  path: 'products',
+  name: 'Products',
+  meta: {
+    title: {
+      en: 'Products',
+      ru: 'Товары'
+    },
+    authorize: []
+  },
+  component: () => import(/* webpackChunkName: 'Products' */ '@pf/src/modules/products/components/pages/Products.vue'),
+},{
+  path: 'products/add',
+  name: 'ProductAdd',
+  component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
+},{
+  path: 'products/:product',
+  name: 'Product Organization',
+  meta: {
+    title: {
+      en: 'Product',
+      ru: 'Продукт'
+    }
+  },
+  component: () => import('@pf/src/modules/products/components/pages/Product.vue')
+}, {
+  path: 'products/:product/edit',
+  name: 'ProductEdit',
+  beforeEnter: [validationAuth.requiresAuth],
+  component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
+}];  
+
+export default productRoutes;

package/src/modules/spots/components/blocks/SpotMemberModify.vue

@@ -25,7 +25,7 @@
 
 <script setup>
 import { ref, computed } from "vue";
-import VueSelect from "vue-select";
+
 import Field from "@pf/src/components/Field/Field.vue";
 import Select from "@pf/src/components/Select/Select.vue";
 const props = defineProps({

package/src/modules/spots/components/pages/SpotEdit.vue

@@ -272,5 +272,4 @@ function redirectDash() {
 </script>
 
 <style scoped>
-  @import "vue-select/dist/vue-select.css";
 </style>

package/src/styles/config.scss

@@ -41,8 +41,8 @@
     }
     // Генерация отрицательных классов без модификаторов
     .#{$class-name}-#{$value-key}-negative {
-      #{$css-property}: calc(#{$value} * -1);
-    }
+		  #{$css-property}: -$value;
+		}
 
     // Генерация классов с модификаторами
     @if $modifiers {
@@ -52,7 +52,8 @@
         }
         // Генерация отрицательных классов с модификаторами
         .#{$class-name}-#{$modifier}-#{$value-key}-negative {
-          #{$css-property}-#{$css-modifier}: calc(#{$value} * -1);
+          #{$css-property}-#{$css-modifier}: -$value;
+          // #{$css-property}-#{$css-modifier}: calc(#{$value} * -1);
         }
       }
     }

package/src/modules/landing/components/sections/SliderFeatures.vue

@@ -1,131 +0,0 @@
-<script setup>
-import 'vue3-carousel/dist/carousel.css'
-
-
-import { ref, onMounted } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { Carousel, Slide, Pagination, Navigation } from 'vue3-carousel'
-
-const ImagesSlider = ref(null)
-
-const text = {
-  messages: {
-    en: {
-      features: [
-        {
-          title: "What's the Weeder Token, Dude?",
-          description: "WDT is like, the backbone of our rad community. It's cash, it's power, it's an investment. Groovy, right?", 
-        },
-        {
-          title: "Light Up and Level Up",
-          description: "Order up, light up, and earn Weeder tokens. More tokes, more cash in your pocket, man.", 
-        },
-        {
-          title: "Hang Ten with Our Community",
-          description: "Find the dopest strains and start floating on cloud 9 with us!", 
-        },
-        {
-          title: "Shop 'Til You Drop... Into Your Couch",
-          description: "Score primo bud and gear with just a few clicks. Delivered right to your pad!", 
-        },
-      ]
-    },
-    ru: {
-      features: [
-        {
-          title: "Что такое токен Weeder, Бро?",
-          description: "WDT - это как основа нашего крутого сообщества. Это деньги, это власть, это инвестиции. Круто, а?", 
-        },
-        {
-          title: "Зажигай и Развивайся",
-          description: "Закажи шмали, курни и зарабатывай токены Weeder. Чем больше курнешь, тем больше кэша у тебя в кармане, чувак.", 
-        },
-        
-        {
-          title: "Веселись с Нашим Сообществом",
-          description: "Найди самые крутые сорта и начни шмалить на девятом облаке вместе с нами.", 
-        },
-        {
-          title: "Покупайте, Когда Накурились",
-          description: "Закажи премиумную бошку и крутые аксессуары за пару кликов, чувак. Прямо к твоей двери!",
-        },
-      ]
-    }
-  }
-}
-
-const { tm,rt } = useI18n(text)
-
-const fadeIn = ref(false)
-
-onMounted(() => {
-
-    setTimeout(() => {
-      ImagesSlider.value.restartCarousel()
-      fadeIn.value = true
-    }, "500")
-
-})
-</script>
-
-<template>
-  <Carousel ref="ImagesSlider" :items-to-show="1" :wrapAround="true" :transition="330" :autoplay="3000" :pauseAutoplayOnHover="true" class="w-100 h-100">
-    <Slide v-for="(feature, index) in tm('features')" :key="index" class="w-100 h-100 flex-v-center flex">
-      <div class="parent-div" :style="`background-image: url(/assets/images/features/${index}.png); background-size:cover; background-position: center center;`">
-          <div class="background-div"></div>
-          <h4 class="mn-b-small">{{ feature.title }}</h4>
-          <p class='mn-b-big mn-r-small mn-l-small'>{{ feature.description }}</p>
-      </div>
-    </Slide>
-  </Carousel>
-</template>
-
-<style lang="scss">
-  .fade-enter-active, .fade-leave-active {
-  transition: opacity .5s;
-}
-.fade-enter, .fade-leave-to /* .fade-leave-active в версии 2.1.8+ */ {
-  opacity: 0;
-}
-  .carousel__track {
-    height: 100%;
-  }
-.carousel-controls {
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-.carousel-indicators {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  display: flex;
-  justify-content: center;
-}
-
-.carousel-indicators li {
-  list-style: none;
-  margin: 0 5px;
-  width: 10px;
-  height: 10px;
-  background: gray;
-  border-radius: 50%;
-}
-
-.carousel-indicators li.active {
-  background: white;
-}
-
-.parent-div {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  width: 100%;
-}
-
-.background-div {
-  flex-grow: 1 // Занимает все оставшееся пространство
-}
-</style>

package/src/modules/organizations/router/organizations.router.js

@@ -1,54 +0,0 @@
-import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
-import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
-
-import backofficeRoutes from '@pf/src/modules/backoffice/router/backoffice.js'
-
-const organizationRoutes = [{
-  path: ':_id',
-  name: 'OrganizationRoot',
-  meta: {
-    title: {
-      en: 'Organization',
-      ru: 'Организация'
-    }
-  },
-  component: layoutEmpty,
-  children: [
-    {
-      path: '',
-      name: 'Organization',
-      meta: {
-        title: {
-          en: 'Organization',
-          ru: 'Организация'
-        }
-      },
-      component: () => import('@pf/src/modules/organizations/components/pages/Organization.vue'),
-    },
-    ...backofficeRoutes 
-  ],
-}, {
-  path: 'create',
-  name: 'Create Organization',
-  meta: {
-    title: {
-      en: 'Create Organization',
-      ru: 'Создать Организацию'
-    }
-  },
-  beforeEnter: [validationAuth.requiresAuth],
-  component: () => import('@pf/src/modules/organizations/components/pages/OrganizationEdit.vue')
-}, {
-  path: ':_id/edit',
-  name: 'Organization Edit',
-  meta: {
-    title: {
-      en: 'Edit Organization',
-      ru: 'Редактировать Организацию'
-    }
-  },
-  beforeEnter: [validationAuth.requiresAuth],
-  component: () => import('@pf/src/modules/organizations/components/pages/OrganizationEdit.vue'),
-}];
-
-export default organizationRoutes;

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

@@ -1,78 +0,0 @@
-import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
-
-const productRoutes = [
-{
-  path: ':_id/products/:product',
-  name: 'Product Organization',
-  meta: {
-    title: {
-      en: 'Product',
-      ru: 'Продукт'
-    }
-  },
-  component: () => import('@pf/src/modules/products/components/pages/Product.vue')
-}, {
-  path: ':_id/products/:product/edit',
-  name: 'ProductEdit',
-  beforeEnter: [validationAuth.requiresAuth],
-  component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-}, {
-  path: ':_id/products/add',
-  name: 'ProductAdd',
-  component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-},{
-  path: ':_id/categories',
-  name: 'Categories Organization',
-  meta: {
-    title: {
-      en: 'Category',
-      ru: 'Категория'
-    }
-  },
-  component: () => import('@pf/src/modules/products/components/pages/Categories.vue')
-}, {
-  path: ':_id/categories/add',
-  name: 'CategoryAdd',
-  component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
-},{
-  path: ':_id/categories/:category/edit',
-  name: 'CategoryEdit',
-  beforeEnter: [validationAuth.requiresAuth],
-  component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
-}, {
-  path: ':_id/leftovers',
-  name: 'Leftovers',
-  meta: {
-    title: {
-      en: 'Leftovers',
-      ru: 'Остатки'
-    },
-    authorize: []
-  },
-  component: () => import(/* webpackChunkName: 'ProductsLeftovers' */ '@pf/src/modules/products/components/pages/Leftovers.vue'),
-},{
-  path: ':_id/leftovers/add',
-  name: 'LeftoverAdd',
-  meta: {
-    title: {
-      en: 'Leftovers Add',
-      ru: 'Управление Остатками'
-    },
-    authorize: []
-  },
-  component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
-},{
-  path: ':_id/leftovers/:leftover',
-  name: 'LeftoverEdit',
-  meta: {
-    title: {
-      en: 'Leftovers Edit',
-      ru: 'Управление Остатками'
-    },
-    authorize: []
-  },
-  component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
-}
-];  
-
-export default productRoutes;

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

@@ -1,90 +0,0 @@
-<template>
-  <header class="mn-b-medium flex-v-center flex-nowrap flex">
-    <h2 class="mn-r-medium">Products</h2>
-    <button 
-      @click="$router.push({
-        name: 'AddProduct'
-      })" 
-      class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
-        +
-    </button>
-  </header>
-
-  <Tab 
-    v-model:selected="tab"
-    :tabs="[
-      { name: 'All',          value: 'all' },
-      { name: 'Published',    value: 'published' },
-      { name: 'Unpublished',  value: 'unpublished' }, 
-      { name: 'Archivied',    value: 'archivied' } 
-    ]"
-    class="mn-b-small o-hidden h5 radius-big bg-grey"
-  />
-  
-  <Feed
-    :states="{
-      empty: {
-        title: 'No Products Found',
-        description: 'Currently, there are no products available.'
-      }
-    }"
-    :store="{
-      read: (options) => products.actions.read(options),
-      state: products.state
-    }"
-    :options="{
-      limit: 15,
-      organization: route.params._id,
-      status: tab
-      // user: user
-    }"
-    v-slot="{ 
-      items 
-    }"
-  >
-    <CardProduct
-      v-for="product in items"
-      :key="product._id"
-      :product="product"
-      @click="$router.push({
-        name: 'ProductEdit', 
-        params: { 
-          product: product._id 
-        } 
-      })" 
-    />
-  </Feed>
-</template>
-
-
-<script setup>
-import { ref, watch, onMounted } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-
-import * as products from '@pf/src/modules/products/store/products' // Путь к вашему стору
-
-// Import components
-import Feed from '@pf/src/components/Feed/Feed.vue'
-import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
-import Tab      from '@pf/src/components/Tab/Tab.vue'
-
-const route = useRoute()
-const router = useRouter()
-
-// Tab logic
-const tab = ref(route.query.tab ? route.query.tab : 'posts')
-
-route.query.tab = tab.value
-
-watch(tab, (newValue) => {
-  router.replace({ query: { ...route.query, tab: newValue } });
-});
-
-onMounted(async () => {
-  await products.actions.fetchProducts()
-})
-</script>
-
-<style lang="scss">
-  
-</style>