@ozdao/prometheus-framework 0.1.29 → 0.1.31

package/src/modules/products/products.server.js

@@ -0,0 +1,5 @@
+import productRoutes from './routes/products.routes.js'
+
+export {
+	productRoutes
+}

package/src/modules/reports/components/pages/BackofficeReports.vue

@@ -0,0 +1,67 @@
+<template>
+  <div>
+    <div class="flex-v-center flex-nowrap flex mn-medium">
+      <h3 class="mn-r-medium">Reports</h3> <!-- Updated this line -->
+    </div>
+
+    <div class="cols-3 gap-thin">
+      <div 
+        v-for="report in state.all"
+        :key="report._id"
+        class="radius-medium pd-small bg-grey"
+      >
+        <!-- Here, you should update the properties of the report object to reflect the actual structure of a report -->
+        <!-- For example, I'm using 'user', 'type', and 'reason'. You should replace them with actual report properties -->
+
+        <p class="t-black p-small mn-small">
+          <span class="uppercase t-transp">User</span>
+          <br> 
+          <span class="pd-2px radius-big d-inline-block bg-grey t-semi">{{report.user}}</span> <!-- Updated this line -->
+        </p>
+
+        <p class="t-black p-small mn-small">
+          <span class="uppercase t-transp">Type</span>
+          <br> 
+          <span class="pd-2px radius-big d-inline-block bg-grey t-semi">{{report.type}}</span> <!-- Updated this line -->
+        </p>
+
+        <p class="t-black p-small mn-small">
+          <span class="uppercase t-transp">Reason</span>
+          <br> 
+          <span class="pd-2px radius-big d-inline-block bg-grey t-semi">{{report.reason}}</span> <!-- Updated this line -->
+        </p>
+
+        <div class="gap-thin flex-nowrap flex">
+          <!-- Update buttons and actions as needed -->
+          <button class="button-small w-100 bg-black t-white button">
+            Close Report
+          </button>
+          <button class="button-small w-100 bg-black t-white button">
+            Hide Content
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { actions as reportActions, state } from '../../store/reports'; // Update the import path
+
+// You might want to handle other lifecycle hooks or methods depending on your needs.
+// Here, I'll demonstrate using the 'deleteReport' method as an example.
+
+const deleteReport = async (id) => {
+  try {
+    await reportActions.remove({ _id: id });  // Updated method name and parameter
+    // Optionally, add a notification about successful deletion here
+  } catch (error) {
+    console.error(error);
+    // Optionally, add a notification about the error here
+  }
+};
+
+// Fetch all reports on component mount. This part depends on how your store is structured.
+reportActions.read();  // Updated method name
+</script>

package/src/modules/reports/components/sections/FormReport.vue

@@ -0,0 +1,114 @@
+<template>
+
+	<div 
+		@click.native="openReportPopup()"
+	>
+		<slot></slot>
+	</div>
+
+	<Popup 
+	  @close-popup="closeReportPopup" 
+	  :isPopupOpen="isReportPopup"
+	  class="w-m-33r t-left pd-big bg-white radius-big"
+	>
+	    <h3 
+	    	class="mn-small"
+	    >
+			Report 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:
+	    </p>
+	    <Select 
+			v-model:select="form.reason" 
+	        :options="[
+	        	'harassment',
+	        	'spam',
+	        	'inappropriate',
+	        	'misinformation',
+	        	'copyright',
+	        	'other'
+	        ]"
+	        :placeholder="'Select reason'"
+			class="mn-small bg-white br-solid br-black-transp br-1px uppercase pd-medium t-semi bg-white t-black radius-medium"
+	      />
+	    
+	    <p class="p-medium mn-small">Our moderators will review your report within 24 hours and take action if it violates our policies.</p>
+	    
+	    <Button 
+	    	:submit="onSubmit" 
+	    	:callback="closeReportPopup" 
+	    	class="w-100 bg-black t-white">
+	    	Report
+	    </Button>
+	</Popup>
+</template>
+
+<script setup="props">
+	// Dependencies
+	import { computed,ref,reactive } from 'vue'
+	// Elements Import
+	import Popup from '@pf/src/components/Popup/Popup.vue';
+	import Button from '@pf/src/components/Button/Button.vue';
+	import Select from '@pf/src/components/Select/Select.vue';
+	// Store Import
+	import * as reports from '@pf/src/modules/reports/store/reports'
+	// ///////////////////////////////////////
+ 	// Components Props
+ 	// ///////////////////////////////////////
+ 	const props = defineProps({
+ 		user: {
+	      type: String,
+	      required: false
+	    },
+	    type: {
+	      type: String,
+	      required: false
+	    },
+	    reason: {
+	      type: String,
+	      required: false
+	    },
+	    target: {
+	      type: String,
+	      required: true
+	    },
+	    text: {
+			type: String,
+			default: '!'
+		},
+	    status: {
+	      type: String,
+	      default: 'new'
+	    }
+ 	})
+ 	// ///////////////////////////////////////
+ 	// Form Logic
+ 	// ///////////////////////////////////////
+ 	const form = reactive({
+		user: props.user,
+		type: props.type,
+		reason: props.reason, 
+		target: props.target,
+		status: props.status,
+	})
+
+	function onSubmit () {
+	    
+	  	reports.actions.create(form)
+	}
+ 	// ///////////////////////////////////////
+	// Popup logic
+	// ///////////////////////////////////////
+	const isReportPopup = ref(false)
+
+	function openReportPopup() {
+	  isReportPopup.value = true;
+	}
+	function closeReportPopup() {
+	  isReportPopup.value = false;
+	}
+</script>

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

