@ozdao/prometheus-framework 0.1.52 → 0.1.54

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

@@ -1,10 +1,9 @@
 <template>
 	<div class="wrapper">
-		12333
 		<Title :text="$t('gallery.title')" class="pd-medium" />
 
 		<div style="min-height: 100vh">
-			<!-- <GalleryWithCategories/> -->
+			<GalleryWithCategories/>
 		</div>
 	</div>
 </template>
@@ -12,5 +11,5 @@
 <script setup>
 	import Title from '@pf/src/modules/globals/components/sections/Title.vue';
 
-	// import GalleryWithCategories from '@pf/src/modules/gallery/components/sections/GalleryWithCategories.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,13 +109,15 @@
 
 <script setup>
 import { ref, onMounted, reactive, computed } from 'vue'
+import { useRoute } from 'vue-router'
 
-import { Button, Field, Select, Upload } from '@ozdao/prometheus-framework'
+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';
 
-import { useRoute } from 'vue-router'
-
 const route = useRoute()
 
 const isEditablePath = false

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/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/users/components/pages/Profile.vue

@@ -192,11 +192,14 @@
 
 
 
-			<Menu class="mn-regular bg-grey">
+			<!-- <Menu class="mn-regular bg-grey">
 				<MenuItem @click="router.push({name: 'User Wallet', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <IconGroups class="i-semi" :icon="true"/>
 			    <span>Wallet</span>
 			  </MenuItem>
+			</Menu> -->
+
+
 			  
 			  <!-- <MenuItem @click="router.push({name: 'User Comments', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <span>Comments</span>
@@ -204,8 +207,7 @@
 			  <MenuItem @click="router.push({name: 'User Likes', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <span>Likes</span>
 			  </MenuItem> -->
-			</Menu>
-
+			  
 			<Menu 
 				v-if="auth.state.user._id === route.params._id"
 				class="bg-grey"

package/src/styles/theme.scss

@@ -1,6 +1,5 @@
 @import './components/block';
 @import './components/breadcrumbs';
-@import './components/button';
 @import './components/card';
 // @import './components/input';
 @import './components/item';

package/src/styles/components/button.scss

