@ozdao/prometheus-framework 0.2.128 → 0.2.130

package/dist/wallet.server.js

@@ -1,6 +1,6 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
-const index = require("./index-BCCiEK_u.js");
+const index = require("./index-BshfsiQG.js");
 require("axios");
 require("bcryptjs");
 require("crypto");
@@ -16,10 +16,8 @@ var wallet_model = (db) => {
       owner: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: () => {
-          if ((void 0).owner.type === "user")
-            return "User";
-          if ((void 0).owner.type === "organization")
-            return "Organization";
+          if ((void 0).owner.type === "user") return "User";
+          if ((void 0).owner.type === "organization") return "Organization";
         },
         required: true
       },
@@ -71,10 +69,8 @@ var reward_model = (db) => {
       user: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: () => {
-          if ((void 0).owner.type === "user")
-            return "User";
-          if ((void 0).owner.type === "organization")
-            return "Organization";
+          if ((void 0).owner.type === "user") return "User";
+          if ((void 0).owner.type === "organization") return "Organization";
         },
         required: true
       },
@@ -86,10 +82,8 @@ var reward_model = (db) => {
       target: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: () => {
-          if ((void 0).owner.blogpost === "blogpost")
-            return "Blogpost";
-          if ((void 0).owner.blogpost === "order")
-            return "Order";
+          if ((void 0).owner.blogpost === "blogpost") return "Blogpost";
+          if ((void 0).owner.blogpost === "order") return "Order";
         },
         required: true
       },

package/dist/wallet.server.mjs

@@ -1,5 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
-import { s as server } from "./index-B6a1mPgp.mjs";
+import { s as server } from "./index-DKtnWDNC.mjs";
 import "axios";
 import "bcryptjs";
 import "crypto";
@@ -15,10 +15,8 @@ var wallet_model = (db) => {
       owner: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: () => {
-          if ((void 0).owner.type === "user")
-            return "User";
-          if ((void 0).owner.type === "organization")
-            return "Organization";
+          if ((void 0).owner.type === "user") return "User";
+          if ((void 0).owner.type === "organization") return "Organization";
         },
         required: true
       },
@@ -70,10 +68,8 @@ var reward_model = (db) => {
       user: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: () => {
-          if ((void 0).owner.type === "user")
-            return "User";
-          if ((void 0).owner.type === "organization")
-            return "Organization";
+          if ((void 0).owner.type === "user") return "User";
+          if ((void 0).owner.type === "organization") return "Organization";
         },
         required: true
       },
@@ -85,10 +81,8 @@ var reward_model = (db) => {
       target: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: () => {
-          if ((void 0).owner.blogpost === "blogpost")
-            return "Blogpost";
-          if ((void 0).owner.blogpost === "order")
-            return "Order";
+          if ((void 0).owner.blogpost === "blogpost") return "Blogpost";
+          if ((void 0).owner.blogpost === "order") return "Order";
         },
         required: true
       },

package/dist/{web-BNKN7kk3.mjs → web-Be96Xqd4.mjs}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-DPsHxX0l.mjs";
+import { W as p } from "./main-DxyAONrm.mjs";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/dist/{web-Bk_OtXgv.js → web-CgjTW1bL.js}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-BV1Yv9Hy.js");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-Ckn0Sslr.js");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.128",
+  "version": "0.2.130",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -178,9 +178,9 @@
     "libphonenumber-js": "^1.10.62",
     "mongoose": "^8.3.3",
     "multer": "^1.4.5-lts.1",
-    "sharp": "^0.33.3",
     "nodemailer": "^6.9.13",
     "openai": "^4.41.0",
+    "sharp": "^0.33.3",
     "uuidv4": "^6.2.13",
     "vue": "^3.4.26",
     "vue-i18n": "^9.13.1"

package/src/{modules/mobile/components → components}/BottomSheet/BottomSheet.vue

@@ -1,27 +1,30 @@
 <template>
-   <section 
-    ref="wrapper" 
-    class="w-100 h-100vh"
-    :style="MOBILE_APP === 'ios' ?'padding-top: 6rem;':''" 
-  >
-    <!-- Toggle To Close -->
-    <div
-      @click="emits('toggle')"
-      @mousedown="startDrag"
-      @touchstart="startDrag"
-      @mousemove="onDrag"
-      @touchmove="onDrag"
-      @mouseup="endDrag"
-      @touchend="endDrag"
-      @mouseleave="endDrag"
-      class="bs-black d-block p-medium pos-relative bg-white flex-center flex uppercase z-index-2"
+  <transition name="slideY"  mode="out-in">
+    <section 
+      ref="wrapper" 
+      class="w-100 h-100vh"
+      :style="MOBILE_APP === 'ios' ?'padding-top: 6rem;':''" 
     >
