@ozdao/prometheus-framework 0.2.128 → 0.2.129

package/src/modules/spots/router/spots.js

@@ -11,7 +11,9 @@ const spots = [
       title: {
         en: 'Spots',
         ru: 'Места'
-      }
+      },
+      header_theme: 'dark',
+      footer_theme: 'dark'
     },
     children: [
       {

package/src/modules/users/components/pages/Profile.vue

@@ -207,7 +207,7 @@
 			    </span>
 			  </MenuItem>
 
-			  <!-- <MenuItem 
+			  <MenuItem 
 			  	@click="router.push({
 			  		name: 'Legal', 
 			  		params: {
@@ -218,7 +218,7 @@
 			    <span>
 			    	About
 			    </span>
-			  </MenuItem> -->
+			  </MenuItem>
 			  
 			  <MenuItem 
 			  	class="cursor-pointer"
@@ -243,8 +243,8 @@ import Button        from '@pf/src/components/Button/Button.vue'
 import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 import Completion from '@pf/src/components/Completion/Completion.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'
 // Org Module
 import ButtonToggleMembership from '@pf/src/modules/organizations/components/elements/ButtonToggleMembership.vue'
 // Report Module

package/src/modules/users/components/pages/ProfileEdit.vue

@@ -114,7 +114,6 @@
 </template>
 
 <script setup>
-  import Cookies from 'js-cookie'
   // Import components
   import Tab           from '@pf/src/components/Tab/Tab.vue'
   import Field         from '@pf/src/components/Field/Field.vue'
@@ -134,13 +133,15 @@
   const route = useRoute()
   const router = useRouter()
   // Async requests
-  await users.actions.read({ _id: auth.state.user._id });
-  // State
   const user = ref(users.state.current);
+  onMounted(async () => {
+    await users.actions.read({ _id: route.params._id });
+  })
   // Methods
   async function onSubmit() {
     await users.actions.update(users.state.current)
   }
+
   async function onSubmitDelete() {
     const confirmation = window.confirm("Are you sure you want to delete your account? Restoration will be possible only with the help of an administrator.");
     

package/src/modules/wallet/controllers/routes/payments.routes.js

@@ -18,7 +18,6 @@ module.exports = function(app, db, origins, publicPath) {
 
   const { verifySignUp, verifyUser } = middlewareFactory(db);
 
-
   observer.subscribe('checkout.session.completed', async (paymentIntent) => {
     const event = await db.event.findOne({ _id: paymentIntent.metadata.product });
 

package/src/styles/base/all.scss

@@ -317,6 +317,10 @@ body {
 	.col-w-100 {
 		grid-column: 1 / -1
 	}
+	// Rows
+	.rows-1 {display: grid; grid-template-rows: auto 1fr; }
+
+
 	// Gaps
 	.gap-extra 		{ gap: var(--extra); }
 	.gap-big 			{ gap: var(--big); }

package/src/styles/config.scss

@@ -189,6 +189,7 @@ $rem: (
   '40r': 40rem,
   '35r': 35rem,
   '30r': 30rem,
+  '25r': 20rem,
   '20r': 20rem,
   '15r': 15rem,
   '10r': 10rem,
@@ -282,7 +283,7 @@ body {
 
 	@include generate-bg-classes('bg-black', 	'black');
 	@include generate-bg-classes('bg-dark', 	'dark');
-	@include generate-bg-classes('bg-light', 	'grey');
+	@include generate-bg-classes('bg-grey', 	'grey');
 	@include generate-bg-classes('bg-light', 	'light');
 	@include generate-bg-classes('bg-white', 	'white');
 }

package/src/styles/layout.scss

@@ -24,7 +24,6 @@ body {
 	// overflow-x: hidden;
 }
 
-
 html,
 body {
   position: relative;

package/dist/credentials.schema-CDZCKfEI.mjs

@@ -1,106 +0,0 @@
-import require$$0 from "mongodb";
-const { ObjectId } = require$$0;
-const addUserStatusFields = (user) => {
-  return {
-    $addFields: {
-      isSubscriber: {
-        $cond: [
-          {
-            $anyElementTrue: {
-              $map: {
-                input: "$memberships",
-                as: "membership",
-                in: {
-                  $and: [
-                    { $eq: ["$$membership.user", new ObjectId(user)] },
-                    { $eq: ["$$membership.role", "subscriber"] }
-                  ]
-                }
-              }
-            }
-          },
-          true,
-          false
-        ]
-      },
-      isMember: {
-        $cond: [
-          {
-            $anyElementTrue: {
-              $map: {
-                input: "$memberships",
-                as: "membership",
-                in: {
-                  $and: [
-                    { $eq: ["$$membership.user", new ObjectId(user)] },
-                    { $not: [{ $in: ["$$membership.role", ["subscriber", "blocked"]] }] }
-                  ]
-                }
-              }
-            }
-          },
-          true,
-          false
-        ]
-      },
-      isBlocked: {
-        $cond: [
-          {
-            $anyElementTrue: {
-              $map: {
-                input: "$memberships",
-                as: "membership",
-                in: {
-                  $and: [
-                    { $eq: ["$$membership.user", new ObjectId(user)] },
-                    { $eq: ["$$membership.role", "blocked"] }
-                  ]
-                }
-              }
-            }
-          },
-          true,
-          false
-        ]
-      }
-    }
-  };
-};
-var addUserStatusFields_1 = addUserStatusFields;
-const addMembersQuantity = (user) => {
-  return {
-    $addFields: {
-      numberOfSubscribers: {
-        $size: {
-          $filter: {
-            input: "$memberships",
-            as: "membership",
-            cond: { $eq: ["$$membership.role", "subscriber"] }
-          }
-        }
-      },
-      numberOfMembers: {
-        $size: {
-          $filter: {
-            input: "$memberships",
-            as: "membership",
-            cond: { $not: { $in: ["$$membership.role", ["blocked", "subscriber"]] } }
-          }
-        }
-      }
-    }
-  };
-};
-var addMembersQuantity_1 = addMembersQuantity;
-var credentials_schema = function applyCredentialsSchema(schema, db) {
-  schema.add({
-    phone: String,
-    email: String,
-    apple_id: String
-  });
-};
-export {
-  addUserStatusFields_1 as a,
-  addMembersQuantity_1 as b,
-  credentials_schema as c
-};

package/dist/credentials.schema-CfhPcsuI.js

@@ -1,105 +0,0 @@
-"use strict";
-const require$$0 = require("mongodb");
-const { ObjectId } = require$$0;
-const addUserStatusFields = (user) => {
-  return {
-    $addFields: {
-      isSubscriber: {
-        $cond: [
-          {
-            $anyElementTrue: {
-              $map: {
-                input: "$memberships",
-                as: "membership",
-                in: {
-                  $and: [
-                    { $eq: ["$$membership.user", new ObjectId(user)] },
-                    { $eq: ["$$membership.role", "subscriber"] }
-                  ]
-                }
-              }
-            }
-          },
-          true,
-          false
-        ]
-      },
-      isMember: {
-        $cond: [
-          {
-            $anyElementTrue: {
-              $map: {
-                input: "$memberships",
-                as: "membership",
-                in: {
-                  $and: [
-                    { $eq: ["$$membership.user", new ObjectId(user)] },
-                    { $not: [{ $in: ["$$membership.role", ["subscriber", "blocked"]] }] }
-                  ]
-                }
-              }
-            }
-          },
-          true,
-          false
-        ]
-      },
-      isBlocked: {
-        $cond: [
-          {
-            $anyElementTrue: {
-              $map: {
-                input: "$memberships",
-                as: "membership",
-                in: {
-                  $and: [
-                    { $eq: ["$$membership.user", new ObjectId(user)] },
-                    { $eq: ["$$membership.role", "blocked"] }
-                  ]
-                }
-              }
-            }
-          },
-          true,
-          false
-        ]
-      }
-    }
-  };
-};
-var addUserStatusFields_1 = addUserStatusFields;
-const addMembersQuantity = (user) => {
-  return {
-    $addFields: {
-      numberOfSubscribers: {
-        $size: {
-          $filter: {
-            input: "$memberships",
-            as: "membership",
-            cond: { $eq: ["$$membership.role", "subscriber"] }
-          }
-        }
-      },
-      numberOfMembers: {
-        $size: {
-          $filter: {
-            input: "$memberships",
-            as: "membership",
-            cond: { $not: { $in: ["$$membership.role", ["blocked", "subscriber"]] } }
-          }
-        }
-      }
-    }
-  };
-};
-var addMembersQuantity_1 = addMembersQuantity;
-var credentials_schema = function applyCredentialsSchema(schema, db) {
-  schema.add({
-    phone: String,
-    email: String,
-    apple_id: String
-  });
-};
-exports.addMembersQuantity_1 = addMembersQuantity_1;
-exports.addUserStatusFields_1 = addUserStatusFields_1;
-exports.credentials_schema = credentials_schema;

package/dist/index-CGIn4v5E.mjs

@@ -1,217 +0,0 @@
-import require$$0 from "jsonwebtoken";
-import require$$0$1 from "mongodb";
-const jwt = require$$0;
-const middlewareFactory$4 = (db) => {
-  const User = db.user;
-  const Role = db.role;
-  const verifyToken = async (req, res, next) => {
-    try {
-      console.log(req.cookies);
-      let user = JSON.parse(req.cookies.user);
-      let token = req.headers["x-access-token"] || user.accessToken;
-      if (!token) {
-        return res.status(403).send({ message: "No token provided!" });
-      }
-      const decoded = jwt.verify(token, process.env.SECRET_KEY);
-      req.userId = decoded._id;
-      console.log("success");
-      next();
-    } catch (err) {
-      console.log(err);
-      return res.status(401).send({ message: "Unauthorized!" });
-    }
-  };
-  const checkRole = (roleToCheck) => async (req, res, next) => {
-    try {
-      const user = await User.findById(req.userId).exec();
-      if (!user) {
-        return res.status(404).send({ message: "User Not found." });
-      }
-      const roles = await Role.find({ _id: { $in: user.roles } }).exec();
-      for (let role of roles) {
-        if (role.name === roleToCheck) {
-          next();
-          return;
-        }
-      }
-      res.status(403).send({ message: `Require ${roleToCheck} Role!` });
-    } catch (err) {
-      res.status(500).send({ message: err.message });
-    }
-  };
-  const isAdmin = checkRole("admin");
-  const isModerator = checkRole("moderator");
-  return {
-    verifyToken,
-    isAdmin,
-    isModerator
-  };
-};
-var authJwt = middlewareFactory$4;
-const middlewareFactory$3 = (db) => {
-  const User = db.user;
-  db.role;
-  const checkDuplicateUsernameOrEmail = async (req, res, next) => {
-    const { type, email, phone } = req.body;
-    console.log(req.body);
-    let query;
-    if (type === "phone" && phone) {
-      query = { phone };
-    }
-    if (type === "email" && email) {
-      query = { email };
-    }
-    try {
-      const user = await User.findOne(query).exec();
-      if (user) {
-        console.log(`USER_ALREADY_REGISTERED`);
-        res.status(400).send({ errorCode: "USER_ALREADY_REGISTERED" });
-        return;
-      }
-      next();
-    } catch (err) {
-      console.log(err);
-      res.status(500).send({ message: err.message });
-    }
-  };
-  const checkRolesExisted = (req, res, next) => {
-    if (req.body.roles) {
-      for (let i = 0; i < req.body.roles.length; i++) {
-        if (!ROLES.includes(req.body.roles[i])) {
-          console.log(`Failed! Role ${req.body.roles[i]} does not exist!`);
-          res.status(400).send({
-            message: `Failed! Role ${req.body.roles[i]} does not exist!`
-          });
-          return;
-        }
-      }
-    }
-    next();
-  };
-  return {
-    checkDuplicateUsernameOrEmail,
-    checkRolesExisted
-  };
-};
-var verifySignUp = middlewareFactory$3;
-const middlewareFactory$2 = (db) => {
-  const User = db.user;
-  db.role;
-  const checkUserExist = async (req, res, next) => {
-    const { type, email, phone } = req.body;
-    let query;
-    if (type === "phone" && phone) {
-      query = { phone };
-    }
-    if (type === "email" && email) {
-      query = { email };
-    }
-    try {
-      const user = await User.findOne(query).exec();
-      if (!user) {
-        console.log(query);
-        res.status(400).send({ errorCode: "USER_NOT_REGISTERED_YET" });
-        return;
-      }
-      next();
-    } catch (err) {
-      res.status(500).send({ message: err.message });
-    }
-  };
-  return {
-    checkUserExist
-  };
-};
-var verifyUser = middlewareFactory$2;
-const { ObjectId } = require$$0$1;
-const middlewareFactory$1 = (db) => {
-  const User = db.user;
-  const Invite = db.invite;
-  const Membership = db.membership;
-  const checkInviteExist = async (req, res, next) => {
-    for (let invite of req.body) {
-      let query;
-      if (invite.contact.includes("@")) {
-        query = { invitedEmail: invite.contact };
-      } else {
-        query = { invitedPhone: invite.contact };
-      }
-      query.organization = req.params._id;
-      const userInvite = await Invite.findOne(query).exec();
-      if (userInvite) {
-        console.log(userInvite);
-        res.status(400).send({ message: "Инвайт c таким email или телефоном уже создан!" });
-        return;
-      }
-    }
-    next();
-  };
-  const checkUsersExist = async (req, res, next) => {
-    for (let invite of req.body) {
-      let query;
-      if (invite.contact.includes("@")) {
-        query = { email: invite.contact };
-      } else {
-        query = { phone: invite.contact };
-      }
-      const user = await User.findOne(query).exec();
-      console.log(req.params);
-      if (user) {
-        const membership = await Membership.findOne({ user: new ObjectId(user._id), organization: req.params._id }).exec();
-        if (membership) {
-          console.log(membership);
-          res.status(400).send({ message: "Пользователь с таким email или телефоном уже добавлен в организацию!" });
-          return;
-        }
-      }
-    }
-    next();
-  };
-  return {
-    checkInviteExist,
-    checkUsersExist
-  };
-};
-var verifyInvites = middlewareFactory$1;
-const middlewareFactory = (db) => {
-  const Category = db.category;
-  const checkCategoryExistOrNot = async (req, res, next) => {
-    try {
-      const category = await Category.findOne({ url: req.body.url });
-      if (category) {
-        res.status(400).send({ message: "Failed! Category with this URL is already in use!" });
-        return;
-      }
-      next();
-    } catch (err) {
-      res.status(500).send({ message: err });
-    }
-  };
-  return {
-    checkCategoryExistOrNot
-  };
-};
-var verifyCategory = middlewareFactory;
-const middlewareIndexFactory = (db) => {
-  const authJwt$1 = authJwt(db);
-  const verifySignUp$1 = verifySignUp(db);
-  const verifyUser$1 = verifyUser(db);
-  const verifyInvites$1 = verifyInvites(db);
-  const verifyCategory$1 = verifyCategory(db);
-  return {
-    authJwt: authJwt$1,
-    verifySignUp: verifySignUp$1,
-    verifyUser: verifyUser$1,
-    verifyInvites: verifyInvites$1,
-    verifyCategory: verifyCategory$1
-  };
-};
-var server = middlewareIndexFactory;
-export {
-  verifyInvites as a,
-  authJwt as b,
-  verifySignUp as c,
-  verifyCategory as d,
-  server as s,
-  verifyUser as v
-};