@ozdao/martyrs 0.2.584 → 0.2.586

package/src/cli/templates/app/src/store/index.js

@@ -0,0 +1,9 @@
+import { useStore } from '@ozdao/martyrs/modules/core/client';
+
+export function getStore() {
+  return useStore();
+}
+
+export { useStore };
+
+export default useStore();

package/src/cli/templates/docker-compose.yaml.mustache

@@ -0,0 +1,47 @@
+services:
+  {{projectNameLower}}:
+    restart: always
+    build:
+      context: .
+      dockerfile: ./app/Dockerfile
+    container_name: {{projectNameLower}}
+    hostname: {{projectNameLower}}
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200m"
+        max-file: "10"
+    environment:
+      - NODE_ENV=production
+      - API_URL=http://localhost
+      - PORT=8080
+    ports:
+      - "8080:8080"
+    networks:
+      - app-net
+    volumes:
+      - './public:/public'
+      - builds_web:/app/builds/web/client
+
+  nginx:
+    image: nginx:1.27-alpine
+    restart: unless-stopped
+    container_name: nginx_{{projectNameLower}}
+    hostname: nginx_{{projectNameLower}}
+    volumes:
+      - './public:/usr/share/nginx/html:ro'
+      - builds_web:/usr/share/nginx/builds:ro
+      - './nginx/default.conf:/etc/nginx/conf.d/default.conf:ro'
+    networks:
+      - app-net
+    depends_on:
+      - {{projectNameLower}}
+    ports:
+      - "80:80"
+
+networks:
+  app-net:
+    driver: bridge
+
+volumes:
+  builds_web:

package/src/cli/templates/nginx/Dockerfile

@@ -0,0 +1,5 @@
+FROM nginx
+
+COPY ./default.conf /etc/nginx/conf.d/
+
+CMD ["nginx", "-g", "daemon off;"]

package/src/cli/templates/nginx/default.conf.mustache

@@ -0,0 +1,55 @@
+client_max_body_size 100M;
+
+gzip on;
+gzip_vary on;
+gzip_proxied any;
+gzip_comp_level 6;
+gzip_buffers 16 8k;
+gzip_http_version 1.1;
+gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+server {
+    listen 80;
+    server_name localhost;
+    server_tokens off;
+    client_max_body_size 100M;
+
+    location ~ \.(js|json|css|map)$ {
+        root /usr/share/nginx/builds;
+        access_log off;
+        expires max;
+        add_header Cache-Control "public, immutable";
+    }
+
+    location / {
+        root /usr/share/nginx/html;
+        try_files $uri @backend;
+    }
+
+    location @backend {
+        proxy_pass http://{{projectNameLower}}:8080;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_buffers 8 16k;
+        proxy_buffer_size 16k;
+        proxy_set_header Cookie $http_cookie;
+        proxy_set_header X-NginX-Proxy true;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_read_timeout 86400;
+    }
+
+    location /api/ws {
+        proxy_pass http://{{projectNameLower}}:8020;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 86400;
+        proxy_buffering off;
+    }
+}

package/src/cli/templates/start-dev.sh.mustache