-      <div class="radius-extra pd-small t-black p-medium">
-        <div class="radius-extra pd-nano w-3r h-1r t-black p-medium bg-black-transp-10"></div>
+      <!-- Toggle To Close -->
+      <div
+        @click="emits('toggle')"
+        @mousedown="startDrag"
+        @touchstart="startDrag"
+        @mousemove="onDrag"
+        @touchmove="onDrag"
+        @mouseup="endDrag"
+        @touchend="endDrag"
+        @mouseleave="endDrag"
+        class="bs-black d-block p-medium pos-relative bg-white flex-center flex uppercase z-index-2"
+      >
+        <div class="radius-extra pd-small t-black p-medium">
+          <div class="radius-extra pd-nano w-3r h-1r t-black p-medium bg-black-transp-10"></div>
+        </div>
       </div>
-    </div>
-    <slot></slot>
-  </section>
+      
+      <slot></slot>
+    </section>
+  </transition>
 </template>
 
 <script setup>

package/src/components/Button/Button.vue

@@ -104,11 +104,13 @@
 
 <template>
 	<button @click.stop="Submit" :disabled="validation" ref="button" class="button">
-		<transition  name="moveFromTopAbsolute" >
+		<transition name="FromTop" >
 			<!-- Slot -->
-			<slot v-if="!loading && !error && !finished || !showLoader"></slot>
+			<span v-if="!loading && !error && !finished || !showLoader"><slot></slot></span>
 			<!-- Loading Circle Animation -->
-			<Loader v-else-if="loading && !error && showLoader"  class="pos-relative pos-t-0 pos-l-0 loading"/>
+			<span v-else-if="loading && !error && showLoader"><Loader  class="pos-relative pos-t-0 pos-l-0 loading"/></span>
+			<!-- <Loader v-else-if="loading && !error && showLoader"/> -->
+			<!-- Success -->
 			<span v-else-if="finished && showSucces" class="t-semi loading t-black">{{text.success}}</span>
 			<!-- Error if not finished -->
 			<span v-else-if="error" class="error">{{ error }}</span>
@@ -128,6 +130,21 @@
 		} 
 	}
 
+	.FromTop-enter-active,
+	.FromTop-leave-active {
+		transform: translateY(0);
+		opacity: 1;
+		transition: all 0.5s ease; 
+		
+	}
+	.FromTop-enter-from,
+	.FromTop-leave-to {
+		position: absolute;
+		transform: translateY(-1rem);
+		opacity: 0;
+		transition: all 0.5s ease;
+	}
+
 	.button {
 		display: flex;
 		width: fit-content;

package/src/components/Feed/Feed.vue

@@ -9,9 +9,31 @@
       @search="updateSearch"
     />
 
-   <!--  <div class="flex-center flex pd-thin bg-light radius-extra aspect-1x1 h-100">
-      <IconFilter class="w-1r h-auto"/>
-    </div> -->
+    <template
+      v-if="filter"
+    >
+      <div class="flex-center flex pd-thin bg-light radius-extra aspect-1x1 h-100">
+        <IconFilter @click="() => filter.active = !filter.active" class="w-1r h-auto"/>
+      </div>
+
+    
+      <BottomSheet
+        v-if="filter.active"
+        :show="filter.active"
+        @toggle="() => filter.active = false"
+        class="z-index-10 pos-fixed pos-t-0 pos-r-0"
+        :class="{
+          'pos-t-0':  filter.active,
+          'pos-t-100': !filter.active
+        }"
+      >
+        <BlockFilter
+          v-model:filter="filter"
+          :options="filter.options"
+          class="h-100 w-100 pd-small bg-light"
+        />
+      </BottomSheet>  
+    </template>
 
     <Dropdown 
       v-if="date"
@@ -113,9 +135,11 @@ import Loader from '@pf/src/components/Loader/Loader.vue';
 import EmptyState from '@pf/src/components/EmptyState/EmptyState.vue';
 import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 import Calendar from '@pf/src/components/DatePicker/Calendar.vue'
