@ozdao/prometheus-framework 0.1.27 → 0.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/CardFooter/CardFooter.vue

@@ -17,41 +17,34 @@
 
 <script setup="props">
   import { computed, ref } from 'vue'
-  import axios from 'axios';
 
-  const props = defineProps(['entity', 'entityType', 'owner']);
+  import * as reactions from '@pf/src/modules/community/store/reactions';
 
-  const isProd = process.env.NODE_ENV === 'production';
-  var clientUrl = 'https://api.ozdao.dev';
-  var localtUrl = 'http://localhost:8081';
+  const props = defineProps(['entity', 'entityType', 'user']);
+ 
+  const reactionsCount = ref(props.entity.numberOfReactions);
+  const isReacted = ref(props.entity.isReacted);
+  const reactionId = ref(props.entity.reactionId);
 
-  const $axios = axios.create({ baseURL: isProd ? clientUrl : localtUrl });
-
-  // const reactionsCount = ref(props.entity.reactionsCount);
-  // const isReacted = ref(props.entity.isReacted);
-  // const reactionId = ref(props.entity.reactionId);
-
-    const reactionsCount = ref(0);
-  const isReacted = ref(0);
-  const reactionId = ref(0);
-  const views = ref(0);
-  const commentsCount = ref(0)
-
-  async function addReaction(type) {
-    if (!props.owner) {
+   async function addReaction(type) {
+    if (!props.user) {
       alert('Please login to add a reaction');
       return;
     }
+
     try {
-      const res = await $axios.post(`/reactions/create/${props.entityType}`, {
-        source: props.entity._id,
-        type: 'like',
-        owner: props.owner
-      });
-      if (res.data.reaction.type === 'like') {
+      const reaction = {
+        target: props.entity._id,
+        type: props.entityType,
+        user: props.user,
+        class: 'like'
+      };
+      const res = await reactions.actions.create(reaction);
+
+      if (res.reaction.class === 'like') {
         reactionsCount.value += 1;
         isReacted.value = true;
-        reactionId.value = res.data.reaction._id;
+        reactionId.value = res.reaction._id;
       }
     } catch (err) {
       console.error(err);
@@ -60,17 +53,21 @@
   }
 
   async function deleteReaction(type) {
-    if (!props.owner) {
-      alert('Please login to remove a reaction');
+    if (!props.user) {
+      alert('Please login to add a reaction');
       return;
     }
+
     try {
-      const res = await $axios.delete(`/reactions/delete/${props.entityType}/${reactionId.value}`);
+      const reaction = { _id: reactionId.value };
+
+      await reactions.actions.delete(reaction);
+
       reactionsCount.value -= 1;
       isReacted.value = false;
       reactionId.value = null;
     } catch (err) {
-      alert('Error removing reaction. Please try again later.');
+      alert('Error adding reaction. Please try again later.');
     }
   }
 </script>

package/src/components/CardHeader/CardHeader.vue

@@ -69,6 +69,8 @@
 						· {{dateFormatted}}
 					</span>
 				</span>
+				
+
 				<!-- Participaters avatar -->
 
 				<div class="d-block mn-l-auto flex-nowrap flex flex-v-center">
@@ -77,7 +79,7 @@
 					    <!-- Круг с числом участников -->
 					    <span 
 					        :style="{ position: 'absolute', top: '0px', right: '0px' }"
-					        class="br-solid br-2px br-white z-index-1 radius-big i-thin bg-second flex flex-center t-white p-small mn-r-small t-semi"
+					        class="br-solid br-2px br-white z-index-1 radius-big i-thin bg-second flex flex-center t-white p-small t-semi"
 					    >
 					        {{members}}
 					    </span>
@@ -87,7 +89,7 @@
 					        v-for="(photo, index) in membersPhotos.slice(0,2)"
 					        :key="index"
 					        :src="(FILE_SERVER_URL || '') + photo"
-					        :style="{ position: 'absolute', top: '0px', right: (index * 20 + 40) + '%', zIndex: 1 - index }"
+					        :style="{ position: 'absolute', top: '0px', right: (index * 20 + 20) + '%', zIndex: 1 - index }"
 					        class="br-solid br-2px br-white i-thin bg-grey radius-big"
 					    />
 					</div>
@@ -96,6 +98,38 @@
 
 				</div>
 
+				<div 
+					@click.stop="openReportPopup()"
+					v-if="type !== 'short'"
+					class="t-transp t-white flex-center flex t-semi mn-l-thin i-medium radius-extra bg-black"
+				>
+					!
+				</div>
+
+				<Popup 
+				  @close-popup="closeReportPopup" 
+				  :isPopupOpen="isReportPopup"
+				>
+				  <div class="w-m-66r t-left pd-big bg-white radius-big">
+				    <h3 class="mn-small">Report Inappropriate Content</h3>
+				    
+				    <p class="p-medium mn-small">We strive to maintain a safe and comfortable environment for all users. If you encounter content that you believe violates our guidelines, please report it. Here’s what you can report:</p>
+				    <ul class="p-medium mn-small">
+				        <li>1. Abusive or harmful content</li>
+				        <li>2. Spam or misleading information</li>
+				        <li>3. Inappropriate or offensive material</li>
+				        <li>4. Unauthorized sharing of personal information</li>
+				    </ul>
+				    <p class="p-medium mn-small">Our team of moderators will review your report and take appropriate action, which may include removing the content if it is found to be in violation of our policies.</p>
+				    
+				    <Button 
+				    	:submit="onSubmit" 
+				    	:callback="closeReportPopup" 
+				    	class="w-100 bg-black t-white">
+				    	Report
+				    </Button>
+				  </div>
+				</Popup>
 
 			</div>
 		</div>
@@ -104,12 +138,15 @@
 
 
 <script setup="props">
-	import { computed } from 'vue'
+	import { computed,ref } from 'vue'
 	
 	import { useRouter } from 'vue-router'
 
 	import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 
+	import Popup from '@pf/src/components/Popup/Popup.vue';
+	import Button from '@pf/src/components/Button/Button.vue';   
+
 	const props = defineProps([
 		'date',
 		'dateFormatted',
@@ -122,6 +159,22 @@
 
 	const router = useRouter()
 
+	// Popup logic
+	const isReportPopup = ref(false)
+
+	function openReportPopup() {
+	  isReportPopup.value = true;
+	}
+	function closeReportPopup() {
+	  isReportPopup.value = false;
+	}
+	// Popup Logic
+	async function onSubmit() {
+		setTimeout(function() {
+
+		}, 1);
+	}
+
 	function getTimeElapsed(timestamp) {
 	  const now = new Date();
 	  const createdAt = new Date(timestamp);

package/src/modules/auth/components/pages/SignIn.vue

@@ -121,13 +121,13 @@
 			{{ t('signin') }}
 		</Button>
 		
-		<Button 
+		<!-- <Button 
 			:submit="onSubmitApple" 
 			:callback="redirectTo" 
 			class="mn-thin bg-black t-white"
 		>
 			{{ t('signin_apple') }}
-		</Button>
+		</Button> -->
 	</section> 
 </template>
 

package/src/modules/community/components/layouts/Community.vue

@@ -23,24 +23,24 @@
     	</h2>
 		</header>
 		
-		<ul class="w-max bg-grey pd-medium radius-big mn-semi flex-nowrap flex">
+		<ul class="w-100 bg-grey pd-small radius-big mn-semi flex-nowrap flex">
 			<li  	
 			:class="{'t-white bg-black': route.params.category === 'featured' }" 					
 			@click="router.push({name: 'Blog'})" 
-			class="mn-r-small t-medium  pd-small radius-small">👑 Featured</li>
+			class="mn-r-small t-medium  pd-thin radius-small">👑 Featured</li>
 			<li  	
 			:class="{'t-white bg-black': route.params.category === 'popular' }"					 				
 			@click="router.push({name: 'Blog', params: { category: 'popular' } })" 
-			class="mn-r-small t-medium  pd-small radius-small">🔥 Popular</li>
+			class="mn-r-small t-medium  pd-thin radius-small">🔥 Popular</li>
 			<li  	
 			:class="{'t-white bg-black': route.params.category === 'new'}" 					
 			@click="router.push({name: 'Blog', params: { category: 'new' } })" 
-			class="mn-r-small t-medium  pd-small radius-small">🆕 New</li>
+			class="mn-r-small t-medium  pd-thin radius-small">🆕 New</li>
 			<li 	
 			v-if="auth.state.user._id"
 			:class="{'t-white bg-black': route.params.category === 'following'}" 		
 			@click="router.push({name: 'Blog', params: { category: 'following' } })" 
-			class="t-medium pd-small radius-small">👥 Following</li>
+			class="t-medium pd-thin radius-small">👥 Following</li>
 		</ul>
 
 	<section class="">

package/src/modules/events/components/blocks/CardEvent.vue

@@ -116,8 +116,9 @@
 			<!-- <CardFooter
 				v-if="type !== 'short'"  
 				class="" 
-				:entity="event" 
-				:owner="owner"
+				:entity="event"
+				:entityType="'event'" 
+				:user="user"
 			/> -->
 
     </section>

package/src/modules/events/components/pages/EditEvent.vue

@@ -33,7 +33,7 @@
       />
     </section>
 
-    <section v-if="event" class="pd-thin pos-fixed pos-l-0 pos-b-0 w-100 ">
+    <section v-if="event" class="pd-thin pos-sticky pos-l-0 pos-b-0 w-100 ">
       <div class="pd-thin radius-big  bg-main w-100 flex-nowrap flex">
         <a v-if="route.params.url" @click="onDelete()" class="mn-r-auto bg-red t-white t-black button">Delete</a>
         <a @click="onDrafts()" class="mn-l-auto bg-white t-black button">To Drafts</a>

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

@@ -1,4 +1,5 @@
 import layoutEvents from '../components/layouts/layoutEvents.vue'
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
 const eventsRoutes = [
   {

package/src/modules/legal/components/pages/Legal.vue

@@ -2,35 +2,51 @@
 	<div 
 		class="for-transition w-100 pd-medium"
 	>
-	<Menu class="bg-grey">
-		<MenuItem @click="router.push({name: 'Terms of Use'})" class="cursor-pointer">
-			<span>Terms of Use</span>
-		</MenuItem> 
-		<MenuItem @click="router.push({name: 'Privacy Policy'})" class="cursor-pointer">
-			<span>Privacy Policy</span>
-		</MenuItem>
-		<MenuItem @click="router.push({name: 'Cookie Policy'})" class="cursor-pointer">
-			<span>Cookie Policy</span>
-		</MenuItem> 
-	</Menu>
-</div>
+		<div class="bg-grey radius-medium pd-medium mn-small">
+			<h2 class="mn-small">About No More Snow CO., LTD.</h2>
+			<p class="mn-small">
+				Welcome to NO MORE SNOW CO., LTD.! We are dedicated to providing top-notch services and creating a trustworthy environment for our users. Your trust and safety are our priority, and we are committed to being transparent about our policies and practices.
+			</p>
+			<p class="mn-small">
+				If you have any questions, concerns, or feedback, please do not hesitate to contact us through the following details. Our team is always here to assist you!
+			</p>
+			<p class="mn-small">
+				Address: 10/3 Laemsai Rd, Karon, Mueang Phuket District, Phuket 83100<br>
+				Telephone: +660803202142<br>
+				Email: <a href="mailto:hello@thecommunephuket.com">hello@thecommunephuket.com</a><br>
+				Website: <a href="https://thecommunephuket.com" target="_blank">https://thecommunephuket.com</a>
+			</p>
+		</div>
+
+		<Menu class="bg-grey">
+			<MenuItem @click="router.push({name: 'Terms of Use'})" class="cursor-pointer">
+				<span>Terms of Use</span>
+			</MenuItem> 
+			<MenuItem @click="router.push({name: 'Privacy Policy'})" class="cursor-pointer">
+				<span>Privacy Policy</span>
+			</MenuItem>
+			<MenuItem @click="router.push({name: 'Cookie Policy'})" class="cursor-pointer">
+				<span>Cookie Policy</span>
+			</MenuItem> 
+		</Menu>
+	</div>
 </template>
 
 <script setup>
-// Import components
+	// Import components
 	import Field         from '@pf/src/components/Field/Field.vue'
 	import Button        from '@pf/src/components/Button/Button.vue'
-// Mobile Module
+	// 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 libs
+	// Import libs
 	import { computed, watch, onMounted, ref, onBeforeMount } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'
 	import * as auth from '@pf/src/modules/auth/store/auth'	
-// Accessing router
+	// Accessing router
 	const route = useRoute()
 	const router = useRouter()
-// Get organization _id from cookie
+	// Get organization _id from cookie
 	const show = ref(false)
 
 

package/src/modules/legal/router/legal.js

@@ -1,22 +1,52 @@
-const legal = [{
-  path: 'legal',
-  name: 'Legal',
-  component: () => import(/* webpackChunkName: 'Legal' */ '../components/pages/Legal.vue'),
-},
-{
-  path: 'legal/privacy-policy',
-  name: 'Privacy Policy',
-  component: () => import(/* webpackChunkName: 'Legal' */ '../components/pages/legal/Privacy.vue'),
-},
-{
-  path: 'legal/terms-of-use',
-  name: 'Terms of Use',
-  component: () => import(/* webpackChunkName: 'Legal' */ '../components/pages/legal/Terms.vue'),
-},
-{
-  path: 'legal/cookies-policy',
-  name: 'Cookie Policy',
-  component: () => import(/* webpackChunkName: 'Legal' */ '../components/pages/legal/Cookies.vue'),
-}];
+const legal = [
+  {
+    path: 'legal',
+    name: 'Legal',
+    meta: {
+      title: {
+        en: 'Legal',
+        ru: 'Юридическая информация'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'Legal' */ '../components/pages/Legal.vue'),
+  },
+  {
+    path: 'legal/privacy-policy',
+    name: 'Privacy Policy',
+    meta: {
+      title: {
+        en: 'Privacy Policy',
+        ru: 'Политика конфиденциальности'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'Privacy' */ '../components/pages/legal/Privacy.vue'),
+  },
+  {
+    path: 'legal/terms-of-use',
+    name: 'Terms of Use',
+    meta: {
+      title: {
+        en: 'Terms of Use',
+        ru: 'Условия использования'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'Terms' */ '../components/pages/legal/Terms.vue'),
+  },
+  {
+    path: 'legal/cookies-policy',
+    name: 'Cookie Policy',
+    meta: {
+      title: {
+        en: 'Cookie Policy',
+        ru: 'Политика Сookies'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'Cookies' */ '../components/pages/legal/Cookies.vue'),
+  }
+];
 
-export default legal;
+export default legal;

package/src/modules/organizations/router/organizations.js

@@ -1,4 +1,5 @@
 import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue'
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
 const organizations = [{
   path: 'organizations',
@@ -26,6 +27,9 @@ const organizations = [{
       en: 'Create Organization',
       ru: 'Создать Организацию'
     },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
     component: () => import(/* webpackChunkName: "organization" */ '@pf/src/modules/organizations/components/pages/OrganizationEdit.vue')
   }, {
     path: ':_id/edit',
@@ -36,6 +40,9 @@ const organizations = [{
         ru: 'Редактировать Организацию'
       }
     },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
     component: () => import(/* webpackChunkName: "organization" */ '@pf/src/modules/organizations/components/pages/OrganizationEdit.vue'),
   }, {
     path: ':_id/departments/create',
@@ -43,6 +50,9 @@ const organizations = [{
     meta: {
       title: 'Создание отдела',
     },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
     component: () => import(/* webpackChunkName: "department" */ '@pf/src/modules/organizations/components/pages/DepartmentEdit.vue'),
   }, {
     path: ':_id/departments/:deparment',
@@ -50,6 +60,9 @@ const organizations = [{
     meta: {
       title: 'Отдел',
     },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
     component: () => import(/* webpackChunkName: "department" */ '@pf/src/modules/organizations/components/pages/Department.vue'),
   }, {
     path: ':_id/departments/:department/edit',
@@ -57,6 +70,9 @@ const organizations = [{
     meta: {
       title: 'Редактирование отдела',
     },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
     component: () => import(/* webpackChunkName: "department" */ '@pf/src/modules/organizations/components/pages/DepartmentEdit.vue'),
   },{
     path: ':_id/products/:product',
@@ -71,6 +87,9 @@ const organizations = [{
   },{
     path: ':_id/products/:product/edit',
     name: 'ProductEdit',
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
     component: () => import(/* webpackChunkName: 'ProductPageEdit' */ '@pf/src/modules/products/components/pages/ProductEdit.vue')
   },{
     path: ':_id/products/add',

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

@@ -1,4 +1,4 @@
-<template>
+x<template>
 	<div 
 		class="for-transition w-100"
 	>
@@ -110,7 +110,7 @@
 			</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'))"
+				v-if="(auth.state.access.roles && 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 

package/src/modules/users/router/users.js

@@ -11,29 +11,12 @@ const users = [{
       }
     },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/Profile.vue'),
-},{
-  path: 'profile/:_id/blogposts',
-  name: 'User Blogposts',
-  meta: {
-    title: {
-      en: 'Posts',
-      ru: 'Посты'
-    }
-  },
-  component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileBlogposts.vue'),
-},{
-  path: 'profile/:_id/comments',
-  name: 'User Comments',
-   meta: {
-      title: {
-        en: 'Comments',
-        ru: 'Комментарии'
-      }
-    },
-  component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileComments.vue'),
 },{
   path: 'profile/:_id/edit',
   name: 'User Edit Profile',
+  beforeEnter: [
+    validationAuth.requiresAuth,
+  ],
   meta: {
     title: {
       en: 'Edit Profile',
@@ -41,6 +24,16 @@ const users = [{
     }
   },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEdit.vue'),
+},{
+  path: 'profile/:_id/blogposts',
+  name: 'User Blogposts',
+  meta: {
+    title: {
+      en: 'Posts',
+      ru: 'Посты'
+    }
+  },
+  component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileBlogposts.vue'),
 },{
   path: 'profile/:_id/events',
   name: 'User Events',
@@ -51,16 +44,6 @@ const users = [{
     }
   },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEvents.vue'),
-},{
-  path: 'profile/:_id/likes',
-  name: 'User Likes',
-   meta: {
-      title: {
-        en: 'Likes',
-        ru: 'Лайки'
-      }
-    },
-  component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileLikes.vue'),
 },{
   path: 'profile/:_id/organizations',
   name: 'User Organizations',
@@ -71,6 +54,28 @@ const users = [{
       }
     },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileOrganizations.vue'),
-}];
+}
+// ,{
+//   path: 'profile/:_id/likes',
+//   name: 'User Likes',
+//    meta: {
+//       title: {
+//         en: 'Likes',
+//         ru: 'Лайки'
+//       }
+//     },
+//   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileLikes.vue'),
+// },{
+//   path: 'profile/:_id/comments',
+//   name: 'User Comments',
+//    meta: {
+//       title: {
+//         en: 'Comments',
+//         ru: 'Комментарии'
+//       }
+//     },
+//   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileComments.vue'),
+// },
+];
 
 export default users;