@ozdao/martyrs 0.2.511 → 0.2.513

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

@@ -17,6 +17,7 @@
 	    name="moveFromTop" 
 	    mode="out-in"
 	  >
+	  	
 	    <section 
 	      v-if="FirstUse && route.meta.walkthrough"
 	      class="w-100 h-100" 

package/src/modules/globals/views/components/sections/Filters.vue

@@ -35,10 +35,6 @@
     >
       <div class="flex-v-center flex-nowrap flex mn-b-medium">
         <h3 class="flex-child-full">Filters</h3>
-        <IconCross 
-          @click="showAllFilters = false" 
-          class="i-regular cursor-pointer"
-        />
       </div>
 
       <div class="filters-content">
@@ -168,12 +164,14 @@
           v-model:field="tempSelected[filter.value].min"
           :placeholder="filter.minPlaceholder || 'Min'"
           type="number"
+          :label="returnCurrency()"
           class="w-50 bg-light pd-small radius-small"
         />
         <Field
           v-model:field="tempSelected[filter.value].max"
           :placeholder="filter.maxPlaceholder || 'Max'"
           type="number"
+          :label="returnCurrency()"
           class="w-50 bg-light pd-small radius-small"
         />
       </div>

package/src/modules/globals/views/components/sections/Walkthrough.vue

@@ -1,82 +1,210 @@
 <template>
-	<div class="pos-fixed pos-t-0 pos-l-0 w-100 h-100vh z-index-6 bg-light flex embla" ref="emblaNode">
-    <div class="w-100 embla__container z-index-1">
-      <div
-        v-for="(slide, index) in walkthrough"
-        :key="index"
-        class="flex-center pd-thin t-center flex-column flex embla__slide"
-        :style="{ opacity: tweenSlides.length ? tweenSlides[index] : undefined, transform: tweenSlides[index] ? `scale(${tweenSlides[index]})` : '' }"
-      >
-        <img loading="lazy" class="w-100" :src="require(`@/assets/images/walkthrough/walkthrough_${index}.png`).default">
-      	<h2 class="mn-b-small">{{slide.title}}</h2>
-      	<p class="p-semi t-transp">{{slide.subtitle}}</p>
+	<div class="pos-fixed  pos-t-0 pos-l-0 w-100 h-100vh z-index-6 bg-white flex embla" ref="emblaNode">
+    
+
+    <div class="embla__container w-100 z-index-1">
+	    
+
+		  <!-- SLIDE 1 -->
+		  <!-- ------------------------------- -->
+    	<div class="pos-relative flex-justify-center pd-thin t-center flex-column flex embla__slide">
+	    		<!-- <div class="pos-absolute w-100 h-100 z-index-0 pos-t-0 pos-r-0">
+	    			<div class="pos-absolute z-index-1 pos-t-0 pos-r-0 w-100 h-100 bg-black-grad"></div>
+	    			<img class="pos-absolute z-index-0 pos-t-0 pos-r-0 object-fit-cover h-100 w-100" src="/assets/walkthrough/1.png">
+	    		</div> -->
+    		<div 
+    			class="flex flex-column flex-center pd-semi o-hidden pos-relative pos-b-0 z-index-1"
+    			 :style="{ opacity: tweenSlides.length ? tweenSlides[0] : undefined, transform: tweenSlides[0] ? `scale(${tweenSlides[0]})` : '' }"
+    		>
+    			<img 
+	      		:src="'/logo/logo_square.svg'" 
+	      		class="i-extra radius-medium mn-b-small"
+	      	>
+
+	        <h3 class="h3 mn-b-medium">Welcome to 3SR</h3>
+	        
+	        <p class="p-regular t-transp mn-b-big">
+	          Access premium cameras, lenses, lighting, and audio gear through our app designed for filmmakers and content creators.
+	        </p>
+
+
+	        <button @click="nextSlide" class="bg-main p-big w-max button">
+	          Get Started
+	        </button>
+	      </div>
+    	</div>
+
+    	<!-- SLIDE 2 -->
+		  <!-- ------------------------------- -->
+    	<div class="pos-relative flex-justify-center pd-thin t-center flex-column flex embla__slide">
+				<div class="flex flex-column flex-center pd-semi o-hidden pos-relative pos-b-0 z-index-1">
+          
+          <div class="mn-b-small w-4r h-4r mn-auto pd-regular bg-main radius-regular t-white flex flex-center">
+            <IconBell/>
+          </div>
+
+	        <h3 class="h3 mn-b-medium">Stay in the Loop</h3>
+	        <p class="p-regular t-transp mn-b-big">
+	          Get instant notifications about equipment availability, booking confirmations, and exclusive deals from our rental platform.
+	        </p>
+
+	        <div class="flex flex-column flex-center gap-small">
+	          <button @click="requestNotificationPermission" class="bg-main p-big w-max button">
+						 	 Enable Notifications
+						 </button>
+	          <button @click="nextSlide" class="bg-light p-big w-max button">
+	            Maybe Later
+	          </button>
+	        </div>
+	      </div>
+			</div>
+
+			<!-- SLIDE 3 -->
+		  <!-- ------------------------------- -->
+			<div class="pos-relative flex-justify-center pd-thin t-center flex-column flex embla__slide">
+        <div class="flex flex-column flex-center pd-semi o-hidden pos-relative pos-b-0 z-index-1">
+          
+          <div class="mn-b-small w-4r h-4r mn-auto pd-regular bg-main radius-regular t-white flex flex-center">
+            <IconAddress/>
+          </div>
+
+          <h3 class="h3 mn-b-medium">Find Nearby Equipment</h3>
+          <p class="p-regular t-transp mn-b-big">
+            Discover rental locations and equipment availability near you. We'll show you the closest pickup points and delivery options.
+          </p>
+
+          <div class="flex flex-column flex-center gap-small">
+            <button @click="requestLocationPermission" class="bg-main p-big w-max button">
+              Enable Location
+            </button>
+            <button @click="nextSlide" class="bg-light p-big w-max button">
+              Skip for Now
+            </button>
+          </div>
+        </div>
       </div>
 
