@ozdao/prometheus-framework 0.2.190 → 0.2.191

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

@@ -1,4 +1,22 @@
 <template>
+  <transition 
+    name="scaleTransition" 
+    mode="out-in"
+  >
+    <section 
+      v-if="FirstUse"
+      class="w-100 h-100" 
+     >
+      <router-view 
+        name="Walkthrough"
+        @updateFirstUse="updateFirstUse" 
+        :slides="[1,2,3]" 
+        class="tab"
+      >
+      </router-view>
+    </section>
+  </transition>
+
   <transition name="moveFromTop" mode="out-in" appear>
     <router-view 
       v-if="!MOBILE_APP"
@@ -21,10 +39,10 @@
 </template>
 
 <script setup>
+  import { computed, ref, onMounted, defineAsyncComponent } from 'vue'
   import { useHead } from '@unhead/vue'
   import { useI18n } from 'vue-i18n'
   import { useRoute } from 'vue-router'
-  import { computed } from 'vue'
 
   import * as globals from '@pf/src/modules/globals/views/store/globals'
 
@@ -37,7 +55,12 @@
       type: Object
     }
   })
-
+  /////////////////////////////
+  // ONBOARDING
+  /////////////////////////////
+  /////////////////////////////
+  // META
+  /////////////////////////////
   const { t, locale } = useI18n({
     messages: props.messages
   })
@@ -49,11 +72,9 @@
   const languages = ['en', 'ru'];
   const base_url = 'https://weeder.delivery';
 
-
   function removeTrailingSlash(url) {
     return url.endsWith('/') ? url.slice(0, -1) : url;
   }