+import BottomSheet from '@pf/src/components/BottomSheet/BottomSheet.vue';
 
 import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
 import BlockSorting  from '@pf/src/modules/globals/components/blocks/BlockSorting.vue'
+import BlockFilter  from '@pf/src/modules/globals/components/blocks/BlockFilter.vue'
 
 import ButtonSort  from '@pf/src/modules/globals/components/elements/ButtonSort.vue'
 import ButtonDate  from '@pf/src/modules/globals/components/elements/ButtonDate.vue'
@@ -125,6 +149,7 @@ import IconEvents from '@pf/src/modules/icons/entities/IconEvents.vue'
 
 const search = defineModel('search')
 const sort = defineModel('sort')
+const filter = defineModel('filter')
 const date = defineModel('date')
 const items = defineModel('items')
 

package/src/components/FieldBig/FieldBig.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class=" pd-thin radius-extra flex-nowrap flex">
+  <div class="pd-thin radius-extra flex-nowrap flex">
     <Field
       v-model:field="inputField"
       @update:field="updateInput"
@@ -9,7 +9,7 @@
       @blur="checkInput"
       class="w-100 p-medium t-regular uppercase pd-small"
     />
-    <button v-if="action" @click="emitAction" class="t-medium radius-big uppercase cursor-pointer pd-l-semi pd-r-semi w-max hover-bg-fifth t-semi transition-linear transition-timing-1 t-black bg-main" v-html="action"/>
+    <button v-if="action" @click="emitAction" class="t-nowrap t-medium radius-big uppercase cursor-pointer pd-l-semi pd-r-semi w-max hover-bg-fifth t-semi transition-linear transition-timing-1 t-black bg-main" v-html="action"/>
   </div>
 </template>
 

package/src/components/Sidebar/Sidebar.vue

@@ -48,8 +48,8 @@
 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 Menu from '@pf/src/components/Menu/Menu.vue'
+import MenuItem from '@pf/src/components/Menu/MenuItem.vue'
 
 import clickOutside from '../FieldPhone/click-outside';
 
