@ozdao/prometheus-framework 0.1.69 → 0.1.70

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,10 +214,13 @@
 
   function getCookie(name) {
     if (process.env.MOBILE_APP) {
-      return CapacitorCookies.getCookie({
-        url: process.env.API_URL,
-        key: name
-      }).then(response => JSON.parse(response.value));
+      // 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;
     } else {
       // Для веб-версии
       const cookie = Cookies.get(name);

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

@@ -52,7 +52,7 @@
 
 
   import { computed, onMounted, reactive, toRefs } from 'vue'
-  import { useStore } from 'vuex'
+  
   import { useRoute,useRouter } from 'vue-router'
  
   const store = useStore()

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

@@ -24,7 +24,7 @@
 <script setup>
 
   import { computed,ref} from 'vue'
-  import { useStore } from 'vuex'
+  
 
   import { VueDraggableNext } from 'vue-draggable-next'
 

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

@@ -69,7 +69,7 @@
 	import EditFilters  		from '@/components/blocks/EditFilters.vue'
 	// Import libs
 	import { computed, onMounted } from 'vue'
-	import { useStore } from 'vuex'
+	
 	import { useRoute } from 'vue-router'
 	// Accessing router and store
 	const store = useStore()

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

@@ -17,7 +17,7 @@
 
 
   import { computed, onMounted } from 'vue'
-  import { useStore } from 'vuex'
+  
   import { useRoute } from 'vue-router'
  
 

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

@@ -81,7 +81,7 @@
 
 
   import { computed, onMounted, reactive, toRefs,ref } from 'vue'
-  import { useStore } from 'vuex'
+  
   import { useRoute,useRouter } from 'vue-router'
  
   const store = useStore()

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

@@ -59,7 +59,7 @@
   import EditCategories   from '@pf/src/modules/products/components/blocks/EditCategories.vue'
 
   import { computed, onMounted, reactive, toRefs } from 'vue'
-  import { useStore } from 'vuex'
+  
   import { useRoute,useRouter } from 'vue-router'
  
   const store = useStore()

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

@@ -44,7 +44,7 @@
 
 
   import { computed, onMounted, reactive, toRefs } from 'vue'
-  import { useStore } from 'vuex'
+  
   import { useRoute,useRouter } from 'vue-router'
  
   const store = useStore()

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

@@ -61,7 +61,6 @@
 <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';
@@ -71,7 +70,6 @@
   import EditModifications from '@/components/sections/product/EditModifications.vue';
   
 	// Accessing router and store
-	const store = useStore()
 	const route = useRoute()
 	const router = useRouter()
 

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

@@ -65,7 +65,7 @@
 <script setup>
   // Import libs
   import { computed, onMounted } from 'vue'
-  import { useStore } from 'vuex'
+  
   import { useRoute } from 'vue-router'
   // Accessing router and store
   const store = useStore()

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

@@ -64,7 +64,7 @@
 
 
   import { computed, onMounted, reactive, toRefs } from 'vue'
-  import { useStore } from 'vuex'
+  
   import { useRoute } from 'vue-router'
  
   import HeaderAdmin from '@pf/src/components/HeaderAdmin/HeaderAdmin.vue'

package/src/modules/constructor/components/elements/Audio.vue

@@ -0,0 +1,82 @@
+<template>
+  <div 
+    class="mn-thin w-100 pd-medium bg-white radius-medium">
+    
+    <div 
+      v-if="prop.content" 
+      v-html="prop.content" 
+      class="flex-center flex"
+    />
+    
+    <div
+      class="" 
+      v-else
+    >
+      <Upload 
+        v-model:field="embedCode"
+        @file-change="onComponentClick"
+        type="file"   
+        :placeholder="'Enter embed code'" 
+        class="
+          w-100
+          br-solid
+          br-1px
+          br-black-transp-10
+          pd-medium
+          radius-small
+          mn-thin
+        "
+      />
+      <button 
+        @click="onComponentClick"
+        class="button-small button"
+      >
+        Save
+      </button>
+    </div>
+    <!-- <button v-if="prop.content" @click="editEmbedCode">Edit Embed Code</button> -->
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+import Upload         from '@pf/src/components/Upload/Upload.vue'
+
+const embedCode = ref(null);
+
+const props = defineProps([
+  'label',
+  'value',
+  'prop'
+]);
+
+const emit = defineEmits(['input', 'updateBlock']);
+
+function isValidEmbedCode(code) {
+  const allowedSources = [/youtube\.com/, /soundcloud\.com/, /vimeo\.com/];
+  return allowedSources.some(pattern => pattern.test(code));
+}
+
+function onComponentClick(file) {
+    embedCode.value = file
+  if (embedCode.value && isValidEmbedCode(embedCode.value)) {
+    emit('input', embedCode.value);
+    emit('updateBlock', props.prop, { content: embedCode.value });
+  } else {
+    alert('Invalid embed code or source not allowed.');
+  }
+}
+
+function editEmbedCode() {
+  let embedInput = prompt('Edit embed code:', prop.content);
+  if (embedInput && isValidEmbedCode(embedInput)) {
+    embedCode.value = embedInput;
+    emit('input', embedCode.value);
+    emit('updateBlock', props.prop, { content: embedCode.value });
+  } else {
+    alert('Invalid embed code or source not allowed.');
+  }
+}
+</script>
+

package/src/modules/constructor/components/elements/Embed.vue

@@ -0,0 +1,85 @@
+<template>
+  <div 
+    class="mn-thin w-100 pd-medium bg-white radius-medium">
+    
+    <div 
+      v-if="prop.content" 
+      v-html="prop.content" 
+      class="flex-center flex"
+    />
+    
+    <div
+      class="" 
+      v-else
+    >
+      <Field 
+        v-model:field="embedCode"
+        type="textarea"   
+        :placeholder="'Paste your embed code here'" 
+        class="
+          w-100
+          br-solid
+          br-1px
+          br-black-transp-10
+          pd-medium
+          radius-small
+          mn-thin
+        "
+      />
+      <div class="flex-v-center flex-nowrap flex gap-small">
+        
+         <p class="t-center">Embeds from youtube.com, vimeo.com, soundcloud.com are allowed</p>
+        <button 
+          @click="onComponentClick"
+          class="button-small button"
+        >
+          Save
+        </button>
+      </div>
+    </div>
+    <!-- <button v-if="prop.content" @click="editEmbedCode">Edit Embed Code</button> -->
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+import Field         from '@pf/src/components/Field/Field.vue'
+
+const embedCode = ref(null);
+
+const props = defineProps([
+  'label',
+  'value',
+  'prop'
+]);
+
+const emit = defineEmits(['input', 'updateBlock']);
+
+function isValidEmbedCode(code) {
+  const allowedSources = [/youtube\.com/, /soundcloud\.com/, /vimeo\.com/];
+  return allowedSources.some(pattern => pattern.test(code));
+}
+
+function onComponentClick() {
+
+  if (embedCode.value && isValidEmbedCode(embedCode.value)) {
+    emit('input', embedCode.value);
+    emit('updateBlock', props.prop, { content: embedCode.value });
+  } else {
+    alert('Invalid embed code or source not allowed.');
+  }
+}
+
+function editEmbedCode() {
+  let embedInput = prompt('Edit embed code:', prop.content);
+  if (embedInput && isValidEmbedCode(embedInput)) {
+    embedCode.value = embedInput;
+    emit('input', embedCode.value);
+    emit('updateBlock', props.prop, { content: embedCode.value });
+  } else {
+    alert('Invalid embed code or source not allowed.');
+  }
+}
+</script>
+

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

@@ -36,17 +36,60 @@ a<template>
         <transition name="fade">
           <div 
             v-if="showControls === index" 
-            class="pos-absolute pos-r-100 pos-t-0 z-index-4 i-semi" 
+            class="pos-absolute z-index-4 i-semi" 
+            style="right: calc(100% + 0.5rem); top: calc(50% - 1.125rem);"
             @mousedown.prevent="startDragging = true"
           >
-            <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>
+            <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> -->
+
             </div>
+
+
           </div>
         </transition>
+
+
+
       </div>
     </VueDraggableNext>
   </section>
@@ -59,6 +102,8 @@ 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';
@@ -76,7 +121,9 @@ const ComponentMap = {
   'H2': H2,
   'Bullets': Bullets,
   'Caption': Caption,
-  'ImageUpload': ImageUpload
+  'ImageUpload': ImageUpload,
+  'Embed': Embed,
+  'Audio': Audio
 };
 
 function handleAddBlock(type = 'Textarea', content = '', index, data) {

package/src/modules/events/components/pages/Events.vue

@@ -1,10 +1,10 @@
 <template>
   <section>
-    <List
+    <!-- <List
       :user="auth.state.user._id"
       class="bg-grey mn-thin radius-big"
       :phase="'week'"
-    />
+    /> -->
     
     <Feed 
       :category="route.params.category" 

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

@@ -9,13 +9,7 @@
 </template>
 
 <script setup>
-	/////////////////////////////
-	// 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,7 +16,6 @@
       </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" 
@@ -30,26 +29,6 @@
             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>
 
@@ -70,6 +49,7 @@
       </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>
@@ -129,11 +109,15 @@
 
 <script setup>
 import { ref, onMounted, reactive, computed } from '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'
 
+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 { state, actions } from '@pf/src/modules/gallery/store/gallery';
+
 const route = useRoute()
 
 const isEditablePath = false

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

@@ -1,14 +1,10 @@
-import * as galleryStore from './store/gallery.store.js';
+import * as galleryStore from './store/gallery.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/globals/mixins/mixins.js

@@ -0,0 +1,52 @@
+// mixins.js
+export const globalMixins = {
+  methods: {
+    returnCurrency() {
+      const currency = '฿'
+      return currency
+    },
+    formatPrice(number) {
+      const currency = this.returnCurrency();
+      let formattedNumber = number.toFixed(2).replace('.', ',').replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
+      return `${formattedNumber} ${currency}`;
+    },
+    formatDate(d) {
+      var fixedDate = new Date(d);
+      var yyyy = fixedDate.getFullYear().toString();
+      var mm = (fixedDate.getMonth() + 1).toString();
+      var dd = fixedDate.getDate().toString();
+      var hh = fixedDate.getHours().toString();
+      var minmin = fixedDate.getMinutes().toString();
+
+      return yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]) + " в " + (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
+    },
+    normalizeUrlParam(param) {
+      if (!param) param = ''
+
+      return param
+        .toLowerCase()
+        .replace(/ /g, '-')
+        .replace(/[^a-z0-9-]/g, '');
+    },
+    getMarketplaceLink(categories, country, state, city) {
+      categories = []
+
+      let country_normalized = this.normalizeUrlParam(country);
+      let state_normalized = this.normalizeUrlParam(state);
+      let city_normalized = this.normalizeUrlParam(city);
+      let base = `/marketplace/${country_normalized || ''}${state_normalized ? `/${state_normalized}` : ''}${city_normalized ? `/${city_normalized}` : ''}`;
+      
+      if (categories.length) {
+        base += `?categories=${categories.join(",")}`;
+      }
+
+      return base;
+    },
+    getSpotsLink(country, state, city) {
+      let country_normalized = this.normalizeUrlParam(country);
+      let state_normalized = this.normalizeUrlParam(state);
+      let city_normalized = this.normalizeUrlParam(city);
+      return `/spots/${country_normalized || ''}${state_normalized ? `/${state_normalized}` : ''}${city_normalized ? `/${city_normalized}` : ''}`;
+    },
+  }
+}

package/src/modules/globals/router/routerGuards.js

@@ -0,0 +1,28 @@
+// routerGuards.js
+export function setupRouterGuards(router, store, app) {
+  router.beforeEach((to, from, next) => {
+    const { authorize } = to.meta;
+    
+    if (authorize) {
+      if (store.auth.state.access.status === false) {
+        return next({ path: '/', query: { returnUrl: to.path } });
+      }
+
+      if (authorize.length && !authorize.some(r => store.auth.state.access.roles.includes(r))) {
+        return next({ path: '/' });
+      }
+    }
+
+    const locale = to.params.locale;
+    if (
+      app.config.globalProperties.$i18n.locale !== locale 
+      && locale 
+      && Object.keys(i18n.global.availableLocales).includes(locale)
+    ) {
+      app.config.globalProperties.$i18n.locale = locale;
+      return next();
+    }
+
+    next();
+  });
+}

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

@@ -2,7 +2,6 @@
 	<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/orders/components/blocks/Positions.vue

@@ -101,7 +101,7 @@
   import InputSelect  from '@/components/elements/InputSelect.vue'
 
 	import {ref,computed,reactive,toRefs } from 'vue'
-	import { useStore } from 'vuex'
+	
 	import { useRouter,useRoute } from 'vue-router'
 
 	const store = useStore()

package/src/modules/orders/components/pages/ViewOrder.vue

@@ -65,7 +65,7 @@
 // import OrderCard from '@/components/blocks/OrderCard.vue';
 
 import { toRefs, computed } from 'vue';
-import { useStore } from 'vuex'
+
 /////////////////////////////
 // HELPERS
 /////////////////////////////

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"
 		/>