@ozdao/martyrs 0.2.482 → 0.2.483

package/src/modules/globals/views/components/partials/Footer.vue

@@ -1,182 +1,182 @@
-<template>
-  <footer 
-    class="pd-thin pd-t-zero"
-    :class="{
-      't-black bg-white': route.meta.footer_theme === 'light',
-      't-white bg-black': route.meta.footer_theme === 'dark'  
-    }"
-  >
-<!-- 
-    <div id="top-footer" class="cols-3 mobile:cols-1 section">
-     
-    <a href="mailto:hello@weeder.delivery" class="w-100 radius-small contact col">
-      <img loading="lazy" 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 loading="lazy" class="h-3r" src="/assets/images/landing/appsvg" alt="Download on App Store">
-        <img loading="lazy" class="h-3r"  src="/assets/images/landing/googleplay.svg" alt="Download on Google Play">
-        </div>
-      </div>
-      
-      <a href="https://t.me/weeder_support" target="_blank" class="w-100 radius-small contact col">
-        <p class="h4 mn-b-small">{{t('socials')}}</p>
-
-        <div class="socials flex-nojustify flex">
-          <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
-            <img loading="lazy" src="@/assets/icons/Telegram_blue.svg">
-          </a> 
-          <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
-            <img loading="lazy" src="@/assets/icons/Telegram_blue.svg">
-          </a> 
-          <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
-            <img loading="lazy" src="@/assets/icons/Telegram_blue.svg">
-          </a> 
-        </div>
+  <template>
+    <footer 
+      class="pd-thin pd-t-zero"
+      :class="{
+        't-black bg-white': route.meta.footer_theme === 'light',
+        't-white bg-black': route.meta.footer_theme === 'dark'  
+      }"
+    >
+
+      <div id="top-footer" class="cols-3 mobile:cols-1 section">
+       
+      <a href="mailto:hello@weeder.delivery" class="w-100 radius-small contact col">
+        <img loading="lazy" class="mn-b-small h-3r" src="/logo/logotype.svg">  
+        <p class="t-transp ">{{t('description')}}</p>
       </a>
-      
-    </div>
 
-    <div class="cols-3 mobile:cols-1 section">
-      
-      <ul class="lh-semi nav-footer col">
-        <li class="mn-b-small t-semi h5">
-          {{t('store')}}
-        </li>
-
-        <div class="mn-b-medium ol">
-          <li v-for="(category,index) in categories.state.all">
-            <router-link :to="getMarketplaceLink([category.url])">
-              <span v-html="t('categories[' + index + ']')"></span>
-            </router-link>  
-          </li>
+        <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 loading="lazy" class="h-3r" src="/assets/images/landing/appsvg" alt="Download on App Store">
+          <img loading="lazy" class="h-3r"  src="/assets/images/landing/googleplay.svg" alt="Download on Google Play">
+          </div>
         </div>
-
-        <a href="https://ozdao.dev" target="_blank">
-          <img loading="lazy" src="/icons/ozdao.svg">
+        
+        <a href="https://t.me/weeder_support" target="_blank" class="w-100 radius-small contact col">
+          <p class="h4 mn-b-small">{{t('socials')}}</p>
+
+          <div class="socials flex-nojustify flex">
+            <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
+              <img loading="lazy" src="@/assets/icons/Telegram_blue.svg">
+            </a> 
+            <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
+              <img loading="lazy" src="@/assets/icons/Telegram_blue.svg">
+            </a> 
+            <a class="mn-r-small" href="https://t.me/weederdelivery" target="_blank"> 
+              <img loading="lazy" src="@/assets/icons/Telegram_blue.svg">
+            </a> 
+          </div>
         </a>
-      </ul>
-      
+        
+      </div>
 
-      <ul class="lh-semi nav-footer col">
-        <li class="mn-b-small t-semi h5">
-          {{t('information')}}
-        </li>
-       
-      </ul>
-      
-      <ul class="lh-semi col">
-        <li class="mn-b-small t-semi h5">{{t('email')}}</li>
-        <div class="mn-b-medium">
-          <li>Phuket,</li>
-          <li>43 283 Soi Boathouse,</li>
-          <li>Rawai</li>
-        </div>
+      <div class="cols-3 mobile:cols-1 section">
         
