@ozdao/prometheus-framework 0.2.81 → 0.2.82

package/dist/users.server.js

@@ -2,23 +2,42 @@
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 require("uuid");
 const require$$0 = require("mongoose");
-const addMembersQuantity$1 = require("./addMembersQuantity-B8UgqlUM.js");
+const credentials_schema = require("./credentials.schema-CfhPcsuI.js");
 const ObjectId = require$$0.Types.ObjectId;
-const addUserStatusFields = addMembersQuantity$1.addUserStatusFields_1;
-const addMembersQuantity = addMembersQuantity$1.addMembersQuantity_1;
+const addUserStatusFields = credentials_schema.addUserStatusFields_1;
+const addMembersQuantity = credentials_schema.addMembersQuantity_1;
 const controllerFactory$1 = (db) => {
   const User = db.user;
   const read = async (req, res) => {
     let query = [];
     let skip = parseInt(req.query.skip) || 0;
     let limit = parseInt(req.query.limit) || 10;
+    console.log(req.query);
     const matchConditions = [
       ...req.query._id ? [{ _id: new ObjectId(req.query._id) }] : []
     ];
-    query.push({ $match: { $and: matchConditions } });
-    console.log(req);
-    console.log(query);
-    console.log(req.body);
+    let search = req.query.search;
+    if (search) {
+      let regexPattern = "";
+      const escapedSearch = search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      if (escapedSearch.includes("@")) {
+        regexPattern = escapedSearch;
+      } else if (escapedSearch.match(/^\+?\d{0,14}$/)) {
+        regexPattern = escapedSearch;
+      } else {
+        regexPattern = `.*${escapedSearch}.*`;
+      }
+      matchConditions.push({
+        $or: [
+          { "profile.name": { $regex: regexPattern, $options: "i" } },
+          { "email": { $regex: regexPattern, $options: "i" } },
+          { "phone": { $regex: regexPattern, $options: "i" } },
+          { "username": { $regex: regexPattern, $options: "i" } }
+        ]
+      });
+    }
+    if (matchConditions.length > 0)
+      query.push({ $match: { $and: matchConditions } });
     query.push({
       $lookup: {
         from: "orders",
@@ -44,23 +63,19 @@ const controllerFactory$1 = (db) => {
       }
     });
     query.push(addMembersQuantity());
-    query.push(addUserStatusFields(req.query.user));
+    if (req.query.user)
+      query.push(addUserStatusFields(req.query.user));
     query.push({
       $skip: skip
     });
     query.push({
       $limit: limit
     });
-    console.log(req);
-    console.log(query);
-    console.log(req.body);
     try {
       const users = await User.aggregate(query);
-      if (!users || users.length === 0) {
-        console.log("no users");
+      if (!users) {
         return res.status(404).send({ message: "Users not found." });
       }
-      console.log(users);
       res.status(200).send(users);
     } catch (err) {
       console.log(err);
@@ -129,36 +144,30 @@ var users_routes = function(app, db, origins) {
   app.put("/api/users/:_id", controller.update);
   app.delete("/api/users/:_id", controller.remove);
 };
-var user_model = (db) => {
-  const UserSchema = new db.mongoose.Schema({
-    username: String,
-    phone: String,
-    email: String,
-    apple_id: String,
-    password: String,
-    status: {
-      type: String,
-      enum: ["active", "banned", "removed", "inactive"],
-      default: "active",
-      required: true
-    },
+var profile_schema = function applyProfileSchema(schema, db) {
+  schema.add({
     profile: {
       photo: {
         type: String,
-        default: ""
+        default: null
       },
       name: {
         type: String,
-        default: ""
+        default: null
       },
       description: {
         type: String,
-        default: ""
+        default: null
       },
       birthday: {
-        type: Date
+        type: Date,
+        default: null
       }
-    },
+    }
+  });
+};
+var socials_schema = function applySocialsSchema(schema, db) {
+  schema.add({
     socials: {
       telegram: {
         type: String,
@@ -176,19 +185,41 @@ var user_model = (db) => {
         type: String,
         default: ""
       }
+    }
+  });
+};
+const applyProfileSchema2 = profile_schema;
+const applySocialsSchema2 = socials_schema;
+const applyCredentialsSchema = credentials_schema.credentials_schema;
+var user_model = (db) => {
+  const UserSchema = new db.mongoose.Schema({
+    username: {
+      type: String,
+      unique: true
     },
-    roles: [
-      {
-        type: db.mongoose.Schema.Types.ObjectId,
-        ref: "Role"
-      }
-    ]
+    password: {
+      type: String,
+      required: true
+    },
+    status: {
+      type: String,
+      enum: ["active", "banned", "removed", "inactive"],
+      default: "active",
+      required: true
+    },
+    roles: [{
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: "Role"
+    }]
   }, {
     // Creation Date
     timestamps: {
       currentTime: () => Date.now()
     }
   });
+  applyProfileSchema2(UserSchema);
+  applySocialsSchema2(UserSchema);
+  applyCredentialsSchema(UserSchema);
   const User = db.mongoose.model("User", UserSchema);
   return User;
 };

package/dist/users.server.mjs

@@ -1,7 +1,7 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import "uuid";
 import require$$0 from "mongoose";
-import { a as addUserStatusFields_1, b as addMembersQuantity_1 } from "./addMembersQuantity-BXp_LeQd.mjs";
+import { a as addUserStatusFields_1, b as addMembersQuantity_1, c as credentials_schema } from "./credentials.schema-CDZCKfEI.mjs";
 const ObjectId = require$$0.Types.ObjectId;
 const addUserStatusFields = addUserStatusFields_1;
 const addMembersQuantity = addMembersQuantity_1;
@@ -11,13 +11,32 @@ const controllerFactory$1 = (db) => {
     let query = [];
     let skip = parseInt(req.query.skip) || 0;
     let limit = parseInt(req.query.limit) || 10;
+    console.log(req.query);
     const matchConditions = [
       ...req.query._id ? [{ _id: new ObjectId(req.query._id) }] : []
     ];
-    query.push({ $match: { $and: matchConditions } });
-    console.log(req);
-    console.log(query);
-    console.log(req.body);
+    let search = req.query.search;
+    if (search) {
+      let regexPattern = "";
+      const escapedSearch = search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      if (escapedSearch.includes("@")) {
+        regexPattern = escapedSearch;
+      } else if (escapedSearch.match(/^\+?\d{0,14}$/)) {
+        regexPattern = escapedSearch;
+      } else {
+        regexPattern = `.*${escapedSearch}.*`;
+      }
+      matchConditions.push({
+        $or: [
+          { "profile.name": { $regex: regexPattern, $options: "i" } },
+          { "email": { $regex: regexPattern, $options: "i" } },
+          { "phone": { $regex: regexPattern, $options: "i" } },
+          { "username": { $regex: regexPattern, $options: "i" } }
+        ]
+      });
+    }
+    if (matchConditions.length > 0)
+      query.push({ $match: { $and: matchConditions } });
     query.push({
       $lookup: {
         from: "orders",
@@ -43,23 +62,19 @@ const controllerFactory$1 = (db) => {
       }
     });
     query.push(addMembersQuantity());
-    query.push(addUserStatusFields(req.query.user));
+    if (req.query.user)
+      query.push(addUserStatusFields(req.query.user));
     query.push({
       $skip: skip
     });
     query.push({
       $limit: limit
     });
-    console.log(req);
-    console.log(query);
-    console.log(req.body);
     try {
       const users = await User.aggregate(query);
-      if (!users || users.length === 0) {
-        console.log("no users");
+      if (!users) {
         return res.status(404).send({ message: "Users not found." });
       }
-      console.log(users);
       res.status(200).send(users);
     } catch (err) {
       console.log(err);
@@ -128,36 +143,30 @@ var users_routes = function(app, db, origins) {
   app.put("/api/users/:_id", controller.update);
   app.delete("/api/users/:_id", controller.remove);
 };
-var user_model = (db) => {
-  const UserSchema = new db.mongoose.Schema({
-    username: String,
-    phone: String,
-    email: String,
-    apple_id: String,
-    password: String,
-    status: {
-      type: String,
-      enum: ["active", "banned", "removed", "inactive"],
-      default: "active",
-      required: true
-    },
+var profile_schema = function applyProfileSchema(schema, db) {
+  schema.add({
     profile: {
       photo: {
         type: String,
-        default: ""
+        default: null
       },
       name: {
         type: String,
-        default: ""
+        default: null
       },
       description: {
         type: String,
-        default: ""
+        default: null
       },
       birthday: {
-        type: Date
+        type: Date,
+        default: null
       }
-    },
+    }
+  });
+};
+var socials_schema = function applySocialsSchema(schema, db) {
+  schema.add({
     socials: {
       telegram: {
         type: String,
@@ -175,19 +184,41 @@ var user_model = (db) => {
         type: String,
         default: ""
       }
+    }
+  });
+};
+const applyProfileSchema2 = profile_schema;
+const applySocialsSchema2 = socials_schema;
+const applyCredentialsSchema = credentials_schema;
+var user_model = (db) => {
+  const UserSchema = new db.mongoose.Schema({
+    username: {
+      type: String,
+      unique: true
     },
-    roles: [
-      {
-        type: db.mongoose.Schema.Types.ObjectId,
-        ref: "Role"
-      }
-    ]
+    password: {
+      type: String,
+      required: true
+    },
+    status: {
+      type: String,
+      enum: ["active", "banned", "removed", "inactive"],
+      default: "active",
+      required: true
+    },
+    roles: [{
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: "Role"
+    }]
   }, {
     // Creation Date
     timestamps: {
       currentTime: () => Date.now()
     }
   });
+  applyProfileSchema2(UserSchema);
+  applySocialsSchema2(UserSchema);
+  applyCredentialsSchema(UserSchema);
   const User = db.mongoose.model("User", UserSchema);
   return User;
 };

package/dist/wallet.server.js

@@ -1,6 +1,6 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
-const index = require("./index-CL9l0HRS.js");
+const index = require("./index-BCCiEK_u.js");
 require("axios");
 require("bcryptjs");
 require("crypto");
@@ -9,7 +9,7 @@ const tickets_controller = require("./tickets.controller-WaQ4qMpv.js");
 const require$$1 = require("stripe");
 const require$$0 = require("mongoose");
 const require$$1$1 = require("bignumber.js");
-require("./queryProcessor-BUDoM96e.js");
+require("./queryProcessor-DRMo_GWK.js");
 var wallet_model = (db) => {
   const WalletSchema = new db.mongoose.Schema(
     {

package/dist/wallet.server.mjs

@@ -1,5 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
-import { s as server } from "./index-CGIn4v5E.mjs";
+import { s as server } from "./index-B6a1mPgp.mjs";
 import "axios";
 import "bcryptjs";
 import "crypto";
@@ -8,7 +8,7 @@ import { t as tickets_controller } from "./tickets.controller-ByZ33N6_.mjs";
 import require$$1 from "stripe";
 import require$$0 from "mongoose";
 import require$$1$1 from "bignumber.js";
-import "./queryProcessor-Cl6sU582.mjs";
+import "./queryProcessor-BJdKh0Ow.mjs";
 var wallet_model = (db) => {
   const WalletSchema = new db.mongoose.Schema(
     {

package/dist/web-CtVocufd.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-8N2Jmsuk.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/dist/web-DNq1tHCE.mjs

@@ -0,0 +1,54 @@
+import { W as p } from "./main-CkeuHuCY.mjs";
+class f extends p {
+  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;
+  }
+}
+export {
+  f as PreferencesWeb
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.81",
+  "version": "0.2.82",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Address/Address.vue

@@ -39,6 +39,7 @@
 
 <script setup>
 import { ref, onMounted, watchEffect } from 'vue';
+import { Loader } from "@googlemaps/js-api-loader";
 
 const props = defineProps({
   apiKey: {
@@ -66,8 +67,18 @@ const addressInput = ref(null);
 let autocomplete;
 
 const initAutocomplete = () => {
-  autocomplete = new google.maps.places.Autocomplete(addressInput.value);
-  autocomplete.addListener('place_changed', onPlaceChanged);
+  const loader = new Loader({
+    apiKey: props.apiKey,
+    version: "weekly",
+    libraries: ["places"]
+  });
+
+  loader.load().then(() => {
+    autocomplete = new google.maps.places.Autocomplete(addressInput.value);
+    autocomplete.addListener('place_changed', onPlaceChanged);
+  }).catch(e => {
+    console.error(e);
+  });
 };
 
 const onInput = () => {

package/src/components/Block/Block.vue

@@ -2,13 +2,14 @@
 	<div 
     class="bg-grey pd-medium radius-medium"
   >
-  	<div class="mn-b-small flex-v-center flex-nowrap flex">
+  	<div v-if="title || actions" class="mn-b-small flex-v-center flex-nowrap flex">
   		<p v-if="title" class="mn-r-thin t-medium p-big">{{title}}</p>
   			
   		<button 
   			v-for="action in actions" 
   			@click="action.function" 
-  			class="i-small pd-thin button-delete button"
+  			class="pd-thin button-delete button"
+  			:class="action.class || 'bg-main radius-small t-center i-medium'"
   		>
   			{{action.label}}
   		</button>

package/src/components/Button/Button.vue

@@ -1,6 +1,6 @@
 <script setup>
 	import { ref } from 'vue'
-	
+
 	const props = defineProps({
 		submit: {
 			type: Function,
@@ -42,6 +42,8 @@
 		},
 	})	
 
+	const emits = defineEmits(['error'])
+
 	const button = ref(null);
 	const error = ref(null);
 	const loading = ref(false);
@@ -55,11 +57,11 @@
 	    // Функция для сброса состояния кнопки.
 	    const resetButton = () => {
 	        if (button.value) {
-	            button.value.classList.replace('bg-second', 'bg-main');
-	            button.value.style.pointerEvents = 'auto';
-	            loading.value = false;
-	            finished.value = false;
-	            error.value = null;
+            button.value.classList.replace('bg-second', 'bg-main');
+            button.value.style.pointerEvents = 'auto';
+            loading.value = false;
+            finished.value = false;
+            error.value = null;
 	        }
 	    };
 
@@ -68,7 +70,6 @@
 
 	        button.value.classList.replace('bg-main', 'bg-second');
 
-	      
 	        loading.value = false;
 
 	        // Используем функцию сброса состояния кнопки здесь.
@@ -83,6 +84,7 @@
 	        if (props.callback) setTimeout(() => props.callback(), props.callbackDelay);
 
 	    } catch (err) {
+	    		emits('error',err)
 	        // Если возникла ошибка, мы изменяем стили и устанавливаем сообщение об ошибке.
 	        button.value.classList.replace('bg-main', 'bg-fourth-nano');
 	        error.value = props.error;
@@ -108,11 +110,6 @@
 			<!-- Loading Circle Animation -->
 			<span v-else-if="loading && !error && showLoader" class="loading">
 				<svg class="i-regular" width="135"	height="140" viewBox="0 0 135 140" xmlns="http://www.w3.org/2000/svg" fill="#fff">
-					<rect 			  y="10"	width="15" 	height="120" rx="6">	<animate attributeName="height"	begin="0.5s" 	dur="1s"	values="120;110;100;90;80;70;60;50;40;140;120" calcMode="linear"	repeatCount="indefinite" /> <animate attributeName="y"	begin="0.5s" 	dur="1s"	values="10;15;20;25;30;35;40;45;50;0;10" calcMode="linear"	repeatCount="indefinite"/> </rect> 
-					<rect x="30"	y="10" 	width="15" 	height="120" rx="6"> 	<animate attributeName="height"	begin="0.25s" dur="1s"	values="120;110;100;90;80;70;60;50;40;140;120" calcMode="linear"	repeatCount="indefinite" /> <animate attributeName="y"	begin="0.25s" dur="1s"	values="10;15;20;25;30;35;40;45;50;0;10" calcMode="linear"	repeatCount="indefinite"/> </rect>
-					<rect x="60" 				 	width="15" 	height="140" rx="6"> 	<animate attributeName="height"	begin="0s" 		dur="1s"	values="120;110;100;90;80;70;60;50;40;140;120" calcMode="linear"	repeatCount="indefinite" /> <animate attributeName="y"	begin="0s" 		dur="1s"	values="10;15;20;25;30;35;40;45;50;0;10" calcMode="linear"	repeatCount="indefinite"/> </rect>
-					<rect x="90"	y="10"	width="15" 	height="120" rx="6"> 	<animate attributeName="height"	begin="0.25s" dur="1s"	values="120;110;100;90;80;70;60;50;40;140;120" calcMode="linear"	repeatCount="indefinite" /> <animate attributeName="y"	begin="0.25s" dur="1s"	values="10;15;20;25;30;35;40;45;50;0;10" calcMode="linear"	repeatCount="indefinite"/> </rect>
-					<rect x="120" y="10" 	width="15" 	height="120" rx="6"> 	<animate attributeName="height"	begin="0.5s" 	dur="1s"	values="120;110;100;90;80;70;60;50;40;140;120" calcMode="linear"	repeatCount="indefinite" /> <animate attributeName="y"	begin="0.5s" 	dur="1s"	values="10;15;20;25;30;35;40;45;50;0;10" calcMode="linear"	repeatCount="indefinite"/> </rect> 
 				</svg>
 			</span>
 			<span v-else-if="finished && showSucces" class="t-semi loading t-black">{{text.success}}</span>

package/src/components/Feed/Feed.vue

@@ -12,10 +12,12 @@
     tag="ul" 
     name="scaleTransition" 
     class="o-hidden bg-grey radius-big"
+   :class="$attrs.class"
   >
     <SkeletonEvent
       v-if="isLoading"
-      v-for="i in currentLimit" :key="i"
+      v-for="i in currentLimit" 
+      :key="'skeleton-' + i"
     />
   </TransitionGroup>
 
@@ -26,6 +28,8 @@
       v-if="!isLoading && itemsList.length < 1"
       :title="states.empty.title"
       :description="states.empty.description"
+      :action="states.empty.action"
+      :callback="states.empty.callback"
       class="pd-medium mn-b-thin bg-grey radius-big"
     />
   </transition>
@@ -38,11 +42,17 @@
     <slot
       v-if="!isLoading && itemsList.length > 0"
       :items="itemsList"
-      :user="user"
     >
-      
     </slot>
 
+   <!--   <slot
+      v-if="!isLoading && itemsList.length > 0"
+      :items="itemsList"
+      :user="user"
+      :key="itemsList"
+    >
+    </slot> -->
+
     <button
       v-if="showLoadMore && hasMoreItems && itemsList.length > 0"
       @click="loadMoreItems"
@@ -50,6 +60,8 @@
     >
       Load More
     </button>
+
+    <div key="sentinel" ref="sentinel" class="sentinel"></div> 
   </TransitionGroup>
 
 </template>
@@ -73,7 +85,7 @@ const props = defineProps({
     default: true
   },
   search: {
-    type: Boolean,
+    type: [Boolean, Object],
     default: false
   },
   states: {
@@ -115,7 +127,9 @@ const props = defineProps({
 const itemsList = ref([]);
 const hasMoreItems = ref(false);
 
+
 let isLoading = ref(true);
+let sentinel = ref(null)
 
 let currentSkip = ref(props.options.skip ? props.options.skip : 0);
 let currentLimit = ref(props.options.limit ? props.options.limit : 10);
@@ -182,8 +196,6 @@ watch(() => props.external, (newVal, oldVal) => {
   }
 }, { deep: true });
 
-
-
 watch(() => props.options, (newVal, oldVal) => {
   if (
     newVal.organization !== oldVal.organization ||
@@ -202,5 +214,15 @@ watch(() => props.options, (newVal, oldVal) => {
 
 onMounted(async () => {
   await fetchItems()
+
+  if (typeof window !== 'undefined' && !props.showLoadMore) {
+    const observer = new IntersectionObserver(entries => {
+      if (entries.some(entry => entry.isIntersecting)) {
+        loadMoreItems()
+      }
+    })
+
+    observer.observe(sentinel.value)
+  }
 });
 </script>