-      <div
-      	class="flex-center flex-column flex pd-big embla__slide"
-      >
-      	<img loading="lazy" 
-      		:src="'/logo/logo_square.svg'" 
-      		class="i-extra radius-medium mn-b-small"
-      	>
-      	<h2 class="t-center mn-b-small">Welcome to The&nbsp;Commune</h2>
-      	<p class="p-medium t-transp mn-b-semi mn-r-auto mn-l-auto t-center">Join our community to connect, share, and learn from the best. Discover new opportunities and grow with us!</p>
-    
-      	<button @click="openFirstRoute('Sign Up')" class="w-100 bg-main button mn-b-thin">Sign Up</button> 
-      	<button @click="openFirstRoute('Sign In')" class="w-100 bg-white button mn-b-semi">Sign In</button>
+      <!-- SLIDE 4 - App Tracking Transparency -->
+		  <!-- ------------------------------- -->
+      <div class="pos-relative flex-justify-center pd-thin t-center flex-column flex embla__slide">
+        <div class="flex flex-column flex-center pd-semi o-hidden pos-relative pos-b-0 z-index-1">
+          <div class="mn-b-small w-4r h-4r mn-auto pd-regular bg-main radius-regular t-white flex flex-center">
+            <IconShield/>
+          </div>
+
+          <h3 class="h3 mn-b-medium">Personalized Experience</h3>
+          <p class="p-regular t-transp mn-b-big">
+            Allow us to provide you with personalized recommendations and improve your app experience based on your preferences.
+          </p>
 
-	      <p class="p-medium text-center">Or explore as a guest:</p> 
-      	<button @click="setFirstUseFalse()" class="button bg-white w-100">Continue without registration</button>
+          <div class="flex flex-column flex-center gap-small">
+            <button @click="requestTrackingPermission" class="bg-main p-big w-max button">
+              Allow Tracking
+            </button>
+            <button @click="nextSlide" class="bg-light p-big w-max button">
+              Ask App Not to Track
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <!-- SLIDE 5 - Final -->
+		  <!-- ------------------------------- -->
+      <div class="pos-relative flex-justify-center pd-thin t-center flex-column flex embla__slide">
+      	<div class="flex flex-column flex-center pd-semi o-hidden pos-relative pos-b-0 z-index-1">
+	      	<img loading="lazy" 
+	      		:src="'/logo/logo_square.svg'" 
+	      		class="i-extra radius-medium mn-b-small"
+	      	>
+	      	<h3 class="h3 mn-b-medium">Ready to Rent?</h3>
+	      	<p class="p-regular t-transp mn-b-big">Join thousands of creators who trust 3SR for their professional video equipment needs. Choose how you'd like to get started.</p>
+	    
+	      	<button @click="openFirstRoute('Sign Up')" class="bg-main p-big w-100 button mn-b-thin">Create Account</button> 
+	      	<button @click="openFirstRoute('Sign In')" class="bg-light t-black p-big w-100 button mn-b-semi">Sign In</button>
+
+		      <p class="p-small mn-b-medium t-transp">Or explore as a guest:</p> 
+	      	<button @click="setFirstUseFalse()" class="bg-light p-big w-max button">Continue as Guest</button>
+      	</div>
 	    </div>
 
     </div>
