@ozdao/martyrs 0.2.484 → 0.2.486

package/src/modules/auth/views/components/pages/ResetPassword.vue

@@ -2,8 +2,8 @@
 	<section class="t-left pd-medium">
 		<!-- <img loading="lazy" src="@/assets/icons/password.png" class="i-extra mn-b-small"> -->
 		<!-- Header -->
-		<h3 class="mn-b-small">{{ t('forgotPasswordTitle') }}</h3>
-		<p class="mn-b-small t-transp">{{ t('instructions') }}</p>
+		<h3 class="mn-b-small">{{ t('auth.resetPassword.forgotPasswordTitle') }}</h3>
+		<p class="mn-b-small t-transp">{{ t('auth.resetPassword.instructions') }}</p>
 		
 		<!-- Select -->
 		<div 
@@ -22,7 +22,7 @@
 		<!-- Phone -->
 			<transition name="slide-fade">
 				<div v-if="tabAuth === 'phone'" class="mn-b-semi radius-small">
-					<p class="mn-b-small t-transp">{{ t('smsInfo') }}</p>
+					<p class="mn-b-small t-transp">{{ t('auth.resetPassword.smsInfo') }}</p>
 					<FieldPhone
 						@change="(event) => auth.state.user.phone = event" 	
 						:dropdownOptions="{
@@ -32,7 +32,7 @@
 						}"
 						:validation="phoneValidation" 
 						mode="national"
-						:inputOptions="{placeholder: t('phonePlaceholder')}"
+						:inputOptions="{placeholder: t('auth.resetPassword.phonePlaceholder')}"
 						class="bg-light h-4r pd-small radius-small mn-b-thin" 
 					/>
 				</div>
@@ -40,10 +40,10 @@
 			<!-- Email -->
 			<transition name="slide-fade">
 				<div v-if="tabAuth === 'email'" class="mn-b-semi radius-small o-hidden">
-					<p class="mn-b-small t-transp">{{ t('emailInfo') }}</p>
+					<p class="mn-b-small t-transp">{{ t('auth.resetPassword.emailInfo') }}</p>
 					<Field 
 						v-model:field="auth.state.user.email" 		
-						:placeholder="t('emailPlaceholder')" 	
+						:placeholder="t('auth.resetPassword.emailPlaceholder')" 	
 						:validation="emailValidation" 
 						class="bg-light h-4r pd-medium radius-small" 
 					/>
@@ -51,7 +51,7 @@
 			</transition>
 		</div>
 		<!-- Button -->
-		<Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-main">{{ t('sendCode') }}</Button>
+		<Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-main">{{ t('auth.resetPassword.sendCode') }}</Button>
 	</section> 
 </template>
 
