@ozdao/martyrs 0.2.429 → 0.2.431

package/src/modules/globals/controllers/utils/queryProcessor.js

@@ -2,7 +2,7 @@ const ObjectId = require('mongoose').Types.ObjectId;
 
 function getBasicOptions(query) {
   console.log(query);
-  const { _id, url, status, notstatus, type, owner, customer, creator } = query;
+  const { _id, url, status, notstatus, type, organization,  owner, customer, creator } = query;
   const stages = [];
   const conditions = [];
 
@@ -33,6 +33,7 @@ function getBasicOptions(query) {
   
   if (type) { conditions.push({ type: type }); }
   if (owner) { conditions.push({ "owner.target": new ObjectId(owner) }); }
+  if (organization) { conditions.push({ "organization": new ObjectId(organization) }); }
   if (customer) { conditions.push({ "customer.target": new ObjectId(customer) }); }
   if (creator) { conditions.push({ "creator.target": new ObjectId(creator) }); }
   

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

@@ -5,11 +5,11 @@
 		:class="{
   		'pd-t-extra': MOBILE_APP === 'ios',  
 			'bg-white': headerTheme === 'light',
-			'bg-dark': headerTheme === 'dark' 
+			'bg-black': headerTheme === 'dark' 
   	}"
 	>
 		<transition name="moveFromTop" appear>
-			<Loader v-if="!page" class="pos-fixed"/>
+			<Loader v-if="!page || isPageLoading" class="pos-fixed"/>
 		</transition>
 	
     <component
@@ -26,6 +26,7 @@
 		    :horizontal="true"
 				:navigationItems="route.meta.sidebar_navigation_items"
 				:stateSidebar="globals.state.isOpenSidebar" 
+				:theme="headerTheme"
 		  />
   	</component>
 
@@ -57,7 +58,6 @@
       }"
 		>
 			<ShopCart 
-				class="pd-t-extra"
 				:class="{
 					'mobile:pd-t-extra': MOBILE_APP === 'ios',  
 				}"
@@ -77,6 +77,7 @@
 	      :stateSidebar="globals.state.isOpenSidebar" 
 	      :widthHidden='route.meta?.sidebar_width_hidden'
 	      :width="route.meta?.sidebar_width"
+	      :theme="headerTheme"
 	      @closeSidebar="() => globals.state.isOpenSidebar = !globals.state.isOpenSidebar"
 	    >
 	    	<transition name="moveFromTop"  mode="out-in"  appear>
@@ -86,11 +87,12 @@
 		        :key="route.meta.sidebar_navigation"
 		        :navigationItems="route.meta.sidebar_navigation_items"
 			      :stateSidebar="globals.state.isOpenSidebar" 
+						:theme="headerTheme"
 		      />
 	      </transition>
 	    </component>
 		  
-		  <div class="rows-1-min0_max1 pos-relative w-100 h-100">
+		  <div class="rows-1-min0_max1 z-index-1 pos-relative w-100 h-100">
   			<Status 
 					v-if="globals.state.error.show" 
 					:data="globals.state.error"
@@ -111,7 +113,7 @@
 			      		:is="Component" 
 			      		:key="route.path"
 			      		class="w-100 h-min-100"
-		      		 @page-loading="handlePageLoading"
+		      		 	@page-loading="handlePageLoading"
 	              @page-loaded="handlePageLoaded"
 			      	/>
 			      	<!-- Key пока выключил непонятно какие проблемы это вызовет -->
@@ -193,7 +195,7 @@
     // Если страница не отправляет событие page-loaded, этот обработчик 
     // может служить запасным вариантом для отключения лоадера
     // Можно оставить закомментированным, если все страницы будут явно вызывать handlePageLoaded
-    // isPageLoading.value = false;
+    isPageLoading.value = false;
   }
 	/////////////////////////////
 	// CREATED
@@ -286,19 +288,23 @@
     position: absolute;
   }
 
-	.moveFromTop-enter-active,
-	.moveFromTop-leave-active {
-		transform: translateY(0);
-		opacity: 1;
-		transition: all 0.5s ease; 
-		
-	}
-	.moveFromTop-enter-from,
-	.moveFromTop-leave-to {
-		transform: translateY(-1rem);
-		opacity: 0;
-		transition: all 0.5s ease;
-	}
+.moveFromTop-enter-active,
+.moveFromTop-leave-active {
+  transition: all 0.3s ease, max-height 0.2s ease;
+  overflow: hidden;
+}
+
+.moveFromTop-enter-from,
+.moveFromTop-leave-to {
+  transform: translateY(-1rem);
+  opacity: 0;
+  // max-height: 0;
+}
+
+.moveFromTop-enter-to,
+.moveFromTop-leave-from {
+  // max-height: 100vh; 
+}
 
 	.moveFromTopAbsolute-enter-active,
 	.moveFromTopAbsolute-leave-active {

package/src/modules/globals/views/components/partials/Header.vue

@@ -71,11 +71,10 @@
 			pos-relative pos-t-0
 			br-b
 			br-solid
-			br-light
 		"
 		:class="{
-  		't-black': theme === 'light',
-  		't-white': theme === 'dark'  
+  		't-black br-light': theme === 'light',
+  		't-white br-dark': theme === 'dark'  
   	}"
 	>
 	<div class="flex-nowrap flex-v-center flex-justify-start flex gap-micro ">