@@ -0,0 +1,67 @@
+const controllerFactory = (db) => {
+  const Report = db.report;
+
+  const read = async (req, res) => {
+    try {
+      const reports = await Report.find({}); 
+
+      if (reports.length === 0) {
+        return res.status(404).json({ errorCode: "REPORTS_NOT_FOUND" }); 
+      }
+      res.status(200).json(reports);
+    } catch (err) {
+      res.status(500).json({ errorCode: "INTERNAL_SERVER_ERROR", message: err.message });
+    }
+  };
+
+  const create = async (req, res) => {
+    const newReport = new Report(req.body);
+    
+    try {
+      const savedReport = await newReport.save();
+      res.status(201).json(savedReport);
+    } catch (err) {
+      console.log(err)
+      res.status(500).json({ errorCode: "INTERNAL_SERVER_ERROR", message: err.message });
+    }
+  };
+
+  const update = async (req, res) => {
+    const { _id } = req.body;
+    
+    try {
+      const updatedReport = await Report.findOneAndUpdate({ _id }, req.body, { new: true, runValidators: true });
+      
+      if (!updatedReport) {
+        return res.status(404).json({ errorCode: "REPORT_NOT_FOUND" });
+      }
+      res.status(200).json(updatedReport);
+    } catch (err) {
+      res.status(500).json({ errorCode: "INTERNAL_SERVER_ERROR", message: err.message });
+    }
+  };
+
+  const deleteReport = async (req, res) => {
+    const { _id } = req.body;
+    
+    try {
+      const report = await Report.findOneAndDelete({ _id });
+      
+      if (!report) {
+        return res.status(404).json({ errorCode: "REPORT_NOT_FOUND" });
+      }
+      res.status(200).json({ message: "Report deleted successfully." });
+    } catch (err) {
+      res.status(500).json({ errorCode: "INTERNAL_SERVER_ERROR", message: err.message });
+    }
+  };
+
+  return {
+    read,
+    create,
+    update,
+    delete: deleteReport, 
+  };
+};
+
+module.exports = controllerFactory;

package/src/modules/reports/models/report.model.js

@@ -0,0 +1,58 @@
+module.exports = (mongoose) => {
+  const ReportSchema = new mongoose.Schema({
+    status:   {
+      type: String,  
+      enum: [
+        'new',
+        'in progress',
+        'canceled',
+        'closed'
+      ], 
+      default: 'new'
+    },
+    user:   {
+      type: String,  
+      default: 'anonymous',
+      required: true
+    },
+    type: {
+      type: String,
+      enum: [
+        'user',
+        'organization',
+        'blogpost',
+        'event',
+        'comment'
+      ], 
+      default: 'spam',
+      required: true,
+    },
+    reason: {
+      type: String,
+      enum: [
+        'spam',
+        'harassment',
+        'inappropriate',
+        'misinformation',
+        'copyright',
+        'other'
+      ], 
+      default: 'spam',
+      required: true,
+    },
+    target: {  // заменяем 'organization' на 'target', так как это может быть или User, или Organization
+      type: mongoose.Schema.Types.ObjectId,
+      ref: function (value) {
+        if (this.type === 'user') return 'User';
+        if (this.type === 'organization') return 'Organization';
+      },
+      required: true,
+    }
+  }, {
+    timestamps: { currentTime: () => Date.now() }
+  });
+ 
+  const Report = mongoose.model("Report", ReportSchema);
+
+    return Report;
+};

package/src/modules/reports/reports.client.js

@@ -0,0 +1,17 @@
+// Importing Vue components from the components directory
+// import Profile from './components/pages/Profile.vue';
+// import ProfileEdit from './components/pages/ProfileEdit.vue';
+
+// Importing Vuex store modules from the store directory
+import * as reportsStore from './store/reports.js';
+
+// Importing Vue Router routes from the router directory
+// import usersRoutes from './router/reports.js';
+
+// Exporting components, store modules, and routes
+export {
+  // Profile,
+  // ProfileEdit,
+  reportsStore,
+  // usersRoutes
+};