@@ -65,8 +65,6 @@ import Button        from '@martyrs/src/components/Button/Button.vue'
 import { computed, onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-// Localization
-import text from '@martyrs/src/modules/auth/views/localization/ResetPassword.json'
 // Import state
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 import * as twofa from '@martyrs/src/modules/auth/views/store/twofa.js'
@@ -76,7 +74,6 @@ import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/i
 // Localization
 const { t } = useI18n({
 	useScope: 'global', 
-	...text
 })
 // Validation
 const phoneValidation = ref(null)
@@ -87,8 +84,8 @@ const router = useRouter()
 // Accessing state
 const availableTabs = computed(() => {
     const tabs = [
-        { name: t('phone'), value: 'phone' },
-        { name: t('email'), value: 'email' }
+        { name: t('auth.resetPassword.phone'), value: 'phone' },
+        { name: t('auth.resetPassword.email'), value: 'email' }
     ];
     return tabs.filter(tab => !globals.state.options.auth.authMethodsExclude.includes(tab.value));
 });

package/src/modules/auth/views/components/pages/SignIn.vue

@@ -4,13 +4,13 @@
 		<img loading="lazy" :src="'/logo/logo.svg'" class="i-extra radius-small mn-b-small">
 
 		<h3 class="mn-b-medium">
-			{{ t('title') }}
+			{{ t('auth.signIn.title') }}
 			<br>
-			<span class="t-semi">{{ t('subtitle') }}</span>
+			<span class="t-semi">{{ t('auth.signIn.subtitle') }}</span>
 		</h3>
 
 		<p class="mn-b-big">
-			<router-link :to="{name: 'Sign Up', query: { returnUrl: route.query?.returnUrl}}" class="underline t-second">{{ t('signup') }}</router-link>
+			<router-link :to="{name: 'Sign Up', query: { returnUrl: route.query?.returnUrl}}" class="underline t-second">{{ t('auth.signIn.signup') }}</router-link>
 		</p>
 		
 		<!-- Select -->
@@ -40,7 +40,7 @@
 						:validCharactersOnly="true"
 						:validation="phoneValidation" 
 						mode="national"
-						:inputOptions="{placeholder: t('phonePlaceholder'), type: 'tel'}"
+						:inputOptions="{placeholder: t('auth.signIn.phonePlaceholder'), type: 'tel'}"
 						class="bg-light h-4r pd-small radius-small mn-b-thin" 
 					/>
 					
@@ -50,7 +50,7 @@
 				<div v-show="tabAuth === 'email'" class="mn-b-thin radius-small o-hidden">
 					<Field 
 						v-model:field="auth.state.user.email" 	
-						:placeholder="t('emailPlaceholder')" 	
+						:placeholder="t('auth.signIn.emailPlaceholder')" 	
 						:validation="emailValidation"
 						:tabIndex="-1"
 						class="bg-light h-4r pd-medium radius-small" 
@@ -64,7 +64,7 @@
 			v-model:field="auth.state.user.password"
 			type="password" 	
 			:validation="passswordValidation" 
-			:placeholder="t('passwordPlaceholder')" 
+			:placeholder="t('auth.signIn.passwordPlaceholder')" 
 			class="
         bg-light
         pd-medium
@@ -79,7 +79,7 @@
 				:to="{name: 'Reset Password', query: { returnUrl: route.query?.returnUrl}}"
 				class="underline d-block t-blue"
 			>
-				{{ t('forgotPassword') }}
+				{{ t('auth.signIn.forgotPassword') }}
 			</router-link>
 		</div>
 		<!-- Button -->
@@ -88,7 +88,7 @@
 			:callback="redirectTo" 
 			class="w-100 bg-main"
 		>
-			{{ t('signin') }}
+			{{ t('auth.signIn.signin') }}
 		</Button>
 		
 		<!-- <Button 
@@ -96,7 +96,7 @@
 			:callback="redirectTo" 
 			class="mn-b-thin bg-black t-white"
 		>
-			{{ t('signin_apple') }}
+			{{ t('auth.signIn.signin_apple') }}
 		</Button> -->
 	</section> 
 </template>
@@ -111,8 +111,6 @@ import Button        from '@martyrs/src/components/Button/Button.vue'
 import { computed, onMounted, ref, inject } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-// Import localization
-import text from '@martyrs/src/modules/auth/views/localization/SignIn.json'
 // Import state
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 import * as globals from '@martyrs/src/modules/globals/views/store/globals.js'
@@ -127,14 +125,13 @@ const route = useRoute()
 const router = useRouter()
 // Localization
 const { t } = useI18n({
-	useScope: 'global', 
-	...text
+	useScope: 'global'
 })
 // Accessing state
 const availableTabs = computed(() => {
     const tabs = [
-        { name: t('phone'), value: 'phone' },
-        { name: t('email'), value: 'email' }
+        { name: t('auth.signIn.phone'), value: 'phone' },
+        { name: t('auth.signIn.email'), value: 'email' }
     ];
     return tabs.filter(tab => !globals.state.options.auth.authMethodsExclude.includes(tab.value));
 });

package/src/modules/auth/views/components/pages/SignUp.vue

@@ -2,7 +2,7 @@
 	<section class="t-left pd-medium">
 		<!-- Header -->
 		<!-- <img loading="lazy" src="@/assets/images/logo.svg" class="i-extra mn-b-small"> -->
-		<h3 class="mn-b-small">{{t('title')}}</h3>
+		<h3 class="mn-b-small">{{t('auth.signUp.title')}}</h3>
 		
 		<!-- Select -->
 		<div 
@@ -21,7 +21,7 @@
 		<!-- Phone -->
 			<transition name="slide-fade">
 				<div v-show="tabAuth === 'phone'" class="mn-b-semi radius-small">
-					<p class="mn-b-small t-transp">{{t('smsNotice')}}</p>
+					<p class="mn-b-small t-transp">{{t('auth.signUp.smsNotice')}}</p>
 					<FieldPhone
 						@change="(event) => auth.state.user.phone = event" 	
 						:dropdownOptions="{
@@ -31,7 +31,7 @@
 						}"
 						:validation="phoneValidation" 
 						mode="national"
-						:inputOptions="{placeholder: t('phonePlaceholder')}"
+						:inputOptions="{placeholder: t('auth.signUp.phonePlaceholder')}"
 						class="bg-light h-4r pd-small radius-small mn-b-thin" 
 					/>
 					
