npm - @ozdao/prometheus-framework - Versions diffs - 0.2.221 → 0.2.223 - Mend

@ozdao/prometheus-framework 0.2.221 → 0.2.223

Files changed (491) hide show

package/src/builder/ssr/ssr-render-html.js CHANGED Viewed

@@ -1,9 +1,4 @@
-const path = require("path");
 const Mustache = require("mustache");
-const chokidar = require("chokidar");
-const template = require("../templates/page.js");
-const templatePath = path.resolve(__dirname, "../templates/page.js");
 const renderHtml = async (stuff) => {
   const data = {
@@ -11,17 +6,20 @@ const renderHtml = async (stuff) => {
     googleTagId: process.env.GOOGLE_TAG_ID,
     googleMapApiKey: process.env.GOOGLE_MAPS_API_KEY
   };
+  const template = require("../templates/page.js");
   return Mustache.render(template, data);
 };
 const createHtmlRenderer = (onTemplateUpdate) => {
-  let currentTemplate = template;
+  let currentTemplate = require("../templates/page.js");
-  chokidar.watch(templatePath).on("change", () => {
-    delete require.cache[require.resolve(templatePath)];
-    currentTemplate = require(templatePath);
-    onTemplateUpdate();
-  });
+  setInterval(() => {
+    delete require.cache[require.resolve("../templates/page.js")];
+    currentTemplate = require("../templates/page.js");
+    if (onTemplateUpdate) {
+      onTemplateUpdate();
+    }
+  }, 1000);
   return async (stuff) => {
     const data = {
@@ -35,5 +33,5 @@ const createHtmlRenderer = (onTemplateUpdate) => {
 module.exports = {
   createHtmlRenderer,
-  renderHtml,
-};
+  renderHtml
+};

package/src/builder/templates/page.html ADDED Viewed

@@ -0,0 +1,37 @@
+<!-- <!DOCTYPE html> -->
+  <html {{{ meta.htmlAttrs }}}>
+    <head {{{ meta.headAttrs }}}>
+      {{{ meta.headTags }}}
+      <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
+      <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
+      <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
+      <link rel="manifest" href="/favicon/site.webmanifest">
+      <link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#5bbad5">
+      <meta name="msapplication-TileColor" content="#000000">
+      <meta name="theme-color" content="#ffffff">
+      <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+      {{{ head }}}
+      <!-- Sign in with Apple -->
+      <!-- <script type="text/javascript" src="https://appleid.cdn-apple.com/appleauth/static/jsapi/appleid/1/en_US/appleid.auth.js"></script> -->
+    </head>
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{googleTagId}}"></script>
+    <body {{{ meta.bodyAttrs }}}>
+      <div id="app">{{{ appHtml }}}</div>
+      <script type="application/json" data-state>
+        {{{ initialState }}}
+      </script>
+      <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+        gtag('config', '{{googleTagId}}');
+      </script>
+      {{{ meta.body }}} {{{ body }}}
+    </body>
+  </html>

package/src/builder/templates/page.js CHANGED Viewed

@@ -25,6 +25,10 @@ module.exports = `
          {{{ userState }}}
       </script>
+      <script type="application/json" data-state>
+        {{{ initialState }}}
+      </script>
       <script>
         window.dataLayer = window.dataLayer || [];
         function gtag(){dataLayer.push(arguments);}

package/src/builder/webpack/webpack.config.client.js CHANGED Viewed

@@ -19,8 +19,8 @@ module.exports = (projectRoot) => {
     devtool: !isProd ? "inline-source-map" : "source-map",
     entry: {
       main: !isProd
-        ? [path.resolve("../utils/hot-reload.js"), path.resolve(projectRoot, "src/entry-client.js")]
-        : path.resolve(projectRoot, "src/entry-client.js"),
+        ? [path.resolve("../utils/hot-reload.js"), path.resolve(projectRoot, "src/index.js")]
+        : path.resolve(projectRoot, "src/index.js"),
     },
     module: {
       rules: [],
@@ -35,10 +35,13 @@ module.exports = (projectRoot) => {
     plugins: [
       // ...(!isProd ? [new webpack.HotModuleReplacementPlugin()] : []),
       new StatsWriterPlugin(),
-      new WorkboxPlugin.GenerateSW({
-         clientsClaim: true,
-         skipWaiting: true,
-       }),
+      ...(!isProd ? [
+        new WorkboxPlugin.GenerateSW({
+          clientsClaim: true,
+          skipWaiting: true,
+          disableDevLogs: true
+        }),
+      ] : []),
       new PurgeCSSPlugin({
         paths: glob.sync([
           path.join(projectRoot, 'src/**/*.vue'),

package/src/builder/webpack/webpack.config.ssr.js CHANGED Viewed

@@ -13,7 +13,7 @@ module.exports = (projectRoot) => {
     target: "node",
     mode: !isProd ? "development" : "production",
     entry: {
-      main: path.resolve(projectRoot, "src/entry-server.js"),
+      main: path.resolve(projectRoot, "src/index.js"),
     },
     output: {
       filename: "main.[fullhash].js",

package/src/components/Button/Button.vue CHANGED Viewed

@@ -11,7 +11,6 @@
 		text: {
 			type: Object,
 			default: (textComponent) => {
-				console.log(textComponent)
 				return textComponent = {
 					...textComponent.text,
 					success: '✔',

package/src/components/Feed/Feed.vue CHANGED Viewed

@@ -141,7 +141,7 @@
 </template>
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { ref, computed, onMounted, onUnmounted, shallowRef, watch } from 'vue';
 import SkeletonEvent from '@pf/src/modules/icons/skeletons/SkeletonEvent.vue'
@@ -213,7 +213,7 @@ const props = defineProps({
   },
 });
-const itemsList = ref(items.value || []);
+const itemsList = shallowRef(items.value || []);
 const hasMoreItems = ref(false);
 let isLoading = ref(true);
@@ -228,12 +228,23 @@ let currentLimit = ref(props.options.limit ? props.options.limit : 10);
 let currentSearch = ref('');
-function updateSearch(search) {
-  currentSearch.value = search
-  currentSkip.value = 0
-  currentLimit.value = 10
+function debounce(fn, delay) {
+  let timeoutId = null;
+  return (...args) => {
+    clearTimeout(timeoutId);
+    timeoutId = setTimeout(() => fn(...args), delay);
+  };
+}
+const debouncedSearch = debounce((value) => {
+  currentSearch.value = value;
+  currentSkip.value = 0;
+  currentLimit.value = 10;
   fetchItems();
+}, 300);
+function updateSearch(search) {
+  debouncedSearch(search);
 }
 const loadMoreItems = async () => {
@@ -270,6 +281,7 @@ const loadMoreItems = async () => {
 };
 const fetchItems = async () => {
+  isLoading.value = true;
   const data = await props.store.read({
     skip: currentSkip.value,
     limit: currentLimit.value,
@@ -294,55 +306,22 @@ const fetchItems = async () => {
   isLoading.value = false;
 };
-watch(() => props.external, (newVal, oldVal) => {
-  if (newVal !== oldVal) {
-     currentSkip.value = 0
-    fetchItems();
-  }
-}, { deep: true });
-watch(() => date.value, (newVal, oldVal) => {
-  if (newVal !== oldVal) {
-     currentSkip.value = 0
-    fetchItems();
-  }
-}, { deep: true });
-watch(() => sort.value?.order, (newVal, oldVal) => {
-  if (newVal !== oldVal) {
-     currentSkip.value = 0
-    fetchItems();
-  }
-});
-watch(() => sort.value?.param, (newVal, oldVal) => {
-  if (newVal !== oldVal) {
-     currentSkip.value = 0
-    fetchItems();
-  }
-});
-watch(() => props.options, (newVal, oldVal) => {
-  if (
-    newVal.organization !== oldVal.organization ||
-    newVal.categories !== oldVal.categories ||
-    newVal.prices !== oldVal.prices ||
-    newVal.delivery !== oldVal.delivery ||
-    newVal.search !== oldVal.search ||
-    newVal.status !== oldVal.status ||
-    newVal.hidden !== oldVal.hidden ||
-    newVal.type !== oldVal.type ||
-    newVal.tags !== oldVal.tags ||
-    newVal.following !== oldVal.following
-  ) {
-    currentSkip.value = 0
-    fetchItems();
-  }
-}, { deep: true });
+watch(
+  () => [props.external, date.value, sort.value, props.options],
+  ([newExternal, newDate, newSort, newOptions], [oldExternal, oldDate, oldSort, oldOptions]) => {
+    if (
+      newExternal !== oldExternal ||
+      newDate !== oldDate ||
+      newSort?.order !== oldSort?.order ||
+      newSort?.param !== oldSort?.param ||
+      JSON.stringify(newOptions) !== JSON.stringify(oldOptions)
+    ) {
+      currentSkip.value = 0;
+      fetchItems();
+    }
+  },
+  { deep: true }
+);
 let observer = null

package/src/components/FieldTags/BlockTags.vue CHANGED Viewed

@@ -1,6 +1,5 @@
 <template>
   <div>
-    <h5 class="mn-b-thin">Tags (maximum 20):</h5>
     <FieldTags
       v-model="tag"
       :tags="selectedTags"

package/src/components/UploadImage/UploadImage.vue CHANGED Viewed

@@ -33,7 +33,7 @@ const props = defineProps([
   'photo' // new prop for holding the image url
 ]);
-const emit = defineEmits(['update:photo']);
+const emit = defineEmits(['update:photo', 'error']);
 watch(props, ({photo}) => {
   if(photo) imageUrl.value = photo;
@@ -63,6 +63,7 @@ async function onFileChange(e) {
     imageUrl.value = response.data[0].filepath;
     emit('update:photo', imageUrl.value);
   } catch (error) {
+    emit('error', error);
     console.error("Upload error:", error); // Логируем ошибку
   }
 }

package/src/modules/auth/controllers/middlewares/authJwt.js CHANGED Viewed

@@ -8,7 +8,7 @@ const middlewareFactory = (db) => {
     return async (req, res, next) => {
       try {
         let token = req.headers["x-access-token"];
         if (!token && req.cookies.user) {
           let user = JSON.parse(req.cookies.user);
           token = user.accessToken;

package/src/modules/auth/controllers/middlewares/verifySignUp.js CHANGED Viewed

@@ -33,17 +33,17 @@ const middlewareFactory = (db) => {
   };
   const checkRolesExisted = (req, res, next) => {
-    if (req.body.roles) {
-      for (let i = 0; i < req.body.roles.length; i++) {
-        if (!ROLES.includes(req.body.roles[i])) {
-          console.log(`Failed! Role ${req.body.roles[i]} does not exist!`)
-          res.status(400).send({
-            message: `Failed! Role ${req.body.roles[i]} does not exist!`
-          });
-          return;
-        }
-      }
-    }
+    // if (req.body.roles) {
+    //   for (let i = 0; i < req.body.roles.length; i++) {
+    //     if (!ROLES.includes(req.body.roles[i])) {
+    //       console.log(`Failed! Role ${req.body.roles[i]} does not exist!`)
+    //       res.status(400).send({
+    //         message: `Failed! Role ${req.body.roles[i]} does not exist!`
+    //       });
+    //       return;
+    //     }
+    //   }
+    // }
     next();
   };

package/src/modules/auth/controllers/routes/auth.routes.js CHANGED Viewed

@@ -14,7 +14,7 @@ module.exports = function(app, db, origins) {
     "/api/auth/signup",
     [
       verifySignUp.checkDuplicateUsernameOrEmail,
-      verifySignUp.checkRolesExisted
+      // verifySignUp.checkRolesExisted
     ],
     controller.signup
   );
@@ -40,7 +40,7 @@ module.exports = function(app, db, origins) {
   app.get(
     "/api/auth/check-accesses",
     [
-      authJwt.verifyToken(true),
+      authJwt.verifyToken(),
     ],
      controller.checkAccesses
   );

package/src/modules/auth/controllers/services/auth.service.js CHANGED Viewed

@@ -222,6 +222,7 @@ const controllerFactory = (db) => {
   const checkAccesses = async (req, res) => {
     try {
+      // console.log('x-access-token:', req.headers['x-access-token']);
       const uid = new db.mongoose.Types.ObjectId(req.userId);
       const depts = await Department.find({ 'members.user': uid });
       const ownedOrgs = await Organization.find({ owner: uid });

package/src/modules/auth/views/components/pages/SignIn.vue CHANGED Viewed

@@ -163,6 +163,7 @@ async function onSubmit() {
 			'Некорректный email'
 		)
 	} catch (error) {
+		console.log(error)
 		throw new Error
 	}

package/src/modules/auth/views/middlewares/auth.validation.js CHANGED Viewed

@@ -8,6 +8,12 @@ function resetUser(to, from, next) {
   auth.state.user.passwordRepeat = ''
 }
+async function initUser(to, from, next) {
+  await auth.initialize();
+  next()
+}
 // Check state before open
 function checkUser(to, from, next) {
   if (auth.state.user.phone === '' && auth.state.user.email === '') {
@@ -21,10 +27,19 @@ function requiresNoAuth(to, from, next) {
   const isLogin = auth.state.access.status;
+  console.log(isLogin)
+    console.log(auth.state.access)
+  console.log('')
   if (isLogin) {
+    console.log('havee login')
     return next('/profile/' + auth.state.user._id);
   }
+  console.log('not have login')
   next();
 }
@@ -56,5 +71,6 @@ export  {
   requiresAuth,
   requiresAdmin,
   resetUser,
-  checkUser
+  checkUser,
+  initUser
 }

package/src/modules/auth/views/middlewares/ownership.validation.js ADDED Viewed

@@ -0,0 +1,60 @@
+import * as auth from '@pf/src/modules/auth/views/store/auth'
+import * as blog from '@pf/src/modules/community/store/blogposts.js';
+import { useGlobalMixins } from "@pf/src/modules/globals/views/mixins/mixins.js"
+const { hasAccess } = useGlobalMixins()
+async function requiresEditAccess(to, from, next) {
+  const postId = to.params.url; // Предполагается, что `url` является идентификатором поста
+  const userId = auth.state.user._id; // Получаем текущего пользователя
+  try {
+    // Получаем данные поста, чтобы проверить его принадлежность к организации или авторство
+    const post = (await blog.read({ url: to.params.url }))[0];
+    console.log('post is', post)
+    if (!post) {
+      return next('/404'); // Если пост не найден, перенаправляем на страницу 404
+    }
+    if (post.owner.type === 'organization') {
+      // Если пост принадлежит организации, проверяем права на редактирование через `hasAccess`
+      const isAccess = hasAccess(post.owner.target._id, 'posts', 'edit', auth.state.accesses);
+      if (!isAccess) {
+        return next('/401'); // Если у пользователя нет прав на редактирование в организации, перенаправляем на 403
+      }
+    } else {
+      // Если пост не принадлежит организации, проверяем авторство
+      if (post.creator.target._id !== userId) {
+        return next('/401'); // Если пользователь не является автором, перенаправляем на 403
+      }
+    }
+    next(); // Если все проверки прошли, продолжаем
+  } catch (error) {
+    console.error("Error during post access check:", error);
+    return next('/500'); // Если произошла ошибка, перенаправляем на страницу 500
+  }
+}
+function requiresAccess(resource, action) {
+  return (to, from, next) => {
+    const isAccess = hasAccess(to.params._id, resource, action, auth.state.accesses)
+    if (isAccess) {
+      return next();
+    } else {
+      return next('/401');
+    }
+  };
+};
+export  {
+  requiresEditAccess,
+  requiresAccess
+}

package/src/modules/auth/views/store/auth.js CHANGED Viewed

@@ -1,5 +1,5 @@
   // Dependencies
-  import axios from 'axios';
+  import $axios, { setAuthToken } from '@pf/src/modules/globals/views/utils/axios-instance.js';
   import Cookies from 'js-cookie'
   // Capacitor
   import { Preferences } from '@capacitor/preferences';
@@ -10,7 +10,11 @@
   // State
   import * as twofa from './twofa'
   // Setup Axios
-  const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true });
+  // const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true });
+  // const $axios = axios.create({
+  //   baseURL: process.env.API_URL,
+  //   withCredentials: true
+  // });
   // State
   const state = reactive({
     user: {
@@ -30,46 +34,47 @@
     ]
   });
-  async function initialize() {
-    try {
-      const userCookie = await getCookie('user');
-      console.log('cookie is', userCookie)
-      if (userCookie) {
-        const { _id, email, phone, roles, accessToken } = userCookie;
+  const actions = {
+    async initialize(cookie) {
+      try {
+        const userCookie = cookie ? cookie : await getCookie('user');
-        console.log('accessToken is', accessToken)
+        if (userCookie) {
+          const { _id, email, phone, roles, accessToken } = userCookie;
-        // Установка токена в Axios интерцептор для всех запросов
-        $axios.interceptors.request.use(config => {
-          config.headers['x-access-token'] = accessToken;
-          return config;
-        }, error => {
-          return Promise.reject(error);
-        });
+          setAuthToken(accessToken);
-        // Проверка токена через серверный маршрут
-        const response = await $axios.get('/api/auth/check-accesses');
-        const userAccesses = response.data;
+          // Проверка токена через серверный маршрут
+          const response = await $axios.get('/api/auth/check-accesses');
+          const userAccesses = response.data;
-        // Обновление состояния приложения с информацией о пользователе и его правах доступа
-        Object.assign(state.user, { _id, email, phone });
-        Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
+          // Обновление состояния приложения с информацией о пользователе и его правах доступа
+          Object.assign(state.user, { _id, email, phone });
+          Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
-        // console.log('roles by initilioze is', state.access.roles)
-        state.accesses = userAccesses;
+          state.accesses = userAccesses;
+        }
+      } catch (error) {
+        console.error('Error initializing auth:', error);
+        removeCookie('user');
+        state.accesses = [];
+        state.user = {
+          _id: undefined,
+          username: '',
+          email: '',
+          phone: '',
+          password: '',
+          passwordRepeat: ''
+        },
+        state.access = {
+          roles: null,
+          token: null,
+          status: false
+        },
+        setError(error)
+        // return Promise.reject(error);
       }
-    } catch (error) {
-      console.error('Error initializing app:', error);
-      removeCookie('user');
-      state.accesses = [];
-    }
-  }
-  initialize();
-  const actions = {
+    },
     async login(user, type) {
       try {
         const response = await $axios.post('/api/auth/signin', {
@@ -89,7 +94,7 @@
           roles: response.data.roles
         });
-        await initialize();
+        await this.initialize();
         return response.data;
       } catch (error) {
@@ -146,7 +151,7 @@
           roles: response.data.roles
         });
-        await initialize();
+        await this.initialize();
         return response.data;
       } catch (error) {
@@ -292,6 +297,5 @@
   // Module Export
   export {
     state,
-    initialize,
     actions
   };

package/src/modules/auth/views/store/twofa.js CHANGED Viewed

@@ -1,12 +1,9 @@
-// Dependencies
-import axios from 'axios';
-import Cookies from 'js-cookie'
 // Vue modules
 import { reactive, watch  } from "vue";
 // Globals
 import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true})
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // State
 const state = reactive({
   code: {
@@ -36,7 +33,7 @@ async function sendCode (user, method, type) {
       return  Promise.resolve(response.data);
     },
     error => {
-      console.log(error)
+      console.log('error is', error)
       setError(error)
       return Promise.reject(error);
     }

package/src/modules/auth/views/validations/inputs.validation.js CHANGED Viewed

@@ -41,7 +41,8 @@ function validateLength(input) {
   if (length < 1) {
     return {
       status: false,
-      message:  i18n.global.t("validation.length")
+      // message:  i18n.global.t("validation.length")
+      message:  'validation.length'
     };
   }
@@ -59,13 +60,15 @@ function validatePhone(phone) {
 }
 function validateEmail(email) {
-  const emailRegex = /^[\w-\.]+@([\w-]+\.)+[\w-]{2,12}$/;
+  // const emailRegex = /^[\w-\.]+@([\w-]+\.)+[\w-]{2,12}$/; Not allowing to add +1, +2, +3 and etc after email
+  const emailRegex = /^[\w-]+(\.[\w-]+)*(\+[\w-]+)?@([\w-]+\.)+[\w-]{2,12}$/;
   if (!emailRegex.test(email)) {
     return {
       status: false,
-      message:  i18n.global.t("validation.email")
+      // message:  i18n.global.t("validation.email")
+      message:  'validation.email'
     };
   }
@@ -85,7 +88,8 @@ function validatePassword(password) {
   if (password.length < 8) {
     return {
       status: false,
-      message:  i18n.global.t("validation.password.minLength")
+      // message:  i18n.global.t("validation.password.minLength")
+      message:  'validation.password.minLength'
     }
   }
@@ -128,11 +132,13 @@ async function validateInputs(input, method, variable, message) {
     input.value = {
       status: false,
-      message: i18n.global.t("validation.length")
+      // message: i18n.global.t("validation.length")
+       message: 'validation.length'
     }
     setTimeout(() => { input.value = null }, 3000);
-    throw new Error(i18n.global.t("validation.length"));
+    // throw new Error(i18n.global.t("validation.length"));
+    throw new Error('validation.length');
   }
   else {
     const InputGood = method(variable)