@ozdao/martyrs 0.2.584 → 0.2.586

package/src/modules/core/views/components/pages/404.vue

@@ -1,5 +1,57 @@
+<script setup>
+import { useRouter } from 'vue-router'
+import IconHome from '@martyrs/src/modules/icons/entities/IconHome.vue'
+import IconArrow from '@martyrs/src/modules/icons/navigation/IconArrow.vue'
+import IconSearch from '@martyrs/src/modules/icons/navigation/IconSearch.vue'
+import IconInfo from '@martyrs/src/modules/icons/entities/IconInfo.vue'
+
+const router = useRouter()
+const goBack = () => window.history.length > 1 ? router.back() : router.push('/')
+</script>
+
 <template>
-  <div class="">
-    404 Not Found
+  <div class="pd-thin flex flex-v-center w-100 h-100 ">
+    <div class="bg-light w-100 h-100 flex flex-h-center flex-column radius-big pd-medium">
+
+      <div class="flex flex-v-center gap-thin pd-thin radius-big bg-main w-fit mn-b-medium">
+        <span class="i-medium radius-big bg-grey"></span>
+        <span class="p-small">Error 404</span>
+      </div>
+
+      <h1 class="mn-b-semi">Page not found</h1>
+
+      <p class="p-medium t-transp w-max-35r mn-b-big" style="line-height: 1.6;">
+        The page you are looking for doesn't exist or has been moved. Please check the URL or navigate back to the home page.
+      </p>
+
+      <div class="flex gap-small mn-b-extra">
+        <router-link to="/" class="button bg-black t-white pd-regular radius-small flex flex-v-center gap-thin">
+          <IconHome class="i-regular" :fill="'rgb(var(--white))'" />
+          <span>Go home</span>
+        </router-link>
+        <button @click="goBack" class="button bg-white t-black pd-regular radius-small flex flex-v-center gap-thin">
+          <IconArrow class="i-regular rotate-180" />
+          <span>Go back</span>
+        </button>
+      </div>
+
+      <div class="pd-t-medium  w-max-25r">
+        <span class="p-micro t-transp t-upper t-500 ls-wide d-block mn-b-small">Search Documentation</span>
+        <div class="field-wrapper bg-white flex flex-v-center radius-small pd-small gap-small">
+          <IconSearch class="i-small t-transp" />
+          <input type="text" placeholder="e.g. Installation guide..." class="w-100  bd-none" />
+        </div>
+        <div class="flex gap-medium mn-t-small">
+          <a href="#" class="flex flex-v-center gap-micro p-small t-transp"><IconInfo class="i-small" /> Help Center</a>
+          <a href="#" class="p-small t-transp">API Status</a>
+        </div>
+      </div>
+
+    </div>
   </div>
-</template>
+</template>
+
+<style scoped>
+input { border: none; outline: none; }
+input::placeholder { color: rgba(var(--dark), 0.4); }
+</style>

package/src/modules/core/views/store/core.store.js

