@ozdao/prometheus-framework 0.2.30 → 0.2.31

package/src/components/Header/Header.vue

@@ -1,84 +1,94 @@
 <template>
-	<header id="header" class="pd-b-zero pd-thin btm-header">
+	<header id="header" class="
+		pos-relative
+		pd-thin 
+		z-index-2 
+		gap-thin
+		flex-center
+		flex-nowrap
+		flex
+		h-4r
+	">
+		<!-- MENU -->
+		<button  
+			@click.stop="() => store.globals.state.isOpenSidebar = !store.globals.state.isOpenSidebar" 
+			class="menu-btn mobile-only"
+			:class="{
+				'menu-btn_active': store.globals.state.isOpenSidebar
+			}"
+		>
+	    <span></span>
+	  </button>
+
+		<!-- LOGO -->
+		<Logotype
+			@click="router.push({ path: '/' })" 
+			class="
+				h-2r
+				w-auto
+				mn-l-thin
+				cursor-pointer
+			"
+		/>
+
+		<button
+    	class="
+    		cursor-pointer
+    		br-solid br-2px br-black 
+    		bg-transp 
+    		pd-l-micro pd-r-micro pd-t-nano pd-b-nano 
+    		radius-extra 
+    		uppercase 
+    		t-semi
+    		mn-r-thin 
+    	"
+    	@click="openLocationPopup()"
+    >
+    	{{store.globals.state.position?.country ? store.globals.state.position.country : '🌎 World'}}
+    </button>
+
+		<!-- NAGIVATION -->
+		<Navigation class="desktop-only"/>
+
+		<Checkbox 
+      :label="'Darkmode'"
+      :radio="store.globals.state.theme.darkmode"
+      @update:radio="event => store.globals.actions.toggleTheme()"
+      name="prices"
+      class="desktop-only t-semi pd-micro br-2px br-solid radius-extra br-black-transp-5"
+    />
+		<Button
+			:submit="a => store.shopcart.actions.toggleShopcart()" 
+			:counter="store.shopcart.getters.cartTotalAmount" 
+			class="pd-zero mn-l-auto"
+			> 
+			<IconShopcart class="i-semi"/>
+
+		</Button>
+		
+		<Button 
+			class="pd-zero bg-transp"
+			:submit="
+				store.auth.state.access.status === false 
+				? 
+				a => router.push({name: 'Sign In'}) 
+				: 
+				a => router.push({ name: 'User Profile', params: { _id: store.auth.state.user._id }})
+			"
+			:showSucces="false"
+			:showLoader="false"
+		>
+			<IconProfile class="i-semi"/>
+		</Button>
+
+
+		<Select 
+			v-model:select="$i18n.locale"
+		  :options="[{name: '🌎&nbsp;En', value: 'en'}, {name: '🇷🇺&nbsp;Ru', value: 'ru'}]"
+		  :property="'value'"
+      class="pos-relative uppercase pd-micro t-semi bg-grey radius-thin"
+    />
 