+        <ul class="lh-semi nav-footer col">
+          <li class="mn-b-small t-semi h5">
+            {{t('store')}}
+          </li>
+
+          <div class="mn-b-medium ol">
+            <li v-for="(category,index) in categories.state.all">
+              <router-link :to="getMarketplaceLink([category.url])">
+                <span v-html="t('categories[' + index + ']')"></span>
+              </router-link>  
+            </li>
+          </div>
+
+          <a href="https://ozdao.dev" target="_blank">
+            <img loading="lazy" src="/icons/ozdao.svg">
+          </a>
+        </ul>
         
 
-      </ul>
+        <ul class="lh-semi nav-footer col">
+          <li class="mn-b-small t-semi h5">
+            {{t('information')}}
+          </li>
+         
+        </ul>
+        
+        <ul class="lh-semi col">
+          <li class="mn-b-small t-semi h5">{{t('email')}}</li>
+          <div class="mn-b-medium">
+            <li>Phuket,</li>
+            <li>43 283 Soi Boathouse,</li>
+            <li>Rawai</li>
+          </div>
+          
+          
+
+        </ul>
+
+      </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="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>
+  </template>
+
+  <script setup="props">
+    import { computed,onMounted, toRefs,ref } from 'vue'
+    import { useRouter, useRoute } from 'vue-router'
+    import { useI18n }    from 'vue-i18n'
+    
+    import * as categories from '@martyrs/src/modules/products/store/categories.js';
 
-    </div>  -->
- <!-- <li  v-for="(page,index) in pages"> -->
+    // Props
+    const props = defineProps({
+      theme: {
+        type: String,
+        default: "light"
+      }
+    });
 
