@ozdao/martyrs 0.2.489 → 0.2.491

package/src/builder/rspack/rspack.config.spa.client.js

@@ -4,6 +4,8 @@ import Mustache from 'mustache';
 import path from 'path';
 import { merge } from 'webpack-merge';
 import { StatsWriterPlugin } from 'webpack-stats-plugin';
+import { InjectManifest } from '@aaroon/workbox-rspack-plugin';
+import { RspackManifestPlugin } from 'rspack-manifest-plugin';
 import template from '../templates/page.js';
 import getClientConfig from './rspack.config.ssr.client.js';
 const { rspack } = core;
@@ -54,7 +56,50 @@ export default projectRoot => {
       //     { from: path.resolve(projectRoot, "../public/icons"), to: 'icons' }
       //   ]
       // })
-      // new ServiceWorkerPlugin()
+      // PWA: инжектим манифест в существующий sw.js (унифицированно с SSR)
+      new InjectManifest({
+        swSrc: path.resolve(projectRoot, '../public/sw.js'),
+        swDest: 'sw.js',
+        exclude: [/\.html$/, /\.map$/],
+        manifestTransforms: [
+          (manifestEntries) => {
+            const manifest = manifestEntries.filter(entry => {
+              return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
+            });
+            return { manifest };
+          }
+        ]
+      }),
+      // PWA Manifest
+      new RspackManifestPlugin({
+        fileName: 'manifest.json',
+        seed: {
+          name: process.env.APP_NAME || 'OZDAO App',
+          short_name: process.env.APP_SHORT_NAME || 'OZDAO',
+          description: process.env.APP_DESCRIPTION || 'OZDAO Progressive Web App',
+          theme_color: '#000000',
+          background_color: '#ffffff',
+          display: 'standalone',
+          orientation: 'portrait',
+          scope: '/',
+          start_url: '/',
+          icons: [
+            {
+              src: '/favicon/android-chrome-192x192.png',
+              sizes: '192x192',
+              type: 'image/png'
+            },
+            {
+              src: '/favicon/android-chrome-512x512.png', 
+              sizes: '512x512',
+              type: 'image/png'
+            }
+          ]
+        },
+        generate: (seed, files, entrypoints) => {
+          return seed;
+        }
+      }),
     ],
     optimization: {
       minimizer: [new rspack.SwcJsMinimizerRspackPlugin(), , new rspack.LightningCssMinimizerRspackPlugin()],

package/src/builder/rspack/rspack.config.ssr.client.js

@@ -5,6 +5,7 @@ import { merge } from "webpack-merge";
 import { StatsWriterPlugin } from "webpack-stats-plugin";
 import { GenerateSW, InjectManifest } from '@aaroon/workbox-rspack-plugin';
 import { PurgeCSSPlugin } from "purgecss-webpack-plugin";
+import { RspackManifestPlugin } from 'rspack-manifest-plugin';
 import baseConfig from './rspack.config.base.js';
 
 export default (projectRoot) => {
@@ -64,6 +65,48 @@ export default (projectRoot) => {
           },
         ],
       }),