@@ -78,10 +78,18 @@ watch(() => route.path, () => {
 
 let vClickOutside = clickOutside
 
-function clickedOutside () {
-  if (props.stateSidebar === true) emits('closeSidebar');
-}
+function clickedOutside(event) {
+  // Проверяем, не является ли элемент, по которому кликнули, кнопкой меню
+  const isMenuButton = event.target.classList.contains('menu-btn');
 
+  console.log(event.target.classList.contains('menu-btn'))
+  
+  if (isMenuButton) { 
+    return null;
+  } else if  (props.stateSidebar === true) {
+    emits('closeSidebar');
+  }
+}
 
 </script>
 

package/src/components/index.js

@@ -31,7 +31,6 @@ export { default as FieldTags } from './FieldTags/FieldTags.vue';
 // export { default as Header } from './Header/Header.vue';
 export { default as Loader } from './Loader/Loader.vue';
 // export { default as LocationSelection } from './LocationSelection/LocationSelection.vue';
-export { default as Magnifier } from './Magnifier/Magnifier.vue';
 // export { default as Navigation } from './Navigation/Navigation.vue';
 // export { default as Search } from './Search/Search.vue';
 export { default as Shader } from './Shader/Shader.vue';

package/src/main.js

@@ -1,7 +1,3 @@
-
-// Define Styles
-// ------------------------------------- //
-import '@pf/src/styles/theme.scss';
 // Define components
 // ------------------------------------- //
 import { 
@@ -38,7 +34,6 @@ import {
   // Header,
   Loader,
   // LocationSelection,
-  Magnifier,
   // Navigation,
   // Search,
   Shader,
@@ -82,7 +77,6 @@ export default {
     // app.component('Header',       () => import('./components/Header/Header.vue'));
     app.component('Loader',       () => import('./components/Loader/Loader.vue'));
     // app.component('LocationSelection',() => import('./components/LocationSelection/LocationSelection.vue'));
-    app.component('Magnifier',    () => import('./components/Magnifier/Magnifier.vue'));
     // app.component('Navigation',   () => import('./components/Navigation/Navigation.vue'));
     // app.component('Search',       () => import('./components/Search/Search.vue'));
     app.component('Shader',       () => import('./components/Shader/Shader.vue'));
@@ -126,7 +120,6 @@ export {
   // Header,
   Loader,
   // LocationSelection,
-  Magnifier,
   // Navigation,
   // Search,
   Shader,

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

@@ -43,16 +43,10 @@ const controllerFactory = (db) => {
     try {
       let user = await User.findOne(query).populate('roles').exec();
 
-      if ((type === 'email' || type === 'phone')) {
-
-        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
-
-        if (!passwordIsValid) {
-          console.log('req obdy is', req.body)
-          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
-        }
+      if (type !== 'apple' && !user) {
+        return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
-    
+
       if (type === 'apple' && !user) {
         const { firstName, lastName } = req.body.user.name;
 
@@ -67,12 +61,18 @@ const controllerFactory = (db) => {
       } else if (!user) {
         return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
-      
-      const memberships = await Membership.findOne({ user: user._id });
+
+      if (type === 'email' || type === 'phone') {
+
+        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
+
+        if (!passwordIsValid) {
+          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
+        }
+      }
       
       const token = jwt.sign({ 
         _id: user._id, 
-        organization: memberships ? memberships.organization : null
       }, process.env.SECRET_KEY, { 
         expiresIn: 86400 
       });
@@ -87,12 +87,9 @@ const controllerFactory = (db) => {
         email: user.email,
         roles: authorities,
         accessToken: token,
-        organization: {
-          _id: memberships ? memberships.organization : null
-        }
       });
     } catch (err) {
-      // console.error(err);
+      console.error(err);
       res.status(500).send({ message: err });
     }
   };
@@ -247,6 +244,7 @@ const controllerFactory = (db) => {
         console.log(defaultAccesses)
 
         const accessData = isOwner ? defaultAccesses.accesses : (depts.find(dept => dept.organization.toString() === orgId) || {}).accesses;
+       
         Object.keys(accessData).forEach(key => {
           if (!rights[key]) {
             rights[key] = {};

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

@@ -29,10 +29,7 @@ function createAuthRoutes (options) {
             ru: 'Вход'
           },
         },
-        component: () => import(
-          /* webpackChunkName: "signin" */ 
-          '../components/pages/SignIn.vue'
-        ),
+        component: () => import(/* webpackChunkName: "signin" */ '../components/pages/SignIn.vue'),
       },{
         path: 'reset-password',
         name: 'Reset Password',

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

@@ -31,35 +31,37 @@
   });
 
   async function initialize() {
-  try {
-    const userCookie = await getCookie('user');
+    try {
+      const userCookie = await getCookie('user');
+
+      if (userCookie) {
+        const { _id, email, phone, roles, accessToken } = userCookie;
+
+        // Установка токена в Axios интерцептор для всех запросов
+        axios.interceptors.request.use(config => {
+          config.headers['x-access-token'] = accessToken;
+          return config;
+        }, error => {
+          return Promise.reject(error);
+        });
 
-    if (userCookie) {
-      const { _id, email, phone, roles, accessToken } = userCookie;
+        // Проверка токена через серверный маршрут
+        const response = await axios.get('/api/auth/check-accesses');
+        const userAccesses = response.data;
 
-      // Установка токена в Axios интерцептор для всех запросов
-      axios.interceptors.request.use(config => {
-        config.headers['x-access-token'] = accessToken;
-        return config;
-      }, error => {
-        return Promise.reject(error);
-      });
+        // Обновление состояния приложения с информацией о пользователе и его правах доступа
+        Object.assign(state.user, { _id, email, phone });
+        Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
 
-      // Проверка токена через серверный маршрут
-      const response = await axios.get('/api/auth/check-accesses');
-      const userAccesses = response.data;
-
-      // Обновление состояния приложения с информацией о пользователе и его правах доступа
-      Object.assign(state.user, { _id, email, phone });
-      Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
-      state.accesses = userAccesses;
+        // console.log('roles by initilioze is', state.access.roles)
+        state.accesses = userAccesses;
+      }
+    } catch (error) {
+      console.error('Error initializing app:', error);
+      removeCookie('user'); 
+      state.accesses = [];
     }
-  } catch (error) {
-    console.error('Error initializing app:', error);
-    removeCookie('user'); 
-    state.accesses = [];
   }
-}
 
   initialize();
 
@@ -92,6 +94,7 @@
           roles: null
         });
 
+        console.log(error)
         setError(error)
         return Promise.reject(error);
       }
@@ -277,5 +280,6 @@
   // Module Export
   export {
     state,
+    initialize,
     actions
   };