-
   // Используйте эту функцию, чтобы удалить слэш в конце URL
   const metadata = computed(() => {return {
     title: t('meta.title'),
@@ -83,8 +104,6 @@
     return languages.map(lang => {
       let newPath = route.path;
 
-      console.log(route)
-
       if (route.params.locale) {
         newPath = newPath.replace(`/${route.params.locale}`, `/${lang}`);
       } else {
@@ -101,4 +120,23 @@
   });
 
   useHead(metadata.value)
+  /////////////////////////////
+  // FIRST USE
+  /////////////////////////////
+  const FirstUse = ref(false);
+
+  import { Preferences } from '@capacitor/preferences';
+
+  async function getFirstUse() {
+    const ret = await Preferences.get({ key: 'first-use' });
+    FirstUse.value = ret.value ? JSON.parse(ret.value) : true;
+  }
+
+  const updateFirstUse = (value) => {
+    FirstUse.value = value;
+  }
+
+  onMounted(async () => {
+    await getFirstUse()
+  });
 </script>

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

@@ -4,23 +4,6 @@
 			<Loader v-if="!page" class="pos-fixed"/>
 		</transition>
 
-		<transition 
-	    name="scaleTransition" 
-	    mode="out-in"
-	  >
-	    <section 
-				v-if="MOBILE_APP && FirstUse"
-	      class="w-100" 
-	     >
-	     	<component 
-	     		:is="Walkthrough"  
-	     		@updateFirstUse="updateFirstUse" 
-	        :slides="[1,2,3]" 
-	        class="tab"
-	      />
-	    </section>
-	  </transition>
-
 		<transition name="moveFromTop" mode="out-in" appear>
 			<Sidebar 
 				v-if="show && globals.state.isOpenSidebar" 
@@ -48,7 +31,6 @@
 	  </Popup>
 
 		<section 
-			v-if="((!FirstUse && MOBILE_APP) || !MOBILE_APP)" 
 			id="screen" 
 			ref="screen"
 			@scroll="handleScroll"
@@ -101,7 +83,7 @@
 
 
 <script setup>
-	import { computed, ref, onMounted, provide, inject, onUnmounted, defineAsyncComponent, onServerPrefetch, onBeforeMount } from 'vue'
+	import { computed, ref, onMounted, provide, inject, onUnmounted, onServerPrefetch, onBeforeMount } from 'vue'
 	// Router
 	import { useRoute, useRouter } from 'vue-router'
 	// Store
@@ -112,38 +94,13 @@
 	import Sidebar from '@pf/src/components/Sidebar/Sidebar.vue'
 	import Popup from '@pf/src/components/Popup/Popup.vue'
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
-	import LocationSelection from '@pf/src/components/LocationSelection/LocationSelection.vue'
+	import LocationSelection from '@pf/src/modules/globals/views/components/partials/LocationSelection.vue'
 
 	import Navigation from '@pf/src/modules/globals/views/components/partials/Navigation.vue'
 	import Footer from '@pf/src/modules/globals/views/components/partials/Footer.vue'
   import BottomNavigation from '@pf/src/modules/globals/views/components/partials/BottomNavigation.vue';
 
 	import ShopCart from '@pf/src/modules/orders/components/partials/ShopCart.vue'
-	// Walkthrough
-  let Walkthrough;
-  
-  if (__MOBILE_APP__) {
-	  Walkthrough = defineAsyncComponent(() =>
-	    import('@pf/src/modules/globals/views/components/sections/Walkthrough.vue').then(_ => _.default)
-	  );
-  } else {
-    Walkthrough = null;
-  }
-  /////////////////////////////
-  // FIRST USE
-  /////////////////////////////
-  const FirstUse = ref(false);
-
-  import { Preferences } from '@capacitor/preferences';
-
-  async function getFirstUse() {
-    const ret = await Preferences.get({ key: 'first-use' });
-    FirstUse.value = ret.value ? JSON.parse(ret.value) : true;
-  }
-
-  const updateFirstUse = (value) => {
-    FirstUse.value = value;
-  }
 	/////////////////////////////
 	// CREATED
 	/////////////////////////////
@@ -156,7 +113,6 @@
 	const screen = ref(null)
 	// Ref Code
 	const referalCode = ref(route.query.referalCode);
-	
 	/////////////////////////////
 	// Methods
 	/////////////////////////////
@@ -220,7 +176,6 @@
 	// }
 
 	onMounted(async () => {
-		await getFirstUse()
 		 
 		if ('serviceWorker' in navigator) {
 	   	window.addEventListener('load', () => {

package/src/modules/globals/views/components/sections/Walkthrough.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pos-fixed pos-t-0 pos-l-0 w-100 h-100vh z-index-6 bg-white flex embla" ref="emblaNode">
+	<div class="pos-fixed pos-t-0 pos-l-0 w-100 h-100vh z-index-6 bg-light flex embla" ref="emblaNode">
     <div class="w-100 embla__container z-index-1">
       <div
         v-for="(slide, index) in walkthrough"
@@ -8,7 +8,7 @@
         :style="{ opacity: tweenSlides.length ? tweenSlides[index] : undefined, transform: tweenSlides[index] ? `scale(${tweenSlides[index]})` : '' }"
       >
         <img class="w-100" :src="require(`@/assets/images/walkthrough/walkthrough_${index}.png`).default">
-      	<h3 class="mn-b-thin">{{slide.title}}</h3>
+      	<h2 class="mn-b-small">{{slide.title}}</h2>
       	<p class="p-big t-transp">{{slide.subtitle}}</p>
       </div>
 
@@ -25,7 +25,7 @@
       	<button @click="openFirstRoute('Sign Up')" class="w-100 bg-main button mn-b-thin">Sign Up</button> 
       	<button @click="openFirstRoute('Sign In')" class="w-100 bg-white button mn-b-semi">Sign In</button>
 
-	      <p class="p-medium text-center mn-b-thin">Or explore as a guest:</p> 
+	      <p class="p-medium text-center">Or explore as a guest:</p> 
       	<button @click="setFirstUseFalse()" class="button bg-white w-100">Continue without registration</button>
 	    </div>
 
@@ -40,7 +40,7 @@
     	class="pos-fixed pos-t-0 pos-l-0 z-index-0"
     /> -->
     
-    <div class="z-index-5 flex-nowrap flex flex-center gap-small w-100 embla__dots">
+    <div class="z-index-5 h-4r pos-absolute pos-b-1r pd-small flex-nowrap flex flex-center gap-small w-100 embla__dots">
 	    <div
 	      v-for="(snap, index) in scrollSnaps"
 	      :key="index"
@@ -53,7 +53,7 @@
 	    >
 		  </div>
 
-		  <div @click.native="setFirstUseFalse()" class="pd-small radius-small br-solid br-main br-2px uppercase t-semi t-main pos-absolute pos-r-10"> 
+		  <div @click.native="setFirstUseFalse()" class="h-100 w-6r pos-b-0r flex-nowrap flex flex-center pos-r-1r pos-relative radius-small br-solid br-main br-2px uppercase t-semi p-big t-main pos-absolute"> 
 		  	skip
 		  </div>
 	  </div>