@ozdao/prometheus-framework 0.2.189 → 0.2.191

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

@@ -4,55 +4,18 @@
 			<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>
-			<Header 
-				v-if="!MOBILE_APP"
-				ref="header" 
-				class="transition-ease-in-out pos-relative br-b br-solid br-grey-transp-10 pos-t-0" 
-				:theme="headerTheme"
-				:class="{
-					'pos-l-70': store.globals.state.isOpenSidebar,
-					'pos-l-0': !store.globals.state.isOpenSidebar,
-				}"
-			/>
-		</transition>
-
-		<transition name="moveFromTop" mode="out-in" appear>
-			<NavigationBar
-		  	v-if="MOBILE_APP"
-				:style="MOBILE_APP === 'ios' ?'padding-top: 6rem;':''" 
-		  />
-		</transition>
-
 		<transition name="moveFromTop" mode="out-in" appear>
 			<Sidebar 
-				v-if="show && store.globals.state.isOpenSidebar" 
-				:stateSidebar="store.globals.state.isOpenSidebar" 
+				v-if="show && globals.state.isOpenSidebar" 
+				:stateSidebar="globals.state.isOpenSidebar" 
 				@closeSidebar="() => { 
-					store.globals.state.isOpenSidebar = !store.globals.state.isOpenSidebar 
+					globals.state.isOpenSidebar = !globals.state.isOpenSidebar 
 				}"
 
 				class="transition-ease-in-out pos-absolute w-70 z-index-0  bg-light"
 				:class="{
-					'pos-l-70-negative': !store.globals.state.isOpenSidebar,
-					'pos-l-0': store.globals.state.isOpenSidebar
+					'pos-l-70-negative': !globals.state.isOpenSidebar,
+					'pos-l-0': globals.state.isOpenSidebar
 				}"
 			>
 				<Navigation class="h3 pd-big cols-1" />
@@ -61,33 +24,32 @@
 
 	  <Popup 
 	  	@close-popup="closeLocationPopup" 
-	  	:isPopupOpen="store.globals.state.isOpenLocationPopup"
+	  	:isPopupOpen="globals.state.isOpenLocationPopup"
 	  	class="bg-white pd-semi w-m-33r radius-big"
 	  >	
 	  	<LocationSelection />
 	  </Popup>
 
 		<section 
-			v-if="((!FirstUse && MOBILE_APP) || !MOBILE_APP)" 
 			id="screen" 
 			ref="screen"
 			@scroll="handleScroll"
-			@click="store.globals.state.isOpenSidebar
+			@click="globals.state.isOpenSidebar
 				? 
-				a => store.globals.state.isOpenSidebar = false 
+				a => globals.state.isOpenSidebar = false 
 				: 
 				a => {console.log('not succes')}"
 			class="transition-ease-in-out h-min-100 w-100 bg-white pos-relative o-scroll"
 			:class="{
-				'pos-l-70': store.globals.state.isOpenSidebar,
-				'pos-l-0': !store.globals.state.isOpenSidebar
+				'pos-l-70': globals.state.isOpenSidebar,
+				'pos-l-0': !globals.state.isOpenSidebar
 			}"
 		>
 			<ShopCart />
 
 			<Status 
-				v-if="store.globals.state.error.show" 
-				:data="store.globals.state.error"
+				v-if="globals.state.error.show" 
+				:data="globals.state.error"
 				class="z-index-7" 
 			/>
 
@@ -121,57 +83,29 @@
 
 
 <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
-	import { useStore } from '@/store';
+	import * as globals from '@pf/src/modules/globals/views/store/globals'
 	// Partials
 	import Loader from '@pf/src/components/Loader/Loader.vue'
 	import Status from '@pf/src/components/Status/Status.vue'
 	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 Header	from '@pf/src/modules/globals/views/components/partials/Header.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 NavigationBar from '@pf/src/modules/globals/views/components/partials/NavigationBar.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
 	/////////////////////////////
 	const route = useRoute()
 	const router = useRouter()
-	const store = useStore();
 	// State
 	let show = ref(false)
 	// Preloader
@@ -179,6 +113,15 @@
 	const screen = ref(null)
 	// Ref Code
 	const referalCode = ref(route.query.referalCode);
+	/////////////////////////////
+	// Methods
+	/////////////////////////////
+	function closeLocationPopup() {
+	  globals.state.isOpenLocationPopup = false;
+	}
+	function scrollTop(){
+		document.getElementById('app').scrollIntoView();
+	}
 	// Scrolling header
 	const scrollOffset = ref(0)
 	let isScrolled = false
@@ -191,15 +134,6 @@
 			return route.meta.header_theme || 'light'
 		}
 	})
