@ozdao/prometheus-framework 0.2.30 → 0.2.32

package/src/components/Sidebar/Sidebar.vue

@@ -1,19 +1,66 @@
 <template>
+
   <div 
-    :class="['sidebar t-black bg-grey', stateSidebar ? 'open' : '']"
+    id="sidebar" class="o-hidden" v-click-outside="clickedOutside"
   >
     <div 
-      class="sidebar-content"
+      class="pd-medium pos-sticky pos-t-0 h-100vh flex-column flex flex-justify-content"
     >
-      <slot></slot>
+      <div>
+        <slot></slot>
+      </div>
+
+      <Checkbox 
+        :label="'Darkmode'"
+        :radio="globals.state.theme.darkmode"
+        @update:radio="event => globals.actions.toggleTheme()"
+        name="prices"
+        class=" t-semi pd-small p-big mn-b-small br-2px br-solid radius-extra br-black-transp-5"
+      />
+
+      <Menu 
+        v-if="(auth.state.access.roles) && (auth.state.access.roles.includes('ROLE_MODERATOR') || auth.state.access.roles.includes('ROLE_ADMIN'))"
+        class="mn-b-regular bg-black t-white"
+      >
+        <MenuItem 
+          @click="router.push({
+            name: 'Backoffice', 
+            params: {
+              _id: route.params._id
+            }
+          })" 
+          class="cursor-pointer"
+          theme="white"
+        >
+          <span>
+            Backoffice
+          </span>
+        </MenuItem> 
+      </Menu>
+
+   
     </div>
   </div>
+
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
+
+// Mobile Module
+import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
+import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
+
+import clickOutside from '../FieldPhone/click-outside';
+
+import { useRoute, useRouter} from 'vue-router'
+
+import * as auth      from '@pf/src/modules/auth/store/auth'
+import * as globals      from '@pf/src/modules/globals/store/globals'
+
+
+import Checkbox    from '@pf/src/components/Checkbox/Checkbox.vue'
 
-import { useRoute, useRouter } from 'vue-router'
 
 const router  = useRouter()
 const route   = useRoute()
@@ -21,40 +68,29 @@ const route   = useRoute()
 const isOpen = ref(false);
 
 const props = defineProps(['stateSidebar'])
-</script>
+const emits = defineEmits(['closeSidebar'])
 
-<style scoped>
-.sidebar {
-  position: fixed;
-  top: 0;
-  left: -80%;
-  width: 80%;
-  height: 100%;
-   box-shadow: -10px 0px 100px -10px rgba(0, 0, 0, 0.1) inset;
-  transition: all 0.3s ease-in-out;
-  z-index: 1000;
-}
+watch(() => route.path, () => {
+  if (props.stateSidebar === true) emits('closeSidebar');
+});
 
-.sidebar.open {
-  left: 0;
-}
 
-.sidebar-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 1rem;
-  background-color: #f8f8f8;
-}
 
-.sidebar-header button {
-  border: none;
-  background-color: transparent;
-  font-size: 1.5rem;
-  cursor: pointer;
-}
+let vClickOutside = clickOutside
 
-.sidebar-content {
-  padding: 1rem;
+function clickedOutside () {
+  if (props.stateSidebar === true) emits('closeSidebar');
 }
+
+
+</script>
+
+<style lang="scss" >
+  #sidebar {
+    ul {
+      li {
+        margin-bottom: 1rem;
+      }
+    }
+  }
 </style>

package/src/components/Spoiler/Spoiler.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div @click="showSpoiler = !showSpoiler" class="flex-v-center flex-nowrap flex">
-      <slot name="header" ></slot>
+      <slot name="header" :is-open="showSpoiler"></slot>
     </div>
 
     <transition name="collapse">

package/src/components/Tab/Tab.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="">
-		<div class="flex-nowrap flex-v-center flex">
+		<div class="flex-nowrap flex-v-center flex pos-relative">
 
 			<div  
 				v-for="(tab,index) in tabs" 

package/src/components/Tooltip/Tooltip.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tooltip-container" @mouseover="showTooltip" @mouseleave="hideTooltip">
+  <div class="cursor-pointer tooltip-container" @mouseover="showTooltip" @mouseleave="hideTooltip">
     <slot></slot>
     <div  class="tooltip-content" :style="tooltipStyle">
       {{ text }}

package/src/components/UploadImage/UploadImage.vue

@@ -13,7 +13,7 @@
       
       <div v-else class="flex-v-center flex-h-center flex w-100 h-100 bg-second" >
         <svg class="i-medium" width="104" height="104" viewBox="0 0 104 104" fill="none" xmlns="http://www.w3.org/2000/svg">
