@ozdao/prometheus-framework 0.1.78 → 0.1.80

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

@@ -1,50 +1,16 @@
-<i18n>
-{
-  "en": {
-    "title": "Welcome to The Commune",
-    "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"
-  },
-  "ru": {
-    "title": "Приветствуем вас,",
-    "subtitle": "Войдите для продолжения",
-    "signup": "Нет аккаунта?",
-    "phone": "Телефон",
-    "email": "Email",
-    "phonePlaceholder": "Введите ваш телефон",
-    "emailPlaceholder": "Введите ваш email",
-    "haveAccount": "Нет аккаунта? Зарегистрироваться",
-    "passwordPlaceholder": "Введите ваш пароль",
-    "forgotPassword": "Забыли пароль?",
-    "signin": "Войти",
-    "signin_apple": "Войти через Apple",
-    "soon": "СКОРО"
-  }
-}
-</i18n>
-
 <template>
 	<section class="">
 		<!-- Header -->
-		<!-- <img src="@/assets/images/logo.svg" class="i-extra mn-small"> -->
+		<img :src="'/logo/logo_square.svg'" class="i-extra mn-small">
+
 		<h3 class="mn-medium">
-			{{ $t('title') }}
+			{{ t('title') }}
 			<br>
-			<span class="t-semi">{{ $t('subtitle') }}</span>
+			<span class="t-semi">{{ t('subtitle') }}</span>
 		</h3>
 		<p class="mn-big">
 		
-			<router-link :to="{name: 'Sign Up'}" class="underline t-second">{{ $t('signup') }}</router-link>
+			<router-link :to="{name: 'Sign Up'}" class="underline t-second">{{ t('signup') }}</router-link>
 		</p>
 		
 			<!-- Select -->
@@ -52,8 +18,8 @@
 			<Tab 
 				v-model:selected="tabAuth"
 				:tabs="[
-					{name: $t('phone'), value: 'phone'},
-					{name: $t('email'), value: 'email'}
+					{name: t('phone'), value: 'phone'},
+					{name: t('email'), value: 'email'}
 				]"
 			/>
 		</div>
@@ -72,7 +38,7 @@
 						}"
 						:validation="phoneValidation" 
 						mode="national"
-						:inputOptions="{placeholder: $t('phonePlaceholder')}"
+						:inputOptions="{placeholder: t('phonePlaceholder')}"
 						class="bg-grey pd-small radius-small mn-thin" 
 					/>
 					
@@ -82,7 +48,7 @@
 				<div v-show="tabAuth === 'email'" class="mn-thin radius-small o-hidden">
 					<Field 
 						v-model:field="auth.state.user.email" 	
-						:placeholder="$t('emailPlaceholder')" 	
+						:placeholder="t('emailPlaceholder')" 	
 						:validation="emailValidation"
 						class="bg-grey pd-medium radius-small" 
 					/>
@@ -95,7 +61,7 @@
 			v-model:field="auth.state.user.password"
 			type="password" 	
 			:validation="passswordValidation" 
-			:placeholder="$t('passwordPlaceholder')" 
+			:placeholder="t('passwordPlaceholder')" 
 			class="
         bg-grey
         pd-medium
@@ -109,7 +75,7 @@
 				to="/auth/reset-password" 
 				class="underline d-block t-blue"
 			>
-				{{ $t('forgotPassword') }}
+				{{ t('forgotPassword') }}
 			</router-link>
 		</div>
 		<!-- Button -->
@@ -118,7 +84,7 @@
 			:callback="redirectTo" 
 			class="mn-thin"
 		>
-			{{ $t('signin') }}
+			{{ t('signin') }}
 		</Button>
 		
 		<!-- <Button 
@@ -126,7 +92,7 @@
 			:callback="redirectTo" 
 			class="mn-thin bg-black t-white"
 		>
-			{{ $t('signin_apple') }}
+			{{ t('signin_apple') }}
 		</Button> -->
 	</section> 
 </template>
@@ -141,6 +107,8 @@ import Button        from '@pf/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 '@pf/src/modules/auth/localization/SignIn.json'
 // Import state
 import * as auth from '@pf/src/modules/auth/store/auth'
 // Import validation
@@ -152,11 +120,10 @@ const emailValidation = ref(null)
 // Accessing router
 const route = useRoute()
 const router = useRouter()
+// Localization
+const { t } = useI18n(text)
 // Accessing state
 const tabAuth = ref('phone')
