@ozdao/prometheus-framework 0.2.221 → 0.2.223

package/src/modules/events/router/events.js

@@ -24,6 +24,17 @@ const eventsRoutes = [
       },
       component: () => import(/* webpackChunkName: 'EventList' */ '../components/pages/Events.vue')
     }]
+  },{
+    path: 'events/backoffice',
+    name: 'Events Backoffice',
+    meta: {
+      title: {
+        en: 'Manage Events',
+        ru: 'Управление Событиями'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'CreateEvent' */ '../components/pages/EventsBackoffice.vue')
   },{
     path: 'events/create',
     name: 'Create Event',
@@ -53,10 +64,6 @@ const eventsRoutes = [
   },{
     path: 'events/:url/edit/tickets',
     name: 'Edit Event Tickets',
-    meta: { authorize: [] },
-    beforeEnter: [
-      validationAuth.requiresAdmin,
-    ],
     component: () => import(/* webpackChunkName: 'EditEvent' */ '../components/pages/EditEventTickets.vue')
   }
 ];

package/src/modules/events/store/events.js

@@ -1,9 +1,7 @@
-// Dependencies
-import axios from 'axios';
-// Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 // Vue modules
 import { reactive, ref, computed, toRefs, watch  } from "vue";
+// Setup Axios
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // Globals
 import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // State

package/src/modules/gallery/components/sections/BackofficeGallery.vue

@@ -12,7 +12,7 @@
         { name: 'Archived', value: 'archived' }
       ]"
       :actions="[
-        { method: () => openPhotoPopup(null), label: 'Add Photo' }
+        ...(hasAccess(route.params._id, 'gallery', 'create', auth.state.accesses) ? [{ method: () => openPhotoPopup(null), label: 'Add Photo' }] : [])
       ]"
       class="mn-b-small bg-light bg-light radius-big"
     />
@@ -50,11 +50,12 @@
           :creator="item.creator"
           :date="item.createdAt"
           :actions="[
-            { method: () => deletePhoto(item), label: 'Delete' },
-            { method: () => changeStatus(item,'archived'), label: 'Archive' },
-            item.status === 'draft' ? 
-              { method: () => changeStatus(item,'published'), label: 'Publish' } : 
-              { method: () => changeStatus(item,'draft'), label: 'Draft' }
+            ...(hasAccess(route.params._id, 'gallery', 'delete', auth.state.accesses) ? [{ method: () => deletePhoto(item), label: 'Delete' }] : []),
+            ...(hasAccess(route.params._id, 'gallery', 'edit', auth.state.accesses) ? [
+                ...(item.status !== 'archived' ? [{ method: () => changeStatus(item, 'archived'), label: 'Archive' }] : []),
+                ...(item.status !== 'published' ? [{ method: () => changeStatus(item, 'published'), label: 'Publish' }] : []),
+                ...(item.status !== 'draft' ? [{ method: () => changeStatus(item, 'draft'), label: 'Draft' }] : [])
+            ] : [])
           ]"
           class="pd-small mn-b-small"
         />
@@ -165,8 +166,6 @@ import gallery from '@pf/src/modules/gallery/store/gallery';
 import CardHeader  from '@pf/src/modules/globals/views/components/blocks/CardHeader.vue'
 import SectionPageTitle from '@pf/src/modules/globals/views/components/sections/SectionPageTitle.vue'
 
-
-
 import EditImages from '@pf/src/components/EditImages/EditImages.vue';
 import BlockTags from '@pf/src/components/FieldTags/BlockTags.vue';
 
@@ -232,14 +231,26 @@ const onUpdatedImages = (newImages) => {
 const photos = ref([])
 
 const deletePhoto = async (item) => {
-  await gallery.delete(item._id);
-  gallery.removeItem(item, photos.value)
+  let deletedPhoto = JSON.parse(JSON.stringify(item));
+
+  deletedPhoto.owner.target = deletedPhoto.owner.target._id
+  deletedPhoto.creator.target = deletedPhoto.creator.target._id
+
+  await gallery.delete(deletedPhoto);
+
+  gallery.removeItem(deletedPhoto, photos.value)
 };
 
 const changeStatus = async (item, status) => {
-  item.status = status
-  await gallery.update(item)
-  gallery.updateItem(item, photos.value)
+  let updatedPhoto = JSON.parse(JSON.stringify(item));
+
+  updatedPhoto.status = status
+
+  updatedPhoto.owner.target = updatedPhoto.owner.target._id
+  updatedPhoto.creator.target = updatedPhoto.creator.target._id
+
+  updatedPhoto = await gallery.update(updatedPhoto)
+  gallery.updateItem(updatedPhoto, photos.value)
 }
 
 const createPhoto = async (status) => {

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 
+  };
+}