@ozdao/prometheus-framework 0.2.137 → 0.2.139

package/src/modules/spots/components/pages/SpotEdit.vue

@@ -96,7 +96,8 @@
         <Address
           :apiKey="GOOGLE_MAPS_API_KEY" 
           :address="spots.state.spot.address" 
-          :location="spots.state.spot.location"     
+          :location="spots.state.spot.location"  
+          :locale="$i18n.locale"   
           label="Address"    
           placeholder="Enter delivery address"  
           class="
@@ -114,7 +115,8 @@
 
           :address="spots.state.spot.address" 
           :location="spots.state.spot.location" 
-         
+          :locale="$i18n.locale"
+          
           class="h-20r mn-b-small radius-bl-medium radius-br-medium  o-hidden"
           @update:location="newLocation => {
             spots.state.spot.location = newLocation;
@@ -144,7 +146,7 @@
       </Block>
     </div>
 
-    <Button :submit="onDelete" :callback="redirectToDash" class="w-100 bg-light">Delete Spot</Button>
+    <Button :submit="onDelete" :callback="redirectDash" class="w-100 bg-light">Delete Spot</Button>
   </div>
 </template>
 
@@ -211,7 +213,8 @@ async function onSubmit() {
 }
 
 function redirectTo() {
-  router.replace({ name: "Spot", params: { _id: route.params._id, spot: spots.state.spot._id } });
+  // router.replace({ name: "Spot", params: { _id: route.params._id, spot: spots.state.spot._id } });
+   router.push({ name: "Organization", params: { _id: route.params._id }});
 }
 
 async function onDelete() {
@@ -222,7 +225,7 @@ async function onDelete() {
 }
 
 function redirectDash() {
-  router.replace({ name: "Organization" });
+  router.push({ name: "Organization", params: { _id: route.params._id }});
 }
 </script>
 

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

@@ -3,8 +3,6 @@ const controllerFactory = (db) => {
 
   const readOne = (req, res) => {
     Spot.findOne({_id: req.params._id})
-      .populate('members.user')
-      .populate('subspots')
       .then(spot => {
         if (!spot) {
           return res.status(404).send({ message: "Отдел не найден" });
@@ -18,8 +16,6 @@ const controllerFactory = (db) => {
 
   const read = (req, res) => {
     Spot.find({ organization: req.params._id })
-      .populate('members.user')
-      .populate('subspots')
       .then(spots => {
         if (!spots) {
           return res.status(404).send({ message: "Spots not found" });
@@ -60,7 +56,7 @@ const controllerFactory = (db) => {
   };
 
   const deleteSpot = (req, res) => {
-    Spot.findOneAndRemove({ _id: req.body._id, organization: req.params._id })
+    Spot.findOneAndDelete({ _id: req.body._id, organization: req.params._id })
       .then(spot => {
         if (!spot) {
           return res.status(404).send({ message: "Spot not found" });

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

@@ -50,7 +50,7 @@ const spots = {
       ],
       component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/SpotEdit.vue'),
     }, {
-      path: ':_id/spots/:deparment',
+      path: ':_id/spots/:spot',
       name: 'Spot',
       meta: {
         title: 'Точка',

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

@@ -1,17 +1,17 @@
 <template>
-	<div class="pd-medium for-transition w-100">
+	<div  v-if="show" class="pd-medium for-transition w-100">
    
     <ProfileCompletion 
       v-if="route.params._id === auth.state.user._id" 
-      :user="auth.state.user._id" 
-      :target="user"
+      :user="auth.state.user._id"
+      :target="users.state.current"
       :cta="false"
     />
     <!--  -->
     <h3 class="mn-b-small">Username</h3>
 
     <Field 
-      v-model:field="user.username"     
+      v-model:field="users.state.current.username"     
       label="@"  
       placeholder="Not specified" 
       class="mn-b-thin w-100 bg-light pd-medium radius-small" 
@@ -25,15 +25,15 @@
 
     <div class="mn-b-thin radius-small w-100 h-10r bg-light flex-center flex-column flex">
        <UploadImage 
-          v-model:photo="user.profile.photo"
-          :uploadPath="'users/' + user._id + '/avatars'"
+          v-model:photo="users.state.current.profile.photo"
+          :uploadPath="'users/' + users.state.current._id + '/avatars'"
           class="h-4r w-4r aspect-1x1 o-hidden bg-white mn-b-thin radius-extra" 
         />
         <h4>Upload userpic</h4>
     </div>
 
     <Field 
-      v-model:field="user.profile.name"     
+      v-model:field="users.state.current.profile.name"     
       label="Name"  
       placeholder="Not specified" 
       class="mn-b-thin bg-light pd-medium radius-small" 
@@ -41,18 +41,17 @@
     />
 
     <Field 
-      v-model:field="user.profile.description"     
+      v-model:field="users.state.current.profile.description"     
       label="Description"  
       placeholder="Not specified" 
       class="mn-b-semi bg-light pd-medium radius-small" 
-      disabled="true"
       :validation="organizationName" 
     />
 
     <!-- <p class="mn-b-thin">Select your birthday if you want to receive your birthday gift.</p>
     
     <Field 
-      v-model:field="user.birthday"     
+      v-model:field="users.state.current.birthday"     
       label="Birthday"  
       type="date"
       placeholder="Not specified" 
@@ -63,25 +62,25 @@
     <p class="mn-b-thin">Please provide only the username for social media profiles, without full links.</p>
 
     <Field 
-      v-model:field="user.socials.instagram"
+      v-model:field="users.state.current.socials.instagram"
       label="Instagram"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
     <Field 
-      v-model:field="user.socials.twitter"
+      v-model:field="users.state.current.socials.twitter"
       label="Twitter"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
     <Field 
-      v-model:field="user.socials.facebook"
+      v-model:field="users.state.current.socials.facebook"
       label="Facebook"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
     <Field 
-      v-model:field="user.socials.telegram"
+      v-model:field="users.state.current.socials.telegram"
       label="Telegram"   
       placeholder="" 
       class="mn-b-semi bg-light pd-medium radius-small" 
@@ -90,7 +89,7 @@
     <h3 class="mn-b-small">Account</h3>
       
     <Field 
-      v-model:field="user.phone"     
+      v-model:field="users.state.current.phone"     
       label="Phone"  
       placeholder="Not specified" 
       class="mn-b-thin bg-light pd-medium mn-b-thin radius-small" 
@@ -99,17 +98,29 @@
     />
 
     <Field 
-      v-model:field="user.email"     
+      v-model:field="users.state.current.email"     
       label="Email"  
       placeholder="Not specified" 
-      class="mn-b-semi  bg-light pd-medium radius-small" 
+      class="mn-b-semi bg-light pd-medium radius-small" 
       :disabled="true"
       :validation="organizationName" 
     />
 
-    <Button :submit="onSubmit" :callback="redirectTo" class="mn-b-thin">Save</Button>
+    <Button 
+      :submit="onSubmit" 
+      :callback="redirectTo" 
+      class="mn-b-thin bg-main w-100"
+    > 
+      Save
+    </Button>
 
-		<Button :submit="onSubmitDelete" :callback="a = () => {router.push({name: 'Sign In'})}" class="mn-b-thin bg-red t-white">Delete Account</Button>
+		<Button
+      :submit="onSubmitDelete" 
+      :callback="a = () => {router.push({name: 'Sign In'})}" 
+      class="mn-b-thin w-100 bg-red t-white"
+    >
+      Delete Account
+    </Button>
 	</div>
 </template>
 
@@ -132,10 +143,14 @@
   // Accessing router
   const route = useRoute()
   const router = useRouter()
-  // Async requests
-  const user = ref(users.state.current);
+
+  const user = ref(null)
+  const show = ref(false)
+
+
   onMounted(async () => {
-    await users.actions.read({ _id: route.params._id });
+    await users.actions.read({ _id: route.params._id, user: auth.state.user._id });
+    show.value = true
   })
   // Methods
   async function onSubmit() {

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

@@ -1,5 +1,5 @@
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 // Factories
 const controllerFactory = require("../factories/payments.factory");
 const controllerFactoryTickets = require("@pf/src/modules/events/controllers/tickets.controller");
@@ -16,7 +16,7 @@ module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db);
   const controllerTickets = controllerFactoryTickets(db, publicPath);
 
-  const { verifySignUp, verifyUser } = middlewareFactory(db);
+  const { verifySignUp, verifyUser } = middlewareFactoryAuth(db);
 
   observer.subscribe('checkout.session.completed', async (paymentIntent) => {
     const event = await db.event.findOne({ _id: paymentIntent.metadata.product });

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

@@ -2,13 +2,13 @@
 const rewardsControllerFactory = require('../factories/rewards.factory');
 
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 
 // Routes
 module.exports = (app, db, wss, wdmClient, origins) => {
   const controller = rewardsControllerFactory(db, wdmClient, wss);
 
-  const { authJwt, authSecret } = middlewareFactory(db);
+  const { authJwt, authSecret } = middlewareFactoryAuth(db);
 
   app.use((req, res, next) => {
     const origin = req.headers.origin;

package/src/modules/middlewares/server/authJwt.js

@@ -1,68 +0,0 @@
-const jwt = require("jsonwebtoken");
-
-const middlewareFactory = (db) => {
-  const User = db.user;
-  const Role = db.role;
-
-  const verifyToken = async (req, res, next) => {
-    try {
-      if (!req.cookies.user) {
-        // Вместо возврата ошибки, просто устанавливаем req.userId как null
-        req.userId = null;
-        return next();
-      }
-
-      let user = JSON.parse(req.cookies.user);
-      let token = req.headers["x-access-token"] || user.accessToken;
-
-      if (!token) {
-        // Также устанавливаем req.userId как null
-        req.userId = null;
-        return next();
-      }
-
-      const decoded = jwt.verify(token, process.env.SECRET_KEY);
-      req.userId = decoded._id;
-      
-      next();
-    } catch (err) {
-      console.log(err);
-      req.userId = null;
-      next();
-    }
-  };
-
-  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
-  };
-};
-
-module.exports = middlewareFactory;