@ozdao/prometheus-framework 0.2.189 → 0.2.190

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

@@ -21,38 +21,18 @@
 	    </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,7 +41,7 @@
 
 	  <Popup 
 	  	@close-popup="closeLocationPopup" 
-	  	:isPopupOpen="store.globals.state.isOpenLocationPopup"
+	  	:isPopupOpen="globals.state.isOpenLocationPopup"
 	  	class="bg-white pd-semi w-m-33r radius-big"
 	  >	
 	  	<LocationSelection />
@@ -72,22 +52,22 @@
 			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" 
 			/>
 
@@ -125,7 +105,7 @@
 	// 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'
@@ -134,10 +114,8 @@
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import LocationSelection from '@pf/src/components/LocationSelection/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'
@@ -171,7 +149,6 @@
 	/////////////////////////////
 	const route = useRoute()
 	const router = useRouter()
-	const store = useStore();
 	// State
 	let show = ref(false)
 	// Preloader
@@ -179,6 +156,16 @@
 	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 +178,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
 
@@ -259,9 +237,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/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

@@ -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>