-// OUATH ENV
-const clientId = inject('APPLE_CLIENTID')
-const redirectURI = inject('APPLE_REDIRECT_URL')
 
 const loadExternalScript = (src) => {
   return new Promise((resolve, reject) => {
@@ -190,16 +157,21 @@ async function onSubmit() {
 	} catch (error) {
 		throw new Error
 	}
-	auth.state.user.phone = auth.state.user.phone.number
- await auth.actions.login(auth.state.user, tabAuth.value)
+
+	// COSTIL PLEASE GOD MAKE IT GOOD, FUKEN INPUT COMPONENT RETURN OBJECT NUT NUMBER
+	const userCopy = {...auth.state.user};
+	userCopy.phone = auth.state.user.phone.number
+	// COSTIL PLEASE GOD MAKE IT GOOD, FUKEN INPUT COMPONENT RETURN OBJECT NUT NUMBER
+
+ 	await auth.actions.login(userCopy, tabAuth.value)
 }
 
 async function onSubmitApple() {
   try {
     window.AppleID.auth.init({
-      clientId: clientId,
+      clientId: 'com.thecommune.app.signin',
       scope: 'email name',
-      redirectURI: redirectURI,
+      redirectURI: 'https://thecommunephuket.com/auth/signin',
       usePopup: true,
     });
 

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

@@ -1,32 +1,3 @@
-<i18n>
-{
-  "en": {
-    "title": "Sign Up to The Commune",
-    "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?"
-  },
-  "ru": {
-    "title": "Новая учетная запись",
-    "description": "Выберите удобный способ регистрации через телефон или email:",
-    "phone": "Телефон",
-    "email": "Email",
-		"phonePlaceholder": "Введите ваш телефон",
-		"emailPlaceholder": "Введите ваш email",
-    "emailNotice": "Мы отправим вам электронное письмо с кодом подтверждения, который вы должны будете ввести в следующем шаге.",
-    "smsNotice": "Мы вышлем вам SMS с кодом подтверждения, который вы должны будете ввести в следующем шаге.",
-		"sendCode": "Отправить код",
-		"haveAccount": "У вас уже есть аккаунт?"
-  }
-}
-</i18n>
-
 <template>
 	<section class="t-left pd-medium">
 		<!-- Header -->

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

@@ -0,0 +1,14 @@
+{
+  "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": {
+    "verifyNumberTitle": "Подтвердите номер",
+    "instructions": "Мы отправили код регистрации на ваш номер телефона. Введите его в поле ниже:",
+    "resendCode": "Отправить код еще раз",
+    "secondsResend": "секунд до возможности отправить код еще раз."
+  }
+}

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

@@ -0,0 +1,20 @@
+{
+  "en": {
+    "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"
+  },
+  "ru": {
+    "almostDone": "Почти все!",
+    "newPasswordPrompt": "Пожалуйста, укажите новый пароль.",
+    "registrationPasswordPrompt": "Пожалуйста, укажите пароль, на этом регистрация будет закончена.",
+    "passwordPlaceholder": "Пароль",
+    "repeatPasswordPlaceholder": "Повторите пароль",
+    "changePasswordBtn": "Поменять пароль",
+    "registerBtn": "Зарегистрироваться"
+  }
+}

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

@@ -0,0 +1,24 @@
+{
+  "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.",
+    "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"
+  },
+  "ru": {
+    "forgotPasswordTitle": "Забыли пароль?",
+    "instructions": "Чтобы сбросить пароль, укажите телефон или email, использованные при регистрации.",
+    "smsInfo": "Мы вышлем вам SMS с кодом подтверждения для сброса пароля, который вы должны будете ввести в следующем шаге.",
+    "emailInfo": "Мы отправим вам электронное письмо с кодом подтверждения  для сброса пароля, который вы должны будете ввести в следующем шаге.",
+    "phone": "Телефон",
+    "email": "Email",
+    "phonePlaceholder": "Введите ваш телефон",
+    "emailPlaceholder": "Введите ваш email",
+    "sendCode": "Отправить код"
+  }
+}

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

@@ -0,0 +1,34 @@
+{
+  "messages": {
+    "en": {
+      "title": "Welcome to Weeder",
+      "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"
+    },
+    "ru": {
+      "title": "Приветствуем вас,",
+      "subtitle": "Войдите для продолжения",
+      "signup": "Нет аккаунта?",
+      "phone": "Телефон",
+      "email": "Email",
+      "phonePlaceholder": "Введите ваш телефон",
+      "emailPlaceholder": "Введите ваш email",
+      "haveAccount": "Нет аккаунта? Зарегистрироваться",
+      "passwordPlaceholder": "Введите ваш пароль",
+      "forgotPassword": "Забыли пароль?",
+      "signin": "Войти",
+      "signin_apple": "Войти через Apple",
+      "soon": "СКОРО"
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+{
+  "en": {
+    "title": "Sign Up to The Commune",
+    "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?"
+  },
+  "ru": {
+    "title": "Новая учетная запись",
+    "description": "Выберите удобный способ регистрации через телефон или email:",
+    "phone": "Телефон",
+    "email": "Email",
+    "phonePlaceholder": "Введите ваш телефон",
+    "emailPlaceholder": "Введите ваш email",
+    "emailNotice": "Мы отправим вам электронное письмо с кодом подтверждения, который вы должны будете ввести в следующем шаге.",
+    "smsNotice": "Мы вышлем вам SMS с кодом подтверждения, который вы должны будете ввести в следующем шаге.",
+    "sendCode": "Отправить код",
+    "haveAccount": "У вас уже есть аккаунт?"
+  }
+}

package/src/modules/auth/router/auth.js

@@ -3,99 +3,108 @@ import layoutAuth from '../components/layouts/Auth.vue'
 import * as validationState from '@pf/src/modules/middlewares/client/states.validation.js'
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
-const auth = [
-  {
-    path: 'auth',
-    name: 'Authentication',
-    meta: {
-      title: {
-        en: 'Sign In',
-        ru: 'Вход'
-      },
-    },
-    component: layoutAuth,
-    children: [{
-      path: 'signin',
-      name: 'Sign In',
-      beforeEnter: [
-        validationAuth.requiresNoAuth,
-        validationState.resetUser
-      ],
+function createAuthRoutes (options) {
+  const auth = [
+    {
+      path: 'auth',
+      name: 'Authentication',
       meta: {
         title: {
-          en: 'Sign In',
-          ru: 'Вход'
+          en: 'Аутентификация',
+          ru: 'Authentication'
         },
+        options: options
       },
-      component: () => import(/* webpackChunkName: "signin" */ '../components/pages/SignIn.vue'),
-    },{
-      path: 'reset-password',
-      name: 'Reset Password',
-      beforeEnter: [
-        validationAuth.requiresNoAuth,
-        validationState.resetUser
-      ],
-      meta: {
-        title: {
-          en: 'Reset Password',
-          ru: 'Сбросить Пароль'
+      component: layoutAuth,
+      children: [{
+        path: 'signin',
+        name: 'Sign In',
+        beforeEnter: [
+          validationAuth.requiresNoAuth,
+          validationState.resetUser
+        ],
+        meta: {
+          title: {
+            en: 'Sign In',
+            ru: 'Вход'
+          },
         },
-      },
-      component: () => import(/* webpackChunkName: "reset-password" */ '../components/pages/ResetPassword.vue'),
-    },{
-      path: 'signup',
-      name: 'Sign Up',
-      beforeEnter: [
-        validationAuth.requiresNoAuth,
-        validationState.resetUser
-      ],
-      meta: {
-        title: {
-          en: 'Sign Up',
-          ru: 'Регистрация'
+        component: () => import(
+          /* webpackChunkName: "signin" */ 
+          '../components/pages/SignIn.vue'
+        ),
+      },{
+        path: 'reset-password',
+        name: 'Reset Password',
+        beforeEnter: [
+          validationAuth.requiresNoAuth,
+          validationState.resetUser
+        ],
+        meta: {
+          title: {
+            en: 'Reset Password',
+            ru: 'Сбросить Пароль'
+          },
         },
-      },
-      component: () => import(/* webpackChunkName: "signup" */ '../components/pages/SignUp.vue'),
-    },{
-      path: 'enter-code',
-      name: 'Enter Code',
-      beforeEnter: [
-        validationAuth.requiresNoAuth,
-        validationState.checkUser
-      ],
-      meta: {
-        title: {
-          en: 'Enter Code',
-          ru: 'Введите Код'
+        component: () => import(/* webpackChunkName: "reset-password" */ '../components/pages/ResetPassword.vue'),
+      },{
+        path: 'signup',
+        name: 'Sign Up',
+        beforeEnter: [
+          validationAuth.requiresNoAuth,
+          validationState.resetUser
+        ],
+        meta: {
+          title: {
+            en: 'Sign Up',
+            ru: 'Регистрация'
+          },
         },
-      },
-      component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterCode.vue'),
-    },{
-      path: 'enter-password',
-      name: 'Enter Password',
-      beforeEnter: [
-        validationAuth.requiresNoAuth,
-        validationState.checkUser
-      ],
-      meta: {
-        title: {
-          en: 'Enter Password',
-          ru: 'Введите Пароль'
+        component: () => import(/* webpackChunkName: "signup" */ '../components/pages/SignUp.vue'),
+      },{
+        path: 'enter-code',
+        name: 'Enter Code',
+        beforeEnter: [
+          validationAuth.requiresNoAuth,
+          validationState.checkUser
+        ],
+        meta: {
+          title: {
+            en: 'Enter Code',
+            ru: 'Введите Код'
+          },
         },
-      },
-      component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterPassword.vue'),
-    },{
-      path: 'invite',
-      name: 'Invite',
-      meta: {
-        title: {
-          en: 'Invite',
-          ru: 'Приглашение'
+        component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterCode.vue'),
+      },{
+        path: 'enter-password',
+        name: 'Enter Password',
+        beforeEnter: [
+          validationAuth.requiresNoAuth,
+          validationState.checkUser
+        ],
+        meta: {
+          title: {
+            en: 'Enter Password',
+            ru: 'Введите Пароль'
+          },
         },
-      },
-      component: () => import(/* webpackChunkName: "signup" */ '../components/pages/Invite.vue'),
-    }],
-  },
-];
+        component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterPassword.vue'),
+      },{
+        path: 'invite',
+        name: 'Invite',
+        meta: {
+          title: {
+            en: 'Invite',
+            ru: 'Приглашение'
+          },
+        },
+        component: () => import(/* webpackChunkName: "signup" */ '../components/pages/Invite.vue'),
+      }],
+    },
+  ];
+  
+  return auth
+}
+
 
-export default auth;
+export default createAuthRoutes;

package/src/modules/auth/store/auth.js

@@ -27,27 +27,27 @@
     },
   });
   
-  // async function initialize() {
-  //   const userCookie = await getCookie('user');
+  async function initialize() {
+    const userCookie = await getCookie('user');
     
-  //   if (userCookie) {
-  //     const {_id, email, phone, roles, accessToken} = userCookie;
-
-  //     Object.assign(state.user, {_id, email, phone});
-  //     Object.assign(state.access, {token: accessToken, roles, status: !!accessToken});
-
-  //     $axios.interceptors.request.use((config) => {
-  //       if (accessToken) {
-  //         config.headers['x-access-token'] = accessToken;
-  //       }
-  //       return config;
-  //     }, (error) => {
-  //       return Promise.reject(error);
-  //     });
-  //   }
-  // }
-
-  // initialize();
+    if (userCookie) {
+      const {_id, email, phone, roles, accessToken} = userCookie;
+
+      Object.assign(state.user, {_id, email, phone});
+      Object.assign(state.access, {token: accessToken, roles, status: !!accessToken});
+
+      $axios.interceptors.request.use((config) => {
+        if (accessToken) {
+          config.headers['x-access-token'] = accessToken;
+        }
+        return config;
+      }, (error) => {
+        return Promise.reject(error);
+      });
+    }
+  }
+
+  initialize();
 
   const actions = {
     async login (user, type) {

package/src/modules/constructor/components/elements/Bullets.vue

@@ -7,6 +7,7 @@
     @input="handleInput" 
     @focus="emit('focus', textarea)"
     ref="textarea" 
+    tabindex="-1"
     class="text-area mn-small">    
   </textarea>
 </div>

package/src/modules/constructor/components/elements/Caption.vue

@@ -6,6 +6,7 @@
     @input="handleInput" 
     @focus="emit('focus', textarea)"
     ref="textarea" 
+    tabindex="-1"
     class="br-l br-solid br-main pd-l-small text-area mn-small">    
   </textarea>
 </div>

package/src/modules/constructor/components/elements/H2.vue

@@ -7,6 +7,7 @@
       @focus="emit('focus', textarea)"
       @keyup="handleKeyUp"
       ref="textarea" 
+      tabindex="-1"
       class="h3 text-area mn-thin">    
     </textarea>
   </div>

package/src/modules/constructor/components/elements/ImageUpload.vue

@@ -6,7 +6,7 @@
     class="w-100 radius-big bg-white image-upload-area flex-v-center flex-h-center flex t-black mn-small">
     <img v-if="prop.content" :src="(FILE_SERVER_URL || '') + prop.content" alt="Uploaded image" class="w-100 h-30r object-fit-contain"/>
     <span v-else class="t-transp pd-extra" >Click or drag-and-drop your image</span>
-    <input type="file" ref="fileInput" @change="onFileChange" style="display: none"/>
+    <input type="file" ref="fileInput" tabindex="-1" @change="onFileChange" style="display: none"/>
   </div>
 </template>
 

package/src/modules/constructor/components/elements/Textarea.vue

@@ -7,6 +7,7 @@
       @focus="emit('focus', textarea)"
       @keyup="handleKeyUp"
       ref="textarea" 
+      tabindex="-1"
       class="text-area mn-thin">    
     </textarea>
   </div>

package/src/modules/globals/localization/methods/get-app-locales.js

@@ -0,0 +1,13 @@
+export function getSupportedLocales() {
+  let annotatedLocales = []
+
+  for (const code of Object.keys(supportedLocales)) {
+    annotatedLocales.push({
+      code,
+      name: supportedLocales[code]
+    })
+  }
+
+  return annotatedLocales
+}
+