@@ -39,10 +39,10 @@
 			</transition>
 			<transition name="slide-fade">
 				<div v-show="tabAuth === 'email'" class="mn-b-semi radius-small o-hidden">
-					<p class="mn-b-small t-transp">{{t('emailNotice')}}</p>
+					<p class="mn-b-small t-transp">{{t('auth.signUp.emailNotice')}}</p>
 					<Field 
 						v-model:field="auth.state.user.email" 	
-						:placeholder="t('emailPlaceholder')" 	
+						:placeholder="t('auth.signUp.emailPlaceholder')" 	
 						:validation="emailValidation"
 						class="bg-light h-4r pd-medium radius-small" 
 					/>
@@ -51,11 +51,11 @@
 		</div>
 		
 		<!-- Button -->
-		<Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-main mn-b-big">{{t('sendCode')}}</Button>
+		<Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-main mn-b-big">{{t('auth.signUp.sendCode')}}</Button>
 			
 		<!-- Links -->
 		<div class="w-100">
-			<router-link :to="{name: 'Sign In', query: { returnUrl: route.query.returnUrl}}" class="underline mn-b-medium d-block t-blue">{{t('haveAccount')}}</router-link>
+			<router-link :to="{name: 'Sign In', query: { returnUrl: route.query.returnUrl}}" class="underline mn-b-medium d-block t-blue">{{t('auth.signUp.haveAccount')}}</router-link>
 		</div>
 
 	</section> 
@@ -71,8 +71,6 @@
 	import { computed, onMounted, ref } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
-	// Import localization
-	import text from '@martyrs/src/modules/auth/views/localization/SignUp.json'
 	// Import state
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 	import * as twofa from '@martyrs/src/modules/auth/views/store/twofa.js'
@@ -82,7 +80,6 @@
 	// Localization
 	const { t } = useI18n({
 		useScope: 'global', 
-		...text
 	})
 	// Validation
 	const phoneValidation = ref(null)
@@ -94,8 +91,8 @@
 	// Accessing state
 	const availableTabs = computed(() => {
 	    const tabs = [
-	        { name: t('phone'), value: 'phone' },
-	        { name: t('email'), value: 'email' }
+	        { name: t('auth.signUp.phone'), value: 'phone' },
+	        { name: t('auth.signUp.email'), value: 'email' }
 	    ];
 	    return tabs.filter(tab => !globals.state.options.auth.authMethodsExclude.includes(tab.value));
 	});

package/src/modules/auth/views/components/sections/SliderFeatures.vue

@@ -4,60 +4,17 @@ import { useI18n } from 'vue-i18n'
 
 import Slider from '@martyrs/src/components/Slider/Slider.vue'
 
-const text = {
-  messages: {
-    en: {
-      features: [
-        {
-          title: "What's the Weeder Token, Dude?",
-          description: "WDT is like, the backbone of our rad community. It's cash, it's power, it's an investment. Groovy, right?", 
-        },
-        {
-          title: "Light Up and Level Up",
-          description: "Order up, light up, and earn Weeder tokens. More tokes, more cash in your pocket, man.", 
-        },
-        {
-          title: "Hang Ten with Our Community",
-          description: "Find the dopest strains and start floating on cloud 9 with us!", 
-        },
-        {
-          title: "Shop 'Til You Drop... Into Your Couch",
-          description: "Score primo bud and gear with just a few clicks. Delivered right to your pad!", 
-        },
-      ]
-    },
-    ru: {
-      features: [
-        {
-          title: "Что такое токен Weeder, Бро?",
-          description: "WDT - это как основа нашего крутого сообщества. Это деньги, это власть, это инвестиции. Круто, а?", 
-        },
-        {
-          title: "Зажигай и Развивайся",
-          description: "Закажи шмали, курни и зарабатывай токены Weeder. Чем больше курнешь, тем больше кэша у тебя в кармане, чувак.", 
-        },
-        {
-          title: "Веселись с Нашим Сообществом",
-          description: "Найди самые крутые сорта и начни шмалить на девятом облаке вместе с нами.", 
-        },
-        {
-          title: "Покупайте, Когда Накурились",
-          description: "Закажи премиумную бошку и крутые аксессуары за пару кликов, чувак. Прямо к твоей двери!",
-        },
-      ]
-    }
-  }
-}
-
-const { tm } = useI18n(text)
-const features = computed(() => tm('features'))
+const { tm } = useI18n({
+  useScope: 'global'
+})
+const features = computed(() => tm('auth.features'))
 </script>
 
 <template>
   <Slider :showDots="true" :slideCount="features.length" class="auth_slider h-100">
     <div class="carousel__slide" v-for="(feature, index) in features" :key="index">
       <div class="parent-div flex flex-h-center" >
