@ozdao/prometheus-framework 0.2.311 → 0.2.313

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.311",
+  "version": "0.2.313",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/BottomSheet/BottomSheet.vue

@@ -3,8 +3,10 @@
     <section 
       ref="wrapper" 
       class="w-100 h-100vh"
-      :style="MOBILE_APP === 'ios' ?'padding-top: 6rem;':''" 
-    >
+      :class="{
+        'pd-t-extra': MOBILE_APP === 'ios',  
+      }"
+      >
       <!-- Toggle To Close -->
       <div
         @click="emits('toggle')"

package/src/components/Feed/Feed.vue

@@ -7,6 +7,7 @@
       :placeholder="search.placeholder || 'Search...'"
       :class="search.class || 'bg-light'"
       @search="updateSearch"
+      :autofocus="search.autofocus"
     />
 
     <template

package/src/components/Field/Field.vue

@@ -12,7 +12,8 @@
     value: null,
     validation: false,
     disabled: null,
-    tabindex: -1
+    tabindex: -1,
+    autofocus: false
   });
 
   if (props.value) {
@@ -20,20 +21,23 @@
   }
 
   const textarea = ref(null);
+  const input = ref(null);
+
 
   function resize() {
     if (textarea.value) textarea.value.style.height = "1rem";
     if (textarea.value) textarea.value.style.height = textarea.value?.scrollHeight + "px";
   }
 
-
   onUpdated(() => {
-   if (props.type === 'textarea') nextTick(() => {  { focus()} })
+   if (props.type === 'textarea') 
+    nextTick(() => {  { focus()} })
     resize()
   });
 
   onMounted(() => {
-    if (props.type === 'textarea') nextTick(() => {  { focus()} })
+    if (props.type === 'textarea') 
+      nextTick(() => {  { focus()} })
     resize()
   });
 
@@ -62,6 +66,7 @@
     <div class="w-100">
       <input 
         v-if="type !== 'textarea'"
+        ref="input"
         @input="event => text = emit('update:field', event.target.value)"
         @focus="event => emit('focus', event)"
         @blur="event => emit('blur', event)"
@@ -71,6 +76,8 @@
         :placeholder="placeholder"
         :tabindex="tabindex"
         :disabled="disabled"
+        :autofocus="autofocus"
+
       />
       <textarea 
         v-else

package/src/modules/auth/views/router/users.js