-          <path  fill="white" d="M21.2784 37.2973C18.8466 34.6628 18.8466 30.6098 21.2784 27.9753L47.2179 2.03584C48.6364 0.81993 50.2577 0.211974 51.8789 0.211974C53.5001 0.211974 55.1213 0.81993 56.5399 2.03584L82.4793 27.9753C84.9111 30.6098 84.9111 34.6628 82.4793 37.2973C79.8448 39.7291 75.7918 39.7291 73.1573 37.2973L58.3637 22.301V71.5454C58.3637 75.1932 55.5266 78.0303 51.8789 78.0303C48.2311 78.0303 45.394 75.1932 45.394 71.5454V22.301L30.6004 37.2973C27.966 39.7291 23.9129 39.7291 21.2784 37.2973ZM97.2729 71.5454C100.921 71.5454 103.758 74.3825 103.758 78.0303V97.4849C103.758 101.133 100.921 103.97 97.2729 103.97H6.48486C2.83713 103.97 0 101.133 0 97.4849V78.0303C0 74.3825 2.83713 71.5454 6.48486 71.5454H38.9092C38.9092 78.6382 44.7861 84.5151 51.8789 84.5151C58.9717 84.5151 64.8486 78.6382 64.8486 71.5454H97.2729ZM87.5456 92.6212C90.1801 92.6212 92.4092 90.392 92.4092 87.7576C92.4092 85.1231 90.1801 82.8939 87.5456 82.8939C84.9111 82.8939 82.682 85.1231 82.682 87.7576C82.682 90.392 84.9111 92.6212 87.5456 92.6212Z"/>
+          <path  fill="rgb(var(--white))" d="M21.2784 37.2973C18.8466 34.6628 18.8466 30.6098 21.2784 27.9753L47.2179 2.03584C48.6364 0.81993 50.2577 0.211974 51.8789 0.211974C53.5001 0.211974 55.1213 0.81993 56.5399 2.03584L82.4793 27.9753C84.9111 30.6098 84.9111 34.6628 82.4793 37.2973C79.8448 39.7291 75.7918 39.7291 73.1573 37.2973L58.3637 22.301V71.5454C58.3637 75.1932 55.5266 78.0303 51.8789 78.0303C48.2311 78.0303 45.394 75.1932 45.394 71.5454V22.301L30.6004 37.2973C27.966 39.7291 23.9129 39.7291 21.2784 37.2973ZM97.2729 71.5454C100.921 71.5454 103.758 74.3825 103.758 78.0303V97.4849C103.758 101.133 100.921 103.97 97.2729 103.97H6.48486C2.83713 103.97 0 101.133 0 97.4849V78.0303C0 74.3825 2.83713 71.5454 6.48486 71.5454H38.9092C38.9092 78.6382 44.7861 84.5151 51.8789 84.5151C58.9717 84.5151 64.8486 78.6382 64.8486 71.5454H97.2729ZM87.5456 92.6212C90.1801 92.6212 92.4092 90.392 92.4092 87.7576C92.4092 85.1231 90.1801 82.8939 87.5456 82.8939C84.9111 82.8939 82.682 85.1231 82.682 87.7576C82.682 90.392 84.9111 92.6212 87.5456 92.6212Z"/>
         </svg>
       </div>
       
@@ -50,14 +50,14 @@ async function onFileChange(e) {
   formData.append("file", file);
 
   try {
-    const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
+    const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true }); 
 