-    
-    <!-- <WavesBackground
-	    :style="{ transform: tweenValues[0] ? `translateX(${tweenValues[0]}%)` : '' }"
-    	class="pos-fixed pos-t-0 pos-l-0 z-index-0"
-    /> -->
-    <!-- <ColorsBackground 
-	    :style="{ transform: tweenValues[0] ? `translateX(${tweenValues[0]}%)` : '' }"
-    	class="pos-fixed pos-t-0 pos-l-0 z-index-0"
-    /> -->
-    
-    <div class="z-index-5 h-4r pos-absolute pos-b-1r pd-small flex-nowrap flex flex-center gap-small w-100 embla__dots">
-	    <div
+
+    <div class="
+	    embla__dots
+    	z-index-5 
+    	h-4r 
+    	pos-absolute 
+    	pos-t-1r 
+    	flex-nowrap 
+    	flex 
+    	flex-center 
+    	gap-thin 
+    	w-100"
+    >
+	    <button
 	      v-for="(snap, index) in scrollSnaps"
 	      :key="index"
 	      @click="scrollTo(index)"
 	      :class="[
-	        'embla__dot i-small radius-extra br-solid br-main br-2px',
+	        'embla__dot bg- i-small radius-extra',
 					{ 'bg-light': index !== selectedIndex },
 	        { 'bg-main': index === selectedIndex }
 	      ]"
 	    >
-		  </div>
+		  </button>
 
-		  <div @click.native="setFirstUseFalse()" class="h-100 w-6r pos-b-0r flex-nowrap flex flex-center pos-r-1r pos-relative radius-small br-solid br-main br-2px uppercase t-semi p-semi t-main pos-absolute"> 
-		  	skip
-		  </div>
+		  <button 
+		  	@click.native="setFirstUseFalse()" 
+		  	class="
+		  		pd-small
+		  		bg-white
+		  		t-black
+		  		w-6r 
+		  		pos-b-0r 
+		  		flex-nowrap 
+		  		flex 
+		  		flex-center 
+		  		pos-r-1r 
+		  		pos-relative 
+		  		radius-small 
+		  		uppercase 
+		  		pos-absolute
+		  	"> 
+		  	<span>Skip</span>
+		  </button>
 	  </div>
 	</div>
 
 </template>
 
 <script setup>
-	import { ref, onMounted } from 'vue';
+	import { ref, onMounted, reactive, inject } from 'vue';
 	import { useRoute, useRouter } from 'vue-router'
 
-	import emblaCarouselVue from 'embla-carousel-vue'; // Assuming a Vue version exists
+	import emblaCarouselVue from 'embla-carousel-vue'; 
+
+	import IconBell from '@martyrs/src/modules/icons/entities/IconBell.vue';
+	import IconAddress from '@martyrs/src/modules/icons/entities/IconAddress.vue';
+	import IconShield from '@martyrs/src/modules/icons/entities/IconAddress.vue';
 
-	// import WavesBackground from '@/components/icons/backgrounds/WavesBackground.vue'
-	// import ColorsBackground from '@/components/icons/backgrounds/ColorsBackground.vue'
+	import { AppTrackingTransparency } from 'capacitor-plugin-app-tracking-transparency';
 
 	const props = defineProps(['slides', 'options']);
 	const emits = defineEmits(['updateFirstUse'])
 	const router = useRouter()
+	
+	// Get notification manager directly
+	import ModuleNotifications from '@martyrs/src/modules/notifications/notifications.client.js'
 
 	// Set firstUse
 	import { Preferences } from '@capacitor/preferences';
 
+	const permissions = reactive({
+	  notifications: false,
+	  location: false,
+	  tracking: false
+	})
+
 	async function setFirstUseFalse() {
     await Preferences.set({
       key: 'first-use',
@@ -96,17 +224,6 @@
 
 		emits('updateFirstUse', false);
 	}
-	// Set Slider
-	let walkthrough = [{
-		title: 'Communicate',
-		subtitle: 'Write posts, comments and put likes.'
-	},{
-		title: 'Party & Fun',
-		subtitle: 'Check the calendar for new events.'
-	},{
-		title: 'Discover',
-		subtitle: 'Browse the gallery of photos.'
-	}]
 
 	const [emblaNode, emblaApi] = emblaCarouselVue({ loop: false })
 
@@ -118,6 +235,12 @@
 
 	const scrollTo = (index) => emblaApi.value && emblaApi.value.scrollTo(index);
 
+	const nextSlide = () => {
+		if (emblaApi.value) {
+			emblaApi.value.scrollNext();
+		}
+	};
+
 	const onInit = (embla) => {
 	  scrollSnaps.value = emblaApi.value.scrollSnapList();
 	};
@@ -179,6 +302,71 @@
 	  emblaApi.value.on('select', onSelect);
 	  emblaApi.value.on('scroll', onScroll)
 	});
