@ozdao/prometheus-framework 0.2.30 → 0.2.32

package/src/modules/chats/components/sections/ChatWindow.vue

@@ -0,0 +1,38 @@
+<template>
+  <div class="chat-window">
+    <div class="h-max-20r o-scroll flex-nowrap flex-column flex gap-thin ">
+      <ChatMessage
+        v-for="message in messages"
+        :key="message._id"
+        :message="message"
+      />
+    </div>
+    <input class="bg-main w-100 radius-big pd-small" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import ChatMessage from '../blocks/ChatMessage.vue';
+import chatStore from '../../store/chat.store.js';
+
+const newMessage = ref('');
+const messages = computed(() => chatStore.state.messages);
+
+const sendMessage = () => {
+  if (newMessage.value) {
+
+    const message = {
+      text: newMessage.value,
+      username: chatStore.state.username,
+      chatId: chatStore.state.currentChatId
+    };
+    chatStore.methods.addMessage(message);
+    newMessage.value = '';
+  }
+};
+</script>
+
+<style>
+/* Стили остаются без изменений */
+</style>

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

@@ -0,0 +1,32 @@
+const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
+ 
+
+const controllerFactory = (db) => {
+  const ChatMessage = db.ChatMessage;
+
+  const saveMessage = async (msg) => {
+    try {
+      const message = new ChatMessage(msg);
+      await message.save();
+      return message;
+    } catch (error) {
+      console.error("Error saving message to database:", error);
+    }
+  };
+
+  const getMessages = async (chatId) => {
+    try {
+      const messages = await ChatMessage.find({ chatId }).sort({ createdAt: 1 });
+      return messages;
+    } catch (error) {
+      console.error("Error retrieving messages from database:", error);
+    }
+  };
+
+  return {
+    saveMessage,
+    getMessages,
+  };
+};
+
+module.exports = controllerFactory;

package/src/modules/chats/models/chat.model.js

@@ -0,0 +1,26 @@
+module.exports = (db) => {
+  
+  const ChatMessageSchema = new db.mongoose.Schema({
+    username: {
+      type: String,
+      required: true
+    },
+    chatId: {
+      type: String,
+      required: true
+    },
+    text: {
+      type: String,
+      required: true
+    },
+    createdAt: {
+      type: Date,
+      default: Date.now
+    }
+  });
+
+  const ChatMessage = db.mongoose.model('ChatMessage', ChatMessageSchema);
+
+  return ChatMessage;
+};
+

package/src/modules/chats/routes/chats.routes.js

@@ -0,0 +1,53 @@
+// Factories
+const controllerFactory = require('../controllers/chats.controller.js');
+// Middlewares
+const middlewareFactory = require('@pf/src/modules/middlewares/server');
+// Routes
+module.exports = function(app, db, wss) {
+  const controller = controllerFactory(db);
+
+  const { verifySignUp, verifyUser } = middlewareFactory(db);
+
+  wss.on('connection', (ws) => {
+    console.log('ws connecting...')
+    console.log(ws)
+
+    ws.on('message', async (message) => {
+      const msg = JSON.parse(message);
+
+      if (msg.type === 'joinChat') {
+        // Обработка joinChat
+        ws.chatId = msg.chatId;
+        console.log(`Client joined chat: ${msg.chatId}`);
+      } else {
+        // Обработка обычных сообщений чата
+        const savedMessage = await controller.saveMessage(msg);
+
+        // Отправка сообщения всем клиентам в том же чате
+        wss.clients.forEach((client) => {
+          if (client.chatId && client.chatId.toString() === msg.chatId) {
+            client.send(JSON.stringify(savedMessage));
+          }
+        });
+      }
+    });
+  });
+
+
+  app.use(function(req, res, next) {
+    res.header(
+      "Access-Control-Allow-Headers",
+      "Access-Control-Allow-Origin: *",
+      "x-access-token, Origin, Content-Type, Accept"
+    );
+    next();
+  });
+
+  // REST API для получения истории сообщений
+  app.get('/messages/:chatId', async (req, res) => {
+    const { chatId } = req.params;
+    const messages = await controller.getMessages(chatId);
+    res.json(messages);
+  });
+};
+