-          <!-- <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="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>
-</template>
-
-<script setup="props">
-  import { computed,onMounted, toRefs,ref } from 'vue'
-  import { useRouter, useRoute } from 'vue-router'
-  import { useI18n }    from 'vue-i18n'
-  
-  import * as categories from '@martyrs/src/modules/products/store/categories.js';
-
-  // Props
-  const props = defineProps({
-    theme: {
-      type: String,
-      default: "light"
-    }
-  });
-
-  const router = useRouter()
-  const route = useRoute()
-    
-  const text = {
-    locale: 'en',
-    messages: {
-      en: {
-        store: 'Online Store',
-        information: "Information",
-        description: "Weeder Delivery stocks a wide range of quality!",
-        app: 'Get Our App',
-        adress: 'Adress',
-        support: 'Get Online Support',
-        socials: 'Find Us in Socials',
-        email: 'Contact by email',
-        // request: 'hello@weeder.delivery',
-        time: "24 / 7 Seven days a week",
-        copyright: "2024 © Weeder Delivery. Proudly created with OZ DAO.",
-        pages: [],
-        categories: [],
-        year: "2024",
-        heart: "❤",
-        name: "Weeder",
-        tagline: "Builded with love in"
-      },
-      ru: {
-        store: 'Онлайн Каталог',
-        information: "Информация",
-        description: "Weeder Delivery предлагает широкий ассортимент качественных!",
-        app: 'Скачайте Наше Приложение',
-        adress: 'Адрес',
-        support: 'Онлайн Поддержка',
-        socials: 'Найдите Нас в Социальных Сетях',
-        email: 'Связаться по email',
-        // request: 'hello@weeder.delivery',
-        time: "24 / 7 без перерывов",
-        copyright: "2024 © Weeder Delivery. С гордостью создано OZ DAO.",
-        pages: [],
-        categories: []
+    const router = useRouter()
+    const route = useRoute()
+      
+    const text = {
+      locale: 'en',
+      messages: {
+        en: {
+          store: 'Online Store',
+          information: "Information",
+          description: "Weeder Delivery stocks a wide range of quality!",
+          app: 'Get Our App',
+          adress: 'Adress',
+          support: 'Get Online Support',
+          socials: 'Find Us in Socials',
+          email: 'Contact by email',
+          // request: 'hello@weeder.delivery',
+          time: "24 / 7 Seven days a week",
+          copyright: "2024 © Weeder Delivery. Proudly created with OZ DAO.",
+          pages: [],
+          categories: [],
+          year: "2024",
+          heart: "❤",
+          name: "Weeder",
+          tagline: "Builded with love in"
+        },
+        ru: {
+          store: 'Онлайн Каталог',
+          information: "Информация",
+          description: "Weeder Delivery предлагает широкий ассортимент качественных!",
+          app: 'Скачайте Наше Приложение',
+          adress: 'Адрес',
+          support: 'Онлайн Поддержка',
+          socials: 'Найдите Нас в Социальных Сетях',
+          email: 'Связаться по email',
+          // request: 'hello@weeder.delivery',
+          time: "24 / 7 без перерывов",
+          copyright: "2024 © Weeder Delivery. С гордостью создано OZ DAO.",
+          pages: [],
+          categories: []
+        }
       }
-    }
-  };
+    };
 
-  categories.state.all.forEach( category => {
-    category.localization.forEach( localization => {
-      text.messages[localization.locale].categories.push(localization.text)
+    categories.state.all.forEach( category => {
+      category.localization.forEach( localization => {
+        text.messages[localization.locale].categories.push(localization.text)
+      })
     })
-  })
 
-  onMounted(async() => {
+    onMounted(async() => {
 
-    await categories.actions.read()
+      await categories.actions.read()
 
-  })
+    })
 
 
-  // state.pages.all.forEach( page => {
-  //   page.localization.forEach( localization => {
-  //     text.messages[localization.locale].pages.push(localization.text)
-  //   })
-  // })
+    // state.pages.all.forEach( page => {
+    //   page.localization.forEach( localization => {
+    //     text.messages[localization.locale].pages.push(localization.text)
+    //   })
+    // })
 
-  const { t } = useI18n(text)
-  // const pages = computed(() => state.pages.all.filter(page => (page.groups.includes('all') || page.groups.includes('footer'))))
-</script>
+    const { t } = useI18n(text)
+    // const pages = computed(() => state.pages.all.filter(page => (page.groups.includes('all') || page.groups.includes('footer'))))
+  </script>
 
-<style lang="scss">
-</style>
+  <style lang="scss">
+  </style>

package/src/modules/globals/views/store/globals.js

@@ -138,46 +138,6 @@ const actions = {
   },
 };
 
-const errorMessages = {
-  ru: {
-    errors: {
-      USER_ALREADY_REGISTERED: 'Такой пользователь уже зарегистрирован!',
-      USER_NOT_REGISTERED_YET: 'Такой пользователь еще не зарегистрирован!',
-      USER_PHONE_OR_PASSWORD_NOT_FOUND: 'Пользователь с таким телефоном или паролем не найден!',
-      INCORRECT_PASSWORD_ENTERED: 'Вы ввели неверный пароль!',
-      INVALID_INVITATION_CODE: 'Неверный код приглашения',
-      MISSING_REQUIRED_PARAMETERS: 'Отсутствуют необходимые параметры.',
-      ERROR_UPDATING_USER: 'Произошла ошибка при обновлении пользователя.',
-      PASSWORDS_DO_NOT_MATCH: 'Введенные вами пароли не совпадают. Исправьте ошибки и попробуйте еще раз.',
-      CODE_NOT_SENT: 'Что-то пошло не так и код не был отправлен. Попробуйте еще раз.',
-      INPUT_ERROR: 'Вставьте только четырехзначный код.',
-      WRONG_CODE: 'Вы ввели неверный код. Попробуйте еще раз.',
-      POST_URL_ALREADY_IN_USE: 'Ошибка! Публикация с этим URL уже используется!',
-      NAME_CANNOT_BE_EMPTY: 'Ошибка: Название не может быть пустым. Пожалуйста, введите название.',
-    },
-  },
-  en: {
-    errors: {
-      USER_ALREADY_REGISTERED: 'Such user is already registered!',
-      USER_NOT_REGISTERED_YET: 'This user has not been registered yet!',
-      USER_PHONE_OR_PASSWORD_NOT_FOUND: 'User with such phone or password not found!',
-      INCORRECT_PASSWORD_ENTERED: 'You entered an incorrect password!',
-      INVALID_INVITATION_CODE: 'Incorrect invitation code.',
-      MISSING_REQUIRED_PARAMETERS: 'Missing required parameters.',
-      ERROR_UPDATING_USER: 'Something wrong when updating user.',
-      PASSWORDS_DO_NOT_MATCH: 'The passwords you entered do not match. Please correct the errors and try again.',
-      CODE_NOT_SENT: 'Something went wrong and the code was not sent. Please try again.',
-      INPUT_ERROR: 'Please enter only a four-digit code.',
-      WRONG_CODE: 'You entered an incorrect code. Please try again.',
-      POST_URL_ALREADY_IN_USE: 'Failed! Blogpost with this URL is already in use!',
-      NAME_CANNOT_BE_EMPTY: 'Error: Name cannot be empty. Please enter a name.',
-    },
-  },
-};
-
-// i18n.global.mergeLocaleMessage('ru', errorMessages.ru);
-// i18n.global.mergeLocaleMessage('en', errorMessages.en);
-
 // Mutations
 function setError(error) {
   state.error.show = true;

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

@@ -1,42 +1,38 @@
 <template>
-	<div style="min-height: 100%;" class="h-min-100">
-		
-
-		 <div class="cols-2-1_3 h-100 z-index-3 pos-relative radius-big">
-
-			<div class="o-y-scroll br-r br-solid br-light  z-index-2 desktop-only h-100 pos-relative">
-	     	<BlockFilter
-          v-model:filter="marketplace.state.filter"
-          :options="marketplace.state.filter.options"
-          class="h-100 w-100 pd-medium"
-		    />
-		  </div>
-
-			<!-- Catalog wrapper -->
-			<div class="pd-thin">
-				<header class="pd-medium radius-medium bg-light mn-b-thin">
-		    	<h2 class="">
-		    		<span class="">Weed Deliveries in </span>
-
-		    		<span 
-		    			v-if="localPosition.city || localPosition.state || localPosition.country"
-		    			@click="a => { globals.state.isOpenLocationPopup = true }" 
-		    			class="t-main t-semi cursor-pointer "
-		    		>
-		  				<template v-if="localPosition.city">{{localPosition.city}}, </template>
-		  				<template v-if="localPosition.state">{{localPosition.state}}, </template>
-		  				<template v-if="localPosition.country">{{localPosition.country}}</template>
-		    		</span>
-
-		    		<span v-else @click="a => { globals.state.isOpenLocationPopup = true }"  class="t-main t-semi cursor-pointer">The World</span>
-		    	</h2>
-				</header>
-
-				<div class="rows-1">
-					<router-view  v-slot="{ Component, route }">
-						<component ref="page" :key="route" :localPosition="localPosition" :is="Component" />
-					</router-view>
-				</div>
+	 <div class="cols-2-1_3 z-index-3 pos-relative radius-big">
+
+		<div class="o-y-scroll br-r br-solid br-light  z-index-2 desktop-only h-100 pos-relative">
+     	<BlockFilter
+        v-model:filter="marketplace.state.filter"
+        :options="marketplace.state.filter.options"
+        class="h-100 w-100 pd-medium"
+	    />
+	  </div>
+
+		<!-- Catalog wrapper -->
+		<div class="pd-thin">
+			<header class="pd-medium radius-medium bg-light mn-b-thin">
+	    	<h2 class="">
+	    		<span class="">Weed Deliveries in </span>
+
+	    		<span 
+	    			v-if="localPosition.city || localPosition.state || localPosition.country"
+	    			@click="a => { globals.state.isOpenLocationPopup = true }" 
+	    			class="t-main t-semi cursor-pointer "
+	    		>
+	  				<template v-if="localPosition.city">{{localPosition.city}}, </template>
+	  				<template v-if="localPosition.state">{{localPosition.state}}, </template>
+	  				<template v-if="localPosition.country">{{localPosition.country}}</template>
+	    		</span>
+
+	    		<span v-else @click="a => { globals.state.isOpenLocationPopup = true }"  class="t-main t-semi cursor-pointer">The World</span>
+	    	</h2>
+			</header>
+
+			<div class="rows-1">
+				<router-view  v-slot="{ Component, route }">
+					<component ref="page" :key="route" :localPosition="localPosition" :is="Component" />
+				</router-view>
 			</div>
 		</div>
 	</div>

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="products.state.current" class="h-100 w-100 mobile:pd-thin pd-small bg-white">
+  <div v-if="products.state.current" class="w-100 mobile:pd-thin pd-small bg-white">
     <div class="cols-2 mobile:cols-1 w-100 gap-medium">
 
       <ProductImages

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

@@ -8,6 +8,7 @@
     }"
     :text="{ title: 'No products available' }"
     :showDots="true"
+    class="popupar_products"
   >
     <template #default="{ item }">
       <router-link  
@@ -31,12 +32,12 @@ import * as products from '@martyrs/src/modules/products/store/products.js'
 </script>
 
 <style lang="scss">
-.carousel__slide {
+.popupar_products .carousel__slide {
   flex: 0 0 25%;
   min-width: 0;
 }
 @media screen and (max-width: 1025px) {
-  .carousel__slide {
+  .popupar_products .carousel__slide {
     flex: 0 0 75%;
     min-width: 0;
   }

package/src/modules/wallet/views/localization/wallet.json

@@ -1,6 +1,6 @@
 {
   "messages": {
-    "en-default": {
+    "en": {
       "wallet": {
         "title": "Your Wallet",
         "subtitle": "Earn WDT by purchasing our weed or contributing to the community.",
@@ -14,7 +14,7 @@
         "depositWithCrypto": "deposit with crypto"
       }
     },
-    "ru-default": {
+    "ru": {
       "wallet": {
         "title": "Ваш Кошелек",
         "subtitle": "Зарабатывайте WDT, покупая товары или внося вклад в сообщество.",