@@ -115,6 +115,7 @@ export function createStore() {
   // State создается для каждого store instance (изоляция SSR)
   const state = reactive({
     loading: false,
+    notFound: false,
 
     isOpenLocationPopup: false,
     isOpenSidebar: false,

package/src/modules/core/views/utils/vue-app-renderer.js

@@ -269,11 +269,19 @@ export async function render({ url, cookies, headers, ssrContext, createApp }) {
   const measure26Total = performance.getEntriesByName('loading-26-total')[0];
   console.log(`[LOADING 26] Total SSR render completed in ${measure26Total?.duration?.toFixed(2)}ms`);
 
+  // Определяем HTTP статус код:
+  // 1. Если store.core.state.notFound === true - 404
+  // 2. Если роут называется 'notfound' - 404
+  // 3. Иначе - 200
+  const statusCode = store.core.state.notFound
+    ? 404
+    : (router.currentRoute?.value?.name?.toLowerCase() === 'notfound' ? 404 : 200);
+
   return {
     html,
     meta: payload,
     state: initialState,
-    statusCode: router.currentRoute?.value?.name?.toLowerCase() === 'notfound' ? 404 : 200,
+    statusCode,
     usedModules: Array.from(ctx.modules || new Set()), // Return used modules
   };
 }

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

@@ -27,13 +27,12 @@ async function sendOrderMessage(orderData) {
     console.error(err);
   }
 }
-import visitorLoggerFactory from '@martyrs/src/modules/auth/controllers/middlewares/visitor.logger.js';
+import { getVisitorsService } from '@martyrs/src/modules/core/controllers/services/visitors.service.js';
 
 const controllerFactory = db => {
   const Order = db.order;
   const Customer = db.customer;
   const Department = db.department;
-  const { findOrCreateVisitor } = visitorLoggerFactory(db);
 
   // Оптимизированная функция получения пользователей с доступом orders.confirm
   const getUsersWithOrdersConfirmAccess = async (organizationId) => {
@@ -163,7 +162,8 @@ const controllerFactory = db => {
     }
     if (!customer) {
       // Create visitor for anonymous customer
-      const visitor = await findOrCreateVisitor(req);
+      const visitorsService = getVisitorsService();
+      const visitor = await visitorsService.findOrCreateVisitor(req);
       
       // Handle the case when creator.target is null
       let creatorType = customerInfo.creator?.type || orderCreator.type;

package/src/modules/pages/pages.router.js

@@ -1,5 +1,6 @@
 import layoutEmpty from '@martyrs/src/modules/core/views/components/layouts/Empty.vue';
-import Sidebar from '@martyrs/src/modules/backoffice/components/partials/Sidebar.vue';
+import Navigation from '@martyrs/src/modules/core/views/components/partials/Navigation.vue';
+import { navigationItems } from '@martyrs/src/modules/backoffice/configs/navigation.backoffice.config.js';
 import SidebarPages from './views/components/partials/SidebarPages.vue';
 
 function createPublicRoutes(options = {}) {
@@ -92,7 +93,8 @@ export function getRoutes(options = {}) {
           title: {
             en: 'Pages',
           },
-          sidebar: Sidebar,
+          sidebar_navigation: Navigation,
+          sidebar_navigation_items: navigationItems,
         },
         routes: createBackofficeRoutes(options),
       },

package/src/modules/pages/views/router/pages.backoffice.router.js

@@ -1,5 +1,5 @@
-import Sidebar from '@martyrs/src/modules/backoffice/components/partials/Sidebar.vue';
-
+import Navigation from '@martyrs/src/modules/core/views/components/partials/Navigation.vue';
+import { navigationItems } from '@martyrs/src/modules/backoffice/configs/navigation.backoffice.config.js';
 import SidebarPages from '../components/partials/SidebarPages.vue';
 
 const pages = {
@@ -8,7 +8,8 @@ const pages = {
     title: {
       en: 'Pages',
     },
-    sidebar: Sidebar,
+    sidebar_navigation: Navigation,
+    sidebar_navigation_items: navigationItems,
   },
   children: [
     {

package/src/modules/products/components/pages/Products.vue

@@ -141,7 +141,7 @@
         </div>
       </div>
 
-      <div class="w-100 rows-1 pd-thin  pos-relative o-hidden">
+      <div class="w-100 flex flex-column pd-thin  pos-relative o-hidden">
         
         <slot></slot>
 

package/dist/_virtual/alignment-pattern.js

@@ -1,5 +0,0 @@
-var alignmentPattern = {};
-export {
-  alignmentPattern as __exports
-};
-//# sourceMappingURL=alignment-pattern.js.map

package/dist/_virtual/alignment-pattern.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"alignment-pattern.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/browser.js

@@ -1,8 +0,0 @@
-import { getDefaultExportFromCjs } from "./_commonjsHelpers.js";
-import { __require as requireBrowser } from "../node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/browser.js";
-var browserExports = requireBrowser();
-const QRCode = /* @__PURE__ */ getDefaultExportFromCjs(browserExports);
-export {
-  QRCode as default
-};
-//# sourceMappingURL=browser.js.map

package/dist/_virtual/browser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"browser.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist/_virtual/browser2.js

@@ -1,5 +0,0 @@
-var browser = {};
-export {
-  browser as __exports
-};
-//# sourceMappingURL=browser2.js.map

package/dist/_virtual/browser2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"browser2.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/canvas.js

@@ -1,5 +0,0 @@
-var canvas = {};
-export {
-  canvas as __exports
-};
-//# sourceMappingURL=canvas.js.map

package/dist/_virtual/canvas.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"canvas.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/dijkstra.js

@@ -1,5 +0,0 @@
-var dijkstra = { exports: {} };
-export {
-  dijkstra as __module
-};
-//# sourceMappingURL=dijkstra.js.map

package/dist/_virtual/dijkstra.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dijkstra.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/error-correction-code.js

@@ -1,5 +0,0 @@
-var errorCorrectionCode = {};
-export {
-  errorCorrectionCode as __exports
-};
-//# sourceMappingURL=error-correction-code.js.map

package/dist/_virtual/error-correction-code.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error-correction-code.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/error-correction-level.js

@@ -1,5 +0,0 @@
-var errorCorrectionLevel = {};
-export {
-  errorCorrectionLevel as __exports
-};
-//# sourceMappingURL=error-correction-level.js.map

package/dist/_virtual/error-correction-level.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error-correction-level.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/finder-pattern.js

@@ -1,5 +0,0 @@
-var finderPattern = {};
-export {
-  finderPattern as __exports
-};
-//# sourceMappingURL=finder-pattern.js.map

package/dist/_virtual/finder-pattern.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"finder-pattern.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/format-info.js

@@ -1,5 +0,0 @@
-var formatInfo = {};
-export {
-  formatInfo as __exports
-};
-//# sourceMappingURL=format-info.js.map

package/dist/_virtual/format-info.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"format-info.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/galois-field.js

@@ -1,5 +0,0 @@
-var galoisField = {};
-export {
-  galoisField as __exports
-};
-//# sourceMappingURL=galois-field.js.map

package/dist/_virtual/galois-field.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"galois-field.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/mask-pattern.js

@@ -1,5 +0,0 @@
-var maskPattern = {};
-export {
-  maskPattern as __exports
-};
-//# sourceMappingURL=mask-pattern.js.map

package/dist/_virtual/mask-pattern.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mask-pattern.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/mode.js

@@ -1,5 +0,0 @@
-var mode = {};
-export {
-  mode as __exports
-};
-//# sourceMappingURL=mode.js.map

package/dist/_virtual/mode.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mode.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/polynomial.js

@@ -1,5 +0,0 @@
-var polynomial = {};
-export {
-  polynomial as __exports
-};
-//# sourceMappingURL=polynomial.js.map

package/dist/_virtual/polynomial.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"polynomial.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/qrcode.js

@@ -1,5 +0,0 @@
-var qrcode = {};
-export {
-  qrcode as __exports
-};
-//# sourceMappingURL=qrcode.js.map

package/dist/_virtual/qrcode.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"qrcode.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/regex.js

@@ -1,5 +0,0 @@
-var regex = {};
-export {
-  regex as __exports
-};
-//# sourceMappingURL=regex.js.map

package/dist/_virtual/regex.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"regex.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/segments.js

@@ -1,5 +0,0 @@
-var segments = {};
-export {
-  segments as __exports
-};
-//# sourceMappingURL=segments.js.map

package/dist/_virtual/segments.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"segments.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/svg-tag.js

@@ -1,5 +0,0 @@
-var svgTag = {};
-export {
-  svgTag as __exports
-};
-//# sourceMappingURL=svg-tag.js.map

package/dist/_virtual/svg-tag.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"svg-tag.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/utils.js

@@ -1,5 +0,0 @@
-var utils = {};
-export {
-  utils as __exports
-};
-//# sourceMappingURL=utils.js.map

package/dist/_virtual/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/utils2.js

@@ -1,5 +0,0 @@
-var utils = {};
-export {
-  utils as __exports
-};
-//# sourceMappingURL=utils2.js.map

package/dist/_virtual/utils2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils2.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/version-check.js

@@ -1,5 +0,0 @@
-var versionCheck = {};
-export {
-  versionCheck as __exports
-};
-//# sourceMappingURL=version-check.js.map

package/dist/_virtual/version-check.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"version-check.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/_virtual/version.js

@@ -1,5 +0,0 @@
-var version = {};
-export {
-  version as __exports
-};
-//# sourceMappingURL=version.js.map

package/dist/_virtual/version.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"version.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/index-_Edcmck_.js

@@ -1,170 +0,0 @@
-import { m as middlewareFactory$4 } from "./authJwt-J1csaMWA.js";
-import crypto from "crypto";
-import * as mongodb from "mongodb";
-const middlewareFactory$3 = () => {
-  const verifySecret = (method, endpoint, secret) => async (req, res, next) => {
-    const requestSignature = req.headers.signature;
-    const signature = crypto.createHmac("sha256", secret).update(method + endpoint).digest("hex");
-    if (signature === requestSignature) {
-      return next();
-    }
-    res.status(403).send("Forbidden");
-  };
-  return { verifySecret };
-};
-const middlewareFactory$2 = (db) => {
-  const User = db.user;
-  db.role;
-  const checkDuplicateUsernameOrEmail = async (req, res, next) => {
-    const { type, email, phone } = req.body;
-    console.log(req.body);
-    let query;
-    if (type === "phone" && phone) {
-      query = { phone };
-    }
-    if (type === "email" && email) {
-      query = { email };
-    }
-    try {
-      const user = await User.findOne(query).exec();
-      if (user) {
-        console.log(`USER_ALREADY_REGISTERED`);
-        res.status(400).send({ errorCode: "USER_ALREADY_REGISTERED" });
-        return;
-      }
-      next();
-    } catch (err) {
-      console.log(err);
-      res.status(500).send({ message: err.message });
-    }
-  };
-  const checkRolesExisted = (req, res, next) => {
-    next();
-  };
-  return {
-    checkDuplicateUsernameOrEmail,
-    checkRolesExisted
-  };
-};
-const middlewareFactory$1 = (db) => {
-  const User = db.user;
-  db.role;
-  const checkDuplicateUsername = async (req, res, next) => {
-    const { username } = req.body;
-    if (!username) {
-      return next();
-    }
-    try {
-      const user = await User.findOne({
-        username,
-        _id: { $ne: req.body._id }
-        // Исключаем текущего пользователя из поиска
-      });
-      if (user) {
-        console.log(`USERNAME_ALREADY_USED`);
-        res.status(400).send({ errorCode: "USERNAME_ALREADY_USED" });
-        return;
-      }
-      next();
-    } catch (err) {
-      console.log(err);
-      res.status(500).send({ message: err.message });
-    }
-  };
-  const checkUserExist = async (req, res, next) => {
-    const { type, email, phone } = req.body;
-    let query;
-    if (type === "phone" && phone) {
-      query = { phone };
-    }
-    if (type === "email" && email) {
-      query = { email };
-    }
-    try {
-      const user = await User.findOne(query).exec();
-      if (!user) {
-        console.log(query);
-        res.status(400).send({ errorCode: "USER_NOT_REGISTERED_YET" });
-        return;
-      }
-      next();
-    } catch (err) {
-      res.status(500).send({ message: err.message });
-    }
-  };
-  return {
-    checkDuplicateUsername,
-    checkUserExist
-  };
-};
-const { ObjectId } = mongodb;
-const middlewareFactory = (db) => {
-  const User = db.user;
-  const Invite = db.invite;
-  const Membership = db.membership;
-  const checkInviteExist = async (req, res, next) => {
-    for (let invite of req.body.invites) {
-      let query;
-      if (invite.contact.includes("@")) {
-        query = { invitedEmail: invite.contact };
-      } else {
-        query = { invitedPhone: invite.contact };
-      }
-      query["owner.target"] = req.body.owner.target;
-      const userInvite = await Invite.findOne(query).exec();
-      if (userInvite) {
-        console.log(userInvite);
-        res.status(400).send({ message: "Инвайт c таким email или телефоном уже создан!" });
-        return;
-      }
-    }
-    next();
-  };
-  const checkUsersExist = async (req, res, next) => {
-    for (let invite of req.body.invites) {
-      let query;
-      if (invite.contact.includes("@")) {
-        query = { email: invite.contact };
-      } else {
-        query = { phone: invite.contact };
-      }
-      const user = await User.findOne(query).exec();
-      console.log(req.params);
-      if (user) {
-        const membership = await Membership.findOne({
-          user: new ObjectId(user._id),
-          "owner.target": req.body.owner.target
-        }).exec();
-        if (membership) {
-          console.log(membership);
-          res.status(400).send({
-            message: "Пользователь с таким email или телефоном уже добавлен в организацию!"
-          });
-          return;
-        }
-      }
-    }
-    next();
-  };
-  return {
-    checkInviteExist,
-    checkUsersExist
-  };
-};
-const middlewareIndexFactory = (db) => {
-  const authJwt = middlewareFactory$4(db);
-  const authSecret = middlewareFactory$3();
-  const verifySignUp = middlewareFactory$2(db);
-  const verifyUser = middlewareFactory$1(db);
-  const verifyInvites = middlewareFactory(db);
-  return {
-    authJwt,
-    authSecret,
-    verifySignUp,
-    verifyUser,
-    verifyInvites
-  };
-};
-export {
-  middlewareIndexFactory as m
-};