package/src/modules/chats/store/chat.store.js

@@ -0,0 +1,61 @@
+import { reactive, readonly } from 'vue';
+
+const state = reactive({
+  messages: [],
+  currentChatId: null,
+  username: null,
+  websocket: null
+});
+
+const methods = {
+  connectWebSocket() {
+    return new Promise(function(resolve, reject) {
+      state.websocket = new WebSocket('wss://localhost:8080');
+
+      state.websocket.onopen = function() {
+        resolve(state.websocket);
+      };
+      state.websocket.onmessage = (event) => {
+        const message = JSON.parse(event.data);
+
+        if (message.chatId === state.currentChatId) {
+          methods.addMessage(message);
+        }
+      };
+      state.websocket.onerror = function(err) {
+        reject(err);
+      };
+    });
+  },
+  setMessages(messages) {
+    state.messages = messages;
+  },
+  addMessage(message) {
+    state.messages.push(message);
+
+    if (state.websocket) {
+      state.websocket.send(JSON.stringify(message));
+    }
+  },
+  async setCurrentChat(chatId) {
+    state.currentChatId = chatId;
+    state.messages = []; // Очистка текущих сообщений при смене чата
+
+    if (state.websocket) {
+      state.websocket.send(JSON.stringify({ type: 'joinChat', chatId }));
+    }
+
+    const response = await fetch(`/messages/${chatId}`);
+    const messages = await response.json();
+
+    methods.setMessages(messages);
+  },
+  setUsername(username) {
+    state.username = username;
+  }
+};
+
+export default {
+  state: readonly(state),
+  methods
+};

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -37,6 +37,17 @@
 			/>
 		</template>
 
+		<template
+			v-if="!firstImage?.content && firstVideo && firstVideo.content && type !== 'blogpostPage'"
+		>
+			<div class="flex-center flex">
+      <video controls class="mn-b-medium object-fit-cover w-100 h-20r">
+        <source :src="firstVideo.content" type="video/mp4">
+        Your browser does not support the video tag.
+      </video>
+    </div>
+		</template>
+
 		<section
 			class="pd-t-zero pd-medium"
 		>
@@ -71,9 +82,9 @@
 			<slot></slot>
 
 			<Chips 
-		      	v-if="type !== 'short' && blogpost.tags.length > 0" 
-		      	:chips="blogpost.tags"
-		     />
+      	v-if="type !== 'short' && blogpost.tags?.length > 0" 
+      	:chips="blogpost.tags"
+     	/>
 
 		</section>
 		
@@ -103,10 +114,14 @@
 
 	const props = defineProps(['blogpost','user', 'type'])
 