@@ -0,0 +1,131 @@
+#!/bin/bash
+
+echo "Checking ports..."
+lsof -ti:{{port}} | xargs kill -9 2>/dev/null
+lsof -ti:{{portNginx}} | xargs kill -9 2>/dev/null
+lsof -ti:{{portWss}} | xargs kill -9 2>/dev/null
+
+cd "$(dirname "$0")/app"
+
+echo "Starting development app on port {{port}}..."
+NODE_ENV=development PORT={{port}} PORT_WSS={{portWss}} node --loader esm-module-alias/loader index.js &
+APP_PID=$!
+
+echo "Waiting for app to start..."
+sleep 5
+
+if ! kill -0 $APP_PID 2>/dev/null; then
+    echo "Error: App failed to start"
+    exit 1
+fi
+
+PROJECT_ROOT="$(dirname "$0")"
+
+cat > /tmp/nginx-dev.conf <<EOF
+worker_processes auto;
+error_log /tmp/nginx-error.log warn;
+pid /tmp/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    default_type application/octet-stream;
+
+    types {
+        text/html                             html htm shtml;
+        text/css                              css;
+        text/xml                              xml;
+        application/javascript                js;
+        application/json                      json;
+        image/gif                             gif;
+        image/jpeg                            jpeg jpg;
+        image/png                             png;
+        image/svg+xml                         svg svgz;
+        image/webp                            webp;
+        font/woff                             woff;
+        font/woff2                            woff2;
+        application/x-font-ttf                ttf;
+        application/vnd.ms-fontobject         eot;
+    }
+
+    client_max_body_size 100M;
+
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml text/javascript;
+
+    server {
+        listen {{portNginx}};
+        server_name localhost;
+
+        location ~ \.(js|json|css|map)$ {
+            proxy_pass http://127.0.0.1:{{port}};
+            proxy_http_version 1.1;
+            proxy_set_header Host \$host;
+            proxy_set_header X-Real-IP \$remote_addr;
+            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto \$scheme;
+            proxy_buffering off;
+            proxy_cache off;
+        }
+
+        location / {
+            root $PROJECT_ROOT/public;
+            try_files \$uri @backend;
+        }
+
+        location @backend {
+            proxy_pass http://127.0.0.1:{{port}};
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade \$http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host \$host;
+            proxy_set_header X-Real-IP \$remote_addr;
+            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto \$scheme;
+            proxy_read_timeout 86400;
+        }
+
+        location /ws {
+            proxy_pass http://127.0.0.1:{{port}};
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade \$http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
+        }
+
+        location /api/ws {
+            proxy_pass http://127.0.0.1:{{portWss}};
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade \$http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host \$host;
+            proxy_set_header X-Real-IP \$remote_addr;
+            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto \$scheme;
+            proxy_read_timeout 86400;
+            proxy_buffering off;
+        }
+    }
+}
+EOF
+
+echo "Starting nginx on port {{portNginx}}..."
+nginx -c /tmp/nginx-dev.conf
+
+echo ""
+echo "================================="
+echo "Development server started!"
+echo "App: http://localhost:{{port}} (direct)"
+echo "Web: http://localhost:{{portNginx}} (via nginx)"
+echo "================================="
+echo ""
+echo "Press Ctrl+C to stop all services"
+
+trap "echo 'Stopping services...'; kill $APP_PID 2>/dev/null; nginx -c /tmp/nginx-dev.conf -s quit 2>/dev/null; exit" SIGINT SIGTERM
+
+wait $APP_PID

package/src/cli/templates/start-prod.sh.mustache

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cd "$(dirname "$0")"
+
+echo "Starting production with docker-compose..."
+docker-compose up -d --build
+
+echo ""
+echo "================================="
+echo "Production server started!"
+echo "Web: http://localhost"
+echo "================================="

package/src/components/Button/Button.vue

@@ -1,8 +1,6 @@
 <script setup>
 import { ref } from 'vue'
 
-import Loader from '@martyrs/src/components/Loader/Loader.vue'
-
 import IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue';
 import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 