-    let response = await $axios.post(`/api/upload/file?folderName=${encodeURIComponent(props.uploadPath)}`, formData, {
+    let response = await $axios.post(`/api/upload/multiple?folderName=${encodeURIComponent(props.uploadPath)}`, formData, {
       headers: {
         "Content-Type": "multipart/form-data"
       }
     });
-    imageUrl.value = response.data.filepath;
+    imageUrl.value = response.data[0].filepath;
     emit('update:photo', imageUrl.value);
   } catch (error) {
     console.error(error);

package/src/components/UploadImageMultiple/UploadImageMultiple.vue

@@ -3,11 +3,28 @@
     @click="onComponentClick"
     @drop="onDrop"
     @dragover.prevent
-    class="flex-v-center flex-h-center flex">
-      <div class="flex-v-center flex-h-center flex w-100 h-100" >
-       upload
+    class="cursor-pointer t-black w-100 flex-v-center flex-h-center flex pos-relative"
+  >
+    <transition name="moveFromTop" mode="out-in">
+      <div v-if="!loading" class="t-center">
+        <IconUpload
+          style="max-height: 4rem;"
+          class="w-100 h-100"
+          fill="rgb(var(--main))"
+        />
+
+        <span v-if="options.showText" class="mn-t-thin  mn-b-thin d-block h3 t-black">{{ text.title }}</span>
+        <span v-if="options.showText" class="mn-b-thin t-transp d-block ">{{ text.subtitle }}</span>
+        <span  v-if="options.showText"class="mn-b-thin uppercase p-small t-medium d-block">or</span>
+
+        <button  v-if="options.showText" class="cursor-pointer mn-b-small br-2px br-main br-solid radius-extra pd-l-thin pd-r-thin  t-main">Browse Files</button>
+
+        <span  v-if="options.showText" class="uppercase p-small t-medium d-block ">Maximum size: 2MB</span>
       </div>
-      <input type="file" ref="fileInput" @change="onFileChange" multiple style="display: none"/>
+      <Loader v-else class="pos-absolute"/>
+    </transition>
+
+    <input type="file" ref="fileInput" @change="onFileChange" multiple style="display: none"/>
   </div>
 </template>
 
@@ -15,12 +32,35 @@
 import { ref, watch } from 'vue';
 import axios from 'axios';
 
+import Loader from '@pf/src/components/Loader/Loader.vue';
+import PlaceholderImage from '@pf/src/modules/icons/placeholders/PlaceholderImage.vue'
+import IconUpload from '@pf/src/modules/icons/navigation/IconUpload.vue'
+
 const images = ref([]);
+const loading = ref(false);
 const fileInput = ref(null);
 
-const props = defineProps([
-  'uploadPath',
-]);
+const props = defineProps({
+  uploadPath: {
+    type: Object,
+    required: true
+  },
+  options: {
+    type: Object,
+    default: () => ({
+      mimeType: ['jpg', 'png', 'gif'],
+      maxSize: 10 * 1024 * 1024,
+      showText: true
+    })
+  },
+  text: {
+    type: Object,
+    default: () => ({
+      title: 'Drag & Drop Your Images Here',
+      subtitle: 'Files supported: JPG, PNG, GIF'
+    })
+  }
+});
 
 const emit = defineEmits(['update:images']);
 
@@ -29,15 +69,17 @@ function onComponentClick() {
 }
 
 async function onFileChange(e) {
+  loading.value = true;
+
   let files = e.target.files;
   let formData = new FormData();
 
-  for(let i = 0; i < files.length; i++) {
-    formData.append("file", files[i]);
+  for (const file of files) {
+    formData.append("file", file);
   }
 
   try {
-    const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
+    const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true }); 
 
     let response = await $axios.post(`/api/upload/multiple?folderName=${encodeURIComponent(props.uploadPath)}`, formData, {
       headers: {
@@ -48,8 +90,10 @@ async function onFileChange(e) {
       images.value.push(file.filepath); // push each file path to the images array
     });
     emit('update:images', images.value);
+    loading.value = false;
   } catch (error) {
     console.error(error);
+    loading.value = false;
   }
 }
 

package/src/modules/applications/controllers/applications.controller.js

@@ -3,7 +3,6 @@
 // --------------------------------------------------
 // DEPENENCY
 // --------------------------------------------------
-const fetch = require('node-fetch')
 const axios = require('axios');
  // --------------------------------------------------
 // Used models

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

@@ -1,6 +1,6 @@
 <template>
 	<section class="t-center pd-medium">
-		<!-- <img src="@/assets/images/icons/message1.png" class="i-extra mn-b-small"> -->
+		<!-- <img src="@/assets/icons/message1.png" class="i-extra mn-b-small"> -->
 
 		<h3 class="mn-b-medium">
 			{{ t('verifyNumberTitle') }}

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

@@ -1,7 +1,7 @@
 <template>
 	<section class="t-left pd-medium">
 		<!-- Header -->
-		<!-- <img src="@/assets/images/icons/password.png" class="i-extra mn-b-small"> -->
+		<!-- <img 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>
@@ -26,10 +26,10 @@
 			 v-if="route.query.method !== 'reset-password'" 
 			 class="p-medium t-semi mn-b-semi "
 		>
-			 By registering, you agree to our <a class="t-second" href="https://thecommunephuket.com/legal/eula" target="_blank" rel="noopener noreferrer">End User License Agreement (EULA)</a>
+			 By registering, you agree to our <a class="t-second" href="/legal/eula" target="_blank" rel="noopener noreferrer">End User License Agreement (EULA)</a>
 		</div>
 		<!-- Button -->
-		<Button :submit="onSubmit" :callback="redirectTo" class="mn-b-big">
+		<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>
 		</Button>

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

@@ -1,6 +1,6 @@
 <template>
 	<section class="t-left pd-medium">
-		<!-- <img src="@/assets/images/icons/password.png" class="i-extra mn-b-small"> -->
+		<!-- <img 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>
@@ -108,7 +108,6 @@ async function onSubmit() {
 }
 
 function redirectTo () {
-
 	router.push({ name: 'Enter Code', query: {type: tabAuth.value, method: 'reset-password'} })
 }
 </script>

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

@@ -1,7 +1,7 @@
 <template>
 	<section class="">
 		<!-- Header -->
-		<img :src="'/logo/logo_square.svg'" class="i-extra radius-small mn-b-small">
+		<img :src="'/logo/logo.svg'" class="i-extra radius-small mn-b-small">
 
 		<h3 class="mn-b-medium">
 			{{ t('title') }}
@@ -82,7 +82,7 @@
 		<Button 
 			:submit="onSubmit" 
 			:callback="redirectTo" 
-			class="mn-b-thin"
+			class="w-100 bg-main mn-b-thin"
 		>
 			{{ t('signin') }}
 		</Button>
@@ -113,6 +113,7 @@ import text from '@pf/src/modules/auth/localization/SignIn.json'
 import * as auth from '@pf/src/modules/auth/store/auth'
 // Import validation
 import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+
 // Init validation
 const phoneValidation = ref(null)
 const passswordValidation = ref(null)
@@ -121,7 +122,11 @@ const emailValidation = ref(null)
 const route = useRoute()
 const router = useRouter()
 // Localization
-const { t } = useI18n(text)
+const { t } = useI18n({
+	useScope: 'global', 
+	...text
+})
+
 // Accessing state
 const tabAuth = ref('phone')
 
@@ -190,13 +195,24 @@ async function onSubmitApple() {
 
 
 function redirectTo () {
-	router.push({ 
-		name: 'User Profile', 
-		params: { 
-			_id: auth.state.user._id 
-		},
-		query: { afterAuth: 'true' }
-	})
+	if (route.query.returnUrl) {
+		router.push({ 
+			path: route.query.returnUrl,
+			query: { 
+				afterAuth: 'true' 
+			}
+		})
+	} else { 
+		router.push({ 
+			name: 'User Profile', 
+			params: { 
+				_id: auth.state.user._id 
+			},
+			query: { 
+				afterAuth: 'true' 
+			}
+		})
+	}
 }
 </script>
 

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

@@ -3,7 +3,6 @@
 		<!-- Header -->
 		<!-- <img src="@/assets/images/logo.svg" class="i-extra mn-b-small"> -->
 		<h3 class="mn-b-small">{{t('title')}}</h3>
-		<p class="mn-b-small t-transp">{{t('description')}}</p>
 		
 		<!-- Select -->
 		<div class="mn-b-small p-small uppercase t-semi bg-grey radius-big o-hidden">
@@ -51,7 +50,7 @@
 		</div>
 		
 		<!-- Button -->
-		<Button :submit="onSubmit" :callback="redirectTo" class="mn-b-big">{{t('sendCode')}}</Button>
+		<Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-main mn-b-big">{{t('sendCode')}}</Button>
 			
 		<!-- Links -->
 		<div class="w-100">

package/src/modules/auth/controllers/twofa.controller.js

@@ -7,10 +7,9 @@ const controllerFactory = (db) => {
     const type = req.body.type;
     const method = req.body.method;
 
-    console.log(req.body)
-
     if (type === 'email') {
-      const emailSent = await sendEmail(req.body.email, 'Verification Code', `Your verification code is ${code}`);
+      const emailSent = await sendEmail(req.body.email, `${process.env.APP_NAME} Verification Code`, `Your ${process.env.APP_NAME} verification code is ${code}`);
+      
       if (emailSent) {
         res.send({ code, type, method });
       } else {
@@ -20,7 +19,8 @@ const controllerFactory = (db) => {
     }
 
     if (type === 'phone') {
-      const smsSent = await sendSms(req.body.phone, `Your code: ${code}`);
+      const smsSent = await sendSms(req.body.phone, `Your ${process.env.APP_NAME} verification code: ${code}`);
+      
       if (smsSent) {
         res.send({ code, type, method });
       } else {

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "messages": {
-    "en": {
+    "en-default": {
       "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": {
+    "ru-default": {
       "forgotPasswordTitle": "Забыли пароль?",
       "instructions": "Чтобы сбросить пароль, укажите телефон или email, использованные при регистрации.",
       "smsInfo": "Мы вышлем вам SMS с кодом подтверждения для сброса пароля, который вы должны будете ввести в следующем шаге.",

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

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

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

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

package/src/modules/auth/utils/server/verifyAppleIdToken.js

@@ -1,5 +1,4 @@
 const jwt = require('jsonwebtoken');
-const fetch = require('node-fetch');
 const jwkToPem = require('jwk-to-pem');
 
 async function verifyAppleIdToken(id_token) {

package/src/modules/backoffice/components/layouts/Backoffice.vue

@@ -1,5 +1,5 @@
 <template>
-  <section id="account" class="cols-1 gap-medium pd-medium">
+  <section id="account" class="cols-1">
     <!-- ---------------------------------------------------------------- -->
     <!-- 02. Page Tabs  -->
     <!-- ---------------------------------------------------------------- -->