-  	const firstImage = computed(() => {
+  const firstImage = computed(() => {
 	  return props.blogpost.content.find(block => block.type === 'ImageUpload');
 	});
 
+	const firstVideo = computed(() => {
+	  return props.blogpost.content.find(block => block.type === 'Video');
+	});
+
 	const firstText = computed(() => {
 	  return props.blogpost.content.find(block => block.type === 'Textarea');
 	});

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

@@ -1,57 +1,105 @@
 <template>
-	<div class="min-h-100vh pd-thin">
-
-		<header class="mn-b-thin flex-v-center t-left flex-nowrap flex">
-    	<h2 class="flex-v-center flex-nowrap flex t-left">
-    		<span class="">Topics for </span>
-
-    		<Select 
-	        :options="['today','week','month','year']"
-	        v-model:select="blog.state.filter.period" 
-	        placeholder="Select type"
-	        class="
-	        	w-max
-	        	mn-l-small
-	        	bg-grey
-	        	pd-thin
-	        	radius-medium
-	          h2
-	         	t-center
-	          t-black
-	        "
-	      />
-    	</h2>
-		</header>
-		
-		<ul class="w-100 bg-grey pd-small radius-big mn-b-semi gap-thin flex-nowrap flex">
+	<div style="grid-template-columns: 1fr 3fr 1fr;" class="cols-3 gap-thin pd-thin">
+
+		<ul class="w-100 bg-grey radius-big pd-medium p-medium gap-thin flex-column flex-nowrap flex">
 			<li  	
 			:class="{'t-white bg-black': route.params.category === 'featured' }" 					
-			@click="router.push({name: 'Blog'})" 
-			class="t-medium  pd-thin radius-small">👑 Featured</li>
+			@click="router.push({name: 'Blog', params: { category: 'featured' } })" 
+			class="cursor-pointer 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="t-medium  pd-thin radius-small">🔥 Popular</li>
+			class="cursor-pointer 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="t-medium  pd-thin radius-small">🆕 New</li>
+			class="cursor-pointer 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-thin radius-small">👥 Following</li>
+			class="cursor-pointer t-medium pd-thin radius-small">👥 Following</li>
+
+			<router-link :to="{name: 'Create BlogPost'}" class="button mn-t-small bg-main w-100">Create Post</router-link>
 		</ul>
 
-	<section class="">
+		<section class="pos-relative">
 
-		<router-view  v-slot="{ Component, route }">
-			<transition   name="scaleIn" mode="out-in">
-				<component ref="page" :key="route.query" :is="Component" />
-			</transition>
-		</router-view>
+			<header class="bg-black t-white radius-big pd-medium pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
+	    	<h2 class="pos-relative flex-v-center flex-nowrap flex t-left">
+	    		<span class="">Topics for </span>
+
+	    		<Select 
+		        :options="['today','week','month','year']"
+		        v-model:select="blog.state.filter.period" 
+		        placeholder="Select type"
+		        class="
+		        	pos-relative 
+		        	w-max
+		        	mn-l-small
+		        	bg-grey
+		        	pd-thin
+		        	radius-medium
+		          h2
+		         	t-center
+		          t-black
+		        "
+		      />
+	    	</h2>
+			</header>
+
+			<router-view  v-slot="{ Component, route }">
+				<transition   name="scaleIn" mode="out-in">
+					<component ref="page" :key="route.query" :is="Component" />
+				</transition>
+			</router-view>
+
+		</section>
 
-	</section>
+		<div class="bg-grey radius-big pd-medium">
+			<div class="gap-thin flex-nowrap flex">
+				<p class="mn-b-small">POPULAR COMMUNITIES</p>
+				<button class="radius-extra flex-center flex i-medium bg-main ">+</button>
+			</div>
+
+
+			<transition name="slide-fade">
+				<Feed
+		      :states="{
+		        empty: {
+		          title: 'No Organization Found',
+		          description: 'Currently, there are no organization available.'
+		        }
+		      }"
+		      :store="{
+		        read: (options) => organizations.actions.read(options),
+		        state: organizations.state
+		      }"
+		      :options="{
+		        	user: auth.state.user._id,
+							sort: 'numberOfMemberships',
+							contain: ['blogposts'],
+							limit: 10
+		      }"
+		      v-slot="{ 
+		        items 
+		      }"
+		    >
+		    	<CardOrganization 
+	    			v-for="organization in items"
+	        	:key="organization._id" 
+		      	:organization="organization"
+		      	:user="auth.state.user"
+		      	:showProducts="false"
+		      	:showRating="false"
+		      	:showFeatured="false"
+		      	:showFollowers="false"
+						@updateMembership="handleMembershipUpdate"
+						class="mn-b-thin w-100 pd-0 bg-white radius-big o-hidden"
+			    />
+		    </Feed>
+			</transition>
+		</div>
 </div>
 </template>
 
@@ -60,13 +108,22 @@
   import { useRoute,useRouter } from 'vue-router'
 
 	import Select         from '@pf/src/components/Select/Select.vue'
+	import Feed from '@pf/src/components/Feed/Feed.vue'
+	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
+
  	// Import state
 	import * as blog from '@pf/src/modules/community/store/blogposts.js';
-	import * as auth from '@pf/src/modules/auth/store/auth.js';
+	import * as auth from '@pf/src/modules/auth/store/auth'
+	import * as organizations from '@pf/src/modules/organizations/store/organizations'
+	import * as memberships from '@pf/src/modules/organizations/store/memberships'
 
 	// State
 	const route = useRoute();