-        <div class="background-div" :style="`background-image: url(/features/${index}.png); background-size:contain; background-position: center center; background-repeat: no-repeat;`"></div>
+        <div class="background-div" :style="`background-image: url(/features/${index}.png);`"></div>
         <div class="pd-big">
           <h5 class="t-center w-100 mn-b-regular">{{ feature.title }}</h5>
           <p class='t-center t-transp w-100'>{{ feature.description }}</p>
@@ -84,6 +41,12 @@ const features = computed(() => tm('features'))
   object-fit: contain;
 }
 
+.background-div {
+  background-size:cover; 
+  background-position: center center; 
+  background-repeat: no-repeat;
+}
+
 .background-div {
   flex-grow: 1; // Занимает все оставшееся пространство
 }

package/src/modules/events/components/pages/EditEvent.vue

@@ -174,7 +174,7 @@ import '@vuepic/vue-datepicker/dist/main.css'
 
 
 
-import Calendar from '@martyrs/src/components/DatePicker/Calendar.vue'
+import Calendar from '@martyrs/src/components/Calendar/Calendar.vue'
 
 import Block from '@martyrs/src/components/Block/Block.vue';
 import Popup from '@martyrs/src/components/Popup/Popup.vue';

package/src/modules/globals/globals.client.js

@@ -136,6 +136,7 @@ export {
   mixins,
   scrollBehavior,
   store,
+  i18nManager,
   // Store
   storeGlobals,
   websockets,

package/src/modules/globals/views/components/blocks/PopupDateSelector.vue

@@ -53,7 +53,7 @@ import { ref, computed, watch, onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import Popup from '@martyrs/src/components/Popup/Popup.vue'
 import Loader from '@martyrs/src/components/Loader/Loader.vue'
-import Calendar from '@martyrs/src/components/DatePicker/Calendar.vue'
+import Calendar from '@martyrs/src/components/Calendar/Calendar.vue'
 import Button from '@martyrs/src/components/Button/Button.vue'
 import IconShopcartAdd from '@martyrs/src/modules/icons/actions/IconShopcartAdd.vue'
 import PriceTotal from '@martyrs/src/modules/orders/components/elements/PriceTotal.vue'

package/src/modules/globals/views/utils/axios-instance.js

@@ -15,4 +15,18 @@ export function setAuthToken(token) {
   }
 }
 
-export default $axios;
+// Функция для получения текущего базового URL
+export function getBaseURL() {
+  return $axios.defaults.baseURL;
+}
+
+// Функция для изменения базового URL
+export function setBaseURL(url) {
+  $axios.defaults.baseURL = url;
+}
+
+export function resetBaseURL() {
+  $axios.defaults.baseURL = process.env.API_URL;
+}
+
+export default $axios;

package/src/modules/icons/actions/IconShow.vue

@@ -0,0 +1,23 @@
+<template>
+<svg width="29" height="28" viewBox="0 0 29 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path v-if="!show" :fill="fill" d="M27.8966 14.6499C28.069 14.4351 28.149 14.1606 28.119 13.8868C28.089 13.613 27.9514 13.3623 27.7366 13.1899C27.5218 13.0175 27.2473 12.9375 26.9735 12.9675C26.6997 12.9976 26.449 13.1351 26.2766 13.3499C26.2166 13.4199 20.0866 20.9999 14.0866 20.9999C8.0866 20.9999 1.9566 13.4199 1.8966 13.3399C1.72155 13.1251 1.46834 12.9886 1.19266 12.9605C0.916983 12.9323 0.641421 13.0149 0.426596 13.1899C0.21177 13.365 0.0752793 13.6182 0.0471489 13.8939C0.0190184 14.1695 0.101553 14.4451 0.276596 14.6599C1.47736 16.0751 2.79537 17.3864 4.2166 18.5799L1.8266 21.9999C1.68609 22.2164 1.63469 22.4787 1.68314 22.7322C1.7316 22.9857 1.87616 23.2106 2.0866 23.3599C2.25126 23.4817 2.45186 23.545 2.6566 23.5399C2.81694 23.5408 2.97513 23.5031 3.11784 23.43C3.26056 23.3569 3.3836 23.2505 3.4766 23.1199L5.8066 19.8099C6.77202 20.5237 7.79947 21.1495 8.8766 21.6799L7.0866 25.2999C7.02857 25.4181 6.99444 25.5465 6.98617 25.6779C6.97789 25.8092 6.99563 25.9409 7.03837 26.0654C7.0811 26.1899 7.148 26.3048 7.23521 26.4033C7.32242 26.5019 7.42824 26.5823 7.5466 26.6399C7.78295 26.7547 8.05497 26.7718 8.30385 26.6876C8.55273 26.6034 8.75847 26.4246 8.8766 26.1899L10.7166 22.4399C11.4847 22.7094 12.2791 22.8971 13.0866 22.9999V26.9999C13.0866 27.2651 13.192 27.5195 13.3795 27.707C13.567 27.8946 13.8214 27.9999 14.0866 27.9999C14.3518 27.9999 14.6062 27.8946 14.7937 27.707C14.9812 27.5195 15.0866 27.2651 15.0866 26.9999V22.9999C15.8928 22.9113 16.6873 22.737 17.4566 22.4799L19.2966 26.2199C19.4147 26.4546 19.6205 26.6334 19.8693 26.7176C20.1182 26.8018 20.3902 26.7847 20.6266 26.6699C20.7488 26.6125 20.8581 26.5309 20.948 26.43C21.0378 26.3292 21.1063 26.2112 21.1493 26.0832C21.1922 25.9552 21.2088 25.8198 21.1981 25.6851C21.1873 25.5505 21.1494 25.4195 21.0866 25.2999L19.3166 21.6999C20.3957 21.1673 21.4262 20.5416 22.3966 19.8299L24.7066 23.1199C24.7996 23.2505 24.9226 23.3569 25.0653 23.43C25.2081 23.5031 25.3663 23.5408 25.5266 23.5399C25.7313 23.545 25.9319 23.4817 26.0966 23.3599C26.3054 23.2091 26.448 22.9835 26.4945 22.7301C26.5411 22.4767 26.4881 22.2152 26.3466 21.9999L23.9666 18.6199C25.3931 17.4172 26.7084 16.0885 27.8966 14.6499Z"/>
+	<path  v-if="show" :fill="fill" d="M27.9166 13.37C27.6466 13 21.3666 5 14.0866 5C7.16657 5 0.556574 13 0.276574 13.34C0.12558 13.5268 0.0432129 13.7598 0.0432129 14C0.0432129 14.2402 0.12558 14.4732 0.276574 14.66C0.556574 15 7.16657 23 14.0866 23C21.0066 23 27.6266 15 27.8966 14.61C28.039 14.4357 28.1184 14.2185 28.122 13.9935C28.1256 13.7685 28.0533 13.5488 27.9166 13.37ZM14.0866 21C9.20657 21 4.13657 15.89 2.46657 14C4.13657 12.15 9.20657 7 14.0866 7C19.2366 7 24.1366 12.11 25.7266 14C24.0866 15.82 19.0866 21 14.0866 21Z"/>
+	<path  v-if="show" :fill="fill" d="M14.0867 9C13.0978 9 12.1311 9.29325 11.3088 9.84265C10.4866 10.3921 9.84571 11.173 9.46727 12.0866C9.08884 13.0002 8.98982 14.0055 9.18275 14.9755C9.37567 15.9454 9.85188 16.8363 10.5511 17.5355C11.2504 18.2348 12.1413 18.711 13.1112 18.9039C14.0811 19.0969 15.0865 18.9978 16.0001 18.6194C16.9137 18.241 17.6946 17.6001 18.244 16.7779C18.7934 15.9556 19.0867 14.9889 19.0867 14C19.0867 12.6739 18.5599 11.4021 17.6222 10.4645C16.6845 9.52678 15.4128 9 14.0867 9ZM14.0867 17C13.4933 17 12.9133 16.8241 12.42 16.4944C11.9266 16.1648 11.5421 15.6962 11.315 15.1481C11.088 14.5999 11.0286 13.9967 11.1443 13.4147C11.2601 12.8328 11.5458 12.2982 11.9654 11.8787C12.3849 11.4591 12.9195 11.1734 13.5014 11.0576C14.0833 10.9419 14.6865 11.0013 15.2347 11.2284C15.7829 11.4554 16.2514 11.8399 16.5811 12.3333C16.9107 12.8266 17.0867 13.4067 17.0867 14C17.0867 14.7956 16.7706 15.5587 16.208 16.1213C15.6454 16.6839 14.8823 17 14.0867 17Z"/>
+</svg>
+
+
+</template>
+
+
+<script setup>
+	const props = defineProps({
+	  fill: {
+	    type: String,
+	    default: 'rgb(var(--black))'
+	  },
+	  show: {
+	  	type: Boolean,
+	    default: false
+	  }
+	})
+</script>