-		<!-- CONTENT -->
-		<div class="br-solid br-1px br-grey bg-white radius-big bottom-header pd-medium z-index-2">
-			<!-- LOGO AND NAVIGATION -->
-			<div class="mn-r-auto flex-nowrap flex-center flex">
-				
-				<!-- Menu -->
-				<div class="mobile-only mn-r-medium menu">
-					<img @click="stateSidebar = !stateSidebar" src="@/assets/images/icons/menu.svg">
-				</div>
-
-				<!-- LOGO -->
-		    <div  class="flex-nowrap flex-center flex mn-r-small logo-link col">
-					<img @click="router.push({ path: '/' }	)" src="@/assets/images/logotype.svg">
-
-					<a
-	        	class="location-button br-inset-2px-black bg-transp pd-thin radius-thin uppercase t-semi"
-	        	@click="openLocationPopup()"
-	        >
-	        	{{store.globals.state.position.country ? store.globals.state.position.country : 'World'}}
-		      </a>
-		      
-		      <Popup 
-		      	@close-popup="closeLocationPopup" 
-		      	:isPopupOpen="store.globals.state.isLocationPopupOpen"
-		      	class="t-white bg-black pd-big w-m-33r radius-big"
-		      >	
-		      	<LocationSelection />
-			    </Popup>
-				</div> 
-
-				<!-- NAGIVATION -->
-				<Navigation class="desktop-only"/>
-
-			</div>
-
-			<!-- ACTIONS -->
-			<ul class="actions flex-nowrap flex-v-center flex">
-			
-				<!-- Search  -->
-				<!-- <label class="desktop-only search"> 
-					<img src="@/assets/images/icons/search.svg">
-					<input 
-						:value="search.current" 
-						type="text"
-					>
-				</label>  -->
-
-				<ButtonIcon 
-					:action="
-						store.auth.state.access.status === false 
-						? 
-						a => router.push({name: 'Sign In'}) 
-						: 
-						a => router.push({ name: 'User Profile', params: { _id: store.auth.state.user._id }})
-					" 
-					class="mn-r-small"
-					:class="{'bg-main radius-small':route.name === 'Profile'}"
-				>
-					<img src="@/assets/images/icons/profile.svg">
-				</ButtonIcon>
-				<ButtonIcon 
-					:action="
-						a => store.shopcart.actions.toggleShopcart()" 
-					:counter="store.shopcart.getters.cartTotalAmount" 
-					class=""
-					> 
-					<img src="@/assets/images/icons/cart.svg">
-				</ButtonIcon>
-
-				<Select 
-				  :options="[{name: '🌎&nbsp;En', value: 'en'}, {name: '🇷🇺&nbsp;Ru', value: 'ru'} ]"
-					:prop="$i18n"
-	        content="locale" 
-	        size="small"
-	        class="mn-l-medium uppercase t-semi bg-grey radius-thin"
-        />
-			</ul>
-		</div>
 
 	</header>
 </template>
@@ -95,13 +105,15 @@
 	// i18n
 	import { useI18n } from 'vue-i18n'
 	// Weeder Component
-	import Popup    			from '@pf/src/components/Popup/Popup.vue'
-
 	import Navigation			from '@pf/src/components/Navigation/Navigation.vue'
-	import LocationSelection			from '@pf/src/components/LocationSelection/LocationSelection.vue'
 	// Prometheus Component
-	import ButtonIcon  		from '@/components/elements/ButtonIcon.vue'
-	import Select 				from '@/components/elements/Select.vue'
+	import Button 				from '@pf/src/components/Button/Button.vue'
+	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'
 	/////////////////////////////
 	// CREATED
 	/////////////////////////////
@@ -114,23 +126,7 @@
 	// POPUS
 	/////////////////////////////
 	function openLocationPopup() {
-	  store.globals.state.isLocationPopupOpen = true;
-	}
-
-	function closeLocationPopup() {
-	  store.globals.state.isLocationPopupOpen = false;
-	}
-	/////////////////////////////
-	// SIDEBAR
-	/////////////////////////////
-	const stateSidebar = inject('stateSidebar')
-
-	function openSidebar() {
-	  stateSidebar.value = true;
-	}
-
-	function closeSiderbar() {
-	  stateSidebar.value = false;
+	  store.globals.state.isOpenLocationPopup = true;
 	}
 	/////////////////////////////
 	// LOCALIZATION
@@ -158,80 +154,79 @@
   });
 </script>
 
-<style lang="scss" scoped>
-.router-link-exact-active, .router-link-exact-active:visited  {
-	color: rgb(var(--main));	
-}
-
+<style lang="scss">
 .location-button { 
 	&:hover {
 		box-shadow: inset 0 0 0 2px rgb(var(--main));
 	}
 }
 