-	const router = useRouter()
+	const router = useRouter();
+
+	const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
+	  memberships.mutations.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
+	};
 
 </script>
 

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

@@ -25,14 +25,15 @@
   const route = useRoute();
   const router = useRouter();
 
-  if (!route.params.category) {
-    route.params.category = 'featured'
-  }
+  // if (!route.params.category) {
+  //   route.params.category = 'popular'
+  // }
 
   onMounted(() => {
 
     if (route.query) {
       const query = route.query;
+
       const newFilterValue = {
         tags: query.tags ? query.tags.split(',') : [],
         period: query.period ? query.period : 'week',

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

@@ -46,8 +46,14 @@
 						class="mn-b-regular"
 					/>
 				</section>
+
+				<a v-if="blogpost.source" :href="blogpost.source" target="_blank" class="mn-b-semi d-block w-max radius-big pd-thin bg-black t-white">
+					Check Source 🔗
+				</a>
+				
       </CardBlogpost>
 
+
 			<Publics 
 				class="mn-b-small"
 			/>
@@ -76,6 +82,7 @@
 	import Comments from '@pf/src/modules/community/components/sections/Comments.vue';
 
 	import Image  from '@pf/src/modules/constructor/components/elements/Image.vue';
+	import VideoPlayer  from '@pf/src/modules/constructor/components/elements/VideoPlayer.vue';
 
 	import * as blog from '@pf/src/modules/community/store/blogposts.js';
 	import * as auth from '@pf/src/modules/auth/store/auth';
@@ -102,7 +109,9 @@
 	  'H2': 'h2',
 	  'Bullets': 'p',
 	  'Caption': 'p',
-	  'ImageUpload': Image
+	  'ImageUpload': Image,
+	  'Video': VideoPlayer,
+	  'Link': 'a'
 	};
 
 	function getBlockProps(block) {

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

@@ -2,15 +2,16 @@
   <article 
     class="pd-thin"
 >
-    <section 
-      v-if="post" 
-      class="h-100 w-100 bg-grey pd-big radius-big"
+    <section  
+      style="min-height: 100%;"
+      class="w-100 bg-grey pd-big radius-big"
     >
       <!-- Title -->
       <div 
         class="w-full h-full"
       >
         <Textarea 
+          v-if="post" 
           :prop="post" 
           content="name" 
           placeholder="Enter post title" 
@@ -19,11 +20,14 @@
       </div>
 
       <Constructor 
+         v-if="post" 
         :content="post.content"
         @update="update => post.content = update"
       />
     </section>
 
+   
+  <transition  name="scaleIn" >
     <section v-if="post" 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>
@@ -31,6 +35,7 @@
         <a @click="openPulicationPopup()" class="mn-l-thin bg-black t-white button">Publish</a>
       </div>
     </section>
+    </transition>
 
     <Popup 
       title="Добавить участника" 
@@ -45,6 +50,13 @@
         :tags="post.tags"
       />
 
+      <h5 class="mn-b-thin">Add source:</h5>
+      <Field 
+        v-model:field="post.source"    
+        placeholder="Add full link to the source" 
+        class="mn-b-medium bg-grey radius-medium pd-small" 
+      />
+
       <h5 class="mn-b-thin">Add to public:</h5>
       <SelectMulti
         v-model="selectedOrganization"
@@ -65,10 +77,11 @@
           name="prices"
           class="w-100"
         />
-      </div>
-      <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
-    </Popup>
-    
+        </div>
+        
+        <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
+      </Popup>
+      
   </article>
 </template>
 
@@ -80,6 +93,7 @@ import Popup    from '@pf/src/components/Popup/Popup.vue'
 import FieldTags    from '@pf/src/components/FieldTags/FieldTags.vue'
 import BlockTags    from '@pf/src/components/FieldTags/BlockTags.vue'
 import Checkbox    from '@pf/src/components/Checkbox/Checkbox.vue'
+import Field from '@pf/src/components/Field/Field.vue'
 import SelectMulti    from '@pf/src/components/SelectMulti/SelectMulti.vue'
 import Button from '@pf/src/components/Button/Button.vue';   
 
@@ -101,6 +115,18 @@ const selectedTags = ref([]);
 const selectedOrganization = ref(null);
 
 onMounted(async () =>{
+  const dataPublics = await organizations.actions.read({
+    user: auth.state.user._id,
+    postable: auth.state.user._id,
+    limit: 100
+  })
+
+    publics.value = dataPublics.map(publicItem => ({
+    name: publicItem.profile.name,
+    _id: publicItem._id,
+    photo: publicItem.profile.photo
+  }));
+
   
   if (route.params.url) {
     const data = await blog.read({ user: auth.state.user._id, url: route.params.url });
@@ -128,19 +154,11 @@ onMounted(async () =>{
     photo: post.value.owner.target.profile.photo
   }
 
-  const dataPublics = await organizations.actions.read({
-    user: auth.state.user._id,
-    postable: auth.state.user._id,
-    limit: 100
-  })
+  
 
   console.log(dataPublics)
 
-  publics.value = dataPublics.map(publicItem => ({
-    name: publicItem.profile.name,
-    _id: publicItem._id,
-    photo: publicItem.profile.photo
-  }));
+
 
 })
 // /////////////////////////////////////////
@@ -224,6 +242,7 @@ function onSubmit() {
   if (route.params.url) {
     blog.update(post.value)
       .then(response => {
+        console.log(post.value)
         router.push({ name: 'BlogPost', params: { url: response.url } });
       })
       .catch(error => {

package/src/modules/community/components/sections/HotPosts.vue

@@ -5,9 +5,9 @@
 		<Feed 
 			:skip="0" 
 			:limit="3" 
-	      	:user="auth.state.user._id"
-	      	:period="'year'"
-	      	class="cols-2 gap-thin"
+    	:user="auth.state.user._id"
+    	:period="'year'"
+    	class="flex flex-wrap gap-thin"
 	    />
 	</section>
 </template>

package/src/modules/community/components/sections/JoinUs.vue

@@ -1,9 +1,15 @@
 <template>
-    <div class="container container-joinus">
+    <div class="w-100 container container-joinus">
         <div class="content">
-            <span class="h0 mn-b-big">{{ userCount.toLocaleString() }}</span> <!-- используйте toLocaleString для форматирования числа -->
-            <p class="w-m-33r t-center mn-b-small p-big">Together, we're shaping the future of the globals cannabis community.</p>
-            <button class="bg-black t-white button">Join Now</button>
+            <span class="h0 mn-b-big">
+                {{ userCount.toLocaleString() }}
+            </span>
+            <p class="w-m-33r t-center mn-b-small p-big">
+                Together, we're shaping the future of the globals cannabis community.
+            </p>
+            <router-link :to="{name: 'Sign In'}" class="bg-black t-white button">
+                Join Now
+            </router-link>
         </div>
     </div>
 </template>
@@ -59,22 +65,22 @@
 <script setup>
 import { ref, onMounted, nextTick } from 'vue';
 
-const userCount = ref(120950); // начальное значение
+const userCount = ref(1230); // начальное значение
 
 const images = ref([
-    '/assets/images/reviews/01.png',
-    '/assets/images/reviews/02.png',
-    '/assets/images/reviews/03.png',
-    '/assets/images/reviews/04.png',
-    '/assets/images/reviews/05.png',
-    '/assets/images/reviews/06.png'
+    '/avatars/01.png',
+    '/avatars/02.png',
+    '/avatars/03.png',
+    '/avatars/04.png',
+    '/avatars/05.png',
+    '/avatars/06.png'
 ]);
 
 
 const increaseUserCount = () => {
     setInterval(() => {
-        userCount.value += Math.floor(Math.random() * 5) + 1; // случайное увеличение от 1 до 5
-    }, 330); // каждые 0.33 секунды,95
+        userCount.value += Math.floor(Math.random() * 2) + 1; // случайное увеличение от 1 до 5
+    }, 1330); // каждые 0.33 секунды,95
 };