@ozdao/prometheus-framework 0.1.79 → 0.1.81

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

@@ -1,15 +1,15 @@
 <template>
 	<section class="">
 		<!-- Header -->
-		<img :src="'/logo/logo_square.svg'" class="i-extra mn-small">
+		<img :src="'/logo/logo_square.svg'" class="i-extra radius-small mn-small">
 
 		<h3 class="mn-medium">
 			{{ t('title') }}
 			<br>
 			<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>
 		</p>
 		
@@ -25,7 +25,7 @@
 		</div>
 
 		<!-- Form -->
-		<div class="">
+		<div class="pos-relative">
 		<!-- Phone -->
 			<transition name="slide-fade">
 				<div v-show="tabAuth === 'phone'" class="mn-thin radius-small">
@@ -124,9 +124,6 @@ const router = useRouter()
 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) => {
@@ -160,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

@@ -17,7 +17,7 @@
 		</div>
 
 		<!-- Form -->
-		<div class="">
+		<div class="pos-relative">
 		<!-- Phone -->
 			<transition name="slide-fade">
 				<div v-show="tabAuth === 'phone'" class="mn-semi radius-small">
@@ -71,16 +71,15 @@
 	import { computed, onMounted, ref } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
+	// Import localization
+	import text from '@pf/src/modules/auth/localization/SignUp.json'
 	// Import state
 	import * as auth from '@pf/src/modules/auth/store/auth'
 	import * as twofa from '@pf/src/modules/auth/store/twofa'
 	// Import validation
 	import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
 	// Localization
-	const { t } = useI18n({
-	    inheritLocale: true,
-	    useScope: 'local'
-	})
+	const { t } = useI18n(text)
 	// Validation
 	const phoneValidation = ref(null)
 	const emailValidation = ref(null)

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

@@ -1,14 +1,16 @@
 {
-  "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": "секунд до возможности отправить код еще раз."
+  "messages": {
+    "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

@@ -1,20 +1,22 @@
 {
-  "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": "Зарегистрироваться"
+  "messages": {
+    "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

@@ -1,24 +1,26 @@
 {
-  "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": "Отправить код"
+  "messages": {
+    "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

@@ -1,7 +1,7 @@
 {
   "messages": {
     "en": {
-      "title": "Welcome to Weeder",
+      "title": "Welcome to The Commune",
       "subtitle": "Sign In to Continue",
       "signup": "Don't have an account?",
       "phone": "Phone",

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

@@ -1,26 +1,28 @@
 {
-  "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": "У вас уже есть аккаунт?"
+  "messages": {
+    "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/middlewares/client/inputs.validation.js

@@ -146,6 +146,7 @@ async function validateInputs(input, method, variable, message) {
       status: false,
       message: i18n.global.t("validation.length")
     }
+    
     setTimeout(() => { input.value = null }, 3000);
     throw new Error(i18n.global.t("validation.length"));
   }