+      // PWA: инжектим манифест в существующий sw.js
+      new InjectManifest({
+        swSrc: path.resolve(projectRoot, '../public/sw.js'),
+        swDest: 'sw.js',
+        exclude: [/\.html$/, /\.map$/],
+        manifestTransforms: [
+          (manifestEntries) => {
+            const manifest = manifestEntries.filter(entry => {
+              return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
+            });
+            return { manifest };
+          }
+        ]
+      }),
+      // PWA Manifest
+      new RspackManifestPlugin({
+        fileName: 'manifest.json',
+        seed: {
+          name: process.env.APP_NAME || 'OZDAO App',
+          short_name: process.env.APP_SHORT_NAME || 'OZDAO',
+          description: process.env.APP_DESCRIPTION || 'OZDAO Progressive Web App',
+          theme_color: '#000000',
+          background_color: '#ffffff',
+          display: 'standalone',
+          orientation: 'portrait',
+          scope: '/',
+          start_url: '/',
+          icons: [
+            {
+              src: '/favicon/android-chrome-192x192.png',
+              sizes: '192x192',
+              type: 'image/png'
+            },
+            {
+              src: '/favicon/android-chrome-512x512.png', 
+              sizes: '512x512',
+              type: 'image/png'
+            }
+          ]
+        },
+        generate: (seed) => seed
+      }),
     ],
     optimization: {
       usedExports: true,  

package/src/builder/templates/page.js

@@ -12,7 +12,7 @@ export default `
       <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="manifest" href="/manifest.json">
       <link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#5bbad5">
       <meta name="msapplication-TileColor" content="#000000">
       <meta name="theme-color" content="#ffffff">

package/src/components/Button/Button.vue

@@ -1,204 +1,238 @@
 <script setup>
-	import { ref } from 'vue'
-
-	import Loader from '@martyrs/src/components/Loader/Loader.vue'
-
-	const props = defineProps({
-		submit: {
-			type: Function,
-			default: async () => { console.log('Button click.') }
-		},
-		text: {
-			type: Object,
-			default: (textComponent) => {
-				return textComponent = {
-					...textComponent.text,
-					success: '✔',
-					error: '✖'
-				}
-			}
-		},
-		counter: {
-	    type: Object
-	  },
-		callback: {
-			type: Function,
-			default: async () => { console.log('Button callback.') }
-		},
-		callbackDelay: {
-			type: Number,
-			default: 750
-		},
-		showSucces: {
-			type: Boolean,
-			default: true
-		},
-		showLoader: {
-			type: Boolean,
-			default: true
-		},
-		validation: {
-			type: Boolean,
-			default: false
-		},
-	})	
-
-	const emits = defineEmits(['error'])
-
-	const button = ref(null);
-	const error = ref(null);
-	const loading = ref(false);
-	const finished = ref(false);
-
-	async function Submit() {
-			console.log('click')
-			
-	    button.value.style['pointer-events'] = 'none';
-	    error.value = null;
-	    loading.value = true;
-
-	    // Функция для сброса состояния кнопки.
-	    const resetButton = () => {
-        if (button.value) {
-          // button.value.classList.replace('bg-second', 'bg-main');
-          button.value.style.pointerEvents = 'auto';
-          loading.value = false;
-          finished.value = false;
-          error.value = null;
-        }
-	    };
-
-	    try {
-        await props.submit();
-
-        button.value.classList.replace('bg-main', 'bg-second');
-
-        loading.value = false;
-
-        // Используем функцию сброса состояния кнопки здесь.
-        if (props.showSucces) { 
-					finished.value = true;
-          setTimeout(resetButton, 500);
-        } else {
-          resetButton();
-        }
-
-        // Если есть callback, мы также установим таймер для его вызова.
-        if (props.callback) setTimeout(() => props.callback(), props.callbackDelay);
-
-	    } catch (err) {
-    		emits('error',err)
-        // Если возникла ошибка, мы изменяем стили и устанавливаем сообщение об ошибке.
-        button.value.classList.replace('bg-main', 'bg-fourth-nano');
-        error.value = props.error;
-        
-        // После задержки снова сбрасываем состояние кнопки.
-        setTimeout(() => {
-          resetButton();
-          // Так как класс кнопки был изменен, вернем его в исходное состояние.
-          button.value.classList.replace('bg-fourth-nano', 'bg-main');
-        }, 1330);
-	    }
-	}
-
+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';
+
+const props = defineProps({
+  submit: {
+    type: Function,
+    default: async () => { console.log('Button click.') }
+  },
+  text: {
+    type: Object,
+    default: () => ({
+      success: null,
+      error: null
+    })
+  },
+  counter: {
+    type: Object
+  },
+  callback: {
+    type: Function,
+    default: async () => { console.log('Button callback.') }
+  },
+  callbackDelay: {
+    type: Number,
+    default: 750
+  },
+  showSucces: {
+    type: Boolean,
+    default: true
+  },
+  showLoader: {
+    type: Boolean,
+    default: true
+  },
+  validation: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const emits = defineEmits(['error'])
+
+const button = ref(null)
+const error = ref(null)
+const loading = ref(false)
+const finished = ref(false)
+
+async function Submit() {
+  console.log('click')
+  
+  button.value.style['pointer-events'] = 'none'
+  error.value = null
+  loading.value = true
+
+  // Функция для сброса состояния кнопки
+  const resetButton = () => {
+    if (button.value) {
+      button.value.style.pointerEvents = 'auto'
+      loading.value = false
+      finished.value = false
+      error.value = null
+    }
+  }
+
+  try {
+    await props.submit()
+
+    button.value.classList.replace('bg-main', 'bg-second')
+    loading.value = false
+
+    // Используем функцию сброса состояния кнопки здесь
+    if (props.showSucces) { 
+      finished.value = true
+      setTimeout(() => {
+        resetButton()
+        button.value.classList.replace('bg-second', 'bg-main')
+      }, 500)
+    } else {
+      resetButton()
+      button.value.classList.replace('bg-second', 'bg-main')
+    }
+
+    // Если есть callback, мы также установим таймер для его вызова
+    if (props.callback) setTimeout(() => props.callback(), props.callbackDelay)
+
+  } catch (err) {
+    emits('error', err)
+    // Если возникла ошибка, мы изменяем стили и устанавливаем сообщение об ошибке
+    button.value.classList.replace('bg-main', 'bg-fourth-nano')
+    loading.value = false
+    error.value = true
+    
+    // После задержки снова сбрасываем состояние кнопки
+    setTimeout(() => {
+      resetButton()
+      // Так как класс кнопки был изменен, вернем его в исходное состояние
+      button.value.classList.replace('bg-fourth-nano', 'bg-main')
+    }, 1330)
+  }
+}
 </script>
 
 <template>
-	<button @click.stop="Submit" :disabled="validation" ref="button" class="button">
-		<transition name="FromTop" >
-			<!-- Slot -->
-			<template v-if="!loading && !error && !finished || !showLoader"><slot></slot></template>
-			<!-- Loading Circle Animation -->
-			<template v-else-if="loading && !error && showLoader"><Loader  class="pos-relative pos-t-0 pos-l-0 loading"/></template>
-			<!-- <Loader v-else-if="loading && !error && showLoader"/> -->
-			<!-- Success -->
-			<span v-else-if="finished && showSucces" class="t-semi t-center w-100  loading t-black">{{text.success}}</span>
-			<!-- Error if not finished -->
-			<span v-else-if="error" class="t-center w-100 error">{{ error }}</span>
-		</transition>
-		<!-- Counter -->
-		<div v-if="counter" class="button-counter flex flex-center"><span>{{counter}}</span></div> 
-
-	</button> 
+  <button 
+    @click.stop="Submit"
+    :disabled="validation"
+    ref="button"
+		class="button"
+    :class="{ 'button--disabled': loading || validation }"
+  >
+    <Transition name="content" mode="out-in">
+      <!-- Default slot content -->
+      <span v-if="!loading && !error && !finished || !showLoader" class="button-content">
+        <slot></slot>
+      </span>
+      <!-- Loading state -->
+      <Loader v-else-if="loading && !error && showLoader"   class="button-content pos-relative pos-t-0 pos-l-0 loading"/>
+      <!-- Success state -->
+      <span v-else-if="finished && showSucces" class="button-content t-semi t-center w-100 loading t-black">
+        <template v-if="text.success">
+          {{ text.success }}
+        </template>
+        <IconCheckmark v-else class="icon" />
+      </span>
+      <!-- Error state -->
+      <span v-else-if="error" class="button-content t-center w-100 error">
+        <template v-if="text.error">
+          {{ text.error }}
+        </template>
+        <IconCross v-else class="icon" />
+      </span>
+    </Transition>
+    
+    <!-- Counter -->
+    <div v-if="counter" class="button-counter flex flex-center">
+      <span>{{ counter }}</span>
+    </div>
+  </button>
 </template>
 
-
 <style lang="scss">
-	.FromTop-enter-active,
-	.FromTop-leave-active {
-		transform: translateY(0);
-		opacity: 1;
-		transition: all 0.5s ease; 
-		
-	}
-	.FromTop-enter-from,
-	.FromTop-leave-to {
-		position: absolute;
-		transform: translateY(-1rem);
-		opacity: 0;
-		transition: all 0.5s ease;
-	}
-
-	button[disabled] {
-		opacity: 0.75  !important;
-	 	pointer-events: none  !important;
-	 	cursor: default  !important;
-	 	color: rgba(var(--dark), 0.33)  !important;
-		background: rgba(var(--light), 1) !important; 
-	}
-
-	a.button {
-			text-box: trim-both cap alphabetic;
-	}
-
-	.button {
-		display: flex;
-
-		padding: 0.5rem;
-		border-radius: 3rem;
-		text-box: trim-both cap alphabetic;
-
-		transform: scale(1);
-		opacity: 1;
-
-		align-items: center;
-		justify-content: center;
-		
-		color: black;
-		text-align: center;
-		text-transform: uppercase;
-		font-size: 1rem;
-		letter-spacing: 5%;
-
-		transition: all 0.33s ease;
-	 
-		&:hover {
-			cursor: pointer;
-			opacity: 0.9;
-		}
-
-		&:active {
-			transform: scale(0.95);
-		}
-
-		&-small {
-			padding: 0.75rem;
-			border-radius: 0.5rem;
-			height: fit-content;
-		}
-
-		.button-counter {
-			position: absolute;
-			right: -8px;
-	    bottom: -8px;
-	    background: yellow;
-	    height: 16px;
-	    border-radius: 16px;
-	    width: 16px;
-	    font-weight: 500;
-	    text-align: center;
-	    line-height: 16px;
-	    font-size: 10px;
-		}
-	}
+button[disabled] {
+  opacity: 0.75 !important;
+  pointer-events: none !important;
+  cursor: default !important;
+  color: rgba(var(--dark), 0.33) !important;
+  background: rgba(var(--light), 1) !important;
+}
+
+a.button {
+  text-box: trim-both cap alphabetic;
+}
+
+.button {
+  display: flex;
+  padding: 0.5rem;
+  border-radius: 3rem;
+  text-box: trim-both cap alphabetic;
+  transform: scale(1);
+  opacity: 1;
+  align-items: center;
+  justify-content: center;
+  color: black;
+  text-align: center;
+  text-transform: uppercase;
+  font-size: 1rem;
+  letter-spacing: 5%;
+  transition: all 0.33s ease;
+
+  &:hover {
+    cursor: pointer;
+    opacity: 0.9;
+  }
+
+  &:active {
+    transform: scale(0.95);
+  }
+
+  &-small {
+    padding: 0.75rem;
+    border-radius: 0.5rem;
+    height: fit-content;
+  }
+
+  .button-counter {
+    position: absolute;
+    right: -8px;
+    bottom: -8px;
+    background: yellow;
+    height: 16px;
+    border-radius: 16px;
+    width: 16px;
+    font-weight: 500;
+    text-align: center;
+    line-height: 16px;
+    font-size: 10px;
+  }
+}
+
+.button-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+}
+
+.icon {
+  width: 1rem;
+  height: 1rem;
+}
+
+/* Vue Transitions */
+.content-enter-active,
+.content-leave-active {
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.content-enter-from {
+  opacity: 0;
+  transform: translateY(8px) scale(0.95);
+}
+
+.content-leave-to {
+  opacity: 0;
+  transform: translateY(-8px) scale(0.95);
+}
+
+.content-enter-to,
+.content-leave-from {
+  opacity: 1;
+  transform: translateY(0) scale(1);
+}
 </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 pos-relative z-index-1 w-100 h-100 w-max-2r h-max-2r h-min-1r w-min-1r" :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/modules/auth/controllers/middlewares/visitor.logger.js

@@ -46,8 +46,30 @@ const modelsFactory = db => {
       next();
     }
   };
+  const findOrCreateVisitor = async (req) => {
+    const fingerprint = generateFingerprint(req);
+    try {
+      let visitor = await Visitor.findOne({ fingerprint: fingerprint });
+      if (!visitor) {
+        visitor = new Visitor({
+          ip: req.ip,
+          userAgent: req.headers['user-agent'],
+          acceptLanguage: req.headers['accept-language'],
+          fingerprint: fingerprint,
+        });
+        await visitor.save();
+      }
+      return visitor;
+    } catch (error) {
+      console.error('Error creating/finding visitor:', error);
+      throw error;
+    }
+  };
+
   return {
     visitorLogger,
+    generateFingerprint,
+    findOrCreateVisitor,
   };
 };
 export default modelsFactory;

package/src/modules/globals/globals.client.js

@@ -59,7 +59,7 @@ function initializeGlobals(app, store, router, config, options = {}) {
   app.use(alertPlugin);
   app.use(popupAuthPlugin);
   app.use(datePickerPlugin);
-  app.use(storeDebuggerPlugin, store);
+  // app.use(storeDebuggerPlugin, store);
 
   // Change Locale to Route Locale if available
   router.beforeEach((to, from, next) => {

package/src/modules/globals/views/components/layouts/Client.vue

@@ -295,15 +295,16 @@
 	onMounted(async () => {
 	  await getFirstUse()
 
-		// if ('serviceWorker' in navigator) {
-	  //  	window.addEventListener('load', () => {
-	  //    	navigator.serviceWorker.register('/service-worker.js').then(registration => {
-	  //      	console.log('SW registered: ', registration);
-	  //    	}).catch(registrationError => {
-	  //      	console.log('SW registration failed: ', registrationError);
-	  //    	});
-	  //  });
-	 	// }
+		// Регистрация единого Service Worker (PWA + push notifications)
+		if ('serviceWorker' in navigator && !window.__MOBILE_APP__) {
+	   	window.addEventListener('load', () => {
+	     	navigator.serviceWorker.register('/sw.js').then(registration => {
+	       	console.log('Unified SW registered: ', registration);
+	     	}).catch(registrationError => {
+	       	console.log('SW registration failed: ', registrationError);
+	     	});
+	   });
+	 	}
 		
 		const savedPosition = localStorage.getItem('position');
 

package/src/modules/notifications/FIXES.md

@@ -0,0 +1,4 @@
+1. У globals.ws нотификаций нет реактиновного состояния или инструментов крове listeners для получения текущего состояния сокетов. Если это синглтон в него надо добавить методы для получения такой информации.
+2. Тоже самое касается NotificationManager - у него нет реактивного состояния и вообще хуй знает что он делает
+3. Нету ABAC для нотификаций и мидлваров вообще никаких. Методы для отправки нотификаций вообще не нужно делать доступными по апи без сервисного ключа. 
+4. Заменить лоадер на компонент Loader