@ozdao/martyrs 0.2.482 → 0.2.483

package/src/components/Status/Status.vue

@@ -1,19 +1,16 @@
 <template>
 	<div class="pd-small error-wrapper">
 		<div class="
-			flex-nowrap flex
+			flex-nowrap flex-v-center flex
 			radius-small
 			pd-small
 			t-white 
 			bg-fourth
 		">
+			<IconInfo fill="rgb(var(--white))" class="t-transp i-medium mn-r-thin z-index-5"/>
 			<p class="w-100">
-				{{data.message}}
-				<!-- <span class="t-semi">Ошибка: {{status}} </span> -->
-				<br>
-				<!-- <span>Сообщение: {{message}}</span> -->
+				{{te(`globals.errors.${data.message}`) ? t(`globals.errors.${data.message}`) : data.message}}
 			</p>
-			
 			<IconCross @click="closeError()"  class="cursor-pointer hover-scale-1 i-regular z-index-5"/>
 		</div>
 	</div>
@@ -22,10 +19,16 @@
 
 <script setup="props">
 	import { computed } from 'vue'
+	import { useI18n } from 'vue-i18n'
+
+	import IconInfo from '@martyrs/src/modules/icons/navigation/IconInfo.vue';
 	import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 
-	const emits = defineEmits('close')
+	const { t, te } = useI18n({
+		useScope: 'global',
+	})
 
