@ozdao/prometheus-framework 0.2.38 → 0.2.40

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

@@ -1,161 +1,150 @@
-// CONFIGS
-// const sms = require("../config/sms.config");
 // --------------------------------------------------
 // DEPENENCY
 // --------------------------------------------------
 const axios = require('axios');
- // --------------------------------------------------
-// Used models
 // --------------------------------------------------
-const db = require("../models");
-const Application = db.application;
+// UTILS
+// --------------------------------------------------
+const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
 // --------------------------------------------------
 // METHODS
 // --------------------------------------------------
-exports.getAll = async (req, res) => {
-  try {
-    const applications = await Application.find({});
-    if (!applications) {
-      return res.status(404).send({ message: "Applications not found." });
-    }
-    res.status(200).send(applications);
-  } catch (err) {
-    res.status(500).send({ message: err });
-  }
-};
-
-exports.create = async (req, res) => {
-  try {
-    const application = await Application.create(req.body);
-    if (!application) {
-      return res.status(404).send({ message: "Something wrong when creating application." });
-    }
+const middlewareFactory = (db) => {
+  const Application = db.application;
 
-    const telegramToken = '6206215053:AAHYCYzpFZF9jDZC-TC03NSff8oo2ExqsSU'; 
-    const chatIds = [6256868874, 2011851185]; // Массив с chat IDs
-
-    // Форматирование текста сообщения
-    const text = `New lead from raisex.co:\n Name: ${application.name}\n Phone: ${application.phone}\n Status: ${application.status}`;
-
-    // Создание кнопок
-    const inlineKeyboard = JSON.stringify({
-      inline_keyboard: [
-        [
-          { text: 'Confirm', callback_data: `confirm_${application._id}` },
-          { text: 'Lost', callback_data: `lost_${application._id}` },
-          { text: 'Delete', callback_data: `delete_${application._id}` }
-        ]
-      ]
-    });
-
-    const telegramUrl = `https://api.telegram.org/bot${telegramToken}/sendMessage`;
-
-    // Отправка сообщения каждому чату из массива
-    for (const chatId of chatIds) {
-      await axios.post(telegramUrl, {
-        chat_id: chatId,
-        text: text,
-        // reply_markup: inlineKeyboard
-      });
+  const read = async (req, res) => {
+    try {
+      const applications = await Application.find({});
+      if (!applications) {
+        return res.status(404).send({ message: "Applications not found." });
+      }
+      res.status(200).send(applications);
+    } catch (err) {
+      res.status(500).send({ message: err });
     }
+  };
 
-    res.status(200).send(application);
-
-  } catch (err) {
-    res.status(500).send({ message: err });
-  }
-};
-
+  const create = async (req, res) => {
+    try {
+      const application = await Application.create(req.body);
 
-exports.handleTelegramWebhook = async (req, res) => {
-  const update = req.body;
+      if (!application) {
+        return res.status(404).send({ message: "Something wrong when creating application." });
+      }
 
-  // Проверка, является ли это обратным вызовом от inline клавиатуры
-  if (update.callback_query) {
-    const callbackQuery = update.callback_query;
-    const callbackData = callbackQuery.data;
+      try {
+        const messageSent = await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","),`New application from ${req.body}`)
+      } catch (err) {  
+        console.log(err)
+      }
+      res.status(200).send(application);
 
-    // Разбор callback_data
-    const [action, applicationId] = callbackData.split('_');
+    } catch (err) {
+      res.status(500).send({ message: err });
+    }
+  };
 
+  const update = async (req, res) => {
     try {
-        // Выполнение действий в зависимости от callback_data
-        let updatedApplication = null;
-
-        switch (action) {
-          case 'confirm':
-            updatedApplication = await Application.findOneAndUpdate(
-              { _id: applicationId },
-              { status: 'confirmed' },
-              { new: true }
-            );
-            break;
-          case 'lost':
-            updatedApplication = await Application.findOneAndUpdate(
-              { _id: applicationId },
-              { status: 'lost' },
-              { new: true }
-            );
-            break;
-          case 'delete':
-            updatedApplication = await Application.findOneAndDelete({ _id: applicationId });
-            break;
-        }
-
-        if (!updatedApplication) {
-          console.log("Application not found or not updated.");
-        } else {
-          console.log("Application updated:", updatedApplication);
-        }
-
+      const application = await Application.findOneAndUpdate({ _id: req.params._id }, req.body, { new: true });
+      if (!application) {
+        return res.status(404).send({ message: "Application not found." });
+      }
+      res.status(200).send(application);
     } catch (err) {
-        console.log("Error updating application:", err);
+      res.status(500).send({ message: err });
     }
+  };
 
-    // Ответ на callback query, чтобы убрать часы ожидания на кнопке
-    const queryId = callbackQuery.id;
-    const telegramToken = '6206215053:AAHYCYzpFZF9jDZC-TC03NSff8oo2ExqsSU';
-    axios.post(`https://api.telegram.org/bot${telegramToken}/answerCallbackQuery`, {
-      callback_query_id: queryId
-    });
-  }
-
-  res.sendStatus(200);
-};
-
-exports.get = async (req, res) => {
-  try {
-    const application = await Application.findOne({ url: req.params.url });
-    if (!application) {
-      return res.status(404).send({ message: "Application not found." });
+  const deleteMethod = async (req, res) => {
+    try {
+      const application = await Application.findOneAndDelete({ _id: req.params._id });
+      if (!application) {
+        return res.status(404).send({ message: "Something wrong when deleting application." });
+      }
+      res.status(200).send(application);
+    } catch (err) {
+      res.status(500).send({ message: err });
     }
-    res.status(200).send(application);
-  } catch (err) {
-    res.status(500).send({ message: err });
-  }
-};
+  };
 
-exports.update = async (req, res) => {
-  try {
-    const application = await Application.findOneAndUpdate({ _id: req.params._id }, req.body, { new: true });
-    if (!application) {
-      return res.status(404).send({ message: "Application not found." });
+  const get = async (req, res) => {
+    try {
+      const application = await Application.findOne({ url: req.params.url });
+      if (!application) {
+        return res.status(404).send({ message: "Application not found." });
+      }
+      res.status(200).send(application);
+    } catch (err) {
+      res.status(500).send({ message: err });
     }
-    res.status(200).send(application);
-  } catch (err) {
-    res.status(500).send({ message: err });
-  }
-};
-
-exports.delete = async (req, res) => {
-  try {
-    const application = await Application.findOneAndDelete({ _id: req.params._id });
-    if (!application) {
-      return res.status(404).send({ message: "Something wrong when deleting application." });
+  };
+
+  const handleTelegramWebhook = async (req, res) => {
+    const update = req.body;
+
+    // Проверка, является ли это обратным вызовом от inline клавиатуры
+    if (update.callback_query) {
+      const callbackQuery = update.callback_query;
+      const callbackData = callbackQuery.data;
+
+      // Разбор callback_data
+      const [action, applicationId] = callbackData.split('_');
+
+      try {
+          // Выполнение действий в зависимости от callback_data
+          let updatedApplication = null;
+
+          switch (action) {
+            case 'confirm':
+              updatedApplication = await Application.findOneAndUpdate(
+                { _id: applicationId },
+                { status: 'confirmed' },
+                { new: true }
+              );
+              break;
+            case 'lost':
+              updatedApplication = await Application.findOneAndUpdate(
+                { _id: applicationId },
+                { status: 'lost' },
+                { new: true }
+              );
+              break;
+            case 'delete':
+              updatedApplication = await Application.findOneAndDelete({ _id: applicationId });
+              break;
+          }
+
+          if (!updatedApplication) {
+            console.log("Application not found or not updated.");
+          } else {
+            console.log("Application updated:", updatedApplication);
+          }
+
+      } catch (err) {
+          console.log("Error updating application:", err);
+      }
+
+      // Ответ на callback query, чтобы убрать часы ожидания на кнопке
+      const queryId = callbackQuery.id;
+      const telegramToken = '6206215053:AAHYCYzpFZF9jDZC-TC03NSff8oo2ExqsSU';
+      axios.post(`https://api.telegram.org/bot${telegramToken}/answerCallbackQuery`, {
+        callback_query_id: queryId
+      });
     }
-    res.status(200).send(application);
-  } catch (err) {
-    res.status(500).send({ message: err });
-  }
+
+    res.sendStatus(200);
+  };
+
+
+  return {
+    read,
+    create,
+    update,
+    delete: deleteMethod,
+    handleTelegramWebhook,
+    get
+  };
 };
 
+module.exports = middlewareFactory;

package/src/modules/applications/models/application.model.js

@@ -1,13 +1,28 @@
 const mongoose = require('mongoose');
 
 const ApplicationSchema = new mongoose.Schema({ 
-  status:   {type: String,  default: 'New'},
-  deal:     {type: String},
-  name:     {type: String},
-  phone:    {type: String},
-  }, {
-    timestamps: { currentTime: () => Date.now() }
-  });
+  status:   {
+    type: String,  
+    default: 'created'
+  },
+  type:     {
+    type: String,
+    default: 'newsletter'
+  },
+  contacts: {
+    name:     {
+      type: String
+    },
+    phone:    {
+      type: String
+    },
+    email:    {
+      type: String
+    },
+  }
+}, {
+  timestamps: { currentTime: () => Date.now() }
+});
 
 const Application = mongoose.model("Application", ApplicationSchema);
 

package/src/modules/applications/routes/applications.routes.js

@@ -1,16 +1,24 @@
-const controller = require("../controllers/applications.controller");
+// Factories
+const controllerFactory = require("../controllers/applications.controller");
+// Middlewares
+const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+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");
-    next();
-  });
+    
+    const origin = req.headers.origin;
 