-	/////////////////////////////
-	// Methods
-	/////////////////////////////
-	function closeLocationPopup() {
-	  store.globals.state.isOpenLocationPopup = false;
-	}
-	function scrollTop(){
-		document.getElementById('app').scrollIntoView();
-	}
 	const handleScroll = () => {
 	  scrollOffset.value = event.target.scrollTop
 
@@ -242,7 +176,6 @@
 	// }
 
 	onMounted(async () => {
-		await getFirstUse()
 		 
 		if ('serviceWorker' in navigator) {
 	   	window.addEventListener('load', () => {
@@ -259,9 +192,9 @@
 		const savedPosition = localStorage.getItem('position');
 
 	  if (savedPosition) {
-	    store.globals.state.position = JSON.parse(savedPosition);
+	    globals.state.position = JSON.parse(savedPosition);
 	  } else {
-  		store.globals.state.isOpenLocationPopup = true;
+  		globals.state.isOpenLocationPopup = true;
 	  }
 
 		if (referalCode.value) {

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

@@ -63,12 +63,10 @@
 /////////////////////////////
 import { ref,computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-import { useStore } from '@/store';
 
 /////////////////////////////
 // CREATED
 /////////////////////////////
-const store = useStore();
 const router = useRouter();
 const route = useRoute();
 const navRef = ref(null);

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

@@ -12,7 +12,6 @@
 	import Select from '@pf/src/components/Select/Select.vue'
 	import Checkbox from '@pf/src/components/Checkbox/Checkbox.vue'
 	// Icons module
-	import Logotype from '@pf/src/modules/icons/logos/Logotype.vue'
 	import IconShopcart from '@pf/src/modules/icons/entities/IconShopcart.vue'
 	import IconProfile from '@pf/src/modules/icons/entities/IconProfile.vue'
 	
@@ -21,7 +20,10 @@
     theme: {
     	type: String,
 	    default: "light"
-    }
+    },
+    logotype: {
+	    type: Object
+	  }
   });
 	// Accessing state
 	const router = useRouter()
@@ -82,14 +84,16 @@
 	  </button>
 
 		<!-- LOGO -->
-		<Logotype
-			@click="router.push({ path: '/' })" 
-			:theme="theme"
-			class="
-				h-2r
-				w-auto
-				cursor-pointer
-			"
+		<component
+			v-if="props.logotype"
+		  :is="props.logotype"
+		  @click="router.push({ path: '/' })" 
+		  :theme="theme"
+		  class="
+		    h-2r
+		    w-auto
+		    cursor-pointer
+		  "
 		/>
 
 		<button

package/src/{components/LocationSelection → modules/globals/views/components/partials}/LocationSelection.vue

@@ -77,9 +77,8 @@ import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue
 // Import libs
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-import { useStore } from '@/store'
 
-const store = useStore()
+import * as globals from '@pf/src/modules/globals/views/store/globals'
 
 // Accessing router and store
 const route = useRoute()
@@ -94,14 +93,14 @@ const position = ref({
 })
 
 function savePosition() {
-	store.globals.state.position = { ...position.value };
-	store.globals.state.isOpenLocationPopup = false
+	globals.state.position = { ...position.value };
+	globals.state.isOpenLocationPopup = false
 
-	localStorage.setItem('position', JSON.stringify(store.globals.state.position));
+	localStorage.setItem('position', JSON.stringify(globals.state.position));
 }
 
 onMounted(() => {
-	position.value = { ...store.globals.state.position }
+	position.value = { ...globals.state.position }
 })
 
 // Localization

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

@@ -2,7 +2,7 @@
   <ul class="t-semi gap-small flex-nowrap flex-center flex">
     <li>
       <router-link  
-        :to="getMarketplaceLink(null,store.globals.state.position?.country,store.globals.state.position?.state,store.globals.state.position?.city)"
+        :to="getMarketplaceLink(null,globals.state.position?.country,globals.state.position?.state,globals.state.position?.city)"
         class="font-second"
      >
         {{ t('HEADER.MENU.MARKETPLACE') }}
@@ -11,7 +11,7 @@
     <li>
       <router-link    
         class="font-second"
-        :to="getSpotsLink(store.globals.state.position?.country,store.globals.state.position?.state,store.globals.state.position?.city)"
+        :to="getSpotsLink(globals.state.position?.country,globals.state.position?.state,globals.state.position?.city)"
      >
         {{ t('HEADER.MENU.DISPENSARIES') }}
       </router-link>
@@ -61,7 +61,8 @@
 import { computed, } from 'vue';
 import { useRoute,useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-import { useStore } from '@/store';
+
+import * as globals from '@pf/src/modules/globals/views/store/globals'
 
 /////////////////////////////
 // HELPERS
@@ -71,7 +72,6 @@ import { useStore } from '@/store';
 // CREATED
 /////////////////////////////
 const route = useRoute()
-const store = useStore()
 // Compoted Vars
 const text = {
   messages: {

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>
 
@@ -16,7 +16,7 @@
       	class="flex-center flex-column flex pd-big embla__slide"
       >
       	<img
-      		src="/logo/logo_square.svg" 
+      		:src="'/logo/logo_square.svg'" 
       		class="i-extra radius-medium mn-b-small"
       	>
       	<h2 class="t-center mn-b-small">Welcome to The&nbsp;Commune</h2>
@@ -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>