@ozdao/prometheus-framework 0.1.67 → 0.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -38,64 +38,64 @@
       "import": "./dist/style.css"
     },
     "./modules/auth/client": {
-      "import": "./dist/prometheus-framework/src/modules/auth/auth.client.js",
-      "require": "./dist/prometheus-framework/src/modules/auth/auth.client.cjs"
+      "import": "./dist/auth.client.js",
+      "require": "./dist/auth.client.cjs"
     },
     "./modules/auth/server": {
       "import": "./dist/auth.server.mjs",
       "require": "./dist/auth.server.js"
     },
     "./modules/community/client": {
-      "import": "./dist/prometheus-framework/src/modules/community/community.client.js",
-      "require": "./dist/prometheus-framework/src/modules/community/community.client.cjs"
+      "import": "./dist/community.client.js",
+      "require": "./dist/community.client.cjs"
     },
     "./modules/community/server": {
       "import": "./dist/community.server.mjs",
       "require": "./dist/community.server.js"
     },
     "./modules/globals/client": {
-      "import": "./dist/prometheus-framework/src/modules/globals/globals.client.js",
-      "require": "./dist/prometheus-framework/src/modules/globals/globals.client.cjs"
+      "import": "./dist/globals.client.js",
+      "require": "./dist/globals.client.cjs"
     },
     "./modules/globals/server": {
       "import": "./dist/globals.server.mjs",
       "require": "./dist/globals.server.js"
     },
     "./modules/orders/client": {
-      "import": "./dist/prometheus-framework/src/modules/orders/orders.client.js",
-      "require": "./dist/prometheus-framework/src/modules/orders/orders.client.cjs"
+      "import": "./dist/orders.client.js",
+      "require": "./dist/orders.client.cjs"
     },
     "./modules/orders/server": {
       "import": "./dist/orders.server.mjs",
       "require": "./dist/orders.server.js"
     },
     "./modules/organizations/client": {
-      "import": "./dist/prometheus-framework/src/modules/organizations/organizations.client.js",
-      "require": "./dist/prometheus-framework/src/modules/organizations/organizations.client.cjs"
+      "import": "./dist/organizations.client.js",
+      "require": "./dist/organizations.client.cjs"
     },
     "./modules/organizations/server": {
       "import": "./dist/organizations.server.mjs",
       "require": "./dist/organizations.server.js"
     },
     "./modules/products/client": {
-      "import": "./dist/prometheus-framework/src/modules/products/products.client.js",
-      "require": "./dist/prometheus-framework/src/modules/products/products.client.cjs"
+      "import": "./dist/products.client.js",
+      "require": "./dist/products.client.cjs"
     },
     "./modules/products/server": {
       "import": "./dist/products.server.mjs",
       "require": "./dist/products.server.js"
     },
     "./modules/spots/client": {
-      "import": "./dist/prometheus-framework/src/modules/spots/spots.client.js",
-      "require": "./dist/prometheus-framework/src/modules/spots/spots.client.cjs"
+      "import": "./dist/spots.client.js",
+      "require": "./dist/spots.client.cjs"
     },
     "./modules/spots/server": {
       "import": "./dist/spots.server.mjs",
       "require": "./dist/spots.server.js"
     },
     "./modules/users/client": {
-      "import": "./dist/prometheus-framework/src/modules/users/users.client.js",
-      "require": "./dist/prometheus-framework/src/modules/users/users.client.cjs"
+      "import": "./dist/users.client.js",
+      "require": "./dist/users.client.cjs"
     },
     "./modules/users/server": {
       "import": "./dist/users.server.mjs",
@@ -106,40 +106,36 @@
       "require": "./dist/events.server.js"
     },
     "./modules/events/client": {
-      "import": "./dist/prometheus-framework/src/modules/events/events.client.js",
-      "require": "./dist/prometheus-framework/src/modules/events/events.client.cjs"
+      "import": "./dist/events.client.js",
+      "require": "./dist/events.client.cjs"
     },
     "./modules/files/client": {
-      "import": "./dist/prometheus-framework/src/modules/files/files.client.js",
-      "require": "./dist/prometheus-framework/src/modules/files/files.client.cjs"
+      "import": "./dist/files.client.js",
+      "require": "./dist/files.client.cjs"
     },
     "./modules/files/server": {
       "import": "./dist/files.server.mjs",
       "require": "./dist/files.server.js"
     },
     "./modules/landing/client": {
-      "import": "./dist/prometheus-framework/src/modules/landing/landing.client.js",
-      "require": "./dist/prometheus-framework/src/modules/landing/landing.client.cjs"
-    },
-    "./modules/gallery/client": {
-      "import": "./dist/prometheus-framework/src/modules/gallery/gallery.client.js",
-      "require": "./dist/prometheus-framework/src/modules/gallery/gallery.client.cjs"
+      "import": "./dist/landing.client.js",
+      "require": "./dist/landing.client.cjs"
     },
     "./modules/gallery/server": {
       "import": "./dist/gallery.server.mjs",
       "require": "./dist/gallery.server.js"
     },
     "./modules/backoffice/client": {
-      "import": "./dist/prometheus-framework/src/modules/backoffice/backoffice.client.js",
-      "require": "./dist/prometheus-framework/src/modules/backoffice/backoffice.client.cjs"
+      "import": "./dist/backoffice.client.js",
+      "require": "./dist/backoffice.client.cjs"
     },
     "./modules/legal/client": {
-      "import": "./dist/prometheus-framework/src/modules/legal/legal.client.js",
-      "require": "./dist/prometheus-framework/src/modules/legal/legal.client.cjs"
+      "import": "./dist/legal.client.js",
+      "require": "./dist/legal.client.cjs"
     },
     "./modules/reports/client": {
-      "import": "./dist/prometheus-framework/src/modules/reports/reports.client.js",
-      "require": "./dist/prometheus-framework/src/modules/reports/reports.client.cjs"
+      "import": "./dist/reports.client.js",
+      "require": "./dist/reports.client.cjs"
     },
     "./modules/reports/server": {
       "import": "./dist/reports.server.mjs",
@@ -175,8 +171,7 @@
     "nodemailer": "^6.9.4",
     "openai": "^4.7.1",
     "uuidv4": "^6.2.13",
-    "vue": "^3.2.25",
-    "vue-i18n": "^9.7.0"
+    "vue": "^3.2.25"
   },
   "devDependencies": {
     "@babel/preset-flow": "^7.22.15",

package/src/components/Button/Button.vue

@@ -142,7 +142,7 @@
 
 			opacity: 1;
 
-			// color: rgba(var(--white), 1);;
+			color: rgba(var(--white), 1);;
 			
 			cursor: pointer;
 		}

