@ozdao/prometheus-framework 0.0.87 → 0.0.89

package/dist/users.server.js

@@ -165,12 +165,12 @@ var user_model = (mongoose) => {
         type: Date
       }
     },
-    social: {
+    socials: {
       telegram: {
         type: String,
         default: ""
       },
-      line: {
+      twitter: {
         type: String,
         default: ""
       },

package/dist/users.server.mjs

@@ -164,12 +164,12 @@ var user_model = (mongoose) => {
         type: Date
       }
     },
-    social: {
+    socials: {
       telegram: {
         type: String,
         default: ""
       },
-      line: {
+      twitter: {
         type: String,
         default: ""
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "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/Field/Field.vue

@@ -45,7 +45,8 @@ const props = defineProps({
   type: 'text',
   placeholder: 'Enter something here',
   field: null,
-  validation: false
+  validation: false,
+  disabled: false
 });
 
 const text = ref(props.field);

package/src/modules/community/components/pages/CreateBlogPost.vue

@@ -131,7 +131,8 @@ onMounted(async () =>{
 
   const dataPublics = await organizations.actions.read({
     user: auth.state.user._id,
-    postable: auth.state.user._id
+    postable: auth.state.user._id,
+    limit: 100
   })
 
   console.log(dataPublics)

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

@@ -99,7 +99,7 @@
       <slot></slot>
       
       <Chips 
-      	v-if="type !== 'short'" 
+      	v-if="type !== 'short' && event.tags.length > 0" 
       	:chips="event.tags"
       />
 			<!-- <CardFooter

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

@@ -22,6 +22,7 @@
     />
 
 		<h3 class="mn-small">Date</h3>
+    {{event.date.start}}
     <Field 
       v-model:field="event.date.start" 
       label="Start"
@@ -39,7 +40,7 @@
     />
 
     <h3 class="mn-small">Description</h3>
-		<section v-if="event" class="w-100 bg-grey pd-big radius-big">
+		<section v-if="event" class="pd-b-extra w-100 bg-grey pd-big radius-big">
       <Constructor 
         :content="event.content"
         @update="update => event.content = update"
@@ -127,6 +128,10 @@ onMounted(async () =>{
   if (route.params.url) {
     const data = await events.read({ user: auth.state.user._id, url: route.params.url });
     event.value = data.pop();
+
+    event.value.date.start = event.value.date.start.slice(0, 16);
+    event.value.date.end = event.value.date.end.slice(0, 16);
+
   } else {
     events.clean();
     event.value = events.state.current;
@@ -151,7 +156,8 @@ onMounted(async () =>{
 
   const dataPublics = await organizations.actions.read({
     user: auth.state.user._id,
-    postable: auth.state.user._id
+    postable: auth.state.user._id,
+    limit: 100
   })
 
   publics.value = dataPublics.map(publicItem => ({
@@ -231,7 +237,7 @@ function onSubmit() {
   } else {
     events.create(event.value)
       .then(response => {
-        router.push({ name: 'Blogevent', params: { url: response.url } });
+        router.push({ name: 'Event', params: { url: response.url } });
       })
       .catch(error => {
         console.log(error);

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

@@ -27,10 +27,7 @@
 	        :owner="event.owner" 
 	        :user="auth.state.user._id"
 	        :type="'normal'"
-	        class="mn-medium"
-	        :class="{
-	          'br-b br-solid br-black-transp-10': index !== event.length - 1
-	        }"
+	        class="mn-medium bg-grey radius-big"
 	      >
           <ButtonJoin 
             v-if="auth.state.user._id"
@@ -41,6 +38,23 @@
             class="mn-small w-100 pd-medium mn-auto"
             @updateTicket="handleTicketUpdate"
           />
+
+          <section>
+            <component
+              v-if="event && event.content"
+              v-for="(block, index) in event.content"
+              :is="ComponentMap[block.type]"
+              :key="index"
+              :index="index"
+              :component="block"
+              :prop="block"
+              :class="block.class"
+              content="content"
+              v-bind="getBlockProps(block)"
+              class="mn-regular"
+            />
+          </section>
+
       </CardEvent>
 
 	  
@@ -68,6 +82,8 @@
   import ButtonJoin from '@pf/src/modules/events/components/elements/ButtonJoin.vue';
   import Comments from '@pf/src/modules/community/components/sections/Comments.vue';
 
+  import Image  from '@pf/src/modules/constructor/components/elements/Image.vue';
+
   import * as events from '@pf/src/modules/events/store/events.js';
   import * as tickets from '@pf/src/modules/events/store/tickets.js';
   import * as auth from '@pf/src/modules/auth/store/auth';
@@ -80,6 +96,29 @@
     tickets.mutations.handleTicketUpdate(event.value, ticket, hasTicket, targetId);
   };
 
+
+  const ComponentMap = {
+    'Textarea': 'p',
+    'H2': 'h2',
+    'Bullets': 'p',
+    'Caption': 'p',
+    'ImageUpload': Image
+  };
+
+  function getBlockProps(block) {
+    if (block.type === 'Textarea') {
+      return { innerHTML: block.content, class: "p-medium"  };
+    } else if (block.type === 'H2') {
+      return { innerHTML: block.content, class: "h3" };
+    } else if (block.type === 'Caption') {
+      return { innerHTML: block.content };
+    } else if (block.type === 'ImageUpload') {
+      return { src: block.content };
+    }
+    return {};
+  }
+
+
   const event = ref(null);
   const isLoading = ref(true);
 

package/src/modules/events/middlewares/server/index.js

@@ -0,0 +1,10 @@
+// middlewareIndexFactory.js
+const middlewareIndexFactory = (db) => {
+  const verifyEvent = require("./verifyEvent")(db);
+
+  return {
+    verifyEvent
+  };
+};
+
+module.exports = middlewareIndexFactory;

package/src/modules/events/middlewares/server/verifyEvent.js

@@ -0,0 +1,60 @@
+// middlewareFactory.js
+const middlewareFactory = (db) => {
+  const Event = db.event;  // Изменено с Blogpost на Event
+
+  const checkEventExistOrNot = async (req, res, next) => {  // Изменено с checkBlogpostExistOrNot на checkEventExistOrNot
+    try {
+      // Обработка URL
+      const url = req.body.url
+        ? req.body.url
+        : req.body.name.toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g, '');
+
+      // Создание события
+      if (!req.body._id) {  // Логика создания события может отличаться от логики создания блога
+        const event = await Event.findOne({ url });  // Изменено с Blogpost на Event
+        if (event) {  // Изменено с blogpost на event
+          res.status(400).send({ errorCode: 'EVENT_URL_ALREADY_IN_USE', accessToken: null });  // Изменено с POST_URL_ALREADY_IN_USE на EVENT_URL_ALREADY_IN_USE
+          return;
+        }
+        next();
+        return;
+      }
+
+      // Обновление события
+      const updatingEventId = req.body._id;  // Изменено с updatingBlogpostId на updatingEventId
+      const existingEvent = await Event.findById(updatingEventId);  // Изменено с Blogpost на Event и с existingBlogpost на existingEvent
+      if (!existingEvent) {  // Изменено с existingBlogpost на existingEvent
+        res.status(404).send({ errorCode: 'EVENT_NOT_FOUND', accessToken: null });  // Изменено с BLOGPOST_NOT_FOUND на EVENT_NOT_FOUND
+        return;
+      }
+      if (existingEvent.url !== url) {  // Изменено с existingBlogpost на existingEvent
+        const event = await Event.findOne({ url });  // Изменено с Blogpost на Event и с blogpost на event
+        if (event) {  // Изменено с blogpost на event
+          res.status(400).send({ errorCode: 'EVENT_URL_ALREADY_IN_USE', accessToken: null });  // Изменено с POST_URL_ALREADY_IN_USE на EVENT_URL_ALREADY_IN_USE
+          return;
+        }
+      }
+      
+      next();
+    } catch (err) {
+      console.log(err);
+      res.status(500).send({ message: err });
+    }
+  }
+  
+  const checkNameNotEmpty = (req, res, next) => {
+    if (!req.body.name || req.body.name.trim() === '') {
+      res.status(400).send({ errorCode: "NAME_CANNOT_BE_EMPTY", accessToken: null });
+      return;
+    }
+
+    next();
+  };
+
+  return {
+    checkEventExistOrNot,  // Изменено с checkBlogpostExistOrNot на checkEventExistOrNot
+    checkNameNotEmpty
+  };
+};
+
+module.exports = middlewareFactory;

package/src/modules/events/routes/events.routes.js

@@ -1,9 +1,15 @@
 // Factories
 const controllerFactory = require("../controllers/events.controller");
+// Middlewares
+const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryEvents = require('../middlewares/server');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
 
+  const { authJwt } = middlewareFactoryGlobal(db);
+  const { verifyEvent } = middlewareFactoryEvents(db);
+
   app.use(function(req, res, next) {
     
     res.header(
@@ -21,11 +27,19 @@ module.exports = function(app, db) {
   
   app.post(
     "/api/events/create",
+    [
+      verifyEvent.checkNameNotEmpty,
+      verifyEvent.checkEventExistOrNot,
+    ],
     controller.create
   );
 
   app.post(
     "/api/events/update",
+    [
+      verifyEvent.checkNameNotEmpty,
+      verifyEvent.checkEventExistOrNot,
+    ],
     controller.update
   );
 
@@ -34,4 +48,3 @@ module.exports = function(app, db) {
     controller.delete
   );
 };
-

package/src/modules/organizations/components/blocks/Socials.vue

@@ -55,12 +55,25 @@ const props = defineProps({
 });
 
 const socialLinks = computed(() => {
-    const networks = ['telegram', 'facebook', 'instagram', 'twitter', 'reddit', 'line', 'dribbble'];
+    const networks = [
+        {name: 'telegram', base: 'https://t.me/'},
+        {name: 'facebook', base: 'https://www.facebook.com/'},
+        {name: 'instagram', base: 'https://www.instagram.com/'},
+        {name: 'twitter', base: 'https://twitter.com/'},
+        {name: 'reddit', base: 'https://www.reddit.com/user/'},
+        {name: 'line', base: ''}, // не уверен в базовом URL для Line, добавьте его, если необходимо
+        {name: 'dribbble', base: 'https://dribbble.com/'}
+    ];
+
     return networks
-        .filter(name => props[name])
-        .map(name => ({ name, href: props[name] }));
+        .filter(network => props[network.name])
+        .map(network => ({ 
+            name: network.name, 
+            href: network.base + props[network.name] 
+        }));
 });
 
+
 function resolveSocialIcon(name) {
     const icons = {
         telegram: IconTelegram,

package/src/modules/organizations/components/pages/OrganizationEdit.vue

@@ -1,9 +1,17 @@
 <template>
 <div class="for-transition pd-thin">
-
-
   
-
+  <h3 class="mn-small">Type of group</h3>
+  <p class="mn-thin">Public groups are open to everyone, whereas in exclusive groups only members can post. If you wish to make a group private, select 'hidden'.</p>
+  
+  <SelectMulti
+    v-model="organization.state.current.types"
+    :options="['public','exclusive','hidden']"
+    :multiple="false"
+    :taggable="false"
+    placeholder="Type to search or add type of organization"
+    class="mn-semi bg-grey pd-medium radius-small" 
+  />
 
 
   <h3 class="mn-small">Profile</h3>
@@ -17,7 +25,7 @@
     <h4>Upload photo</h4>
   </div>
 
-   <Field 
+    <Field 
       v-model:field="organization.state.current.profile.name"   
       placeholder="Name of organization" 
       class="mn-thin bg-grey pd-medium radius-small" 
@@ -25,7 +33,7 @@
 
     <Field 
       v-model:field="organization.state.current.profile.description"    
-      placeholder="Bio" 
+      placeholder="Brief description of your group" 
       class="mn-thin bg-grey pd-medium radius-small" 
     />
     <BlockTags
@@ -33,17 +41,33 @@
       :tags="organization.state.current.profile.tags"
     />
 
-     <h3 class="mn-small">Settings</h3>
-    <p class="mn-thin">Public groups are open to everyone, whereas in exclusive groups only members can post. If you wish to make a group private, select 'hidden'.</p>
-     <SelectMulti
-      v-model="organization.state.current.types"
-      :options="['public','exclusive','hidden']"
-      :multiple="false"
-      :taggable="false"
-      placeholder="Type to search or add type of organization"
-      class="mn-semi bg-grey pd-medium radius-small" 
-    />
+    <h3 class="mn-small">Socials</h3>
+    <p class="mn-thin">Please provide only the username for social media profiles, without full links.</p>
 
+    <Field 
+      v-model:field="organization.state.current.socials.instagram"
+      label="Instagram"   
+      placeholder="" 
+      class="mn-thin bg-grey pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.socials.twitter"
+      label="Twitter"   
+      placeholder="" 
+      class="mn-thin bg-grey pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.socials.facebook"
+      label="Facebook"   
+      placeholder="" 
+      class="mn-thin bg-grey pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.socials.telegram"
+      label="Telegram"   
+      placeholder="" 
+      class="mn-thin bg-grey pd-medium radius-small" 
+    />
    
     <Button :submit="onSubmit" :callback="redirectTo" class="mn-thin">Save</Button>
     <!-- <Button :submit="onDelete" :callback="redirectDash" class="mn-thin bg-fourth">Delete</Button> -->

package/src/modules/organizations/components/sections/DetailsTab.vue

@@ -44,15 +44,19 @@
 
 		 	<slot></slot>
 
-
-	        <h4 v-if="organization.social.telegram" class="mn-t-small mn-thin">Find us in socials</h4>
-
-	       	<Socials 
-	       		:telegram="organization.social.telegram"
-	       		:facebook="organization.social.facebook"
-	       		:instagram="organization.social.instagram"
-	       		:line="organization.social.line"
-	       	/>
+      <h4 
+      	v-if="Object.values(organization.socials).some(value => value)" 
+      	class="mn-t-small mn-thin"
+      >
+    		Find us in socials
+    	</h4>
+    	
+     	<Socials 
+     		:telegram="organization.socials.telegram"
+     		:facebook="organization.socials.facebook"
+     		:instagram="organization.socials.instagram"
+     		:twitter="organization.socials.twitter"
+     	/>
 		</section>
 
 	<!-- <h3 class="mn-small">Rating</h3>

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

@@ -191,7 +191,7 @@ const controllerFactory = (db) => {
       owner: 1,
       contacts: 1,
       rating: 1,
-      social: 1,
+      socials: 1,
       numberOfProducts: 1, 
       numberOfMemberships: 1,
       memberships: 1,

package/src/modules/organizations/models/organization.model.js

@@ -6,6 +6,10 @@ module.exports = (mongoose) => {
       ref: 'User', 
       required: true,
     },
+    official: { 
+      type: Boolean, 
+      default: false,
+    },
     // Types of organizations
     types: {
         type: Array,
@@ -31,9 +35,9 @@ module.exports = (mongoose) => {
       },
       address: String,
     },
-    social: {
+    socials: {
       telegram: String,
-      line: String,
+      twitter: String,
       facebook: String,
       instagram: String
     },

package/src/modules/organizations/store/organizations.js

@@ -27,7 +27,7 @@ const state = reactive({
       phone: '',
       address: '',
     },
-    social: {
+    socials: {
       telegram: '',
       line: '',
       facebook: '',
@@ -218,7 +218,7 @@ const actions = {
         phone: '',
         address: '',
       },
-      social: {
+      socials: {
         telegram: '',
         line: '',
         facebook: '',

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

@@ -14,7 +14,7 @@
 			/>
 
 			<section 
-				class="t-center w-100 mn-semi radius-medium pd-medium bg-grey"
+				class="flex-center flex flex-column t-center w-100 mn-semi radius-medium pd-medium bg-grey"
 			>
 				<IconEdit
 					v-if="route.params._id === auth.state.user._id"
@@ -70,14 +70,28 @@
 				</p>
 				
 				<ButtonFollow 
-			      v-if="auth.state.user._id && route.params._id && route.params._id !== auth.state.user._id"
-			      :type="'user'" 
-			      :isMember="users.state.current.isMember" 
-			      :targetId="users.state.current._id" 
-			      :userId="auth.state.user._id"
-			      class="w-min mn-auto" 
-			      @updateMembership="handleMembershipUpdate"
-		    	/>
+		      v-if="auth.state.user._id && route.params._id && route.params._id !== auth.state.user._id"
+		      :type="'user'" 
+		      :isMember="users.state.current.isMember" 
+		      :targetId="users.state.current._id" 
+		      :userId="auth.state.user._id"
+		      class="w-min mn-auto" 
+		      @updateMembership="handleMembershipUpdate"
+	    	/>
+
+	    	<h4 
+	      	v-if="Object.values(users.state.current.socials).some(value => value)" 
+	      	class="mn-t-small mn-thin"
+	      >
+	    		Find Me in Socials
+	    	</h4>
+	     	<Socials 
+	     		:telegram="users.state.current.socials.telegram"
+	     		:facebook="users.state.current.socials.facebook"
+	     		:instagram="users.state.current.socials.instagram"
+	     		:twitter="users.state.current.socials.twitter"
+	     		class="mn-r-auto mn-l-auto"
+	     	/>
 
 			</section>
 
@@ -95,7 +109,7 @@
 			    <span>Posts</span>
 			  </MenuItem> 
 			</Menu>
-
+<!-- 
 			<Menu>
 			  <MenuItem @click="router.push({name: 'User Comments', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <span>Comments</span>
@@ -103,7 +117,7 @@
 			  <MenuItem @click="router.push({name: 'User Likes', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <span>Likes</span>
 			  </MenuItem>
-			</Menu>
+			</Menu> -->
 
 			<Menu 
 				v-if="auth.state.user._id === route.params._id"
@@ -148,6 +162,7 @@ import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
 import ButtonFollow from '@pf/src/modules/organizations/components/elements/ButtonFollow.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'
 // Users Module
 import ProfileCompletion from '@pf/src/modules/users/components/sections/ProfileCompletion.vue'
 // Icons Module

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

@@ -59,6 +59,33 @@
       class="mn-semi bg-grey pd-medium radius-small" 
       :validation="organizationName" 
     />
+    <h3 class="mn-small">Socials</h3>
+    <p class="mn-thin">Please provide only the username for social media profiles, without full links.</p>
+
+    <Field 
+      v-model:field="user.socials.instagram"
+      label="Instagram"   
+      placeholder="" 
+      class="mn-thin bg-grey pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="user.socials.twitter"
+      label="Twitter"   
+      placeholder="" 
+      class="mn-thin bg-grey pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="user.socials.facebook"
+      label="Facebook"   
+      placeholder="" 
+      class="mn-thin bg-grey pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="user.socials.telegram"
+      label="Telegram"   
+      placeholder="" 
+      class="mn-semi bg-grey pd-medium radius-small" 
+    />
     <!--  -->
     <h3 class="mn-small">Account</h3>
     
@@ -78,16 +105,7 @@
       label="Email"  
       placeholder="Not specified" 
       class="mn-thin  bg-grey pd-medium radius-small" 
-      disabled="true"
-      :validation="organizationName" 
-    />
-
-    <Field 
-      v-model:field="user.password"     
-      label="Password"  
-      placeholder="Not specified" 
-      class="mn-semi  bg-grey pd-medium radius-small" 
-      disabled="true"
+      :disabled="true"
       :validation="organizationName" 
     />
 

package/src/modules/users/models/user.model.js

@@ -25,12 +25,12 @@ module.exports = (mongoose) => {
       }
     },
 
-    social: {
+    socials: {
         telegram: {
             type: String,
             default: ''
         },
-        line: {
+        twitter: {
             type: String,
             default: ''
         },

package/src/modules/users/store/users.js

@@ -19,10 +19,9 @@ const state =  reactive({
       description: "",
       birthday: "",
     },
-
     socials: {
       facebook: "",
-      line: "",
+      twitter: "",
       instagram: "",
       telegram: ""
     },