@ozdao/prometheus-framework 0.2.30 → 0.2.31

package/src/{modules/globals/components/sections → components/Feed}/Feed.vue

@@ -1,48 +1,42 @@
 <template>
-  <section class="feed">
-
-    <TransitionGroup tag="ul" name="scaleTransition" class="o-hidden bg-grey radius-big">
-      <SkeletonEvent
-        v-if="isLoading"
-        v-for="i in currentLimit" :key="i"
-      />
-    </TransitionGroup>
-
-    <transition name="scaleTransition">
-      <EmptyState
-        v-if="!isLoading && itemsList.length < 1"
-        :title="states.empty.title"
-        :description="states.empty.description"
-        class="pd-medium mn-b-thin bg-grey radius-big"
-      />
-    </transition>
-
-    <!-- <SortProducts
-
-    /> -->
-
-    <TransitionGroup tag="ul" name="scaleTransition" class="cols-1 gap-thin">
-    
-
-      <slot
-        v-if="!isLoading && itemsList.length > 0"
-        :items="itemsList"
-        :user="user"
-      ></slot>
-
-      <button
-        v-if="hasMoreItems && itemsList.length > 0"
-        @click="loadMoreItems"
-        class="w-100 bg-main button"
-      >
-        Load more
-      </button>
-    </TransitionGroup>
-  </section>
+  <TransitionGroup v-if="isLoading" tag="ul" name="scaleTransition" class="o-hidden bg-grey radius-big">
+    <SkeletonEvent
+      v-if="isLoading"
+      v-for="i in currentLimit" :key="i"
+    />
+  </TransitionGroup>
+  <transition name="scaleTransition">
+    <EmptyState
+      v-if="!isLoading && itemsList.length < 1"
+      :title="states.empty.title"
+      :description="states.empty.description"
+      class="pd-medium mn-b-thin bg-grey radius-big"
+    />
+  </transition>
+
+  <!-- <SortProducts
+
+  /> -->
+
+  <TransitionGroup tag="ul" name="scaleTransition" :class="$attrs.class">
+    <slot
+      v-if="!isLoading && itemsList.length > 0"
+      :items="itemsList"
+      :user="user"
+    ></slot>
+  </TransitionGroup>
+
+  <button
+    v-if="hasMoreItems && itemsList.length > 0"
+    @click="loadMoreItems"
+    class="w-100 bg-main button"
+  >
+    Load more
+  </button>
 </template>
 
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, onMounted, watch } from 'vue';
 
 import SkeletonEvent from '@pf/src/modules/icons/skeletons/SkeletonEvent.vue'
 
@@ -79,12 +73,13 @@ const props = defineProps({
       user:  null,
       status: null,
       period:  null,
+      contain:  null,
     }),
   },
 });
   
 const itemsList = ref([]);
-const hasMoreItems = ref(true);
+const hasMoreItems = ref(false);
 
 let isLoading = ref(true);
 
@@ -109,14 +104,17 @@ const loadMoreItems = async () => {
 
     if (data.length === 0) {
       hasMoreItems.value = false;
+    } else if (data.length < currentLimit.value) {
+      hasMoreItems.value = false;
+    } else {
+      hasMoreItems.value = true;
     }
 
     itemsList.value = [...itemsList.value, ...data];
   }
 };
 