+
+	const requestNotificationPermission = async () => {
+	  try {
+	    // Use notification manager from global store if available
+	    const notificationManager = window.$store?.notificationManager;
+	    
+	    if (notificationManager) {
+	      await notificationManager.pushHandler.requestPermissions();
+	      await notificationManager.registerWebPush(window.$store);
+	      permissions.notifications = true;
+	    }
+	    
+	    setTimeout(() => {
+	      nextSlide()
+	    }, 1000)
+	  } catch (error) {
+	    console.error('Notification permission error:', error)
+	    nextSlide()
+	  }
+	}
+
+	const requestLocationPermission = async () => {
+	  try {
+	    if (!('geolocation' in navigator)) {
+	      nextSlide()
+	      return
+	    }
+
+	    navigator.geolocation.getCurrentPosition(
+	      () => {
+	        permissions.location = true
+	        setTimeout(() => {
+	          nextSlide()
+	        }, 1000)
+	      },
+	      () => {
+	        setTimeout(() => {
+	          nextSlide()
+	        }, 1000)
+	      },
+	      { timeout: 8000 }
+	    )
+	  } catch (error) {
+	    console.error('Location permission error:', error)
+	    nextSlide()
+	  }
+	}
+
+	const requestTrackingPermission = async () => {
+	  try {
+	    const { status } = await AppTrackingTransparency.requestPermission();
+	    
+	    if (status === 'authorized') {
+	      permissions.tracking = true;
+	    }
+	    
+	    setTimeout(() => {
+	      nextSlide();
+	    }, 1000);
+	  } catch (error) {
+	    console.error('Tracking permission error:', error);
+	    nextSlide();
+	  }
+	};
+
 </script>
 
 <style lang="scss">

package/src/modules/inventory/components/pages/Inventory.vue

@@ -21,7 +21,6 @@
     <div class="rows-1">
       <Feed
         :search="true"
-        v-model:filter="filter"
         v-model:sort="sort"
         :store="{
           read: (options) => products.actions.read(options),

package/src/modules/notifications/FIXES.md

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

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

