@ozdao/martyrs 0.2.484 → 0.2.486

package/src/.martyrs/filemap.json

@@ -1096,8 +1096,8 @@
     "hash": "17654329cb0ff87efecf8973a808c98124e3f1dc99f3141b8fe8c5b33b494fee"
   },
   {
-    "path": "/Users/magicofoz/Development/OZDAO/ozdao.dev/app/martyrs/src/components/DatePicker/Calendar.vue",
-    "relativePath": "components/DatePicker/Calendar.vue",
+    "path": "/Users/magicofoz/Development/OZDAO/ozdao.dev/app/martyrs/src/components/Calendar/Calendar.vue",
+    "relativePath": "components/Calendar/Calendar.vue",
     "extension": ".vue",
     "size": 15481,
     "modified": "2025-03-10T11:29:12.667Z",

package/src/components/Feed/Feed.vue

@@ -180,7 +180,7 @@ import Loader from '@martyrs/src/components/Loader/Loader.vue';
 import Skeleton from '@martyrs/src/components/Skeleton/Skeleton.vue';
 import EmptyState from '@martyrs/src/components/EmptyState/EmptyState.vue';
 import Dropdown from "@martyrs/src/components/Dropdown/Dropdown.vue";
-import Calendar from '@martyrs/src/components/DatePicker/Calendar.vue'
+import Calendar from '@martyrs/src/components/Calendar/Calendar.vue'
 import BottomSheet from '@martyrs/src/components/BottomSheet/BottomSheet.vue';
 
 import BlockSearch from '@martyrs/src/modules/globals/views/components/blocks/BlockSearch.vue'

package/src/components/Field/Field.vue

@@ -1,6 +1,9 @@
 <script setup>
 import { ref, onMounted, nextTick, watch } from 'vue'
+import IconShow from '@martyrs/src/modules/icons/actions/IconShow.vue';
+
 const emit = defineEmits(['update:field', 'focus', 'blur']);
+
 const props = defineProps({
   label: null,
   symbol: null,
@@ -13,26 +16,23 @@ const props = defineProps({
   tabindex: -1,
   autofocus: false
 });
+
 if (props.value) {
   emit('update:field', props.value)
 }
+
 const textarea = ref(null);
 const input = ref(null);
+const showPassword = ref(false);
 
 function resize() {
   if (!textarea.value) {
     textarea.value.style.height = '';
     return;
   }
-  
   const el = textarea.value;
-  
-  // Сначала сбрасываем высоту для правильного расчета scrollHeight
   el.style.height = '';
-  
   const scrollHeight = el.scrollHeight;
-  
-  // Теперь устанавливаем высоту на основе scrollHeight
   if (scrollHeight > 33) {
     el.style.height = scrollHeight + 'px';
   } else {
@@ -40,7 +40,6 @@ function resize() {
   }
 }
 
-
 function focus() {
   if (props.autofocus) {
     if (props.type === 'textarea' && textarea.value) {
@@ -51,14 +50,12 @@ function focus() {
   }
 }
 
-// Следим за изменениями поля
 watch(() => props.field, () => {
   if (props.type === 'textarea') {
     nextTick(resize);
   }
 });
 
-// Autofocus
 watch(() => props.autofocus, (newVal) => {
   if (newVal) {
     nextTick(focus);
@@ -72,32 +69,31 @@ onMounted(() => {
 
 const text = ref(props.field);
 </script>
+
 <template>
-  <div 
+  <div
     :class="[
-      $attrs.class, 
-      { 
-        'bg-fourth-nano': validation 
-      }
-    ]" 
+      $attrs.class,
+      { 'bg-fourth-nano': validation }
+    ]"
     class="flex-center flex-nowrap flex"
   >
-    <div 
-      v-if="label" 
+    <div
+      v-if="label"
       class="t-transp mn-r-small"
     >
       <span class="t-nowrap">
         {{label}}
       </span>
     </div>
-    <div class="w-100">
-      <input 
+    <div class="w-100 pos-relative">
+      <input
         v-if="type !== 'textarea'"
         ref="input"
         @input="event => text = emit('update:field', event.target.value)"
         @focus="event => emit('focus', event)"
         @blur="event => emit('blur', event)"
-        :type="type"
+        :type="type === 'password' && !showPassword ? 'password' : type === 'password' ? 'text' : type"
         class="w-100"
         :value="field"
         :placeholder="placeholder"
@@ -105,7 +101,7 @@ const text = ref(props.field);
         :disabled="disabled"
         :autofocus="autofocus"
       />
-      <textarea 
+      <textarea
         v-else
         ref="textarea"
         @input="event => text = emit('update:field', event.target.value)"
@@ -117,10 +113,16 @@ const text = ref(props.field);
         :tabindex="tabindex"
         :disabled="disabled"
       />
-    </div> 
+    </div>
+    <IconShow
+      v-if="type === 'password'"
+      :show="!showPassword"
+      @click="showPassword = !showPassword"
+      class="i-medium cursor-pointer"
+    />
     <slot></slot>
-    <div 
-      v-if="symbol" 
+    <div
+      v-if="symbol"
       class="t-transp mn-l-small"
     >
       <span>
@@ -135,21 +137,34 @@ const text = ref(props.field);
     </div>
   </transition>
 </template>
+
 <style scoped>
-input, textarea, span {
+input,
+textarea,
+span {
   line-height: 1;
   color: inherit;
 }
+
 textarea {
   resize: none;
   overflow: hidden;
-  height: 1rem; 
+  height: 1rem;
   line-height: 1rem;
 }
+
 input[type="date"]::-webkit-calendar-picker-indicator,
 input[type="time"]::-webkit-calendar-picker-indicator {
-  filter: invert(1); /* Это инвертирует иконку, подходит при светлом фоне */
+  filter: invert(1);
   opacity: 1;
   color: inherit;
 }
+
+.cursor-pointer {
+  cursor: pointer;
+}
+
+.pos-relative {
+  position: relative;
+}
 </style>

package/src/components/index.js

@@ -1,6 +1,7 @@
 export { default as Address } from './Address/Address.vue';
 export { default as Button } from './Button/Button.vue';
 export { default as Checkbox } from './Checkbox/Checkbox.vue';
+export { default as Calendar } from './Calendar/Calendar.vue';
 export { default as Dropdown } from './Dropdown/Dropdown.vue';
 export { default as Error } from './Error/Error.vue';
 export { default as Field } from './Field/Field.vue';
@@ -28,6 +29,7 @@ export { default as Countdown } from './Countdown/Countdown.vue';
 export { default as DatePicker } from './DatePicker/DatePicker.vue';
 export { default as EmptyState } from './EmptyState/EmptyState.vue';
 export { default as Feed } from './Feed/Feed.vue';
+export { default as Carousel } from './Feed/Carousel.vue';
 export { default as FieldBig } from './FieldBig/FieldBig.vue';
 export { default as FieldTags } from './FieldTags/FieldTags.vue';
 // export { default as Footer } from './Footer/Footer.vue';

package/src/main.js

@@ -7,11 +7,13 @@ import {
   Checkbox,
   Chips,
   Countdown,
+  Calendar,
   DatePicker,
   Dropdown,
   EmptyState,
   Error,
   Feed,
+  Carousel,
   Field,
   FieldBig,
   FieldPhone,
@@ -47,6 +49,7 @@ export default {
     app.component('Address', () => import('./components/Address/Address.vue'));
     app.component('Button', () => import('./components/Button/Button.vue'));
     app.component('Checkbox', () => import('./components/Checkbox/Checkbox.vue'));
+      app.component('Calendar', () => import('./components/Calendar/Calendar.vue'));
     app.component('Dropdown', () => import('./components/Dropdown/Dropdown.vue'));
     app.component('Error', () => import('./components/Error/Error.vue'));
     app.component('Field', () => import('./components/Field/Field.vue'));
@@ -72,6 +75,7 @@ export default {
     app.component('DatePicker', () => import('./components/DatePicker/DatePicker.vue'));
     app.component('EmptyState', () => import('./components/EmptyState/EmptyState.vue'));
     app.component('Feed', () => import('./components/Feed/Feed.vue'));
+    app.component('Carousel', () => import('./components/Feed/Carousel.vue'));
     app.component('FieldBig', () => import('./components/FieldBig/FieldBig.vue'));
     app.component('FieldTags', () => import('./components/FieldTags/FieldTags.vue'));
     // app.component('Footer',       () => import('./components/Footer/Footer.vue'));
@@ -91,6 +95,7 @@ export {
   Address,
   Breadcrumbs,
   Button,
+  Calendar,
   Checkbox,
   Chips,
   Countdown,
@@ -99,6 +104,7 @@ export {
   EmptyState,
   Error,
   Feed,
+  Carousel,
   Field,
   FieldBig,
   FieldPhone,

package/src/modules/auth/auth.client.js

@@ -21,14 +21,21 @@ import ResetPassword from './views/components/pages/ResetPassword.vue';
 import SignIn from './views/components/pages/SignIn.vue';
 import SignUp from './views/components/pages/SignUp.vue';
 
+
 // Importing sections components
 import FeaturedUsers from './views/components/sections/FeaturedUsers.vue';
 import SliderFeatures from './views/components/sections/SliderFeatures.vue';
 
+import { i18nManager }  from '@martyrs/src/modules/globals/views/classes/globals.i18n.js';
+
+import locales from './locales/index.js';
+
 // Пример функции инициализации для модуля аутентификации
 function initializeAuth(app, store, router, options = {}) {
   const route = options.route || 'Home';
 
+  i18nManager.register('auth', locales);
+
   router.addRoute(route, routerAuth);
   router.addRoute(route, routerUsers);
 

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

@@ -0,0 +1,76 @@
+// @martyrs/src/modules/auth/locales/en.js
+export default {
+  auth: {
+    signIn: {
+      title: "Welcome to OZ DAO,",
+      subtitle: "Sign In to Continue",
+      signup: "Don't have an account?",
+      phone: "Phone",
+      email: "Email",
+      phonePlaceholder: "Enter your phone",
+      emailPlaceholder: "Enter your email",
+      haveAccount: "Don't have an account? Sign Up",
+      passwordPlaceholder: "Enter your password",
+      forgotPassword: "Forgot Password?",
+      signin: "Sign In",
+      signin_apple: "Sign In with Apple",
+      soon: "SOON"
+    },
+    signUp: {
+      title: "Sign Up",
+      description: "Choose a convenient way to register via phone or email:",
+      phone: "Phone",
+      email: "Email",
+      phonePlaceholder: "Enter your phone",
+      emailPlaceholder: "Enter your email",
+      emailNotice: "We will send you an email with a confirmation code that you will need to enter in the next step.",
+      smsNotice: "We will send you an SMS with a confirmation code that you will need to enter in the next step.",
+      sendCode: "Send Code",
+      haveAccount: "Already have an account?"
+    },
+    enterCode: {
+      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."
+    },
+    resetPassword: {
+      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.",
+      emailInfo: "We will send you an email with a confirmation code to reset your password, which you will need to enter in the next step.",
+      phone: "Phone",
+      email: "Email",
+      phonePlaceholder: "Enter your phone",
+      emailPlaceholder: "Enter your email",
+      sendCode: "Send code"
+    },
+    enterPassword: {
+      almostDone: "Almost there!",
+      newPasswordPrompt: "Please, set a new password.",
+      registrationPasswordPrompt: "Please, set your password to complete the registration.",
+      passwordPlaceholder: "Password",
+      repeatPasswordPlaceholder: "Repeat Password",
+      changePasswordBtn: "Change Password",
+      registerBtn: "Register"
+    },
+    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!"
+      }
+    ]
+  }
+};

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

@@ -0,0 +1,7 @@
+import en from './en.js';
+import ru from './ru.js';
+
+export default {
+  en,
+  ru
+};

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

@@ -0,0 +1,76 @@
+// @martyrs/src/modules/auth/locales/ru.js
+export default {
+  auth: {
+    signIn: {
+      title: "Приветствуем вас,",
+      subtitle: "Войдите для продолжения",
+      signup: "Нет аккаунта?",
+      phone: "Телефон",
+      email: "Email",
+      phonePlaceholder: "Введите ваш телефон",
+      emailPlaceholder: "Введите ваш email",
+      haveAccount: "Нет аккаунта? Зарегистрироваться",
+      passwordPlaceholder: "Введите ваш пароль",
+      forgotPassword: "Забыли пароль?",
+      signin: "Войти",
+      signin_apple: "Войти через Apple",
+      soon: "СКОРО"
+    },
+    signUp: {
+      title: "Новая учетная запись",
+      description: "Выберите удобный способ регистрации через телефон или email:",
+      phone: "Телефон",
+      email: "Email",
+      phonePlaceholder: "Введите ваш телефон",
+      emailPlaceholder: "Введите ваш email",
+      emailNotice: "Мы отправим вам электронное письмо с кодом подтверждения, который вы должны будете ввести в следующем шаге.",
+      smsNotice: "Мы вышлем вам SMS с кодом подтверждения, который вы должны будете ввести в следующем шаге.",
+      sendCode: "Отправить код",
+      haveAccount: "У вас уже есть аккаунт?"
+    },
+    enterCode: {
+      verifyNumberTitle: "Подтвердите номер",
+      instructions: "Мы отправили код регистрации на ваш номер телефона. Введите его в поле ниже:",
+      resendCode: "Отправить код еще раз",
+      secondsResend: "секунд до возможности отправить код еще раз."
+    },
+    resetPassword: {
+      forgotPasswordTitle: "Забыли пароль?",
+      instructions: "Чтобы сбросить пароль, укажите телефон или email, использованные при регистрации.",
+      smsInfo: "Мы вышлем вам SMS с кодом подтверждения для сброса пароля, который вы должны будете ввести в следующем шаге.",
+      emailInfo: "Мы отправим вам электронное письмо с кодом подтверждения  для сброса пароля, который вы должны будете ввести в следующем шаге.",
+      phone: "Телефон",
+      email: "Email",
+      phonePlaceholder: "Введите ваш телефон",
+      emailPlaceholder: "Введите ваш email",
+      sendCode: "Отправить код"
+    },
+    enterPassword: {
+      almostDone: "Почти все!",
+      newPasswordPrompt: "Пожалуйста, укажите новый пароль.",
+      registrationPasswordPrompt: "Пожалуйста, укажите пароль, на этом регистрация будет закончена.",
+      passwordPlaceholder: "Пароль",
+      repeatPasswordPlaceholder: "Повторите пароль",
+      changePasswordBtn: "Поменять пароль",
+      registerBtn: "Зарегистрироваться"
+    },
+    features: [
+      {
+        title: "Что такое токен Weeder, Бро?",
+        description: "WDT - это как основа нашего крутого сообщества. Это деньги, это власть, это инвестиции. Круто, а?"
+      },
+      {
+        title: "Зажигай и Развивайся",
+        description: "Закажи шмали, курни и зарабатывай токены Weeder. Чем больше курнешь, тем больше кэша у тебя в кармане, чувак."
+      },
+      {
+        title: "Веселись с Нашим Сообществом",
+        description: "Найди самые крутые сорта и начни шмалить на девятом облаке вместе с нами."
+      },
+      {
+        title: "Покупайте, Когда Накурились",
+        description: "Закажи премиумную бошку и крутые аксессуары за пару кликов, чувак. Прямо к твоей двери!"
+      }
+    ]
+  }
+};

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

@@ -2,7 +2,6 @@
   <div 
   	class="cols-2-1_2 gap-small pd-small"
   >
-
     <router-view
     	class="pd-big mobile:pd-medium w-m-66r t-center" 
     	v-slot="{ Component, route }"
@@ -26,50 +25,9 @@
 </template>
 
 <script setup>
-// Import components
-import Tab from '@martyrs/src/components/Tab/Tab.vue'
-import Field from '@martyrs/src/components/Field/Field.vue'
-import Button from '@martyrs/src/components/Button/Button.vue'
-// Import blocks
 import SliderFeatures from '@martyrs/src/modules/auth/views/components/sections/SliderFeatures.vue'
-// Import libs
-import { computed, onMounted, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-// Import state
-import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
-// Import validation
-import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/inputs.validation'
 
-const phoneValidation = ref(null)
-const passswordValidation = ref(null)
-const emailValidation = ref(null)
-// Accessing router
-const route = useRoute()
-const router = useRouter()
-// Accessing state
-const tabAuth = ref('email')
-// Methods
-async function onSubmit() {
-  try {
-    await inputsValidation.validateInputs(
-      emailValidation,
-      inputsValidation.validateEmail,
-      auth.state.user.email,
-      'Некорректный email'
-    )
-    await inputsValidation.validateInputs(
-      passswordValidation,
-      inputsValidation.validatePassword,
-      auth.state.user.password,
-      'Некорректный пароль'
-    )
-  } catch (error) {
-    throw new Error
-  }
-  await auth.actions.login(auth.state.user, tabAuth.value)
-}
+import { useRoute } from 'vue-router'
 
-function redirectTo() {
-  router.push({ name: 'Account' })
-}
+const route = useRoute()
 </script>

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

@@ -3,10 +3,10 @@
 		<!-- <img loading="lazy" src="@/assets/icons/message1.png" class="i-extra mn-b-small"> -->
 
 		<h3 class="mn-b-medium">
-			{{ t('verifyNumberTitle') }}
+			{{ t('auth.enterCode.verifyNumberTitle') }}
 		</h3>
 
-		<p class="mn-b-big t-transp">{{ t('instructions') }}</p>
+		<p class="mn-b-big t-transp">{{ t('auth.enterCode.instructions') }}</p>
 
 		<div class="w-100 mn-b-big flex-nowrap flex">
       		<input 
@@ -49,18 +49,18 @@
     	</div>
 
 		<a v-if="resendTimer < 1" @click="sendAgain" class="t-blue">
-			{{ t('resendCode') }}
+			{{ t('auth.enterCode.resendCode') }}
 		</a>
 
 		<span v-else>
-			{{resendTimer}} {{ t('secondsResend') }}
+			{{resendTimer}} {{ t('auth.enterCode.secondsResend') }}
 		</span>
 	</section>
 </template>
 
 <script setup>
 	// Import components
-	import Field         from '@martyrs/src/components/Field/Field.vue'
+	import Field from '@martyrs/src/components/Field/Field.vue'
 	// Import libs
 	import { computed,reactive,ref, onMounted, onBeforeMount, watch } from 'vue'
 	import { useRoute,useRouter } from 'vue-router'
@@ -74,11 +74,9 @@
 	const router = useRouter()
 
 	// Localization
-	import text from '@martyrs/src/modules/auth/views/localization/EnterCode.json'
 	// Localization
 	const { t } = useI18n({
 		useScope: 'global', 
-		...text
 	})
 	
 	const state = reactive({

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

@@ -2,9 +2,9 @@
 	<section class="t-left pd-medium">
 		<!-- Header -->
 		<!-- <img loading="lazy" src="@/assets/icons/password.png" class="i-extra mn-b-small"> -->
-		<h3 class="mn-b-small">{{ t('almostDone') }}</h3>
-		<p v-if="route.query.method === 'reset-password'" class="mn-b-semi t-transp">{{ t('newPasswordPrompt') }}</p>
-		<p v-else class="mn-b-semi t-transp">{{ t('registrationPasswordPrompt') }}</p>
+		<h3 class="mn-b-small">{{ t('auth.enterPassword.almostDone') }}</h3>
+		<p v-if="route.query.method === 'reset-password'" class="mn-b-semi t-transp">{{ t('auth.enterPassword.newPasswordPrompt') }}</p>
+		<p v-else class="mn-b-semi t-transp">{{ t('auth.enterPassword.registrationPasswordPrompt') }}</p>
 	
 		<!-- Form -->
 		<div class="mn-b-semi radius-small o-hidden">
@@ -12,13 +12,13 @@
 				v-model:field="auth.state.user.password"
 				type="password" 	
 				:validation="passswordValidation" 
-				:placeholder="t('passwordPlaceholder')"		
+				:placeholder="t('auth.enterPassword.passwordPlaceholder')"		
 				class="bg-light pd-small radius-small mn-b-thin"
 			/>
 			<Field 
 				v-model:field="auth.state.user.passwordRepeat"
 				type="password" 	
-				:placeholder="t('repeatPasswordPlaceholder')"
+				:placeholder="t('auth.enterPassword.repeatPasswordPlaceholder')"
 				class="bg-light pd-small radius-small mn-b-thin"
 			/>
 		</div>
@@ -30,8 +30,8 @@
 		</div>
 		<!-- Button -->
 		<Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-main mn-b-big">
-			<span  v-if="route.query.method === 'reset-password'">{{ t('changePasswordBtn') }}</span>
-			<span v-else>{{ t('registerBtn') }}</span>
+			<span  v-if="route.query.method === 'reset-password'">{{ t('auth.enterPassword.changePasswordBtn') }}</span>
+			<span v-else>{{ t('auth.enterPassword.registerBtn') }}</span>
 		</Button>
 	</section> 
 </template>
@@ -51,11 +51,8 @@ import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/inputs.validation'
 const passswordValidation = ref(null)
 // Localization
-import text from '@martyrs/src/modules/auth/views/localization/EnterPassword.json'
-// Localization
 const { t } = useI18n({
 	useScope: 'global', 
-	...text
 })
 // Accessing router
 const route = useRoute()