package/src/components/Sidebar/Sidebar.vue

@@ -1,18 +1,13 @@
 <template>
-  <div 
-    :class="['sidebar t-black bg-grey', stateSidebar ? 'open' : '']"
-  >
-    <div 
-      class="sidebar-content"
-    >
+  <div :class="['sidebar t-black bg-grey', stateSidebar ? 'open' : '']">
+    <div class="sidebar-content">
       <slot></slot>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
+import { ref, } from 'vue';
 import { useRoute, useRouter } from 'vue-router'
 
 const router  = useRouter()
@@ -21,6 +16,7 @@ const route   = useRoute()
 const isOpen = ref(false);
 
 const props = defineProps(['stateSidebar'])
+
 </script>
 
 <style scoped>
@@ -35,6 +31,12 @@ const props = defineProps(['stateSidebar'])
   z-index: 1000;
 }
 
+.active {
+
+}
+
+
+
 .sidebar.open {
   left: 0;
 }

package/src/components/Upload/Upload.vue

@@ -1,7 +1,5 @@
 <template>
   <div :class="[$attrs.class, { 'bg-fourth-nano': validation }]" class="flex-center flex-nowrap flex">
-          {{fileURL}}
-
     <!-- Label -->
     <div v-if="label" class="t-transp mn-r-small">
       <span>{{label}}</span>
@@ -31,7 +29,6 @@
 
 <script setup>
 import { ref, computed,} from 'vue'
-import axios from 'axios';
 
 const emit = defineEmits(['update:field', 'focus', 'blur', 'file-change']);
 
@@ -46,33 +43,16 @@ const props = defineProps({
   }
 });
 
-const fileURL = ref(null);
-const fileInput = ref(null);
-
 // Handles file change event