-onMounted(async () => {
-  console.log(props.options)
+const fetchItems = async () => {
   const data = await props.store.read({
     skip: currentSkip.value,
     limit: currentLimit.value,
@@ -125,12 +123,29 @@ onMounted(async () => {
 
   if (data.length === 0) {
     hasMoreItems.value = false;
+  } else if (data.length < currentLimit.value) {
+    hasMoreItems.value = false;
   } else {
     hasMoreItems.value = true;
   }
 
   itemsList.value = data;
-  
   isLoading.value = false;
+};
+
+watch(() => props.options, (newVal, oldVal) => {
+  if (
+    newVal.organization !== oldVal.organization ||
+    newVal.categories !== oldVal.categories ||
+    newVal.prices !== oldVal.prices ||
+    newVal.delivery !== oldVal.delivery
+  ) {
+    fetchItems();
+  }
+}, { deep: true });
+
+
+onMounted(async () => {
+  await fetchItems()
 });
 </script>

package/src/components/FieldBig/FieldBig.vue

@@ -3,13 +3,13 @@
     <Field
       v-model:field="inputField"
       @update:field="updateInput"
-      :placeholder="inputPlaceholder"
+      :placeholder="typing ? ' ' : inputPlaceholder"
       @input="handleInput"
       @focus="handleFocus"
       @blur="checkInput"
-      class="w-100 pd-small p-big"
+      class="w-100 t-semi uppercase pd-small p-big"
     />
-    <button v-if="action" @click="emitAction" class="w-min hover_bg-white hover-t-black t-black bg-main  button" v-html="action"/>
+    <button v-if="action" @click="emitAction" class="w-min hover-bg-black hover-t-white t-black bg-main  button" v-html="action"/>
   </div>
 </template>
 
@@ -30,8 +30,16 @@
     placeholderTexts: {
       type: Object,
       default: () => ({
-        en: ['First placeholder', 'Second placeholder', 'Third placeholder'],
-        ru: ['Первый плейсхолдер', 'Второй плейсхолдер', 'Третий плейсхолдер']
+        en: [
+          'Lowest THC, please!',
+          'Something with banana flavors?',
+          "I'm in the mood for trippy vibes."
+        ],
+        ru: [
+          'Я хочу самый низкий THC',
+          'Я хочу чего-нибудь бананового',
+          'Я хочу курнуть хейза'
+        ],
       })
     },
     typingSpeed: {
@@ -77,8 +85,11 @@
 
   function handleFocus() {
     typing.value = false
+
     clearInterval(typeInterval.value)
+
     inputPlaceholder.value = props.placeholder
+
     if (!userText.value) {
       inputField.value = ''
     }

package/src/components/FieldPhone/FieldPhone.vue

@@ -410,7 +410,7 @@
           metadata,
           ...phoneObject
         } = result;
-        console.log(result)
+        
         // console.log(result.isValid?result.isValid():'loll')
         let valid = result.isValid?.();
         let formatted = this.phone;
@@ -876,6 +876,7 @@
   margin-right:5px
 }
 .vti__input{
+  color: inherit;
   border:none;
   border-radius:0 2px 2px 0;
   width:100%;

package/src/components/Footer/Footer.vue

@@ -1,19 +1,19 @@
 <template>
 <div class="pd-t-zero pd-thin">
-  <footer class="bg-black t-white radius-big footer">
-
+  <footer class="bg-black t-white radius-small pd-thin">
+<!-- 
     <div id="top-footer" class="cols-3 section">
      
     <a href="mailto:hello@weeder.delivery" class="w-100 radius-small contact col">
-      <!-- <img class="mn-b-small h-3r" src="/logo/logotype-white.svg">   -->
+      <img class="mn-b-small h-3r" src="/logo/logotype.svg">  
       <p class="t-transp ">{{t('description')}}</p>
     </a>
 
       <div @click="this.$router.push({ name: 'Home' } )" class="flex-v-center flex logo-link col">
          <p class="h4 mn-b-small">{{t('app')}}</p>
         <div class="store-buttons">
-        <!-- <img class="h-3r" src="/assets/images/landing/appsvg" alt="Download on App Store"> -->
-        <!-- <img class="h-3r"  src="/assets/images/landing/googleplay.svg" alt="Download on Google Play"> -->
+        <img class="h-3r" src="/assets/images/landing/appsvg" alt="Download on App Store">
+        <img class="h-3r"  src="/assets/images/landing/googleplay.svg" alt="Download on Google Play">
         </div>
       </div>
       
@@ -22,13 +22,13 @@
 
         <div class="socials flex-nojustify flex">
           <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
-            <!-- <img src="@/assets/images/icons/Telegram_blue.svg"> -->
+            <img src="@/assets/icons/Telegram_blue.svg">
           </a> 
           <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
-            <!-- <img src="@/assets/images/icons/Telegram_blue.svg"> -->
+            <img src="@/assets/icons/Telegram_blue.svg">
           </a> 
           <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
-            <!-- <img src="@/assets/images/icons/Telegram_blue.svg"> -->
+            <img src="@/assets/icons/Telegram_blue.svg">
           </a> 
         </div>
       </a>
@@ -44,14 +44,14 @@
 
         <div class="mn-b-medium ol">
           <li v-for="(category,index) in categories.state.all">
-            <!-- <router-link :to="{ name: 'CatalogCategory', params: { url: category.url }}"> -->
+            <router-link :to="getMarketplaceLink([category.url])">
               <span v-html="t('categories[' + index + ']')"></span>
-            <!-- </router-link>   -->
+            </router-link>  
           </li>
         </div>
 
         <a href="https://ozdao.dev" target="_blank">
-          <!-- <img src="@/assets/images/icons/ozdao.svg"> -->
+          <img src="/icons/ozdao.svg">
         </a>
       </ul>
       
@@ -60,12 +60,7 @@
         <li class="mn-b-small t-semi h5">
           {{t('information')}}
         </li>
-        <!-- <li  v-for="(page,index) in pages"> -->
-
-          <!-- <router-link :to="{ name: 'Page', params: { url: page.url}}" class="col nav-link"> -->
-             <!-- <span v-html="t('pages[' + index + ']')"></span> -->
-          <!-- </router-link> -->
-        <!-- </li> -->
+       
       </ul>
       
       <ul class="lh-semi col">
@@ -80,11 +75,19 @@
 
       </ul>
 
-    </div> 
+    </div>  -->
+ <!-- <li  v-for="(page,index) in pages"> -->
 
+          <!-- <router-link :to="{ name: 'Page', params: { url: page.url}}" class="col nav-link"> -->
+             <!-- <span v-html="t('pages[' + index + ']')"></span> -->
+          <!-- </router-link> -->
+        <!-- </li> -->
     
-    <p class="pd-small t-center br-top-dark copyright">
-      {{t('copyright')}}
+    <p class="t-semi uppercase t-center">
+      {{ t('year') }} 
+      <span class="t-main copyleft">{{ t('heart') }}</span> 
+      {{ t('name') }}, {{ t('tagline') }} 
+      <a href="https://ozdao.dev" class="t-main" target="_blank" rel="noopener" >OZ DAO.</a>
     </p>
   </footer>
 </div>
@@ -95,11 +98,9 @@
   import { useRouter } from 'vue-router'
   import { useI18n }    from 'vue-i18n'
   
-  import * as categories from '@pf/src/modules/products/store/products';
+  import * as categories from '@pf/src/modules/products/store/categories';
 
   const router = useRouter()
-
-  await categories.actions.fetchCategories()
   // await dispatch('pages/fetchAll')
     
   const text = {
@@ -118,7 +119,11 @@
         time: "24 / 7 Seven days a week",
         copyright: "2022 © Weeder Delivery. Proudly created with OZ DAO.",
         pages: [],
-        categories: []
+        categories: [],
+        year: "2023",
+        heart: "❤",
+        name: "Weeder",
+        tagline: "Builded with love in"
       },
       ru: {
         store: 'Онлайн Каталог',
@@ -144,6 +149,13 @@
     })
   })
 
+  onMounted(async() => {
+
+    await categories.actions.fetchCategories()
+
+  })
+
+
   // state.pages.all.forEach( page => {
   //   page.localization.forEach( localization => {
   //     text.messages[localization.locale].pages.push(localization.text)
@@ -155,7 +167,4 @@
 </script>
 
 <style lang="scss">
-#top-footer {
-  padding-bottom: 0;
-}
 </style>