@ozdao/prometheus-framework 0.1.16 → 0.1.18

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

@@ -1,14 +1,23 @@
-const controller = require("../controllers/gallery.controller");
+// Factories
+const controllerFactory = require("../controllers/gallery.controller");
+// Middlewares
+const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
 
-const { authJwt } = require("../middlewares");
+module.exports = function(app, db, origins) {
+  const controller = controllerFactory(db);
+
+  const { authJwt } = middlewareFactoryGlobal(db);
 
-module.exports = function(app) {
   app.use(function(req, res, next) {
-    res.header(
-      "Access-Control-Allow-Headers", 
-      "Access-Control-Allow-Origin: *", 
-      "x-access-token, Origin, Content-Type, Accept"
-    );
+    
+    const origin = req.headers.origin;
+
+    if (origins.includes(origin)) {
+      res.setHeader('Access-Control-Allow-Origin', origin);
+    }
+
+    res.header("Access-Control-Allow-Headers", "x-access-token, Origin, Content-Type, Accept");
+
     next();
   });
 
@@ -29,7 +38,7 @@ module.exports = function(app) {
     controller.update
   );
 
-  app.delete(
+  app.post(
     "/api/gallery/delete/:_id",
     [authJwt.verifyToken],
     controller.delete

package/src/modules/gallery/store/gallery.js

@@ -2,7 +2,9 @@
 import axios from 'axios';
 import { reactive } from "vue";
 
-const $axios = axios.create({baseURL: process.env.API_URL}) 
+const clientUrl = process.env.API_URL;
+
+const $axios = axios.create({baseURL: clientUrl, withCredentials: true})
 
 // State
 const state = reactive({
@@ -10,29 +12,32 @@ const state = reactive({
 });
 
 const actions = {
-  async fetchGallery () {
+  async fetchGallery(page, limit) {
+    const params = [];
+    if (page) params.push(`page=${page}`);
+    if (limit) params.push(`limit=${limit}`);
+    const url = `/api/gallery${params.length ? `?${params.join('&')}` : ''}`;
+
     try {
-      const response = await axios.get('/api/gallery');
-      state.gallery = response.data;
+      const response = await $axios.get(url);
+
+      console.log(response)
+
+      if (response && response.data) {
+        state.gallery = [...state.gallery, ...response.data];
+        return response.data; // Optionally return the fetched data
+      }
     } catch (error) {
-      console.error(error);
+      console.error('Error fetching gallery:', error);
+      throw error; // Re-throwing the error allows the caller to handle it, if needed
     }
   },
   
-  async createPhoto (photo) {
+  async createPhoto(photos) {
     try {
-      const formData = new FormData();
-      formData.append('image', photo.image);
-      formData.append('categories', typeof photo.categories === 'string' ? photo.categories.split(',').map(item => item.trim()) : photo.categories);
-      formData.append('size', JSON.stringify(photo.size));
-
-      const response = await $axios.post('/api/gallery/create', formData, {
-        headers: {
-          'Content-Type': 'multipart/form-data'
-        }
-      });
-
-      state.gallery.push(response.data);
+      const response = await $axios.post('/api/gallery/create', photos)
+      console.log(response.data)
+      state.gallery = [...response.data, ...state.gallery];
     } catch (error) {
       console.error(error);
     }
@@ -57,7 +62,8 @@ const actions = {
 
   async deletePhoto (photoId) {
     try {
-      await axios.delete(`/api/gallery/delete/${photoId}`);
+
+      const response =  await $axios.post(`/api/gallery/delete/${photoId}`);
       const index = state.gallery.findIndex(p => p._id === photoId);
       if (index !== -1) {
         state.gallery.splice(index, 1);

package/src/modules/icons/navigation/IconChevronRight.vue

@@ -1,5 +1,17 @@
 <template>
 	<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-		<path fill="black" d="M16.25 9.375L20 5.9375C21.5625 4.53125 23.9062 4.6875 25.3125 6.25L54.2188 37.8125C55.3125 39.0625 55.3125 40.9375 54.2188 42.1875L25.3125 73.75C23.9062 75.3125 21.5625 75.4688 20 74.0625L16.25 70.625C14.6875 69.375 14.5312 66.875 15.9375 65.4688L39.375 40L15.9375 14.5312C14.5312 13.125 14.6875 10.625 16.25 9.375Z"/>
+		<path :fill="theme" d="M16.25 9.375L20 5.9375C21.5625 4.53125 23.9062 4.6875 25.3125 6.25L54.2188 37.8125C55.3125 39.0625 55.3125 40.9375 54.2188 42.1875L25.3125 73.75C23.9062 75.3125 21.5625 75.4688 20 74.0625L16.25 70.625C14.6875 69.375 14.5312 66.875 15.9375 65.4688L39.375 40L15.9375 14.5312C14.5312 13.125 14.6875 10.625 16.25 9.375Z"/>
 	</svg>
-</template>
+</template>
+
+
+<script>
+	export default {
+	  props: {
+	    theme: {
+	      type: String,
+	      default: 'black'
+	    }
+	  }
+	}
+</script>

package/src/modules/mobile/components/Menu/Menu.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="mobile-menu-section mn-semi pd-r-zero pd-t-thin pd-b-thin pd-medium bg-grey radius-medium">
+  <section class="mobile-menu-section mn-semi pd-r-zero pd-t-thin pd-b-thin pd-medium radius-medium">
     <slot></slot>
   </section>
 </template>

package/src/modules/mobile/components/Menu/MenuItem.vue

@@ -3,7 +3,13 @@
   import IconChevronRight from '@pf/src/modules/icons/navigation/IconChevronRight.vue';  // Importing the IconChevronRight component
 
   export default defineComponent({
-    setup(_, { slots }) {
+    props: {
+      theme: {
+        type: String,
+        default: 'black'  // Значение по умолчанию
+      }
+    },
+    setup(props, { slots }) {
       return () => {
         const defaultSlotContent = slots.default ? slots.default() : [];
 
@@ -59,7 +65,7 @@
                 )
               ]
             ),
-            h(IconChevronRight, { class: "i-medium mn-r-medium", type: "chevron" })  // Inserting IconChevronRight directly 
+            h(IconChevronRight, { class: "i-medium mn-r-medium", type: "chevron",  theme: props.theme })
           ]
         );
       };

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

@@ -108,8 +108,28 @@
 	     	/>
 
 			</section>
+			
+			<Menu 
+				v-if="(auth.state.user._id === route.params._id) && (auth.state.access.roles.includes('ROLE_MODERATOR') || auth.state.access.roles.includes('ROLE_ADMIN'))"
+				class="bg-black t-white"
+			>
+			  <MenuItem 
+			  	@click="router.push({
+			  		name: 'Backoffice', 
+			  		params: {
+			  			_id: route.params._id
+			  		}
+			  	})" 
+			  	class="cursor-pointer"
+			  	theme="white"
+			  >
+			    <span>
+			    	Backoffice
+			    </span>
+			  </MenuItem> 
+			</Menu>
 
-			<Menu>
+			<Menu class="bg-grey">
 			  <MenuItem @click="router.push({name: 'User Events', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <IconEvents class="i-semi" :icon="true"/> 
 			    <span>Events</span>
@@ -135,6 +155,7 @@
 
 			<Menu 
 				v-if="auth.state.user._id === route.params._id"
+				class="bg-grey"
 			>
 			  <MenuItem 
 			  	@click="router.push({

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

@@ -1,109 +0,0 @@
-<template>
-	<div class="for-transition w-100">
-		<div id="dash" class="w-100">
-<!-- 
-			<section class="w-100 mn-big radius-medium pd-medium bg-second t-white">
-				<h3 class="mn-regular">Заполните профиль</h3>
-				
-				<router-link to="/app/profile/edit" class="t-white  br-white bg-transp w-100 button">Заполнить</router-link>
-			</section> -->
-
-			<section class="t-center w-100 mn-thin radius-medium pd-medium br-grey br-1px br-solid">
-				<svg v-if="!route.params._id" @click="$router.push({name: 'Edit Profile'})" class="pos-absolute pos-t-regular pos-r-regular i-regular t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
-        	<path fill="black" d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z"/>
-        </svg>
-
-				<img v-if="users.state.current.photo" :src="'/' + users.state.current.photo" class="radius-medium mn-small i-extra" />
-				<img v-else class="radius-medium mn-small i-extra" src="@/assets/images/avatar.svg">
-				<h3 class="">{{users.state.current.name ? users.state.current.name : 'Не указан' }}</h3>
-				<p class="t-main t-semi">@magicofoz</p>
-				<p>2 324 subscribers</p>
-				<div class="flex-center flex-nowrap flex">
-					<div class="pd-thin bg-grey">
-						🎵 DJ
-					</div>
-					<div class="pd-thin bg-grey">
-						👷 Builder
-					</div>
-				</div>
-
-				<Contacts
-	        :website="users.state.current.name"
-	        :phone="users.state.current.phone ? users.state.current.phone : 'Не указан'"
-	        :email="users.state.current.email ? users.state.current.email : 'Не указан'"
-	        :address="users.state.current.name"
-	        class="cols-4 radius-medium mn-auto gap-thin"
-	      />
-
-			</section>
-
-			<Activity 
-				likes="3212"
-				comments="342"
-				subscriptions="235"
-			/>
-
-			<Tab 
-				v-model:selected="tabOrganization"
-				:tabs="[
-					{ name: 'Posts', 			value: 'spots' },
-					{ name: 'Hubs', 	value: 'products' },
-					{ name: 'Hubs', 	value: 'products' },
-					{ name: 'Spots', 	value: 'members' }		
-				]"
-				class="o-hidden h5 radius-big bg-grey"
-			/>
-
-			<Feed 
-	      :user="users.state.current._id"
-				:owner="users.state.current._id"
-	    />
-			
-		</div>
-	</div>
-</template>
-
-<script setup>
-import { watch  } from 'vue'
-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'
-import Button        from '@pf/src/components/Button/Button.vue'
-// Org Module
-import Contacts from '@pf/src/modules/organizations/components/blocks/Contacts.vue'
-// Community Module
-import Feed from '@pf/src/modules/community/components/sections/Feed.vue'; 
-import Activity from '@pf/src/modules/community/components/blocks/Activity.vue'; 
-// Import libs
-import { computed, onMounted, ref, onBeforeMount } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-// Import state
-import * as auth from '@pf/src/modules/auth/store/auth'
-import * as users from '@/modules/users/store'
-// Import validation
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-const passswordValidation = ref(null)
-// Accessing router
-const route = useRoute()
-const router = useRouter()
-// Get organization _id from cookie
-if (!route.params._id) await users.actions.fetch({ _id: auth.state.user._id });
-if (route.params._id)	await users.actions.fetch({ _id: route.params._id });
-// State
-let tab = route.query.tab ? route.query.tab : 'spots';
-
-const tabOrganization = ref(tab)
-
-route.query.tab = tabOrganization.value
-
-watch(tabOrganization, (newValue) => {
-  router.push({ query: { ...route.query, tab: newValue } });
-});
-</script>
-
-<style lang="scss">
-	#header {
-		// height: 3rem;
-	}
-</style>

package/src/modules/backoffice/components/pages/profile/ProfileEdit.vue

@@ -1,132 +0,0 @@
-<template>
-	<div class="for-transition w-100">
-		<div id="dash" class="w-100 pd-medium bg-grey">
-
-			<section class="w-100 mn-medium radius-medium o-hidden">
-				<Field 
-          v-model:field="user.phone"     
-          label="Телефон"  
-          placeholder="Не указан" 
-          class="bg-white "
-          disabled="true"
-          :validation="organizationName" 
-        />
-
-				<Field 
-          v-model:field="user.email"     
-          label="Email"  
-          placeholder="Не указан" 
-          class="bg-white"
-          disabled="true"
-          :validation="organizationName" 
-        />
-			</section>
-
-			<section class="w-100 mn-medium radius-medium o-hidden">
-				<Field 
-          v-model:field="user.name"     
-          label="ФИО"  
-          placeholder="Не указан" 
-          class="bg-white "
-          :validation="organizationName" 
-        />
-        <Field 
-          v-model:field="user.dateOfBirth"     
-          label="Дата рождения"  
-          type="date"
-          placeholder="Не указан" 
-          class="bg-white "
-          :validation="organizationName" 
-        />
-
-        <Field 
-          v-model:field="user.address"     
-          label="Адрес регистрации"  
-          placeholder="Не указан" 
-          class="bg-white "
-          :validation="organizationName" 
-        />
-			</section> 
-
-
-			<section class="w-100 mn-medium radius-medium pd-medium bg-white" >
-			    <span class="t-transp mn-small d-block">Хобби</span>
-			    <Field 
-			        v-model:field="user.hobbies"     
-			        label="Хобби"  
-			        placeholder="Не указаны" 
-			        class="bg-white "
-			        :validation="organizationName" 
-			    />
-			    <span class="t-transp mn-small d-block">Питомцы</span>
-			    <Field 
-			        v-model:field="user.pets"     
-			        label="Питомцы"  
-			        placeholder="Не указаны" 
-			        class="bg-white "
-			        :validation="organizationName" 
-			    />
-			    <span class="t-transp mn-small d-block">Сведения о детях</span>
-			    <div v-for="(child, index) in user.childrenInfo" :key="index">
-			        <Field 
-			            v-model:field="child.name"     
-			            label="Имя"  
-			            placeholder="Не указано" 
-			            class="bg-white "
-			            :validation="organizationName" 
-			        />
-			        <Field 
-			            v-model:field="child.dateOfBirth"     
-			            label="Дата рождения"  
-			            type="date"
-			            placeholder="Не указана" 
-			            class="bg-white "
-			            :validation="organizationName" 
-			        />
-			    </div>
-			</section>
-
-			<Button :submit="onSubmit" :callback="redirectTo" class="mn-thin">Сохранить</Button>
-
-		</div>
-	</div>
-</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'
-import Button        from '@pf/src/components/Button/Button.vue'
-// Import libs
-import { computed, onMounted, ref, onBeforeMount } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-// Import state
-import * as auth from '@pf/src/modules/auth/store/auth'
-import * as users from '@/modules/users/store'
-// Import validation
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-const passswordValidation = ref(null)
-// Accessing router
-const route = useRoute()
-const router = useRouter()
-// Async requests
-await users.actions.fetch({ _id: auth.state.user._id });
-// State
-const user = ref(users.state.current);
-// Methods
-async function onSubmit() {
-  await users.actions.update(users.state.current)
-}
-
-function redirectTo () {
-  router.replace({ name: 'My Profile'});
-}
-
-</script>
-
-<style lang="scss">
-	#header {
-		// height: 3rem;
-	}
-</style>