@@ -173,7 +172,7 @@
 
 		<NotificationBadge
 			v-if="auth.state.user._id"
-			:fill="'rgb(var(--black))'"
+			:fill="theme === 'light' ? 'rgb(var(--black))' : 'rgb(var(--white))'" 
 		/>
 
 		<Button 

package/src/modules/globals/views/components/partials/Navigation.vue

@@ -22,6 +22,10 @@ import Spoiler from '@martyrs/src/components/Spoiler/Spoiler.vue'
 
 const props = defineProps({
   navigationItems: Array, // Fixed property name typo
+  theme: {
+    type: String,
+    default: "light"
+  },
   stateSidebar: {
     type: Boolean,
     default: false
@@ -82,10 +86,10 @@ const processRoute = (route) => {
 
 <template>
   <nav
-    class="o-y-scroll o-x-hidden h-100"
+    class="o-x-hidden h-100"
     :class="[
       stateSidebar ? 'pd-small' : 'pd-micro',
-      horizontal ? 'w-100 desktop-only flex flex-center flex-nowrap' : 'rows-1',
+      horizontal ? 'w-100 desktop-only flex flex-center flex-nowrap o-y-hidden' : 'o-y-scroll rows-1',
     ]"
   >
     <div 
@@ -94,7 +98,7 @@ const processRoute = (route) => {
       :key="section.category" 
       :class="[
         horizontal ? 'w-max flex-child-default flex flex-nowrap' : '',
-         stateSidebar && !horizontal ? 'mn-t-medium' : '',
+        stateSidebar && !horizontal ? 'mn-t-medium' : '',
       ]"
       class=""
     >
@@ -102,7 +106,9 @@ const processRoute = (route) => {
         class="sidebar-category"
         :class="{ 
           'hidden': !stateSidebar || horizontal, 
-          'visible': stateSidebar && !horizontal 
+          'visible': stateSidebar && !horizontal,
+          't-black': theme === 'light',
+          't-white':  theme === 'dark'
         }"
       >
         {{ section.category }}
@@ -119,8 +125,9 @@ const processRoute = (route) => {
           v-show="!item.visible || (typeof item.visible === 'function' ? item.visible(auth.state) : true)"
           class="flex-center"
           :class="[
-            stateSidebar ? '' : 'aspect-1x1',
+            stateSidebar ? '' : '',
             horizontal ? 'w-100 flex flex-nowrap' : '',
+            stateSidebar && !horizontal ? '' : 'aspect-1x1'
           ]"
         >
           <button
@@ -129,14 +136,15 @@ const processRoute = (route) => {
             :class="[
               stateSidebar || horizontal ? 'expanded-item pd-thin' : 'w-100 h-100 justify-center',
               horizontal ? 'w-max flex flex-nowrap' : '',
-              item.route && $route.path === processRoute(item.route) ? 'bg-light' : ''
+              item.route && $route.path === processRoute(item.route) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
+              theme === 'light' ? 'hover-bg-light' : 'hover-bg-dark'
             ]"
           >
             <component 
               v-if="item.iconComponent && !horizontal" 
               :is="item.iconComponent" 
               class="i-medium flex-child-default" 
-              :fill="globals.state.theme.darkmode ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.25)'"
+              :fill="globals.state.theme.darkmode || theme === 'dark' ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.25)'"
             />
             <span  v-if="!item.iconComponent && !horizontal"  class="i-medium sidebar-item-icon t-lh-1 flex-child-default">{{ item.icon }}</span>
             
@@ -177,7 +185,7 @@ const processRoute = (route) => {
                     v-if="subItem.iconComponent" 
                     :is="subItem.iconComponent" 
                     class="sidebar-subitem-icon i-medium" 
-                    :fill="globals.state.theme.darkmode ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.25)'"
+                    :fill="globals.state.theme.darkmode || theme === 'dark' ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.25)'"
                   />
                   <span v-else class="sidebar-subitem-icon">{{ subItem.icon }}</span>
                   <span class="sidebar-subitem-title">{{ subItem.title }}</span>
@@ -211,7 +219,7 @@ const processRoute = (route) => {
                     v-if="subItem.iconComponent" 
                     :is="subItem.iconComponent" 
                     class="sidebar-subitem-icon i-medium" 
-                    :fill="globals.state.theme.darkmode ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.25)'"
+                   :fill="globals.state.theme.darkmode || theme === 'dark' ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.25)'"
                   />
                   <span v-else class="sidebar-subitem-icon">{{ subItem.icon }}</span>
                   <span class="sidebar-subitem-title">{{ subItem.title }}</span>
@@ -242,16 +250,6 @@ const processRoute = (route) => {
 
 
 
-.sidebar-subitem-link:hover {
-  background: var(--light-regular);
-}
-
-.sidebar-item-btn:hover {
-  background: var(--light-regular);
-}
-
-
-
 .expanded-item {
   display: flex;
   align-items: center;

package/src/modules/globals/views/components/partials/Sidebar.vue

@@ -3,6 +3,10 @@ import { ref, watch } from 'vue'
 import * as globals from '@martyrs/src/modules/globals/views/store/globals'
 
 const props = defineProps({
+  theme: {
+    type: String,
+    default: "light"
+  },
   stateSidebar: {
     type: Boolean,
     default: false
@@ -28,18 +32,30 @@ const toggleSidebar = () => {
 
 <template>
   <aside
-    class="transition-linear w-min-0  o-hidden flex-child-default z-index-2 bg-white br-r br-solid br-light flex flex-column h-100"
+    class="transition-linear w-min-0  o-hidden flex-child-default z-index-2  br-r br-solid  flex flex-column h-100"
     :class="[
       'sidebar-container',
-      stateSidebar ? `${width} w-min-10 tablet:w-min-100 tablet:w-100 mobile:w-min-100 mobile:w-100` : `${widthHidden} mobile:w-0 br-zero`
+      // 
+      stateSidebar
+      ? `${width} w-min-10 tablet:w-min-100 tablet:w-100 mobile:w-min-100 mobile:w-100`
+      : `${widthHidden} mobile:w-0 br-zero`,
+      // 
+      theme === 'light' 
+      ? 't-black bg-white br-light'
+      : 't-white bg-black br-dark'
     ]"
   >
     <!-- Slot for navigation content -->
     <slot></slot>
 
     <div 
-      class="sidebar-footer"
-      :class="{ 'pd-micro': !stateSidebar, 'pd-small': stateSidebar }"
+      class="br-solid br-t"
+      :class="{ 
+        'pd-micro': !stateSidebar, 
+        'pd-small': stateSidebar,
+        'br-light': theme === 'light',
+        'br-dark':  theme === 'dark'
+      }"
     >
       <button
         @click="() => globals.actions.toggleTheme()"
@@ -101,11 +117,6 @@ const toggleSidebar = () => {
   transform: scale(1.1);
 }
 
-.sidebar-footer {
-  border-top-width: 1px;
-  border-top-style: solid;
-  border-top-color: var(--light-regular);
-}
 
 .hidden {
   opacity: 0;

package/src/modules/landing/components/sections/SectionHeroToken.vue

@@ -30,7 +30,7 @@
 		class="pos-relative bg-black o-hidden t-white t-center pd-extra flex-column flex-center flex"
 	>
 		<div class="sheen h-5r mn-b-small radius-extra o-hidden pos-relative ">
-	  	<img loading="lazy" src="/logo/wdt.svg" class="w-100 h-100">
+	  	<img loading="lazy" :src="(FILE_SERVER_URL || '') + '/logo/token.svg'" class="w-100 h-100">
 	  </div>
 
 		<h1 

package/src/modules/landing/landing.client.js

@@ -10,6 +10,10 @@ import SectionOverview  from './components/sections/SectionOverview.vue';
 import FloatingImages from './components/elements/FloatingImages.vue';
 import AnimatedGrid from './components/elements/AnimatedGrid.vue';
 
+import SectionHeroToken  from './components/sections/SectionHeroToken.vue';
+import SectionFeaturesImages  from './components/sections/SectionFeaturesImages.vue';
+import SectionRoadmap  from './components/sections/SectionRoadmap.vue';
+
 export {
   SectionEarn,
   SectionMobileApp,
@@ -19,5 +23,8 @@ export {
   SubscribeNewsletter,
   SectionFeatures,
   FloatingImages,
+  SectionHeroToken,
+  SectionFeaturesImages,
+  SectionRoadmap,
   AnimatedGrid
 };

package/src/modules/notifications/components/elements/NotificationBadge.vue

@@ -84,14 +84,6 @@ const recentNotifications = computed(() => {
 // Methods
 const toggleNotifications = () => {
   isOpen.value = !isOpen.value;
-  
-  // Load notifications if opening
-  if (isOpen.value) {
-    const userId = auth.state.user._id;
-    if (userId) {
-      getNotifications(userId);
-    }
-  }
 };
 
 const handleNotificationClick = (notification) => {
@@ -118,11 +110,10 @@ const handleClickOutside = (event) => {
 onMounted(() => {
   document.addEventListener('click', handleClickOutside);
 
-  if (isOpen.value) {
-    const userId = auth.state.user._id;
-    if (userId) {
-      getNotifications(userId);
-    }
+  // Load notifications when component mounts
+  const userId = auth.state.user._id;
+  if (userId) {
+    getNotifications(userId);
   }
 });