+    if (origins.includes(origin)) {
+      res.setHeader('Access-Control-Allow-Origin', origin);
+    }
 
-  app.get(
-    "/applications",
-    controller.getAll
-  );
+    res.header("Access-Control-Allow-Headers", "x-access-token, Origin, Content-Type, Accept");
+
+    next();
+  });
 
   app.post(
     "/applications",
@@ -18,11 +26,11 @@ module.exports = function(app) {
   );
 
   app.get(
-    "/applications/:_id",
-    controller.get
+    "/applications",
+    controller.read
   );
 
-   app.post(
+  app.post(
     "/applications/:_id",
     controller.update
   );
@@ -31,8 +39,16 @@ module.exports = function(app) {
     "/applications/:_id",
     controller.delete
   );
+  
+  app.get(
+    "/applications/:_id",
+    controller.get
+  );
 
-  app.post("/applications/telegram-webhook", controller.handleTelegramWebhook);
+  app.post(
+    "/applications/telegram-webhook", 
+    controller.handleTelegramWebhook
+  );
 
 };
 

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

@@ -76,7 +76,10 @@
 	// Localization
 	import text from '@pf/src/modules/auth/localization/EnterCode.json'
 	// Localization
-	const { t } = useI18n(text)
+	const { t } = useI18n({
+		useScope: 'global', 
+		...text
+	})
 	
 	const state = reactive({
 	  digits: ['', '', '', ''],

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

@@ -53,7 +53,10 @@ const passswordValidation = ref(null)
 // Localization
 import text from '@pf/src/modules/auth/localization/EnterPassword.json'
 // Localization
-const { t } = useI18n(text)
+const { t } = useI18n({
+	useScope: 'global', 
+	...text
+})
 // Accessing router
 const route = useRoute()
 const router = useRouter()

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

@@ -72,7 +72,10 @@ import * as twofa from '@pf/src/modules/auth/store/twofa'
 // Import validation
 import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
 // Localization
-const { t } = useI18n(text)
+const { t } = useI18n({
+	useScope: 'global', 
+	...text
+})
 // Validation
 const phoneValidation = ref(null)
 const emailValidation = ref(null)

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

@@ -78,7 +78,10 @@
 	// Import validation
 	import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
 	// Localization
-	const { t } = useI18n(text)
+	const { t } = useI18n({
+		useScope: 'global', 
+		...text
+	})
 	// Validation
 	const phoneValidation = ref(null)
 	const emailValidation = ref(null)

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

@@ -6,7 +6,7 @@ const { uuid } = require('uuidv4');
 const { verifyAppleIdToken } = require('../utils/server/verifyAppleIdToken')
 // Factory
 const controllerFactory = (db) => {
-  
+
   const User = db.user;
   const Membership = db.membership;
   const Invite = db.invite;
@@ -38,7 +38,6 @@ const controllerFactory = (db) => {
     }
 
     try {
-
       let user = await User.findOne(query).populate('roles').exec();
 
       if ((type === 'email' || type === 'phone')) {
@@ -89,7 +88,7 @@ const controllerFactory = (db) => {
         }
       });
     } catch (err) {
-      console.error(err);
+      // console.error(err);
       res.status(500).send({ message: err });
     }
   };

package/src/modules/auth/localization/SignUp.json

@@ -1,7 +1,7 @@
 {
   "messages": {
     "en-default": {
-      "title": "Sign Up to Weeder",
+      "title": "Sign Up",
       "description": "Choose a convenient way to register via phone or email:",
       "phone": "Phone",
       "email": "Email",

package/src/modules/auth/store/auth.js

@@ -32,8 +32,6 @@
 
     const userCookie = await getCookie('user');
 
-    console.log('user cookie is ' + userCookie)
-
     if (userCookie) {
       const { _id, email, phone, roles, accessToken } = userCookie;
 
@@ -212,8 +210,8 @@
 
   // Cookies
   const optionsDefault = {
-    development: { secure: false, expires: 1 },
-    production: { expires: 1, domain: process.env.API_URL, sameSite: 'none', secure: true }
+    development: { secure: false, expires: 7 },
+    production: { expires: 7, path: '/', domain: process.env.API_URL, sameSite: 'none', secure: true }
   };
 
   async function getCookie(name) {
@@ -226,7 +224,7 @@
     }
   }
 
-  function setCookie(name, data, env = process.env.NODE_ENV) {
+  function setCookie(name, data, env = process.env.DOMAIN_URL) {
     if (process.env.MOBILE_APP) {
       // Если приложение запущено в Capacitor
       Preferences.set({

package/src/modules/chats/components/blocks/ChatMessage.vue

@@ -3,8 +3,9 @@
     class="pd-small"
     :class="{'bg-main-nano': message.username === 'Weeder Support'}"
   >
-    <p class="w-100 p-small">
-      <strong class="mn-r-auto">{{ message.username }} {{formatDate(message.createdAt)}}:</strong>
+    <p class="flex-v-center gap-thin flex-nowrap flex w-100 p-small">
+      <img v-if="message.username === 'Weeder Support'" src="/logo/logo.png" class="i-medium">
+      <strong class="mn-r-auto"><span class="t-semi">{{ message.username }}</span> <span class="t-transp">{{formatDate(message.createdAt)}}</span></strong>
     </p>
     <p>{{ message.text }}</p>
   </div>

package/src/modules/chats/components/pages/ChatPage.vue

@@ -1,15 +1,15 @@
 <template>
-  <div class="chat-page">
-    <aside class="chat-list">
+  <!-- <div class="chat-page h-max-20r"> -->
+    <!-- <aside class="chat-list"> -->
       <!-- Примерный список чатов. Должен быть дополнен реальной логикой -->
       <!-- <div v-for="chat in chats" :key="chat.id" @click="selectChat(chat.id)">
         Чат {{ chat.name }}
       </div> -->
-    </aside>
-    <main class="chat-main">
+    <!-- </aside> -->
+    <!-- <main class="chat-main"> -->
       <ChatWindow />
-    </main>
-  </div>
+    <!-- </main> -->
+  <!-- </div> -->
 </template>
 
 <script setup>

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

@@ -1,27 +1,56 @@
 <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-white w-100 radius-big pd-small" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
+  <div class="bg-white radius-semi bg-white o-hidden pos-relative">
+    
+      <div ref="allMessages"  class="chat-messages o-scroll h-max-20r">
+        <div  class="pos-relative h-min-20r flex-justify-end flex flex-column br-b br-solid br-black-transp-10">
+          <transition  name="scaleIn" mode="out-in">
+            <div v-if="messages.length < 1"  class="flex-center w-100 h-100 flex-column flex pos-absolute">
+              <PlaceholderChat class="radius-100 mn-b-thin"/>
+              <h4>Here you can view your chat history</h4>
+              <p>Feel free to ask if you have any questions.</p>
+            </div>
+
+            <TransitionGroup v-else  name="list" tag="ul" class="w-100 o-hidden">
+              <ChatMessage
+                v-for="message in messages"
+                :key="message._id"
+                :message="message"
+              />
+
+            </TransitionGroup>
+           </transition>
+          
+        </div>
+      </div>
+
+      
+      <div class="flex-nowrap flex-v-center flex bg-white w-100 radius-big pd-small">
+        <IconAdd
+          class="mn-r-thin t-transp i-regular"
+        />
+        <input class="" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
+      </div>
   </div>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
+
+import IconAdd from '@pf/src/modules/icons/navigation/IconAdd.vue'
+import PlaceholderChat from '@pf/src/modules/icons/placeholders/PlaceholderChat.vue'
+
 import ChatMessage from '../blocks/ChatMessage.vue';
 import chatStore from '../../store/chat.store.js';
 
 const newMessage = ref('');
+const allMessages = ref(null)
+
+// Вычисляемые свойства
 const messages = computed(() => chatStore.state.messages);
 
+// Функция для отправки сообщения
 const sendMessage = () => {
   if (newMessage.value) {
-
     const message = {
       text: newMessage.value,
       username: chatStore.state.username,
@@ -29,12 +58,28 @@ const sendMessage = () => {
     };
 
     chatStore.methods.addMessage(message);
+    console.log(allMessages.value.lastElementChild.offsetHeight)
+    allMessages.value.scrollTop = allMessages.value.lastElementChild.offsetHeight
     
     newMessage.value = '';
   }
 };
+
+// // При добавлении нового сообщения автоматически прокручиваем вниз
+watch(chatStore.state.messages, () => {
+  allMessages.value.scrollTop = allMessages.value.lastElementChild.offsetHeight
+}, {deep: true});
+
 </script>
 
 <style>
-/* Стили остаются без изменений */
+.list-enter-active,
+.list-leave-active {
+  transition: all 0.5s ease;
+}
+.list-enter-from,
+.list-leave-to {
+  opacity: 0;
+  transform: translateX(30px);
+}
 </style>

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

@@ -9,8 +9,12 @@ const state = reactive({
 
 const methods = {
   connectWebSocket() {
+    console.log('process env')
+      console.log(process.env.WSS_URL)
+
     return new Promise(function(resolve, reject) {
-      state.websocket = new WebSocket('wss://localhost:8080');
+
+      state.websocket = new WebSocket(process.env.WSS_URL);
 
       state.websocket.onopen = function() {
         resolve(state.websocket);
@@ -28,6 +32,7 @@ const methods = {
     });
   },
   setMessages(messages) {
+          console.log(process.env.API_URL)
     state.messages = messages;
   },
   addMessage(message) {