-.search {
-	display: block;
-	position: relative;
-	input {
-		border: 0;
-		outline: 0;
-		padding: 0.5rem;
-		padding-left: 2rem;
-		border-radius: 0.5rem;
-		color: black;
-		background: #f7f7f7;
-	}
-
-	img {
-		position: absolute;
-
-		left: 0.35rem;
-		top: 0.35rem;
-
-		z-index: 10
-	}
+.menu-btn {
+  display: block;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  position: relative;
+}
+.menu-btn span,
+.menu-btn span::before,
+.menu-btn span::after {
+  position: absolute;
+  top: 50%; margin-top: -1px;
+  left: 50%; margin-left: -10px;
+  width: 20px;
+  height: 2px;
+  background-color: rgb(var(--black));
+}
+.menu-btn span::before,
+.menu-btn span::after {
+  content: '';
+  display: block;
+  transition: 0.2s;
+}
+.menu-btn span::before {
+  transform: translateY(-5px);
+}
+.menu-btn span::after {
+  transform: translateY(5px);
 }
 
-
-.btm-header {
-	top: 0;
-	position: sticky;
-	width: 100%;
-	// background: white;
-	z-index: 15;
-	
-	display: flex;
-	flex-direction: column;
-	flex-wrap: nowrap;
-	// border-bottom: 1px solid rgba(0,0,0,0.1);
-	
-	.bottom-header {
-		display: flex;
-		position: sticky;
-		// justify-content: space-between;
-		align-items: center;
-
-
-		height: 4rem;
-
-		.logo-link { 
-			height: 3.5rem; 
-			text-align: center;
-			
-			img { height: 60%;  position: relative; }
-			
-			&:hover {
-				cursor: pointer;
-			} 
-		}
-
-		.button-icon {
-			width: 1.5rem;
-			height: 1.5rem;
-		}
-	}
-
+.menu-btn_active span:before {
+  transform: rotate(-35deg);
+  width: 10px;
+  transform-origin: left bottom;
+}
+.menu-btn_active span:after {
+  transform: rotate(35deg);
+  width: 10px;
+  transform-origin: left top;
 }
 
+.menu-block {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.menu-nav {
+  background-color: #fff;
+  height: 50px;
+  
+}
+.menu-nav__link {
+  display: inline-block;
+  text-decoration: none;
+  color: #fff;
+  margin-right: 20px;
+}
+.menu-nav__link {
+  transition: 0.5s;
+  transform-origin: right center;
+  transform: translateX(50%);
+  opacity: 0;
+}
+.menu-nav__link_active {
+  transform: translateX(0%);
+  opacity: 1;
+}
 
 </style>

package/src/components/Loader/Loader.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="circular-loader">
     <svg viewBox="25 25 50 50">
-      <circle cx="50" cy="50" r="20" fill="none" stroke-width="4" stroke-miterlimit="10" />
+       <circle class="circular-loader-fill" cx="50" cy="50" r="20" fill="none" stroke-width="4" stroke-miterlimit="10" />
+      <circle class="circular-loader-circle" cx="50" cy="50" r="20" fill="none" stroke-width="4" stroke-miterlimit="10" />
+     
     </svg>
     <div v-if="progress" class="progress-text">{{ progress }}</div>
     <div v-if="status" class="uppercase t-semi w-m-10r status-text">{{ status }}</div>
@@ -38,7 +40,7 @@ export default {
   animation: rotate 2s linear infinite;
 }
 
-.circular-loader circle {
+.circular-loader-circle {
   stroke-dasharray: 1, 200;
   stroke-dashoffset: 0;
   stroke-linecap: round;
@@ -46,6 +48,11 @@ export default {
   animation: dash 1.5s ease-in-out infinite;
 }
 
+.circular-loader-fill {
+  stroke-linecap: round;
+  stroke: rgba(var(--black),0.2);
+}
+
 .progress-text {
   position: absolute;
   top: 50%;

package/src/components/LocationMarker/LocationMarker.vue

@@ -1,10 +1,20 @@
 <template>
-  <div class="pos-relative map-container">
+  <div class="pos-relative">
     <div ref="mapContainer" class="w-100 h-100"></div>
-    <button class="pos-absolute pos-t-regular pos-r-regular i-semi bg-second radius-extra" @click="setUserLocation">
-      <svg class="i-medium" width="98" height="98" viewBox="0 0 98 98" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M50.0004 31.4995C39.7996 31.4995 31.5 39.7991 31.5 49.9999C31.5 60.2007 39.7996 68.5003 50.0004 68.5003C60.2012 68.5003 68.5008 60.2007 68.5008 49.9999C68.5008 39.7991 60.2012 31.4995 50.0004 31.4995ZM50.0004 63.7944C42.3941 63.7944 36.2059 57.6062 36.2059 49.9999C36.2059 42.3936 42.3941 36.2054 50.0004 36.2054C57.6067 36.2054 63.7949 42.3936 63.7949 49.9999C63.7949 57.6062 57.6067 63.7944 50.0004 63.7944Z" fill="white"/>
-        <path d="M97.6471 47.6471H84.56C83.3977 30.4141 69.5859 16.6024 52.3529 15.44V2.35294C52.3529 1.05255 51.2988 0 50 0C48.6996 0 47.6471 1.05255 47.6471 2.35294V15.44C30.4141 16.6024 16.6024 30.4141 15.44 47.6471H2.35294C1.05255 47.6471 0 48.6996 0 50C0 51.2988 1.05255 52.3529 2.35294 52.3529H15.44C16.6024 69.5859 30.4141 83.3977 47.6471 84.56V97.6471C47.6471 98.9459 48.6996 100 50 100C51.2988 100 52.3529 98.9459 52.3529 97.6471V84.56C69.5859 83.3977 83.3977 69.5859 84.56 52.3529H97.6471C98.9459 52.3529 100 51.2988 100 50C100 48.6996 98.9459 47.6471 97.6471 47.6471ZM50 79.9435C33.4886 79.9435 20.0565 66.5114 20.0565 50C20.0565 33.4886 33.4886 20.0565 50 20.0565C66.5098 20.0565 79.9435 33.4886 79.9435 50C79.9435 66.5098 66.5098 79.9435 50 79.9435Z" fill="white"/>      </svg>
+
+    <button class="cursor-pointer flex-center flex pos-absolute pos-t-regular pos-r-regular i-semi bg-second pd-nano radius-extra" @click="setUserLocation">
+
+      <transition name="ScaleOut" mode="out-in"> 
+        
+
+        
+        <svg v-if="!locationLoading" class="i-regular" width="98" height="98" viewBox="0 0 98 98" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <path d="M50.0004 31.4995C39.7996 31.4995 31.5 39.7991 31.5 49.9999C31.5 60.2007 39.7996 68.5003 50.0004 68.5003C60.2012 68.5003 68.5008 60.2007 68.5008 49.9999C68.5008 39.7991 60.2012 31.4995 50.0004 31.4995ZM50.0004 63.7944C42.3941 63.7944 36.2059 57.6062 36.2059 49.9999C36.2059 42.3936 42.3941 36.2054 50.0004 36.2054C57.6067 36.2054 63.7949 42.3936 63.7949 49.9999C63.7949 57.6062 57.6067 63.7944 50.0004 63.7944Z" fill="rgb(var(--white))"/>
+          <path d="M97.6471 47.6471H84.56C83.3977 30.4141 69.5859 16.6024 52.3529 15.44V2.35294C52.3529 1.05255 51.2988 0 50 0C48.6996 0 47.6471 1.05255 47.6471 2.35294V15.44C30.4141 16.6024 16.6024 30.4141 15.44 47.6471H2.35294C1.05255 47.6471 0 48.6996 0 50C0 51.2988 1.05255 52.3529 2.35294 52.3529H15.44C16.6024 69.5859 30.4141 83.3977 47.6471 84.56V97.6471C47.6471 98.9459 48.6996 100 50 100C51.2988 100 52.3529 98.9459 52.3529 97.6471V84.56C69.5859 83.3977 83.3977 69.5859 84.56 52.3529H97.6471C98.9459 52.3529 100 51.2988 100 50C100 48.6996 98.9459 47.6471 97.6471 47.6471ZM50 79.9435C33.4886 79.9435 20.0565 66.5114 20.0565 50C20.0565 33.4886 33.4886 20.0565 50 20.0565C66.5098 20.0565 79.9435 33.4886 79.9435 50C79.9435 66.5098 66.5098 79.9435 50 79.9435Z" fill="rgb(var(--white))"/>      
+        </svg>
+
+        <Loader v-else  class="pos-t-0 pos-l-0 i-small"/>
+      </transition>
 
     </button>
   </div>
@@ -13,17 +23,17 @@
 <script setup>
 import { ref, onMounted, watchEffect } from 'vue';
 
-import Button        from '@pf/src/components/Button/Button.vue'
+import Loader from '@pf/src/components/Loader/Loader.vue'
 
 // Добавим новый проп для ключа API
 const props = defineProps({
   location: {
     type: Object,
-    default:  { lat: 48.6900735, lng: 41.16202390 }
+    default: () => ({ lat: 15.8700, lng: 100.9925 })
   },
   address: {
     type: String,
-    default: ""
+    default: null
   },
   apiKey: String,
 })
@@ -31,15 +41,18 @@ const props = defineProps({
 const emit = defineEmits(['update:location', 'update:address', 'update:country', 'update:state', 'update:city']);
 
 const mapContainer = ref(null);
+const locationLoading = ref(false);
 
 let map, marker;
 
 onMounted(() => {
+  console.log(props.location)
   map = new google.maps.Map(mapContainer.value, {
     center: props.location,
     zoom: 15,
     mapTypeControl: false,
     fullscreenControl: false,
+    disableDefaultUI: true
   });
 
   marker = new google.maps.Marker({
@@ -50,7 +63,9 @@ onMounted(() => {
 
   marker.addListener("dragend", (e) => {
     const newLocation = { lat: e.latLng.lat(), lng: e.latLng.lng() };
+
     emit('update:location', newLocation);
+
     getAddressFromLocation(newLocation);
   });
 });
@@ -64,12 +79,16 @@ watchEffect(() => {
 watchEffect(() => {
   if (props.location && map) {
     const newCenter = new google.maps.LatLng(props.location.lat, props.location.lng);
+    
     map.setCenter(newCenter);
+    map.setZoom(15);
   }
 });
 
 function getAddressFromLocation(location) {
+  
   const geocoder = new google.maps.Geocoder;
+
   geocoder.geocode({ 'location': location }, (results, status) => {
     if (status === 'OK') {
       if (results[0]) {
@@ -103,30 +122,37 @@ function getAddressFromLocation(location) {
 
 // Функция для установки местоположения пользователя
 async function setUserLocation() {
+  locationLoading.value = true
+  
   if (navigator.geolocation) {
     navigator.geolocation.getCurrentPosition((position) => {
       const newLocation = { lat: position.coords.latitude, lng: position.coords.longitude };
       emit('update:location', newLocation);
       getAddressFromLocation(newLocation);
+      locationLoading.value = false
     }, () => {
       console.error('Error getting location');
+      locationLoading.value = false
     });
   } else {
     console.error('Geolocation is not supported by this browser.');
+    locationLoading.value = false
   }
+
+  
 }
 </script>
 
 
 <style scoped>
-.map-container {
-/*  height: 400px;*/
-  width: 100%;
-}
 .my-location-button {
   position: absolute;
   right: 10px;
   top: 10px;
   z-index: 99;
 }
+
+.gm-style-cc { display:none; }
+
+
 </style>