@@ -126,20 +126,56 @@ const NotificationsController = (db, wss, notificationService) => {
   // Register device for push notifications
   const registerDevice = async (req, res) => {
     try {
-      const { userId, deviceId, deviceType, deviceToken } = req.body;
-      // Upsert device registration
-      const device = await db.userDevice.findOneAndUpdate(
-        { userId, deviceId },
-        {
+      const { userId, anonymousId, deviceId, deviceType, deviceToken } = req.body;
+      
+      // Validate that either userId or anonymousId is provided
+      if (!userId && !anonymousId) {
+        return res.status(400).json({ message: 'Either userId or anonymousId is required' });
+      }
+      
+      const isAnonymous = !userId;
+      let query, updateData;
+      
+      if (isAnonymous) {
+        // For anonymous users
+        query = { anonymousId, deviceId };
+        updateData = {
+          anonymousId,
+          deviceId,
+          deviceType,
+          deviceToken,
+          isActive: true,
+          isAnonymous: true,
+          lastActive: Date.now(),
+        };
+      } else {
+        // For registered users - first delete any anonymous device with same deviceId/token
+        await db.userDevice.deleteMany({
+          $or: [
+            { deviceId, isAnonymous: true },
+            { deviceToken, isAnonymous: true }
+          ]
+        });
+        
+        query = { userId, deviceId };
+        updateData = {
           userId,
           deviceId,
           deviceType,
           deviceToken,
           isActive: true,
+          isAnonymous: false,
           lastActive: Date.now(),
-        },
-        { upsert: true, new: true }
+        };
+      }
+      
+      // Upsert device registration
+      const device = await db.userDevice.findOneAndUpdate(
+        query,
+        { $set: updateData },
+        { upsert: true, new: true, setDefaultsOnInsert: true }
       );
+      
       return res.status(201).json(device);
     } catch (err) {
       return res.status(500).json({ message: err.message });
@@ -184,6 +220,108 @@ const NotificationsController = (db, wss, notificationService) => {
     }
   };
 
+  // Send notification to specific device tokens
+  const sendToTokens = async (req, res) => {
+    try {
+      const { tokens, title, body, data = {} } = req.body;
+      
+      if (!tokens || !Array.isArray(tokens) || tokens.length === 0) {
+        return res.status(400).json({ message: 'tokens array is required' });
+      }
+      
+      if (!title || !body) {
+        return res.status(400).json({ message: 'title and body are required' });
+      }
+      
+      // Find devices by tokens
+      const devices = await db.userDevice.find({
+        deviceToken: { $in: tokens },
+        isActive: true
+      });
+      
+      const results = [];
+      
+      // Send to each device
+      for (const device of devices) {
+        try {
+          await notificationService.sendToDeviceToken({
+            deviceToken: device.deviceToken,
+            deviceType: device.deviceType,
+            title,
+            body,
+            data
+          });
+          results.push({ token: device.deviceToken, success: true });
+        } catch (error) {
+          results.push({ token: device.deviceToken, success: false, error: error.message });
+        }
+      }
+      
+      return res.json({
+        message: 'Notifications sent',
+        results,
+        total: tokens.length,
+        found: devices.length
+      });
+    } catch (err) {
+      return res.status(500).json({ message: err.message });
+    }
+  };
+  
+  // Send notification to anonymous devices
+  const sendToAnonymous = async (req, res) => {
+    try {
+      const { anonymousIds, title, body, data = {} } = req.body;
+      
+      if (!title || !body) {
+        return res.status(400).json({ message: 'title and body are required' });
+      }
+      
+      let devices;
+      
+      if (anonymousIds && Array.isArray(anonymousIds)) {
+        // Send to specific anonymous IDs
+        devices = await db.userDevice.find({
+          anonymousId: { $in: anonymousIds },
+          isAnonymous: true,
+          isActive: true
+        });
+      } else {
+        // Send to all anonymous devices
+        devices = await db.userDevice.find({
+          isAnonymous: true,
+          isActive: true
+        });
+      }
+      
+      const results = [];
+      
+      // Send to each device
+      for (const device of devices) {
+        try {
+          await notificationService.sendToDeviceToken({
+            deviceToken: device.deviceToken,
+            deviceType: device.deviceType,
+            title,
+            body,
+            data
+          });
+          results.push({ anonymousId: device.anonymousId, deviceToken: device.deviceToken, success: true });
+        } catch (error) {
+          results.push({ anonymousId: device.anonymousId, deviceToken: device.deviceToken, success: false, error: error.message });
+        }
+      }
+      
+      return res.json({
+        message: 'Notifications sent to anonymous devices',
+        results,
+        devicesFound: devices.length
+      });
+    } catch (err) {
+      return res.status(500).json({ message: err.message });
+    }
+  };
+
   return {
     create,
     createBatch,
@@ -193,6 +331,8 @@ const NotificationsController = (db, wss, notificationService) => {
     updatePreferences,
     getUserPreferences,
     markAllAsRead,
+    sendToTokens,
+    sendToAnonymous,
   };
 };
 export default NotificationsController;

package/src/modules/notifications/models/user-device.model.js

@@ -1,12 +1,20 @@
 export default (db, additionalFields = {}) => {
   const schema = new db.mongoose.Schema({
-    userId: { type: db.mongoose.Schema.Types.ObjectId, ref: 'User', required: true },
+    userId: { type: db.mongoose.Schema.Types.ObjectId, ref: 'User', required: false },
+    anonymousId: { type: String, required: false }, // For anonymous users
     deviceId: { type: String, required: true },
     deviceType: { type: String, enum: ['ios', 'android', 'web'], required: true },
     deviceToken: { type: String, required: true }, // Push token for mobile, or web token
     isActive: { type: Boolean, default: true },
     lastActive: { type: Date, default: Date.now },
+    isAnonymous: { type: Boolean, default: false }, // Flag to identify anonymous devices
   });
-  schema.index({ userId: 1, deviceId: 1 }, { unique: true });
+  
+  // Compound indexes for both registered and anonymous users
+  schema.index({ userId: 1, deviceId: 1 }, { unique: true, sparse: true });
+  schema.index({ anonymousId: 1, deviceId: 1 }, { unique: true, sparse: true });
+  schema.index({ deviceToken: 1 }, { unique: true });
+  schema.index({ isAnonymous: 1, isActive: 1 });
+  
   return db.mongoose.model('UserDevice', schema);
 };