@ozdao/prometheus-framework 0.2.222 → 0.2.223

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

@@ -11,8 +11,6 @@ const controllerFactory = (db) => {
 
   const read = async (req, res) => {
 
-    console.log(req.query.tags)
-
     let stages = [
       ...queryProcessorGlobals.getBasicOptions(
         req.query
@@ -40,8 +38,6 @@ const controllerFactory = (db) => {
         req.query.limit
       )
     ];
-
-    console.log(stages)
     
     try {
       const photos = await Photo.aggregate(stages);
@@ -89,8 +85,6 @@ const controllerFactory = (db) => {
 
         photo = await Photo.findOne({ _id: photo._id }).populate('creator.target').populate('owner.target')
 
-        console.log(photo)
-
         photos.push(photo);
       }
 
@@ -101,33 +95,38 @@ const controllerFactory = (db) => {
     }
   }
 
-  const update = (req, res) => {
-    Photo.findOneAndUpdate({_id:req.body._id}, req.body, { new: true })
-      .exec()
-      .then(photo => {
-        if (!photo) {
-          return res.status(404).send({ message: "Something went wrong when updating photo." });
-        }
-        res.status(200).send(photo);
-      })
-      .catch(err => {
-        console.log(err)
-        return res.status(500).send({ message: err });
-      });
+  const update = async (req, res) => {
+    try {
+      const updatedPhoto = await Photo.findOneAndUpdate({_id: req.body._id}, req.body, { new: true })
+        .populate('creator.target')
+        .populate('owner.target');
+
+      if (!updatedPhoto) {
+        return res.status(404).send({ message: "Something went wrong when updating photo." });
+      }
+      
+      res.status(200).send(updatedPhoto);
+    } catch (err) {
+      console.log(err);
+      return res.status(500).send({ message: err.message });
+    }
   };
 
-  const deletePhoto = (req, res) => {
-    Photo.findOneAndDelete({_id: req.params._id})
-      .exec()
-      .then(photo => {
-        if (!photo) {
-          return res.status(404).send({ message: "Photo is not deleted." });
-        }
-        res.status(200).send(photo);
-      })
-      .catch(err => {
-        return res.status(500).send({ message: err });
-      });
+  const deletePhoto = async (req, res) => {
+    try {
+      const deletedPhoto = await Photo.findOneAndDelete({_id: req.body._id})
+        .populate('creator.target')
+        .populate('owner.target');
+
+      if (!deletedPhoto) {
+        return res.status(404).send({ message: "Photo is not deleted." });
+      }
+      
+      res.status(200).send(deletedPhoto);
+    } catch (err) {
+      console.log(err);
+      return res.status(500).send({ message: err.message });
+    }
   };
 
   return {

package/src/modules/gallery/router/gallery.backoffice.router.js

@@ -1,3 +1,5 @@
+import * as validationOwnership from '@pf/src/modules/auth/views/middlewares/ownership.validation';
+
 const gallery = [{
   path: 'gallery',
   name: 'Backoffice Gallery',
@@ -6,8 +8,10 @@ const gallery = [{
       en: 'Backoffice Gallery',
       ru: 'Управление Галерей'
     },
-    authorize: []
   },
+  beforeEnter: [
+    validationOwnership.requiresAccess('gallery', 'read')
+  ],
   component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '@pf/src/modules/gallery/components/sections/BackofficeGallery.vue'),
 }];
 

package/src/modules/gallery/routes/gallery.routes.js

@@ -2,35 +2,53 @@
 const controllerFactory = require("../controllers/gallery.controller");
 // Middlewares
 const middlewareFactoryAuth = require('@pf/src/modules/auth/controllers/middlewares');
-const middlewareFactoryAccesses = require('@pf/src/modules/auth/controllers/middlewares/verifyAccesses')
+const middlewareFactoryAccesses = require('@pf/src/modules/organizations/middlewares/verifyAccesses')
 
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
   const { authJwt } = middlewareFactoryAuth(db);
-  const { verifyRead } = middlewareFactoryAccesses(db)
+  const { verifyAccess, handleAccessResult } = middlewareFactoryAccesses(db)
 
   app.get(
     "/api/gallery/read",
     [
       authJwt.verifyToken(true),
-      verifyRead('gallery'),
+      verifyAccess('gallery', 'read'),
+      handleAccessResult({ allowPublished: true, allowUnauthenticated: true }),
     ],
     controller.read
   );
   
   app.post(
     "/api/gallery/create",
+    [
+      authJwt.verifyToken(),
+      verifyAccess('gallery', 'create'),
+      handleAccessResult(),
+    ],
     controller.create
   );
 
   app.put(
     "/api/gallery/update",
+    [
+      authJwt.verifyToken(),
+      verifyAccess('gallery', 'edit'),
+      handleAccessResult({ 
+        allowOwnResources: true 
+      }),
+    ],
     controller.update
   );
 
   app.delete(
-    "/api/gallery/delete/:_id",
+    "/api/gallery/delete",
+    [
+      authJwt.verifyToken(),
+      verifyAccess('gallery', 'delete'),
+      handleAccessResult(),
+    ],
     controller.delete
   );
 };

package/src/modules/globals/controllers/utils/queryProcessor.js

@@ -74,13 +74,23 @@ function getCreatorUserLookupStage() {
   return {
     $lookup: {
       from: "users",
-      localField: "creator.target",
-      foreignField: "_id",
+      let: { creatorId: "$creator.target" },
+      pipeline: [
+        {
+          $match: {
+            $expr: { $eq: ["$_id", "$$creatorId"] }
+          }
+        },
+        {
+          $project: { password: 0 }
+        }
+      ],
       as: "creatorUser"
     }
   };
 }
 
+
 function getCreatorOrganizationLookupStage() {
   return {
     $lookup: {
@@ -108,13 +118,23 @@ function getOwnerUserLookupStage() {
   return {
     $lookup: {
       from: "users",
-      localField: "owner.target",
-      foreignField: "_id",
+      let: { ownerId: "$owner.target" },
+      pipeline: [
+        {
+          $match: {
+            $expr: { $eq: ["$_id", "$$ownerId"] }
+          }
+        },
+        {
+          $project: { password: 0 }
+        }
+      ],
       as: "ownerUser"
     }
   };
 }
 
+
 function getOwnerOrganizationLookupStage() {
   return {
     $lookup: {

package/src/modules/globals/globals.client.js

@@ -11,6 +11,7 @@ import Sidebar from '@pf/src/modules/globals/views/components/partials/Sidebar.v
 import BottomNavigationBar from '@pf/src/modules/globals/views/components/partials/BottomNavigationBar.vue'
 
 import * as mixins from './views/mixins/mixins.js'
+import * as appRenderer from './views/utils/vue-app-renderer.js';
 import * as storeGlobals from './views/store/globals.js';
 
 export {
@@ -18,6 +19,7 @@ export {
   mixins,
   scrollBehavior,
   getBrowserLocale,
+  appRenderer,
   // Store
   storeGlobals,
   // Components

package/src/modules/globals/views/classes/globals.store.js

@@ -70,9 +70,10 @@ class Store {
     });
   }
 
-  async delete(itemId) {
-    return await this.request(`/delete/${itemId}`, {
-      method: 'DELETE'
+  async delete(item) {
+    return await this.request(`/delete`, {
+      method: 'DELETE',
+      body: item
     });
   }
 

package/src/modules/globals/views/components/blocks/Card.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="flex-v-center flex-nowrap flex">
+    <img loading="lazy" 
+      v-if="photo" 
+      :src="(FILE_SERVER_URL || '') + photo" 
+      class="radius-medium aspect-1x1 bg-white object-fit-cover mn-r-thin h-100 w-auto" 
+    />
+
+    <PlaceholderUserpic
+      v-if="!photo"
+      class="radius-medium aspect-1x1 mn-r-thin h-100 w-auto"
+    />
+
+    <div>
+      <p class="h4">{{ title }}</p>
+      <span class="t-transp mn-r-small">{{ subtitle }}</span>
+    </div>
+
+    <div v-if="action" class="mn-l-auto  flex-stretch flex-v-center flex">
+      <button 
+        v-if="action" 
+        @click.stop="action.method" 
+        class="h-2r w-2r t-white mn-l-thin capitalize t-medium radius-big bg-red"
+      >
+        <component v-if="action.label.is" :is="action.label.is" v-bind="action.label.props"></component>  
+
+        <template v-else>
+          {{action.label}} 
+        </template>
+      </button>
+    </div>
+ 
+  </div>
+</template>
+
+<script setup>
+  import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
+
+  const props = defineProps({
+    photo: {
+      type: String,
+      default: null
+    },
+    title: {
+      type: String,
+      default: 'No name'
+    },
+    subtitle: {
+      type: String,
+    },
+    action: {
+      type: Object,
+    }
+  
+  });
+</script>

package/src/modules/globals/views/components/blocks/CardHeader.vue

@@ -154,7 +154,7 @@
 
 				<!-- Report -->
 				<Dropdown 
-					v-if="type !== 'short' && user"
+					v-if="type !== 'short' && user && (user !== creator.target._id || (actions && actions.length > 0))"
 					:label="{ component: IconEllipsis, class: 't-transp i-regular' }"
 					:align="'right'"
 					class="cursor-pointer z-index-2"
@@ -236,8 +236,6 @@
 
 	const router = useRouter()
 
-
-
 	function getTimeElapsed(timestamp) {
 	  const now = new Date();
 	  const createdAt = new Date(timestamp);

package/src/modules/globals/views/components/layouts/App.vue

@@ -64,6 +64,7 @@
   import { useRoute } from 'vue-router'
 
   import * as globals from '@pf/src/modules/globals/views/store/globals'
+  import * as auth from '@pf/src/modules/auth/views/store/auth'
 
   const props = defineProps({
     messages: {

package/src/modules/globals/views/components/layouts/Client.vue

@@ -80,7 +80,6 @@
 						class="z-index-7" 
 					/>
 
-
 					<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
 		      	<component 
 		      		ref="page"  
@@ -182,35 +181,6 @@
 
 	const handleScroll = () => {
 	  scrollOffset.value = event.target.scrollTop
-
-	  if (scrollOffset.value > 50 && !isScrolled) {
-	    isScrolled = true;
-
-	    // header.value.$el.classList.add('scrolled');
-
-	    const firstRect = header.value.$el.getBoundingClientRect();
-	    const invert = -firstRect.top;
-
-	    header.value.$el.style.transform = `translateY(${invert}px)`;
-
-	    // headerTheme.value - light
-
-	    setTimeout(() => {
-	      header.value.$el.style.transform = 'translateY(0)';
-	    }, 0);
-	  } else if (scrollOffset.value <= 75 && isScrolled) {
-	    isScrolled = false;
-	    // header.value.$el.classList.remove('scrolled');
-
-	    const firstRect = header.value.$el.getBoundingClientRect();
-	    const invert = firstRect.top;
-
-	    header.value.$el.style.transform = `translateY(${invert}px)`;
-
-	    setTimeout(() => {
-	      header.value.$el.style.transform = 'translateY(0)';
-	    }, 0);
-	  }
 	};
 
 	onMounted(async () => {

package/src/modules/globals/views/store/globals.js

@@ -22,7 +22,7 @@ const state = reactive({
     status: "",
     headers: "",
     data: "",
-    show: "",
+    show: false,
     name: "",
     message: ""
   }
@@ -227,6 +227,7 @@ const errorMessages = {
 
 // Mutations
 function setError(error) {
+  state.error.show = true
   let errorData 
 
   errorData = error
@@ -234,7 +235,8 @@ function setError(error) {
   if (error?.response?.data) errorData = error.response.data
 
   if (error && errorData.errorCode) {
-    state.error.message = i18n.global.t(`errors.${errorData.errorCode}`);
+    // state.error.message = i18n.global.t(`errors.${errorData.errorCode}`);
+    state.error.message = errorData.errorCode;
   } else {
     state.error.message = errorData.message || "Unknown error";
   }

package/src/modules/globals/views/utils/axios-instance.js

@@ -0,0 +1,18 @@
+// axiosInstance.js
+import axios from 'axios';
+// Создаем один экземпляр axios
+const $axios = axios.create({
+  baseURL: process.env.API_URL,
+  withCredentials: true
+});
+
+// Функция для установки токена в заголовки
+export function setAuthToken(token) {
+  if (token) {
+    $axios.defaults.headers.common['x-access-token'] = token; // Устанавливаем токен в заголовок
+  } else {
+    delete $axios.defaults.headers.common['x-access-token']; // Удаляем токен из заголовка
+  }
+}
+
+export default $axios;

package/src/modules/globals/views/utils/vue-app-renderer.js

@@ -0,0 +1,87 @@
+import { renderToString } from "@vue/server-renderer";
+import { renderSSRHead } from '@unhead/ssr'
+import { setAuthToken } from '@pf/src/modules/globals/views/utils/axios-instance.js';
+
+import getBrowserLocale from "@pf/src/modules/globals/views/localization/get-browser-locale.js"
+
+export function renderAndMountApp({ createApp }) {
+  const start = async () => {
+    const { app, router, store } = createApp();
+
+    let initialState;
+
+    try {
+      const initialStateElement = document.querySelector("[data-state]");
+
+      if (initialStateElement && initialStateElement.innerHTML.trim() !== "") {
+        initialState = JSON.parse(initialStateElement.innerHTML.trim());
+      }
+    } catch (error) {
+      console.error("Failed to parse user state", error);
+    }
+    
+    if (initialState) {
+      // Применяем начальное состояние ко всем модулям
+      store.setInitialState(initialState);
+    }
+
+    if (initialState && initialState.auth && initialState.auth.user) {
+      setAuthToken(initialState.auth.user.accessToken);
+    }
+   // app.config.globalProperties.$i18n.locale = router.currentRoute.value.params.locale
+   // app.config.globalProperties.$i18n.locale = router.currentRoute.value.params.locale
+    // If user browser locae supported then change locale
+    // if (i18n.global.availableLocales.includes(browserLocale)) {
+    //   app.config.globalProperties.$i18n.locale = browserLocale;
+    // }
+
+    await router.isReady();
+    app.mount("#app");
+  };
+  start();
+}
+
+export async function render({ url, cookies, createApp }) {
+  const { app, router, store, meta } = createApp();
+
+  await router.push(url);
+  await router.isReady();
+
+    
+  // If user's language is supported, change the locale
+  // if (language === 'en' || language === 'ru') {
+  //   app.config.globalProperties.$i18n.locale = language
+  // }
+
+  // console.log(router.currentRoute.value.params.locale)
+  // app.config.globalProperties.$i18n.locale = router.currentRoute.value.params.locale
+  
+  const sharedContext = {};
+
+  if (router.currentRoute.value.name?.toLowerCase() === 'notfound') {
+    sharedContext.notFound = true;
+  }
+  
+  let user = null;
+
+  if (cookies.user) {  
+    user = JSON.parse(cookies.user)
+  }
+  
+  let auth = null
+
+  if (user) {
+    await store.auth.actions.initialize(user)
+  }
+
+  const html = await renderToString(app, sharedContext);
+  const payload = await renderSSRHead(meta, {})
+  const initialState = await store.getInitialState();
+
+  return { 
+    html, 
+    meta: payload, 
+    state: initialState, 
+    statusCode: router.currentRoute?.value?.name?.toLowerCase() === 'notfound' ? 404 : 200 
+  };
+}

package/src/modules/integrations/stripe/controllers/services/stripe.service.js

@@ -52,6 +52,7 @@ class servicePaymentStripe extends servicePayment {
         });
 
         let newPrice;
+        let paymentLink;
 
         // Check if any active price matches the new price
         const matchingPrice = activePrices.data.find(price => price.unit_amount === event.specialData.ticketPrice * 100);
@@ -69,38 +70,22 @@ class servicePaymentStripe extends servicePayment {
                 nickname: 'default',
                 active: true // Make the new price active
             });
-        } else {
-            // Deactivate all active prices except the matching one
-            const deactivatePromises = activePrices.data
-                .filter(price => price.id !== matchingPrice.id)
-                .map(price => stripe.prices.update(price.id, { active: false }));
 
-            await Promise.all(deactivatePromises);
-
-            // Create a new price with the same details as the matching price
-            newPrice = await stripe.prices.create({
-                product: product.id,
-                unit_amount: matchingPrice.unit_amount,
-                currency: matchingPrice.currency,
-                nickname: 'default',
-                active: true // Make the new price active
+            // Create new payment link
+            paymentLink = await stripe.paymentLinks.create({
+                line_items: [{ 
+                    price: newPrice.id, 
+                    quantity: 1,
+                    adjustable_quantity: {
+                        enabled: true
+                    } 
+                }],
+                metadata: {
+                    product: event._id.toString()
+                }
             });
-        }
-
-        // Create new payment link
-        const paymentLink = await stripe.paymentLinks.create({
-            line_items: [{ 
-                price: newPrice.id, 
-                quantity: 1,
-                adjustable_quantity: {
-                    enabled: true
-                } 
-            }],
-            metadata: {
-                product: event._id.toString()
-            }
-        });
-
+        } 
+        
         return { product, price: newPrice, paymentLink };
     }
 

package/src/modules/landing/components/pages/Governance.vue

@@ -1,6 +1,7 @@
 <template>
-	<div class="pd-thin">
-    <SectionHeroToken class="mn-b-extra h-min-100"/>
+	<div>
+    <SectionHeroToken class="mn-b-extra h-100"/>
+    <div class="pd-thin">
     <SectionFeaturesImages class="mn-b-thin"/>
     <SectionFeatures
       :textData="{
@@ -98,6 +99,7 @@
         }
       }"
     />
+    </div>
     <!-- Partials (need to remove) -->
   </div>
 </template>

package/src/modules/landing/components/sections/SectionHeroToken.vue

@@ -27,40 +27,42 @@
 <template>
 	<div
 		id="heroGovernance" 
-		class="pos-relative bg-black o-hidden t-white t-center pd-extra radius-big flex-column flex-center flex"
+		class="pos-relative bg-black o-hidden t-white t-center pd-extra flex-column flex-center flex"
 	>
 		<div class="sheen h-5r mn-b-small radius-extra o-hidden pos-relative ">
 	  	<img loading="lazy" src="/logo/wdt.svg" class="w-100 h-100">
 	  </div>
 
 		<h1 
-			class="w-max-35r mn-b-medium" 
+			class="w-max-50r mn-b-medium" 
 			v-html="t('TITLE')"
 		/>
 
 		<p 
-			class="w-max-40r mn-b-big t-transp p-big" 
+			class="w-max-50r mn-b-big t-transp p-big" 
 			v-html="t('DESCRIPTION')"
 		/>
 
 		<div 
-			class="t-white gap-small cols-2-fit-content"
+			class="t-white gap-thin z-index-1 cols-2"
 		>
 			<router-link 
 				:to="{
 					name: 'Sign In'
 				}"
-				class="w-max bg-light t-dark br-light button"
-				v-html="t('SUBACTION')"
-			/>
+				class="w-100 bg-light t-dark br-light button"
+			>
+				{{t('SUBACTION')}}
+			</router-link>
 
 			<router-link  
 				:to="{
 					name: 'Marketplace'
 				}"
-				class="w-max bg-dark t-white button"
-				v-html="t('ACTION')"
-			/>
+				class="w-100 bg-dark t-white button"
+			>
+				{{t('ACTION')}}
+			</router-link>
 		</div>
 
 		<AnimatedGrid class="w-100 h-100 pos-absolute pos-t-0 pos-r-0 z-index-0" />