-
-async function onFileChange(e) {
-
-  let file = e.target.files[0];
-  let formData = new FormData();
-
-  formData.append("file", file);
-
-  try {
-    const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
-
-    let response = await $axios.post(`/api/upload/file?folderName=${encodeURIComponent(props.uploadPath)}`, formData, {
-      headers: {
-        "Content-Type": "multipart/form-data"
-      }
-    });
-
-    fileURL.value = response.data.filepath;
-    emit('file-change', fileURL.value);
-  } catch (error) {
-    console.error(error);
+const onFileChange = (event) => {
+  if (props.multiple) {
+    const files = Array.from(event.target.files);
+    emit('file-change', { files });
+  } else {
+    const file = event.target.files[0];
+    emit('file-change', { file });
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>

package/src/modules/auth/components/pages/SignIn.vue

@@ -1,4 +1,4 @@
-<!-- <i18n>
+<i18n>
 {
   "en": {
     "title": "Welcome to The Commune",
@@ -31,7 +31,7 @@
     "soon": "СКОРО"
   }
 }
-</i18n> -->
+</i18n>
 
 <template>
 	<section class="">

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

@@ -41,7 +41,7 @@ const controllerFactory = (db) => {
 
       let user = await User.findOne(query).populate('roles').exec();
 
-      if ((type === 'email' || type === 'phone')) {
+      if ((type === 'email' || type === 'phone') && req.body.password) {
 
         const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
 

package/src/modules/auth/store/auth.js

@@ -27,27 +27,27 @@
     },
   });
   
-  // async function initialize() {
-  //   const userCookie = await getCookie('user');
+  async function initialize() {
+    const userCookie = await getCookie('user');
     
-  //   if (userCookie) {
-  //     const {_id, email, phone, roles, accessToken} = userCookie;
+    if (userCookie) {
+      const {_id, email, phone, roles, accessToken} = userCookie;
 
-  //     Object.assign(state.user, {_id, email, phone});
-  //     Object.assign(state.access, {token: accessToken, roles, status: !!accessToken});
+      Object.assign(state.user, {_id, email, phone});
+      Object.assign(state.access, {token: accessToken, roles, status: !!accessToken});
 
-  //     $axios.interceptors.request.use((config) => {
-  //       if (accessToken) {
-  //         config.headers['x-access-token'] = accessToken;
-  //       }
-  //       return config;
-  //     }, (error) => {
-  //       return Promise.reject(error);
-  //     });
-  //   }
-  // }
+      $axios.interceptors.request.use((config) => {
+        if (accessToken) {
+          config.headers['x-access-token'] = accessToken;
+        }
+        return config;
+      }, (error) => {
+        return Promise.reject(error);
+      });
+    }
+  }
 
-  // initialize();
+  initialize();
 
   const actions = {
     async login (user, type) {
@@ -214,13 +214,10 @@
 
   function getCookie(name) {
     if (process.env.MOBILE_APP) {
-      // return CapacitorCookies.getCookie({
-      //   url: process.env.API_URL,
-      //   key: name
-      // })
-      // .then(response => JSON.parse(response.value));
-      const cookie = Cookies.get(name);
-      return cookie ? JSON.parse(cookie) : null;
+      return CapacitorCookies.getCookie({
+        url: process.env.API_URL,
+        key: name
+      }).then(response => JSON.parse(response.value));
     } else {
       // Для веб-версии
       const cookie = Cookies.get(name);

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

@@ -61,6 +61,7 @@
 <script setup>
 	// Import libs
 	import { reactive, computed, onMounted, toRefs } from 'vue'
+	import { useStore } from 'vuex'
 	import { useRoute, useRouter } from 'vue-router'
 	// Import components
 	import EditProductInfo from '@/components/sections/product/EditProductInfo.vue';
@@ -70,6 +71,7 @@
   import EditModifications from '@/components/sections/product/EditModifications.vue';
   
 	// Accessing router and store
+	const store = useStore()
 	const route = useRoute()
 	const router = useRouter()
 

package/src/modules/constructor/components/sections/Constructor.vue

@@ -36,60 +36,17 @@ a<template>
         <transition name="fade">
           <div 
             v-if="showControls === index" 
-            class="pos-absolute z-index-4 i-semi" 
-            style="right: calc(100% + 0.5rem); top: calc(50% - 1.125rem);"
+            class="pos-absolute pos-r-100 pos-t-0 z-index-4 i-semi" 
             @mousedown.prevent="startDragging = true"
           >
-            <button 
-              @click="showMenu = !showMenu" 
-              class="mn-small cursor-pointer w-100 i-semi bg-white radius-thin"
-            >
-              {{ block.content ? '...' : '+' }}
-            </button>
-            
-            <div 
-              v-if="showMenu" 
-              class="z-index-5 radius-thin pd-thin bg-white w-max mn-small flex-nowrap flex-column flex"
-            >
-              <span 
-                @click="handleDeleteBlock(block)" 
-                class="mn-thin w-max t-red bg-white button-small button"
-              >
-                Remove
-              </span>
-              <span 
-                @click="handleAddBlock('ImageUpload', '', index)" 
-                class="mn-thin w-max t-black bg-white button-small button"
-              >
-                Add Image
-              </span>
-              <span 
-                @click="handleAddBlock('H2', '', index)"
-                class="w-max button-small t-black bg-white button"
-              >
-                Add Title
-              </span>
-              <span 
-                @click="handleAddBlock('Embed', '', index)"
-                class="w-max button-small t-black bg-white button"
-              >
-                Add Embed
-              </span>
-             <!--  <span 
-                @click="handleAddBlock('Audio', '', index)"
-                class="w-max button-small t-black bg-white button"
-              >
-                Add Audio
-              </span> -->
-
+            <button @click="showMenu = !showMenu" class="mn-small w-100 i-semi bg-white radius-thin">{{ block.content ? '...' : '+' }}</button>
+            <div v-if="showMenu" class="z-index-5 radius-thin mn-small relative left-0 mt-2 w-max bg-white shadow-lg rounded">
+              <button @click="handleDeleteBlock(block)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Remove</button>
+              <button @click="handleAddBlock('ImageUpload', '', index)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Add Image</button>
+              <button @click="handleAddBlock('H2', '', index)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Add Title</button>
             </div>
-
-
           </div>
         </transition>
-
-
-
       </div>
     </VueDraggableNext>
   </section>
@@ -102,8 +59,6 @@ import H2           from '../elements/H2.vue';
 import Caption      from '../elements/Caption.vue';
 import Bullets      from '../elements/Bullets.vue';
 import ImageUpload  from '../elements/ImageUpload.vue';
-import Embed        from '../elements/Embed.vue';
-import Audio        from '../elements/Audio.vue';
 
 import { ref, watchEffect, computed, emit } from 'vue';
 import { VueDraggableNext } from 'vue-draggable-next';
@@ -121,9 +76,7 @@ const ComponentMap = {
   'H2': H2,
   'Bullets': Bullets,
   'Caption': Caption,
-  'ImageUpload': ImageUpload,
-  'Embed': Embed,
-  'Audio': Audio
+  'ImageUpload': ImageUpload
 };
 
 function handleAddBlock(type = 'Textarea', content = '', index, data) {

package/src/modules/gallery/components/pages/Gallery.vue

@@ -9,7 +9,13 @@
 </template>
 
 <script setup>
-	import Title from '@pf/src/modules/globals/components/sections/Title.vue';
+	/////////////////////////////
+	// COMPONENT DEPENDENCIES
+	/////////////////////////////
+	import { onMounted } from 'vue'
+	import { gsap } from "gsap/dist/gsap";
+  import { ScrollTrigger } from "gsap/dist/ScrollTrigger";
 
+	import Title from '@pf/src/modules/globals/components/sections/Title.vue';
 	import GalleryWithCategories from '@pf/src/modules/gallery/components/sections/GalleryWithCategories.vue';
 </script>

package/src/modules/gallery/components/sections/GalleryWithCategories.vue

@@ -16,6 +16,7 @@
       </div>
 
     <div ref="grid" class="pd-medium cols-4 gap-thin">
+       <!-- :class="['grid-item pd-small', item.size.value, ...item.categories]" -->
       <div 
         v-for="(item, index) in filteredGallery" 
         :key="item.id" 
@@ -29,6 +30,26 @@
             class="w-100 h-100 o-hidden radius-medium object-fit-cover" 
             @click="openModal(item.image)"
           />
+          <!-- <div class="pd-small radius-small bg-white" v-else>
+            <img :src="'/photos/' + item.cover" class="w-100 radius-small mn-small h-10r object-fit-cover " @click="openModal(item)" />
+            
+            <p class="t-black p-small mn-small">
+              <span class="uppercase t-transp ">Size</span>
+              <br>
+              <span class="pd-2px radius-big d-inline-block bg-grey">{{item.size.name}}</span>
+            </p>
+
+            <p class="t-black p-small mn-small uppe">
+              <span class="uppercase t-transp">Categories</span>
+              <br> 
+              <span class="pd-2px radius-big d-inline-block bg-grey t-semi" v-for="category in item.categories">{{category}}</span>
+            </p>
+            
+            <div class="flex-nowrap flex">
+            <button class="mn-r-thin button-small w-100 button"  @click="editPhoto(item)">Edit</button>
+             <button class="button-small w-100 button" @click="deletePhoto(item._id)">Delete</button>
+            </div>
+          </div> -->
         </transition>
       </div>
 
@@ -49,7 +70,6 @@
       </transition>
 
       <transition name="modal">
-
       <div v-if="selectedImage.image !== false && modal === 'edit-modal'"  class="flex-v-center flex m modal pd-big">   
         <div class="modal-content radius-small pd-medium bg-white">
             <span class="close" @click="closeModal">&times;</span>
@@ -109,15 +129,11 @@
 
 <script setup>
 import { ref, onMounted, reactive, computed } from 'vue'
-import { useRoute } from 'vue-router'
-
-import Field         from '@pf/src/components/Field/Field.vue'
-import Button        from '@pf/src/components/Button/Button.vue'
-import Select        from '@pf/src/components/Select/Select.vue'
-import Upload        from '@pf/src/components/Upload/Upload.vue'
-
+import { Button, Field, Select, Upload } from '@ozdao/prometheus-framework'
 import { state, actions } from '@pf/src/modules/gallery/store/gallery';
 
+import { useRoute } from 'vue-router'
+
 const route = useRoute()
 
 const isEditablePath = false

package/src/modules/gallery/gallery.client.js

@@ -1,10 +1,14 @@
-import * as galleryStore from './store/gallery.js';
+import * as galleryStore from './store/gallery.store.js';
 
 // Importing Vue Router routes from the router directory
 import galleryRouter from './router/gallery.router.js';
 
+import galleryPage from './components/pages/Gallery.vue'
+
 // Exporting components, store modules, and routes
 export {
   galleryStore,
   galleryRouter,
+  filesStore,
+  filesRoutes
 };

package/src/modules/marketplace/components/layouts/Marketplace.vue

@@ -2,6 +2,7 @@
 	<div class="min-h-100vh pd-thin">
 
 		<div class=" br-solid br-1px br-grey bg-grey radius-big">
+			<Breadcrumbs class=" br-b br-solid br-black-transp  pd-medium"/>
 
 			<header class=" pd-medium mn-r-auto flex-v-center t-left flex-nowrap flex">
 	    	<h2 class="t-left">

package/src/modules/organizations/components/pages/Organization.vue

@@ -49,9 +49,9 @@
 			:tabs="[
 
 				{ name: 'Community', 	value: 'community' },
-				// { name: 'Products', 	value: 'products' },	
+				{ name: 'Products', 	value: 'products' },	
 				{ name: 'Events', 		value: 'events' },
-				// { name: 'Spots', 		value: 'spots' }	
+				{ name: 'Spots', 		value: 'spots' }	
 			]"
 			class="mn-small o-hidden h5 radius-big bg-grey"
 		/>

package/src/modules/payments/components/pages/Payments.vue

@@ -1,6 +1,6 @@
 <template>
    <!-- Toolbar -->
-  <section class="br-bot-dark bg-white pd-big">
+ <!--  <section class="br-bot-dark bg-white pd-big">
     <header class="flex-nojustify flex-bottom flex-nowrap flex">
       <h1 class="mn-r-small">Заказы</h1>
      
@@ -54,7 +54,7 @@
 
         </p>
     </div>
-  </section>
+  </section> -->
 </template>
 
 
@@ -65,8 +65,9 @@
   import { useRoute,useRouter } from 'vue-router'
  
 
+  // const store = useStore()
   const route = useRoute()
-   const router = useRouter()
+  const router = useRouter()
 
   // await store.dispatch('orders/fetchOrders').then(
   //   succes => { console.log('sycces') },

package/src/modules/products/components/blocks/CardLeftover.vue

@@ -64,7 +64,6 @@
   import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
   import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 
-
 	const router = useRouter()
 
 	const props = defineProps({

package/src/modules/products/components/blocks/CardProduct.vue

@@ -25,7 +25,6 @@
 		>
 			<!-- Image Wrappers  -->
 			<img v-if="product.images[0]" :src="(FILE_SERVER_URL || '') + product.images[0]" class="w-100 h-100">
-
 			<svg 
 				v-else
 				class="h-100 w-100"
@@ -108,7 +107,22 @@
 
 	const props = defineProps(['product'])
 
+	function addToFavorites(product) {
+		store.dispatch('favorites/addProductToFavorites', product);
+
+		console.log('hello');
+	}
   const { t } = useI18n()
+
+	const isInFavorites = computed(() => { 
+		return store.state.favorites.items.filter(function(item, index) {
+			if (item._id === props.product._id) {
+				return true;
+			}
+		})
+	})
+
+
 </script>
 
 <style lang="scss">