package/src/modules/reports/reports.server.js

@@ -0,0 +1,13 @@
+// Importing controllers from the controllers directory
+const reportsController = require('./controllers/reports.controller.js');
+// Importing routes from the routes directory
+const reportsRoutes = require('./routes/reports.routes.js');
+// Models
+const ReportModel = require('./models/report.model.js');
+
+// Exporting controllers, routes, and models
+module.exports = {
+  reportsController,
+  reportsRoutes,
+  ReportModel
+};

package/src/modules/reports/routes/reports.routes.js

@@ -0,0 +1,43 @@
+const controllerFactory = require("../controllers/reports.controller");
+// Middlewares
+const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+
+module.exports = function(app, db, origins) {
+  const controller = controllerFactory(db);
+
+  const { authJwt } = middlewareFactoryGlobal(db);
+
+  app.use(function(req, res, next) {
+    
+    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();
+  });
+
+  app.get(
+    "/reports",
+    controller.read
+  );
+
+  app.post(
+    "/reports",
+    controller.create
+  );
+
+  app.post(
+    "/reports",
+    controller.update
+  );
+  
+  app.post(
+    "/reports",
+    controller.delete
+  );
+};
+

package/src/modules/reports/store/reports.js

@@ -0,0 +1,118 @@
+import { reactive, computed, watch } from "vue";
+import { setError } from '@pf/src/modules/globals/store/globals'
+import axios from 'axios';
+
+const $axios = axios.create({baseURL: process.env.API_URL}) 
+
+const state = reactive({
+  all: [],
+  current: {
+    _id: '',
+    status: '',
+    user: '',
+    type: '',
+    reason: '',
+    target: ''
+  },
+  form: {
+    isOpen: false,
+    status: '',
+    user: '',
+    type: '',
+    reason: '',
+    target: ''
+  }
+});
+
+// Действия, относящиеся к асинхронным операциям
+const actions = {
+  async read() {
+    try {
+      const response = await $axios.get(`/reports`);
+      mutations.setAll(response.data);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+  async create(report) {
+    try {
+      console.log(report)
+      const response = await $axios.post('/reports', report);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+
+  async update(report) {
+    try {
+      const response = await $axios.put('/reports/' + report._id, report);
+      mutations.updateReportInAll(response.data);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+
+  async remove(report) {
+    try {
+      const response = await $axios.delete('/reports/' + report._id);
+      mutations.removeReportFromAll(report._id);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  }
+};
+
+const mutations = {
+  setAll(reports) {
+    state.all = reports;
+  },
+
+  setCurrent(report) {
+    state.current = report;
+  },
+
+  updateReportInAll(updatedReport) {
+    const index = state.all.findIndex(r => r._id === updatedReport._id);
+    if (index !== -1) {
+      state.all[index] = updatedReport;
+    }
+  },
+
+  removeReportFromAll(reportId) {
+    const index = state.all.findIndex(r => r._id === reportId);
+    if (index !== -1) {
+      state.all.splice(index, 1);
+    }
+  },
+
+  toggleForm() {
+    state.form.isOpen = !state.form.isOpen;
+    state.form = {
+      status: '',
+      user: '',
+      type: '',
+      reason: '',
+      target: ''
+    }
+  }
+};
+
+const history = [];
+
+history.push(state);
+
+watch(state, (newState, oldState) => { history.push(newState); });
+
+export {
+  state,
+  actions,
+  mutations
+};

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

@@ -1,5 +1,6 @@
-x<template>
+<template>
 	<div 
+		v-if="show"
 		class="for-transition w-100"
 	>
 		<div 
@@ -22,8 +23,48 @@ x<template>
 			/>
 
 			<section 
+
 				class="flex-center flex flex-column t-center w-100 mn-semi radius-medium pd-medium bg-grey"
 			>
+
+				<Dropdown 
+					v-if="route.params._id && route.params._id !== auth.state.user._id"
+					:label="'...'" 
+					:align="'right'"
+					class="cursor-pointer pos-absolute pos-r-0 pos-t-0 pd-thin radius-extra "
+				>
+					<section 
+						class="bg-black pd-thin radius-small"
+					>
+						<FormReport 
+							:user="auth.state.user._id"
+							:type="'user'" 
+							:target="users.state.current._id" 
+							:text="'Report'" 
+							class="w-100"
+						>
+							<button 
+								class="w-100 bg-black br-solid br-1px br-white-transp-20 t-white button-small button"
+							>
+								Report
+							</button>
+						</FormReport>
+
+						<ButtonToggleMembership
+							v-if="auth.state.user._id"
+				      :user="auth.state.user._id"
+				      :type="'user'" 
+			      	:role="'blocked'" 
+				      :target="users.state.current._id" 
+				      :status="users.state.current.isBlocked" 
+				      :text="{create: 'Block', remove: 'Unblock'}"
+				      @updateMembership="event => handleMembershipUpdate(event, 'isBlocked')"
+				      class="t-white mn-t-thin bg-red" 
+			    	/>
+					</section>
+	      </Dropdown>	
+
+
 				<IconEdit
 					v-if="route.params._id === auth.state.user._id"
 					@click="$router.push({
@@ -80,17 +121,19 @@ x<template>
 				>
 					<!-- 👍 3 212 likes ·  -->
 					<!-- 💬 342 comments ·  -->
-					👨‍👨‍👧‍👧 {{users.state.current.numberOfMemberships}} followers
+					👨‍👨‍👧‍👧 {{users.state.current.numberOfSubscribers}} followers
 				</p>
 				
-				<ButtonFollow 
-		      v-if="auth.state.user._id && route.params._id && route.params._id !== auth.state.user._id"
+	    	<ButtonToggleMembership
+	    		v-if="auth.state.user._id && route.params._id && route.params._id !== auth.state.user._id"
+		      :user="auth.state.user._id"
 		      :type="'user'" 
-		      :isMember="users.state.current.isMember" 
-		      :targetId="users.state.current._id" 
-		      :userId="auth.state.user._id"
+	      	:role="'subscriber'" 
+		      :target="users.state.current._id" 
+		      :status="users.state.current.isSubscriber" 
+					:text="{create: 'Follow', remove: 'Unfollow'}"
+		      @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
 		      class="w-min mn-medium	mn-r-auto mn-l-auto" 
-		      @updateMembership="handleMembershipUpdate"
 	    	/>
 
 	    	<h4 
@@ -203,11 +246,15 @@ x<template>
 // Import components
 import Field         from '@pf/src/components/Field/Field.vue'
 import Button        from '@pf/src/components/Button/Button.vue'
+import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 // Mobile Module
 import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
 import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
 // Org Module
 import ButtonFollow from '@pf/src/modules/organizations/components/elements/ButtonFollow.vue'
+import ButtonToggleMembership from '@pf/src/modules/organizations/components/elements/ButtonToggleMembership.vue'
+// Report Module
+import FormReport from '@pf/src/modules/reports/components/sections/FormReport.vue'   
 // Community Module 
 import Activity from '@pf/src/modules/community/components/blocks/Activity.vue'; 
 import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
@@ -239,8 +286,8 @@ onMounted(async () => {
  	show.value = true
 })
 
-const handleMembershipUpdate = ({ membership, isMember, targetId }) => {
-  memberships.mutations.handleMembershipUpdate(users.state.current, membership, isMember, targetId)
+const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
+  memberships.mutations.handleMembershipUpdate(users.state.current, membership, status, target, statusName, statusNumber)
 };
 
 function logout () {

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

@@ -1,6 +1,9 @@
 const { v4: uuidv4 } = require('uuid');
 const ObjectId = require('mongoose').Types.ObjectId;
 
+const addUserStatusFields = require('@pf/src/modules/organizations/controllers/utils/addUserStatusFields');
+const addMembersQuantity = require('@pf/src/modules/organizations/controllers/utils/addMembersQuantity');
+
 const controllerFactory = (db) => {
   const User = db.user;
 
@@ -48,25 +51,9 @@ const controllerFactory = (db) => {
       }
     });
 
-    query.push({
-      $addFields: {
-        numberOfMemberships: { $size: '$memberships' }
-      }
-    });
-
-    query.push({
-      $addFields: {
-        isMember: {
-          $cond: {
-            if: req.query.user,
-            then: {
-              $in: [ new ObjectId(req.query.user), "$memberships.user" ]
-            },
-            else: "$$REMOVE"
-          }
-        }
-      }
-    });
+ 
+    query.push(addMembersQuantity());
+    query.push(addUserStatusFields(req.query.user));
 
     query.push({
       $skip: skip

package/src/styles/base/all.scss

@@ -421,6 +421,8 @@ body {
 	.gap-micro 	{ gap: var(--micro); }
 	.gap-zero 			{ gap: 0; }
 	// Z-INDEX
+	.z-index-0-negative { z-index: -10;  }
+	.z-index-0 	{z-index: 0;  }
 	.z-index-1 	{z-index: 10; }
 	.z-index-2 	{z-index: 20; }
 	.z-index-3 	{z-index: 30; }