@@ -57,7 +57,7 @@ const users = {
     component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEdit.vue'),
   },{
     path: ':_id/blogposts',
-    name: 'User Blogposts',
+    name: 'User Posts',
     meta: {
       title: {
         en: 'Posts',

package/src/modules/community/components/pages/CreateBlogPost.vue

@@ -308,7 +308,7 @@ function onDelete() {
   if (confirm('Are you sure you want to delete this post?')) {
     blog.remove(post.value._id)
       .then(response => {
-        router.push({ name: 'User Blogposts', params: { _id: post.value.creator.target._id } });
+        router.push({ name: 'User Posts', params: { _id: post.value.creator.target._id } });
       })
       .catch(error => {
         console.log(error);

package/src/modules/globals/views/components/blocks/BlockSearch.vue

@@ -10,6 +10,10 @@ const props = defineProps({
     type: String,
     default: 'Enter shop or product name'
   },
+  autofocus:{ 
+    type: Boolean,
+    default: false
+  },
   button: {
     type: String,
     default: 'Search'
@@ -30,6 +34,7 @@ const updateSearch = (search) => {
     <Field
       :placeholder="placeholder"
       @update:field="search => updateSearch(search)"
+      :autofocus="autofocus"
       class="w-100"
     />
 

package/src/modules/globals/views/components/layouts/Client.vue

@@ -30,14 +30,14 @@
       />
 		</transition>
 
-	  <Popup 
+	  <!-- <Popup 
 	  	v-if="route.meta.header.location"
 	  	@close-popup="closeLocationPopup" 
 	  	:isPopupOpen="globals.state.isOpenLocationPopup"
 	  	class="bg-white pd-semi w-m-33r radius-big"
 	  >	
 	  	<LocationSelection />
-	  </Popup>
+	  </Popup> -->
 
 		<section 
 			id="screen" 

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

@@ -50,6 +50,21 @@
 		    </span>
 		  </MenuItem>
 
+		  <MenuItem 
+		  	v-if="hasAccess(route.params._id, 'products', 'read', auth.state.accesses)"
+		  	@click="router.push({
+		  		name: 'Categories', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		  	<IconProducts class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
+		    <span>
+		    	Categories
+		    </span>
+		  </MenuItem>
+
 		  <MenuItem 
 		  	v-if="hasAccess(route.params._id, 'leftovers', 'read', auth.state.accesses)"
 		  	@click="router.push({

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

@@ -1,6 +1,46 @@
 <template>
-  <div class="flex-v-center flex-column flex">
-    <h4 class="mn-r-auto">{{category.order}} / {{category.name}}</h4>
+  <div class="flex-v-center bg-light pd-small radius-small flex-column flex">
+    <div class="w-100 flex-nowrap gap-thin flex">
+      <h4 class="my-handle mn-r-auto">{{category.name}}</h4>
+
+      <router-link
+       :to="{
+          name: 'Category Edit', 
+          params: { 
+            _id: route.params._id,
+            category: category.url
+          } 
+        }"
+        class="
+          i-semi
+          z-index-2
+          cursor-pointer 
+          card-page-actions
+          radius-extra pd-micro bg-second
+        "
+      >
+        <IconEdit
+          class="w-100 h-100" 
+          classes="fill-white"
+        />
+      </router-link>
+
+      <button
+        @click="deleteCategory(category)"
+        class="
+          i-semi
+          z-index-2
+          cursor-pointer 
+          card-page-actions
+          radius-extra pd-micro bg-second
+        "
+      >
+        <IconAdd
+          class="w-100 h-100"
+          :fill="'white'"
+        />
+      </button>
+    </div>
 
     <!-- <p v-if=" category.children.length > 0" class="w-100">Subcategories:</p> -->
    <!--  <CardCategory
@@ -10,25 +50,6 @@
       class="pd-l-small bg-white w-100"
     /> -->
 
-    <router-link 
-    	:to="{
-				name: 'Category Edit', 
-				params: { 
-					_id: route.params._id,
-					category: category.url
-				} 
-			}"
-    	class="mn-r-medium nav-link"
-    >
-    	Edit
-   	</router-link>
-
-    <a 
-    	class="nav-link" 
-    	@click="deleteCategory(category)"
-    >
-  		Delete
-  	</a>
    </div>
 </template>
 
@@ -39,6 +60,9 @@ import { useRoute, useRouter } from 'vue-router';
 
 import CardCategory from './CardCategory.vue'
 
+import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
+import IconAdd from '@pf/src/modules/icons/navigation/IconAdd.vue'
+
 const props = defineProps({
   category: Object,
 });
@@ -55,10 +79,17 @@ const deleteCategory = (category) => {
 </script>
 
 
-<style lang="scss">
-.categories-card {
 
+<style lang="scss">
+.card-title {
+  .card-page-actions {
+    display: none;
+  }
+
+  &:hover {
+    .card-page-actions {
+      display: block;
+    }
+  }
 }
 </style>
-
-

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

@@ -1,12 +1,14 @@
 <template>
 	<div 
 		class="
-			radius-big 
+			radius-medium 
 			cols-1
 			o-hidden
 			pos-relative
 		"
 	>
+
+		<!-- listing/ -->
 		<router-link
 			v-if="access"
       :to="organization ? { name: 'Organization_ProductEdit', params: { _id: organization, product: product._id	} } : { name: 'ProductEdit' }" 
@@ -27,7 +29,7 @@
 
 
 		<div 
-			class="o-hidden w-100 pos-relative aspect-1x1"
+			class="o-hidden pd-thin pd-b-zero radius-medium o-hidden w-100 pos-relative aspect-1x1"
 			:class="
 				product.information[2] 
 				&& product.information[2].value === 'AAAA' 
@@ -45,14 +47,14 @@
 
 			<PlaceholderImage
 				v-else
-				class="pos-absolute h-100 w-100"
+				class="bg-white radius-medium h-100 w-100"
 			/>
-			<span v-if="product.quantity <= 0" class="pos-absolute bg-white t-black pd-thin radius-big p-small t-medium pos-t-medium pos-l-medium">Out of Stock</span>
+			<span v-if="product.quantity <= 0 && product.listing === 'rent'" class="pos-absolute bg-white t-black pd-thin radius-big p-small t-medium pos-t-medium pos-l-medium">Out of Stock</span>
 			<THC v-if="product.information?.length > 0 && product.information[1]?.name === 'THC'" :product="product" />
 		</div>
 
 		<!-- Product Info Start -->
-		<div  class="pd-medium t-left product-card-content">
+		<div  class="pd-small t-left product-card-content">
 			<!-- Detail -->
 			<p 
 				v-if="product.information.length > 0"  
@@ -67,12 +69,12 @@
 				{{product.information[0].value}}
 			</p>
 			<!-- Name -->
-			<p class="mn-b-thin t-semi h4">
-				{{product.name}}
-			</p>
+			<span style=" hyphens: auto;" class="word-break mn-b-thin w-100 w-max-100 t-regular h5">
+				{{product.name.substring(0,32)}}...
+			</span>
 
 			<p 
-				v-if="product.description && !product.localization" 
+				v-if="product.description && !product.localization && product.listing !== 'rent'" 
 				class="mn-b-small t-transp p-small"
 			>
 				{{product.description.substring(0, 99)}}...
@@ -83,16 +85,28 @@
 				<span v-if="$i18n.locale === 'ru'">{{product.localization[1].text.substring(0, 99)}}...</span>
 			</p> -->
 			
-			<Price 
-				:product="product" 
-				size="small" 
-				:class="
-					product.information[2] 
-					&& product.information[2].value === 'AAAA' 
-					? 'bg-third t-white' 
-					: ''
-				" 
-			/>
+			<div class="flex-v-center flex-nowrap flex">
+				<Price 
+					:product="product" 
+					size="small" 
+					class="mn-r-auto" 
+				/>
+
+			
+
+				<button
+					v-if="user && product.listing === 'rent'"
+		      class="
+		      	z-index-2
+		        cursor-pointer 
+		        radius-extra pd-thin bg-main
+		      "
+		    >
+		      <svg class="i-medium" xmlns="http://www.w3.org/2000/svg" width="26" height="21" viewBox="0 0 26 21" fill="none">
+						  <path d="M8.19141 15.582C7.49414 15.582 6.95638 15.3861 6.57812 14.9941C6.19987 14.6022 5.95833 14.0622 5.85352 13.374L4.52734 4.30957H1.9502C1.68587 4.30957 1.45801 4.21387 1.2666 4.02246C1.0752 3.8265 0.979492 3.59408 0.979492 3.3252C0.979492 3.05632 1.0752 2.82617 1.2666 2.63477C1.45801 2.4388 1.68587 2.34082 1.9502 2.34082H4.91699C5.43197 2.34082 5.79655 2.44564 6.01074 2.65527C6.22493 2.86035 6.36393 3.16797 6.42773 3.57812L6.55078 4.42578H14.7471C14.7288 4.5625 14.7152 4.69922 14.7061 4.83594C14.6969 4.97266 14.6924 5.10938 14.6924 5.24609C14.6924 6.04362 14.8405 6.79102 15.1367 7.48828C15.4329 8.18555 15.8454 8.80306 16.374 9.34082C16.9072 9.87858 17.5247 10.3024 18.2266 10.6123C18.9284 10.9176 19.6826 11.0771 20.4893 11.0908L20.4209 11.248C20.2432 11.5671 20.0016 11.8132 19.6963 11.9863C19.391 12.1595 19.0127 12.2461 18.5615 12.2461H7.67188L7.80859 13.1963C7.84049 13.3831 7.90885 13.5335 8.01367 13.6475C8.11849 13.7614 8.25977 13.8184 8.4375 13.8184H18.459C18.696 13.8184 18.9056 13.8981 19.0879 14.0576C19.2702 14.2171 19.3613 14.429 19.3613 14.6934C19.3613 14.9622 19.2702 15.1787 19.0879 15.3428C18.9056 15.5023 18.696 15.582 18.459 15.582H8.19141ZM7.34375 18.4873C7.34375 18.1865 7.41667 17.9108 7.5625 17.6602C7.71289 17.4141 7.91113 17.2181 8.15723 17.0723C8.40788 16.9264 8.68359 16.8535 8.98438 16.8535C9.28516 16.8535 9.55859 16.9264 9.80469 17.0723C10.0553 17.2181 10.2536 17.4141 10.3994 17.6602C10.5452 17.9108 10.6182 18.1865 10.6182 18.4873C10.6182 18.7926 10.5452 19.0684 10.3994 19.3145C10.2536 19.5651 10.0553 19.7611 9.80469 19.9023C9.55859 20.0482 9.28516 20.1211 8.98438 20.1211C8.68359 20.1211 8.40788 20.0482 8.15723 19.9023C7.91113 19.7611 7.71289 19.5651 7.5625 19.3145C7.41667 19.0684 7.34375 18.7926 7.34375 18.4873ZM15.3555 18.4873C15.3555 18.1865 15.4284 17.9108 15.5742 17.6602C15.7246 17.4141 15.9229 17.2181 16.1689 17.0723C16.4196 16.9264 16.6953 16.8535 16.9961 16.8535C17.3014 16.8535 17.5771 16.9264 17.8232 17.0723C18.0693 17.2181 18.2653 17.4141 18.4111 17.6602C18.5615 17.9108 18.6367 18.1865 18.6367 18.4873C18.6367 18.7926 18.5615 19.0684 18.4111 19.3145C18.2653 19.5651 18.0693 19.7611 17.8232 19.9023C17.5771 20.0482 17.3014 20.1211 16.9961 20.1211C16.6953 20.1211 16.4196 20.0482 16.1689 19.9023C15.9229 19.7611 15.7246 19.5651 15.5742 19.3145C15.4284 19.0684 15.3555 18.7926 15.3555 18.4873ZM20.5439 9.82617C19.915 9.82617 19.3226 9.70768 18.7666 9.4707C18.2152 9.23372 17.7275 8.90332 17.3037 8.47949C16.8799 8.05566 16.5472 7.56803 16.3057 7.0166C16.0687 6.46061 15.9502 5.86816 15.9502 5.23926C15.9502 4.61035 16.0687 4.02018 16.3057 3.46875C16.5472 2.91732 16.8799 2.42969 17.3037 2.00586C17.7275 1.58203 18.2152 1.25163 18.7666 1.01465C19.3226 0.773112 19.915 0.652344 20.5439 0.652344C21.1729 0.652344 21.763 0.773112 22.3145 1.01465C22.8704 1.25163 23.3581 1.58203 23.7773 2.00586C24.2012 2.42513 24.5316 2.91276 24.7686 3.46875C25.0055 4.02018 25.124 4.61035 25.124 5.23926C25.124 5.86361 25.0033 6.45378 24.7617 7.00977C24.5247 7.5612 24.1943 8.04883 23.7705 8.47266C23.3467 8.89648 22.8568 9.22917 22.3008 9.4707C21.7493 9.70768 21.1637 9.82617 20.5439 9.82617ZM20.5439 8.19922C20.7445 8.19922 20.904 8.13997 21.0225 8.02148C21.141 7.89844 21.2002 7.73893 21.2002 7.54297V5.89551H22.8408C23.0368 5.89551 23.194 5.83626 23.3125 5.71777C23.4355 5.59928 23.4971 5.44206 23.4971 5.24609C23.4971 5.04557 23.4355 4.88607 23.3125 4.76758C23.194 4.64453 23.0368 4.58301 22.8408 4.58301H21.2002V2.95605C21.2002 2.75553 21.141 2.59603 21.0225 2.47754C20.904 2.35905 20.7445 2.2998 20.5439 2.2998C20.3434 2.2998 20.1839 2.36133 20.0654 2.48438C19.9469 2.60286 19.8877 2.76009 19.8877 2.95605V4.58301H18.2539C18.0534 4.58301 17.8916 4.64453 17.7686 4.76758C17.6501 4.88607 17.5908 5.04557 17.5908 5.24609C17.5908 5.44206 17.6523 5.59928 17.7754 5.71777C17.8984 5.83626 18.0579 5.89551 18.2539 5.89551H19.8877V7.54297C19.8877 7.73893 19.9469 7.89844 20.0654 8.02148C20.1839 8.13997 20.3434 8.19922 20.5439 8.19922Z" fill="white"/>
+						</svg>
+		    </button>
+		  </div>
 		</div>
 
 	</div>
@@ -134,7 +148,19 @@
 </script>
 
 <style lang="scss">
-
+.word-break {
+  width: 100%; 
+  overflow: auto;
+  overflow-wrap: break-word;
+  word-break: break-all;
+  white-space: -moz-pre-wrap;
+  white-space: -hp-pre-wrap;
+  white-space: -o-pre-wrap;
+  white-space: -pre-wrap; 
+  white-space: pre-wrap; 
+  white-space: pre-line; 
+  word-wrap: break-word;
+}
 </style>
 
 

package/src/modules/products/components/elements/Price.vue

@@ -1,5 +1,6 @@
 <template>
 	<div 
+      v-if="product.listing !== 'rent'"
     class="price-tag radius-small"
     :class="
       { 
@@ -17,9 +18,16 @@
         }
       " 
     >
-      {{product.price }} {{returnCurrency()}} 
+      {{product.price }} {{product.price_currency}} {{ product.listing === 'rent' ? 'per day' : '' }} 
     </p>
-    <p v-if="product.sale"  class="pd-r-small t-transp t-transp p-medium line-through price">{{(product.price / 100) * (100 + product.sale) }} {{returnCurrency()}} </p>
+    <p v-if="product.sale"  class="pd-r-small t-transp t-transp p-medium line-through price">{{(product.price / 100) * (100 + product.sale) }} {{product.price_currency}} </p>
+  </div>
+
+  <div
+    v-else
+    class="mn-r-auto"
+  >
+    <span class="t-second h5 "> {{product.price+product.price_currency }}</span> <span class="p-small t-transp">/ per day </span>
   </div>
 </template>
 

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

@@ -2,7 +2,9 @@
 	<Feed
 		v-model:sort="marketplace.state.sort"
 		v-model:filter="marketplace.state.filter"
-    :search="true"
+    :search="{
+    	autofocus:true
+    }"
     :showLoadMore="false"
     :states="{
       empty: {

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

@@ -91,7 +91,7 @@
       
     </Block>
     <!-- Subcategories -->
-    <Block
+    <!-- <Block
       title="Subcategories"
       placeholder="No subcategories added yet"
       :actions="[{
@@ -100,36 +100,6 @@
       }]"
       class="mn-b-thin"
     >
-
-      {{categories.state.current.children}}
-      <Feed
-        :states="{
-          empty: {
-            title: 'No Events Found',
-            description: 'Currently, there are no events available.'
-          }
-        }"
-        :store="{
-          read: (options) => categories.actions.read(options),
-          state: categories.state
-        }"
-        :options="{
-            user: auth.state.user._id,
-            limit: 10
-        }"
-        v-slot="{ 
-          items 
-        }"
-      >
-        <div 
-          v-for="(category,index) in items"
-          @click="() => { categories.state.current.children.push(category._id) }"
-          class="bg-white pd-medium radius-small mn-b-medium"
-        >
-          {{category.name}}
-        </div>
-        
-      </Feed>
    
       <div 
         class="gap-thin mn-b-thin flex-nowrap flex" 
@@ -155,7 +125,7 @@
           />
         </div>
       </div> 
-    </Block>
+    </Block> -->
      <!-- Filters -->
     <Block
       title="Filters"

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

@@ -1,15 +1,12 @@
 <template>
-	<div class="flex flex-column w-100 o-hidden gap-thin pd-thin">
+	<div class="h-100 w-100 bg-white ">
 		<!-- <Breadcrumbs class="bg-light radius-big pd-small"/> -->
-		<!-- {{product.quantity}}
-		<div v-if="product.ingredients">
-			{{product?.ingredients[0]?._id}}
-			{{product?.ingredients[0]?.quantity}}
-			{{product?.ingredients[1]?.quantity}}
-		</div> -->
 		<SectionProduct v-if="product" :product="product" :user="auth.state.user" class="pos-relative"/>
 
-		<PopularProducts />
+		<div class="h-max pos-relative">
+		  <h3 class="pd-medium pd-b-small">Most Popular</h3>
+			<PopularProducts />
+		</div>
 	</div>
 </template>
 
@@ -40,12 +37,6 @@
 
 	const text = {
 		messages: {
-			en: {
-
-			},
-			ru: {
-
-			}
 		}
 	};
 
@@ -62,11 +53,4 @@
 </script>
 
 <style lang="scss">
-.h1-product  {
-	font-size: 3rem;
-}
-.produc-data { 
-	padding-top: 2rem;
-	padding-bottom: 0;
-}
 </style>

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

@@ -45,7 +45,7 @@
     />
 
 
-    <div class="rows-1 h-100 z-index-3 bg-white radius-tl-big radius-tr-big">
+    <div class="z-index-3 bg-white radius-tl-big radius-tr-big">
       <div class="pd-thin z-index-3 radius-tl-big radius-tr-big pos-t-0 pos-sticky">
         <BlockSearch 
           @search="updateSearch"
@@ -55,7 +55,6 @@
       </div>
       <Feed
         v-model:filter="marketplace.state.filter"
-        
         :states="{
           empty: {
             title: 'No Products Found',
@@ -80,17 +79,20 @@
           items 
         }"
         class="cols-4 rows-1 pd-t-zero pd-thin gap-thin"
+       
       >
         <router-link  
           v-for="product in items" 
-          :to="route.params._id ? { name: 'Organization_Product', params: { _id: route.params._id, product: product._id  } } : { name: 'Product', params: { product: product._id  } }">
+          :to="route.params._id ? { name: 'Organization_Product', params: { _id: route.params._id, product: product._id  } } : { name: 'Product', params: { product: product._id  } }"
+           class="pos-relative h-100 w-100"
+          >
           <CardProduct
             :key="product._id"
             :product="product"
             :user="auth.state.access"
             :organization="route.params._id"
             :access="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses)"
-            class="h-max bg-light"
+            class="pos-relative  h-100 w-100 bg-light"
           />
         </router-link>
       </Feed>

package/src/modules/products/components/sections/CategoriesTree.vue

@@ -3,22 +3,20 @@
     v-bind="dragOptions" 
     class="dragArea list-group w-full"
     :list="items"
+    :handle="'.my-handle'"
     @change="handleChange"
   >
-    <div v-for="category in items" :key="category._id" class="pd-medium bg-light radius-medium mn-b-thin">
+    <div v-for="category in items" :key="category._id" class="mn-t-thin  radius-medium mn-b-thin">
       <CardCategory 
         :category="category" 
         @delete="deleteCategory" 
       />
-      <div
-      >
-      <!-- Subcategories: -->
       <CategoryList 
         :items="category.children"
         :state="items"
         @update="emitChange"
+        class="pd-l-medium"
       />
-      </div>
     </div>
   </VueDraggableNext>
 </template>