@@ -119,7 +117,9 @@ async function Submit() {
     </span>
 
     <span class="button-loader" :class="{ 'active': loading && showLoader }">
-      <Loader class=""/>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
     </span>
 
     <span class="button-success" :class="{ 'active': finished && showSucces }">
@@ -203,9 +203,17 @@ a.button {
   align-items: center;
   justify-content: center;
   gap: 8px;
-  transition: opacity 0.3s ease;
-}
+  transform: translateY(0);
+  opacity: 1;
+  transition:
+    opacity 0.2s cubic-bezier(0.4, 0, 0.2, 1),
+    transform 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 
+  &.hidden {
+    opacity: 0;
+    transform: translateY(4px);
+  }
+}
 
 .button-loader {
   position: absolute;
@@ -213,9 +221,39 @@ a.button {
   display: flex;
   align-items: center;
   justify-content: center;
+  gap: 4px;
   opacity: 0;
-  transition: opacity 0.3s ease;
+  transform: translateY(4px);
+  transition:
+    opacity 0.25s cubic-bezier(0.0, 0, 0.2, 1) 0.05s,
+    transform 0.25s cubic-bezier(0.0, 0, 0.2, 1) 0.05s;
   pointer-events: none;
+
+  &.active {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
+  .dot {
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background: currentColor;
+    animation: dot-bounce 0.8s cubic-bezier(0.4, 0, 0.2, 1) infinite;
+
+    &:nth-child(1) { animation-delay: 0s; }
+    &:nth-child(2) { animation-delay: 0.12s; }
+    &:nth-child(3) { animation-delay: 0.24s; }
+  }
+}
+
+@keyframes dot-bounce {
+  0%, 100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-5px);
+  }
 }
 
 .button-success {
@@ -225,8 +263,16 @@ a.button {
   align-items: center;
   justify-content: center;
   opacity: 0;
-  transition: opacity 0.3s ease;
+  transform: translateY(4px);
+  transition:
+    opacity 0.2s cubic-bezier(0.0, 0, 0.2, 1),
+    transform 0.2s cubic-bezier(0.0, 0, 0.2, 1);
   pointer-events: none;
+
+  &.active {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
 .button-error {
@@ -236,15 +282,15 @@ a.button {
   align-items: center;
   justify-content: center;
   opacity: 0;
-  transition: opacity 0.3s ease;
+  transform: translateY(4px);
+  transition:
+    opacity 0.2s cubic-bezier(0.0, 0, 0.2, 1),
+    transform 0.2s cubic-bezier(0.0, 0, 0.2, 1);
   pointer-events: none;
-}
 
-.active {
-  opacity: 1;
-}
-
-.hidden {
-  opacity: 0;
+  &.active {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 </style>

package/src/components/Loader/Loader.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="circular-loader pos-relative z-index-1 w-100 h-100 w-max-2r h-max-2r" :class="{ 'circular-loader-centered': centered }">
+  <div class="circular-loader z-index-1 w-100 h-100 w-max-2r h-max-2r" :class="{ 'circular-loader-centered': centered }">
     <svg viewBox="25 25 50 50">
       <circle class="circular-loader-fill" cx="50" cy="50" r="20" fill="none" stroke-width="4" stroke-miterlimit="10" />
       <circle class="circular-loader-circle" cx="50" cy="50" r="20" fill="none" stroke-width="4" stroke-miterlimit="10" />

package/src/components/Tooltip/Tooltip.vue

@@ -1,16 +1,18 @@
 <template>
   <div class="cursor-pointer tooltip-container" @mouseover="showTooltip" @mouseleave="hideTooltip">
     <slot></slot>
-    <div  class="tooltip-content" :style="tooltipStyle">
-      <span>{{ text }}</span>
-    </div>
+    <Transition name="tooltip">
+      <div v-if="visible" class="tooltip-content" :style="{ left: posX, top: posY }">
+        <span>{{ text }}</span>
+      </div>
+    </Transition>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref } from 'vue';
 
-const props = defineProps({
+defineProps({
   text: {
     type: String,
     required: true
@@ -18,39 +20,45 @@ const props = defineProps({
 });
 
 const visible = ref(false);
-
-const tooltipStyle = reactive({
-  position: 'absolute',
-  width: 'max-content',
-  zIndex: 1000,
-  background: '#333',
-  color: '#fff',
-  padding: '5px',
-  borderRadius: '3px',
-  fontSize: '14px',
-  display: 'none',
-});
+const posX = ref('0px');
+const posY = ref('0px');
 
 function showTooltip(event) {
   visible.value = true;
-  tooltipStyle.left = `${(event.clientX / 100) + 10 }px`;
-  tooltipStyle.top = `${(event.clientY / 100) + 10 }px`;
-  tooltipStyle.display = 'block';
+  posX.value = `${(event.clientX / 100) + 10}px`;
+  posY.value = `${(event.clientY / 100) + 10}px`;
 }
 
 function hideTooltip() {
   visible.value = false;
-  tooltipStyle.display = 'none';
 }
 </script>
 
-<style >
+<style lang="scss">
 .tooltip-container {
   position: relative;
   display: inline-block;
 }
 
 .tooltip-content {
+  position: absolute;
+  width: max-content;
+  z-index: 1000;
+  background: #333;
+  color: #fff;
+  padding: 5px;
+  border-radius: 3px;
+  font-size: 14px;
   pointer-events: none;
 }
-</style>
+
+.tooltip-enter-active,
+.tooltip-leave-active {
+  transition: opacity 0.2s ease;
+}
+
+.tooltip-enter-from,
+.tooltip-leave-to {
+  opacity: 0;
+}
+</style>

package/src/modules/TASKS.MD

@@ -39,4 +39,33 @@
 4. Загружать настройки при старте приложения и кэшировать
 5. Обновить компоненты для получения настроек из store вместо config
 
-**Приоритет**: Высокий - статусы заказов особенно критичны для разных проектов
+**Приоритет**: Высокий - статусы заказов особенно критичны для разных проектов
+
+---
+
+### SSR Hydration mismatch в i18nManager
+
+**Проблема**: `i18nManager` — синглтон. При SSR порядок регистрации модулей может отличаться между сервером и клиентом. В результате `getMessages()` мержит локали в разном порядке, и одинаковые ключи (например `footer.copyright`) резолвятся по-разному.
+
+**Симптомы**:
+- Hydration mismatch: сервер рендерит "All rights reserved" (из core), клиент — "© 2025 OZ INTERACTIVE" (из app)
+- Текст из martyrs/core появляется вместо переводов проекта
+
+**Текущий костыль**: В проекте добавлять footer в overrides:
+```javascript
+// overrides.js
+export default {
+  core: {
+    en: { footer: en.footer },
+    ru: { footer: ru.footer }
+  }
+};
+```
+
+**Решение**:
+1. Гарантировать порядок регистрации модулей (app всегда после core)
+2. Или очищать i18nManager между SSR запросами
+3. Или использовать приоритеты при merge (app > core)
+
+**Затронутые файлы**:
+- `src/modules/core/views/classes/i18n.manager.js`