@@ -1,253 +0,0 @@
-button[disabled] {background: grey; &:hover {background: grey; } }
-
-.button {
-	display: flex;
-	width: fit-content;
-
-	padding: 1rem 1.75rem;
-	border-radius: 3rem;
-
-	transform: scale(1);
-	opacity: 1;
-
-	align-items: center;
-	justify-content: center;
-	
-	text-align: center;
-	text-transform: uppercase;
-	font-size: 1rem;
-	font-weight: 500;
-	letter-spacing: 5%;
-
-	transition: all 0.33s ease;
- 
-	&:hover {
-		opacity: 1;
-		cursor: pointer;
-	}
-
-	&:active {
-		transform: scale(0.95);
-	}
-
-	&-small {
-		padding: 0.5rem 0.75rem;
-		border-radius: 0.5rem;
-		height: fit-content;
-	}
-
-	&-square {
-		height: 2.5rem;
-		width: 2.5rem;
-
-		padding: 1rem;
-		border-radius: 0.5rem;
-		font-size: 1.125rem;
-	}
-
-	&-close-popup {
-		position: absolute;
-
-		right: 0;
-		top: 0;
-
-		width: 3rem;
-		height: 3rem;
-
-		background: transparent;
-
-		padding: 0;
-
-		border-radius: 0;
-
-		img {
-			width: 33%;
-		}
-	}
-
-	&-delete {
-		&:hover {
-			background: red;
-		}
-	}
-
-	&-grey {
-		background: rgba(var(--dark), 1);;
-		background-color: #F7F7F7;
-	}
-
-	&-sort {
-		height: 2.5rem;
-
-		padding: 0.5rem 1.25rem;
-
-		text-transform: none;
-		font-size: 1rem;
-		background: rgba(var(--dark), 1);;
-		background-color: #F7F7F7;
-	}
-
-	&-active {
-		background: rgb(var(--main));;
-		color: white;
-		&:hover {
-			background: rgb(var(--main));;
-			color: rgba(255,255,255,0.75);
-
-		}
-	}
-
-	
-
-	
-	&-filter {
-		height: 2.5rem;
-
-		padding: 0;
-		border-radius: 0.5rem;
-		font-size: 1.125rem;
-
-		background: rgba(var(--dark), 1);;
-		background: white;
-	}
-
-	&-disabled {
-		color: rgba(0,0,0,0.5);
-
-		&:hover {
-			color: rgba(0,0,0,0.5);
-		}
-		&:active {
-			pointer-events: none;
-			transform: scale(1,1);
-		}
-	}
-	&-active {
-		background: rgb(var(--main));;
-		color: white;
-		&:hover {
-			background: rgb(var(--main));;
-			color: rgba(255,255,255,0.75);
-
-		}
-	}
-	&-reset-filter {
-		width: 100%;
-		text-transform: uppecase;
-		height: 3.75rem;
-
-		background: transparent;
-
-		&:hover {
-			background: rgb(var(--main));;
-			color: black;
-
-		}
-	}
-	
-	&-icon {
-		height: 1rem; width: 1rem; background: transparent; img { width: 100%; height: 100%}
-		background: transparent;
-		box-shadow: none;
-		border-radius: 0;
-		padding: 0;
-
-		&:hover {
-			cursor: pointer;
-		}
-	}	
-	
-	
-	&-link      {
-		color: rgba(0, 0, 0, 0.5);
-		font-size: 1.125rem;
-		display: flex;
-		align-items: center;
-		font-weight: 600;
-
-		&-blue {color: #2495FF;}
-		
-		&-black{color: rgba(0, 0, 0, 0.5);}
-		
-		&-cream {color: #DBADAA; text-align: left; font-weight: 600; letter-spacing: 0;}
-		
-	}
-
-	&-otr-link {
-		display: inline-flex;
-		margin-top: 0.25rem;
-		align-items: center;
-		color: #000;
-
-		img { margin-right: 0.5rem;}
-	}
-	
-	&-cart {
-		display: inline-flex;
-		color: #000;
-		height: 3rem;
-		width: 3rem;
-		font-weight: 700;
-		width: fit-content;
-		font-size: 1.5rem;
-		background: rgb(var(--main));;
-		background: #FAF7F3;
-		text-transform: none;
-		padding: 0.75rem 1rem;
-		border-radius: 4rem;
-
-		&:hover {
-			background: rgb(var(--main));;
-			color: white;
-			opacity: 1;
-
-			cursor: pointer;
-		}
-	}
-
-	&-cart-big {
-		display: inline-flex;
-		color: #000;
-		font-weight: 700;
-		width: fit-content;
-		background: #FFE500;
-		text-transform: none;
-		font-size: 2rme;
-		padding: 1.5rem 2rem;
-		border-radius: 2rem;
-	}
-
-	&-blog {
-		padding: 0.75rem 1rem;
-		background-color: #2495FF;
-		color: #fff;
-		border-radius: 0.375rem;
-		font-size: 1.125rem;
-		text-transform: uppercase;
-		width: fit-content;
-	}
-
-	&-nav-footer{
-		color: #000;
-		font-size: 0.875rem;
-		font-weight: 700; display: flex;
-		align-items: center;
-			svg {margin-right: 0.5rem;}}
-
-	&-inst {
-		background: radial-gradient(179.06% 43.44% at -16.75% 7.2%, #3771C8 0%, #3771C8 12.8%, rgba(102, 0, 255, 0) 100%),
-		radial-gradient(92.18% 99.11% at 26.56% 107.7%, #FFDD55 0%, #FFDD55 10%, #FF543E 50%, #C837AB 100%);
-		color: white;
-		font-size: 1.125rem;
-		font-weight: 700;
-		text-transform: uppercase;
-		padding: 0.75rem 0.75rem;
-		border-radius: 0.5625rem;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: fit-content;
-		box-shadow: 4px 4px 24px -12px rgba(201, 163, 163, 0.5);
-		img {margin-right: 0.5rem}
-	}
-}