+	const emits = defineEmits('close')
 	const props = defineProps({
 	  status: String,
 	  message: String,

package/src/modules/auth/views/components/layouts/Auth.vue

@@ -20,7 +20,7 @@
     </router-view>
 
     <section class="w-100 desktop-only o-hidden radius-big bg-grad-main">
-      <!-- <SliderFeatures/> -->  
+      <SliderFeatures/>  
     </section>
   </div>
 </template>

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

@@ -1,9 +1,7 @@
 <script setup>
-import { ref, onMounted } from 'vue'
+import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
-
-import emblaCarouselVue from 'embla-carousel-vue';
-import Autoplay from 'embla-carousel-autoplay'
+import Slider from '@martyrs/src/components/Slider/Slider.vue'
 
 const text = {
   messages: {
@@ -37,7 +35,6 @@ const text = {
           title: "Зажигай и Развивайся",
           description: "Закажи шмали, курни и зарабатывай токены Weeder. Чем больше курнешь, тем больше кэша у тебя в кармане, чувак.", 
         },
-        
         {
           title: "Веселись с Нашим Сообществом",
           description: "Найди самые крутые сорта и начни шмалить на девятом облаке вместе с нами.", 
@@ -51,86 +48,23 @@ const text = {
   }
 }
 
-const { tm,rt } = useI18n(text)
-
-
-
-
-const selectedIndex = ref(0);
-const scrollSnaps = ref([]);
-
-const autoplayOptions = {
-  delay: 2000,
-  jump: false,
-  stopOnInteraction: false,
-  stopOnMouseEnter: false,
-  stopOnFocusIn: true,
-  stopOnLastSnap: false,
-  rootNode: (emblaRoot) => emblaRoot.parentElement
-}
-
-const [emblaNode, emblaApi] = emblaCarouselVue({ loop: true }, [Autoplay(autoplayOptions)])
-
-const scrollTo = (index) => emblaApi.value && emblaApi.value.scrollTo(index);
-const onInit = (embla) =>  scrollSnaps.value = emblaApi.value.scrollSnapList();
-const onSelect = (embla) => selectedIndex.value = emblaApi.value.selectedScrollSnap();
-
-onMounted(async() => {
-  onInit(emblaApi);
-  onSelect(emblaApi);
-
-  emblaApi.value.on('reInit', onInit);
-  emblaApi.value.on('reInit', onSelect);
-  emblaApi.value.on('select', onSelect);
-});
+const { tm } = useI18n(text)
+const features = computed(() => tm('features'))
 </script>
 
 <template>
-  <div class="embla" ref="emblaNode">
-    <div class="embla__container">
-      <div class="embla__slide pd-nano" v-for="(feature, index) in tm('features')" :key="index">
-        <div class="parent-div" :style="`background-image: url(/assets/images/features/${index}.png); background-size:cover; background-position: center center;`">
-          <div class="background-div"></div>
-          <h4 class="mn-b-small">{{ feature.title }}</h4>
-          <p class='mn-b-big mn-r-small mn-l-small'>{{ feature.description }}</p>
-        </div>
+  <Slider :showDots="true" :slideCount="features.length">
+    <div class="carousel__slide pd-nano" v-for="(feature, index) in features" :key="index">
+      <div class="parent-div" :style="`background-image: url(/assets/images/features/${index}.png); background-size:cover; background-position: center center;`">
+        <div class="background-div"></div>
+        <h4 class="mn-b-small">{{ feature.title }}</h4>
+        <p class='mn-b-big mn-r-small mn-l-small'>{{ feature.description }}</p>
       </div>
     </div>
-  </div>
+  </Slider>
 </template>
 
 <style lang="scss">
-.carousel__track {
-    height: 100%;
-  }
-.carousel-controls {
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-.carousel-indicators {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  display: flex;
-  justify-content: center;
-}
-
-.carousel-indicators li {
-  list-style: none;
-  margin: 0 5px;
-  width: 10px;
-  height: 10px;
-  background: gray;
-  border-radius: 50%;
-}
-
-.carousel-indicators li.active {
-  background: white;
-}
-
 .parent-div {
   display: flex;
   flex-direction: column;
@@ -139,6 +73,6 @@ onMounted(async() => {
 }
 
 .background-div {
-  flex-grow: 1 // Занимает все оставшееся пространство
+  flex-grow: 1; // Занимает все оставшееся пространство
 }
-</style>
+</style>

package/src/modules/auth/views/localization/EnterCode.json

@@ -1,12 +1,12 @@
 {
   "messages": {
-    "en-default": {
+    "en": {
       "verifyNumberTitle": "Verify Number",
       "instructions": "We have sent a registration code to your phone number. Please enter it in the field below:",
       "resendCode": "Send the code again",
       "secondsResend": "seconds to the possibility of sending the code again."
     },
-    "ru-default": {
+    "ru": {
       "verifyNumberTitle": "Подтвердите номер",
       "instructions": "Мы отправили код регистрации на ваш номер телефона. Введите его в поле ниже:",
       "resendCode": "Отправить код еще раз",

package/src/modules/auth/views/localization/EnterPassword.json

@@ -1,6 +1,6 @@
 {
   "messages": {
-    "en-default": {
+    "en": {
       "almostDone": "Almost there!",
       "newPasswordPrompt": "Please, set a new password.",
       "registrationPasswordPrompt": "Please, set your password to complete the registration.",
@@ -9,7 +9,7 @@
       "changePasswordBtn": "Change Password",
       "registerBtn": "Register"
     },
-    "ru-default": {
+    "ru": {
       "almostDone": "Почти все!",
       "newPasswordPrompt": "Пожалуйста, укажите новый пароль.",
       "registrationPasswordPrompt": "Пожалуйста, укажите пароль, на этом регистрация будет закончена.",

package/src/modules/auth/views/localization/ResetPassword.json

@@ -1,6 +1,6 @@
 {
   "messages": {
-    "en-default": {
+    "en": {
       "forgotPasswordTitle": "Forgot Password?",
       "instructions": "To reset your password, specify the phone or email used during registration.",
       "smsInfo": "We will send you an SMS with a confirmation code to reset your password, which you will need to enter in the next step.",
@@ -11,7 +11,7 @@
       "emailPlaceholder": "Enter your email",
       "sendCode": "Send code"
     },
-    "ru-default": {
+    "ru": {
       "forgotPasswordTitle": "Забыли пароль?",
       "instructions": "Чтобы сбросить пароль, укажите телефон или email, использованные при регистрации.",
       "smsInfo": "Мы вышлем вам SMS с кодом подтверждения для сброса пароля, который вы должны будете ввести в следующем шаге.",

package/src/modules/auth/views/localization/SignIn.json

@@ -1,6 +1,6 @@
 {
   "messages": {
-    "en-default": {
+    "en": {
       "title": "Welcome to OZ DAO,",
       "subtitle": "Sign In to Continue",
       "signup": "Don't have an account?",
@@ -15,7 +15,7 @@
       "signin_apple": "Sign In with Apple",
       "soon": "SOON"
     },
-    "ru-default": {
+    "ru": {
       "title": "Приветствуем вас,",
       "subtitle": "Войдите для продолжения",
       "signup": "Нет аккаунта?",

package/src/modules/auth/views/localization/SignUp.json

@@ -1,6 +1,6 @@
 {
   "messages": {
-    "en-default": {
+    "en": {
       "title": "Sign Up",
       "description": "Choose a convenient way to register via phone or email:",
       "phone": "Phone",
@@ -12,7 +12,7 @@
       "sendCode": "Send Code",
       "haveAccount": "Already have an account?"
     },
-    "ru-default": {
+    "ru": {
       "title": "Новая учетная запись",
       "description": "Выберите удобный способ регистрации через телефон или email:",
       "phone": "Телефон",

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

@@ -25,13 +25,27 @@ import datePickerPlugin from './views/plugins/date-picker.plugin.js';
 import storeDebuggerPlugin from './views/plugins/store-debugger/store-debugger.plugin.js';
 
 import store from './views/classes/store.js';
-
 import websockets from './views/classes/globals.websocket.js';
+import { i18nManager }  from '@martyrs/src/modules/globals/views/classes/globals.i18n.js';
+
+import en from './locales/en.js';
+import ru from './locales/ru.js';
+
 
 // Пример функции инициализации для модуля заказов
 function initializeGlobals(app, store, router, config, options = {}) {
   const route = options.route || 'Home';
 
+  const locales = {
+    en: en,
+    ru: ru,
+    es: {}  // или es: undefined
+  };
+
+  i18nManager.register('globals', locales);
+
+  console.log('mesages is',  i18nManager.getAllMessages())
+
   const envVariables = ['NODE_ENV', 'PORT', 'APP_NAME', 'DOMAIN_URL', 'API_URL', 'WSS_URL', 'FILE_SERVER_URL', 'WDT_TOKEN', 'WDM_URL_PROD', 'GOOGLE_MAPS_API_KEY', 'MOBILE_APP'];
 
   app.config.globalProperties.DOMAIN_URL = process.env.DOMAIN_URL;

package/src/modules/globals/locales/en.js

@@ -0,0 +1,21 @@
+// @martyrs/src/modules/globals/locales/en.js
+export default {
+  globals: {
+    errors: {
+      USER_NOT_FOUND: 'Such user is not registered',
+      USER_ALREADY_REGISTERED: 'Such user is already registered!',
+      USER_NOT_REGISTERED_YET: 'This user has not been registered yet!',
+      USER_PHONE_OR_PASSWORD_NOT_FOUND: 'User with such phone or password not found!',
+      INCORRECT_PASSWORD_ENTERED: 'You entered an incorrect password!',
+      INVALID_INVITATION_CODE: 'Incorrect invitation code.',
+      MISSING_REQUIRED_PARAMETERS: 'Missing required parameters.',
+      ERROR_UPDATING_USER: 'Something wrong when updating user.',
+      PASSWORDS_DO_NOT_MATCH: 'The passwords you entered do not match. Please correct the errors and try again.',
+      CODE_NOT_SENT: 'Something went wrong and the code was not sent. Please try again.',
+      INPUT_ERROR: 'Please enter only a four-digit code.',
+      WRONG_CODE: 'You entered an incorrect code. Please try again.',
+      POST_URL_ALREADY_IN_USE: 'Failed! Blogpost with this URL is already in use!',
+      NAME_CANNOT_BE_EMPTY: 'Error: Name cannot be empty. Please enter a name.',
+    }
+  }
+};

package/src/modules/globals/locales/index.js

@@ -0,0 +1,8 @@
+// @martyrs/src/modules/globals/locales/index.js
+import en from './en.js';
+import ru from './ru.js';
+
+export default {
+  en,
+  ru
+};

package/src/modules/globals/locales/ru.js

@@ -0,0 +1,21 @@
+// @martyrs/src/modules/globals/locales/ru.js
+export default {
+  globals: {
+    errors: {
+      USER_NOT_FOUND: 'Такой пользователь не зарегистрирован!',
+      USER_ALREADY_REGISTERED: 'Такой пользователь уже зарегистрирован!',
+      USER_NOT_REGISTERED_YET: 'Такой пользователь еще не зарегистрирован!',
+      USER_PHONE_OR_PASSWORD_NOT_FOUND: 'Пользователь с таким телефоном или паролем не найден!',
+      INCORRECT_PASSWORD_ENTERED: 'Вы ввели неверный пароль!',
+      INVALID_INVITATION_CODE: 'Неверный код приглашения',
+      MISSING_REQUIRED_PARAMETERS: 'Отсутствуют необходимые параметры.',
+      ERROR_UPDATING_USER: 'Произошла ошибка при обновлении пользователя.',
+      PASSWORDS_DO_NOT_MATCH: 'Введенные вами пароли не совпадают. Исправьте ошибки и попробуйте еще раз.',
+      CODE_NOT_SENT: 'Что-то пошло не так и код не был отправлен. Попробуйте еще раз.',
+      INPUT_ERROR: 'Вставьте только четырехзначный код.',
+      WRONG_CODE: 'Вы ввели неверный код. Попробуйте еще раз.',
+      POST_URL_ALREADY_IN_USE: 'Ошибка! Публикация с этим URL уже используется!',
+      NAME_CANNOT_BE_EMPTY: 'Ошибка: Название не может быть пустым. Пожалуйста, введите название.',
+    }
+  }
+};

package/src/modules/globals/views/classes/globals.i18n.js

@@ -0,0 +1,84 @@
+import merge from 'lodash.merge';
+
+class I18nManager {
+  constructor() {
+    this.moduleLocales = new Map();
+    this.overrides = new Map();
+    this.extensions = new Map();
+  }
+
+  register(moduleName, locales) {
+    if (typeof moduleName !== 'string' || !this.isValidLocales(locales)) {
+      throw new TypeError('Invalid arguments for register()');
+    }
+    this.moduleLocales.set(moduleName, locales);
+    return this;
+  }
+
+  extend(moduleName, locales) {
+    if (!this.isValidLocales(locales)) throw new TypeError('Invalid locales for extend()');
+    const existing = this.extensions.get(moduleName) || {};
+    merge(existing, locales);
+    this.extensions.set(moduleName, existing);
+    return this;
+  }
+
+  override(moduleName, locales) {
+    if (!this.isValidLocales(locales)) throw new TypeError('Invalid locales for override()');
+    const existing = this.overrides.get(moduleName) || {};
+    merge(existing, locales);
+    this.overrides.set(moduleName, existing);
+    return this;
+  }
+
+  getMessages(locale) {
+    const result = {};
+
+    for (const [, moduleLocales] of this.moduleLocales) {
+      if (moduleLocales[locale]) {
+        merge(result, moduleLocales[locale]);
+      }
+    }
+
+    for (const [, ext] of this.extensions) {
+      if (ext[locale]) {
+        merge(result, ext[locale]);
+      }
+    }
+
+    for (const [, override] of this.overrides) {
+      if (override[locale]) {
+        merge(result, override[locale]);
+      }
+    }
+
+    return result;
+  }
+
+  getAllMessages() {
+    const allLocales = new Set();
+
+    for (const moduleLocales of this.moduleLocales.values()) {
+      Object.keys(moduleLocales).forEach(locale => allLocales.add(locale));
+    }
+
+    const messages = {};
+
+    for (const locale of allLocales) {
+      messages[locale] = this.getMessages(locale);
+    }
+
+    return messages;
+  }
+
+  isValidLocales(obj) {
+    return this.isObject(obj) && Object.values(obj).every(this.isObject);
+  }
+
+  isObject(item) {
+    return item && typeof item === 'object' && !Array.isArray(item);
+  }
+}
+
+export const i18nManager = new I18nManager();
+export default I18nManager;

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

@@ -114,37 +114,48 @@
 	    </component>
 		  <!-- rows-1-min0_max1 z-index-1 pos-relative w-100 h-100 -->
 		  <div class="rows-1-min0_max1 z-index-1 pos-relative w-100 h-100">
-  			<Status 
-					v-if="globals.state.error.show" 
-					:data="globals.state.error"
-					@close="globals.state.error.show = false"
-					class="z-index-7" 
-				/>
-				 <Suspense @resolve="onSuspenseResolved">
-					<router-view  
-						id="view"
-						v-slot="{ Component, route }" 
-						:class="{
-							'scroll-hide': MOBILE_APP,
-						}"
-						class="o-y-scroll o-x-hidden flex flex-column pos-relative h-100"
-					>
-						<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
-			      	<component 
-			      		ref="page"  
-			      		:is="Component" 
-			      		:key="route.path"
-			      		class="w-100 h-min-100"
-		      		 	@page-loading="handlePageLoading"
-	              @page-loaded="handlePageLoaded"
-			      	/>
-			      	<!-- Key пока выключил непонятно какие проблемы это вызовет -->
-			      	<!--  -->
-			      </transition>
-
-			      <!-- <Footer /> -->
-					</router-view>
-				</Suspense>
+		  	<div class="o-y-scroll o-x-hidden h-100">
+	  			<Status 
+	  				v-if="globals.state.error.show"
+						:data="globals.state.error"
+						@close="globals.state.error.show = false"
+						class="z-index-7" 
+					/>
+					<div class="h-min-100 pos-relative w-100">
+				 		<Suspense @resolve="onSuspenseResolved">
+							<router-view  
+								id="view"
+								v-slot="{ Component, route }" 
+								:class="{
+									'scroll-hide': MOBILE_APP,
+								}"
+								class="h-min-100 pos-relative w-100"
+							>
+								<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
+					      	<component 
+					      		ref="page"  
+					      		:is="Component" 
+					      		:key="route.path"
+					      		class="w-100 h-min-100"
+				      		 	@page-loading="handlePageLoading"
+			              @page-loaded="handlePageLoaded"
+					      	/>
+					      	<!-- Key пока выключил непонятно какие проблемы это вызовет -->
+					      	<!--  -->
+					      </transition>
+						  </router-view>
+						</Suspense>
+				  </div>
+			  
+	        <component
+						v-if="!MOBILE_APP && route.meta.footer && !route.meta.hideFooter"
+			      ref="footer" 
+			      :is="route.meta.footer"
+			      :theme="headerTheme"
+			      :logotype="route.meta.logotype"
+			      :location="route.meta.location"
+			    />
+				</div>
 			</div>
 		</section>
 
@@ -157,14 +168,7 @@
     	/>
 		</router-view>
 
-	  <component
-			v-if="!MOBILE_APP && route.meta.footer?.component && !route.meta.hideFooter"
-      ref="footer" 
-      :is="route.meta.footer.component"
-      :theme="headerTheme"
-      :logotype="route.meta.footer.logotype"
-      :location="route.meta.footer.location"
-    />
+	
 
     <component 
       v-if="MOBILE_APP && route.meta.title_hide"
@@ -190,7 +194,6 @@
 
 	import NavigationBar from '@martyrs/src/modules/globals/views/components/partials/NavigationBar.vue';
 	import LocationSelection from '@martyrs/src/modules/globals/views/components/partials/LocationSelection.vue';
-	// import Footer from '@martyrs/src/modules/globals/views/components/partials/Footer.vue'
 
 	import ShopCart from '@martyrs/src/modules/orders/components/partials/ShopCart.vue';
 	// PROPS