@ozdao/martyrs 0.2.487 → 0.2.488

package/src/modules/auth/controllers/middlewares/authJwt.js

@@ -1,78 +1,58 @@
 import jwt from 'jsonwebtoken';
 
 const middlewareFactory = db => {
-  console.log('[Middleware Factory] Initializing middleware factory');
   
   const User = db.user;
   const Role = db.role;
   
   const verifyToken = (continueOnFail = false) => {
-    console.log('[Middleware Factory] Creating verifyToken middleware, continueOnFail:', continueOnFail);
     
     return async (req, res, next) => {
-      console.log('[VerifyToken] Middleware called');
-      console.log('[VerifyToken] Headers:', req.headers);
-      console.log('[VerifyToken] Cookies:', req.cookies);
       
       try {
         let token = req.headers['x-access-token'];
-        console.log('[VerifyToken] Token from header:', token);
         
         if (!token && req.cookies && req.cookies.user) {
-          console.log('[VerifyToken] Trying to get token from cookies');
           let user = JSON.parse(req.cookies.user);
           token = user.accessToken;
-          console.log('[VerifyToken] Token from cookies:', token);
         }
         
         if (req.headers['x-service-key']) {
-          console.log('[VerifyToken] Service key detected');
           const serviceKey = req.headers['x-service-key'];
           const validServiceKey = process.env.SERVICE_KEY;
           
           if (serviceKey !== validServiceKey) {
-            console.log('[VerifyToken] Invalid service key');
             return res.status(403).send({ message: 'Unauthorized: Invalid service key' });
           }
           
           req.isServiceRequest = true;
-          console.log('[VerifyToken] Service request validated');
           return next();
         }
         
         if (!token) {
-          console.log('[VerifyToken] No token found');
           req.userId = null;
           
           if (continueOnFail) {
-            console.log('[VerifyToken] Continue on fail enabled, proceeding');
             return next();
           } else {
-            console.log('[VerifyToken] Returning 401 - No token');
             return res.status(401).send({ message: 'Unauthorized: No token provided' });
           }
         }
         
-        console.log('[VerifyToken] Verifying token with secret');
         const decoded = jwt.verify(token, process.env.SECRET_KEY);
-        console.log('[VerifyToken] Token decoded:', decoded);
         
         req.userId = decoded._id;
         req.user = {
           _id: decoded._id,
         };
         
-        console.log('[VerifyToken] userId set to:', req.userId);
         next();
       } catch (err) {
-        console.log('[VerifyToken] Error:', err.message);
         req.userId = null;
         
         if (continueOnFail) {
-          console.log('[VerifyToken] Error but continue on fail enabled');
           next();
         } else {
-          console.log('[VerifyToken] Returning 401 - Invalid token');
           res.status(401).send({ message: 'Unauthorized: Invalid token' });
         }
       }
@@ -80,8 +60,6 @@ const middlewareFactory = db => {
   };
   
   const checkRole = roleToCheck => async (req, res, next) => {
-    console.log('[CheckRole] Checking role:', roleToCheck);
-    console.log('[CheckRole] userId:', req.userId);
     
     try {
       const user = await User.findById(req.userId).exec();
@@ -91,20 +69,15 @@ const middlewareFactory = db => {
       }
       
       const roles = await Role.find({ _id: { $in: user.roles } }).exec();
-      console.log('[CheckRole] User roles:', roles.map(r => r.name));
       
       for (let role of roles) {
         if (role.name === roleToCheck) {
-          console.log('[CheckRole] Role found, proceeding');
           next();
           return;
         }
       }
-      
-      console.log('[CheckRole] Role not found');
       res.status(403).send({ message: `Require ${roleToCheck} Role!` });
     } catch (err) {
-      console.log('[CheckRole] Error:', err.message);
       res.status(500).send({ message: err.message });
     }
   };
@@ -118,8 +91,6 @@ const middlewareFactory = db => {
     isModerator,
   };
   
-  console.log('[Middleware Factory] Returning authJwt object:', Object.keys(authJwt));
-  
   return authJwt;
 };
 

package/src/modules/auth/views/components/pages/ResetPassword.vue

@@ -13,7 +13,7 @@
 			<Tab 
 				v-model:selected="tabAuth"
 				:tabs="availableTabs"
-				tabClass="pd-small pd-r-medium pd-l-medium w-100 pd-small radius-small"
+				classTab="pd-small pd-r-medium pd-l-medium w-100 pd-small radius-small"
 			/>
 		</div>
 

package/src/modules/auth/views/components/pages/SignIn.vue

@@ -21,7 +21,7 @@
 			<Tab 
 				v-model:selected="tabAuth"
 				:tabs="availableTabs"
-				tabClass="pd-small pd-r-medium pd-l-medium w-100 pd-small radius-small"
+				classTab="pd-small pd-r-medium pd-l-medium w-100 pd-small radius-small"
 			/>
 		</div>
 		<!-- Form -->

package/src/modules/auth/views/components/pages/SignUp.vue

@@ -12,7 +12,7 @@
 			<Tab 
 				v-model:selected="tabAuth"
 				:tabs="availableTabs"
-				tabClass="pd-small pd-r-medium pd-l-medium w-100 pd-small radius-small"
+				classTab="pd-small pd-r-medium pd-l-medium w-100 pd-small radius-small"
 			/>
 		</div>
 

package/src/modules/auth/views/components/sections/FeaturedUsers.vue

@@ -68,7 +68,7 @@
       </div>
     </Marquee>
 
-    <p class="w-m-33r mn-r-auto mn-l-auto t-center mn-b-small p-big">
+    <p class="w-m-33r mn-r-auto mn-l-auto t-center mn-b-small p-semi">
       Together, we're shaping the future of the globals music community.
     </p>
     <router-link :to="{ name: 'Sign In' }" class="bg-black w-max mn-r-auto mn-l-auto t-medium t-white button">

package/src/modules/backoffice/components/admin/Users.vue

@@ -41,7 +41,7 @@
       </p>
 
       <div class="flex block">
-        <p class="w-100 mn-b-thin p-big">
+        <p class="w-100 mn-b-thin p-semi">
           <!-- +7{{user.phone}}  -->
         </p>
          

package/src/modules/backoffice/components/partials/Sidebar.vue

@@ -95,9 +95,9 @@ const menuItems = [
     icon: IconProducts
   },
   {
-    name: 'leftovers',
-    title: 'Leftovers',
-    routeName: 'Leftovers',
+    name: 'inventory',
+    title: 'Inventory',
+    routeName: 'BackofficeInventoryList',
     icon: IconLeftovers
   },
   {

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -49,7 +49,7 @@
 			
 			<p 
 				v-if="firstText && firstText.content && type !== 'blogpostPage' && !hideDescription" 
-				class='mn-b-medium t-transp p-big'
+				class='mn-b-medium t-transp p-semi'
 			>
 				{{firstText.content.slice(0,120)}}...
 			</p>

package/src/modules/community/components/layouts/Community.vue

@@ -1,8 +1,8 @@
-<template>
+	<template>
 	<div class="bg-white">
-		<section class="w-100 h-100 o-hidden flex-nowrap flex gap-thin mobile:pd-zero pd-thin pos-relative">
+		<section class="w-100  flex-nowrap flex gap-thin mobile:pd-zero pd-thin pos-relative">
 
-			<div style="flex: 1 1 auto" class="w-100 o-y-scroll h-100 pos-relative">
+			<div style="flex: 1 1 auto" class="w-100 h-100 pos-relative">
 				<header v-if="!route.params.url && route.name !== 'Create BlogPost'" class="bg-light pd-medium radius-medium mobile:radius-zero scroll-hide o-y-visible t-black pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
 		    	<h2 class="pos-relative t-nowrap flex-v-center flex-nowrap flex">
 		    		<span class="mn-r-thin">Posts for </span>
@@ -84,7 +84,7 @@
 				</router-view>
 			</div>
 
-			<div style="flex: 1 1 auto" class="desktop-only scroll-hide o-y-scroll h-100  w-40 h-100 pos-relative ">
+			<div style="flex: 1 1 auto" class="desktop-only pos-sticky pos-t-thin scroll-hide  h-100  w-40 h-100 pos-relative ">
 				<div class="radius-medium bg-light mn-b-thin pd-small">
 					<div class="gap-thin flex-nowrap flex">
 						<p class="t-medium mn-b-small">Latest Comments</p>
@@ -106,7 +106,7 @@
 		    </div>
 
 	      <div class="radius-medium bg-light pd-small">
-					<div class="gap-thin flex-nowrap flex  mn-b-small">
+					<div class="gap-thin flex-v-center flex-nowrap flex  mn-b-small">
 						<p class="text-box-trim-end t-medium">Popular Communities</p>
 						
 						<router-link 

package/src/modules/community/components/pages/Blog.vue

@@ -30,7 +30,7 @@
         :key="item._id" 
         :blogpost="item" 
         :user="auth.state.user._id" 
-        class="h-max-40r bg-light mn-b-thin radius-medium mobile:radius-zero"
+        class="h-max-40r bg-light radius-medium mobile:radius-zero"
       />
     </Feed>
   </section>

package/src/modules/community/components/sections/Comments.vue

@@ -9,7 +9,7 @@
           <textarea 
             v-model="commentContent" 
             placeholder="Enter your comment" 
-            class="p-big w-100"
+            class="p-semi w-100"
             style="resize: none;"
           ></textarea>
           <button type="submit" class="mn-l-auto bg-main pd-r-regular pd-l-regular pd-thin button">

package/src/modules/constructor/components/sections/Viewer.vue

@@ -47,7 +47,7 @@ function getBlockProps(block, index) {
     if (!prevTextarea) {
       return { innerHTML: block.content, class: props.notitle ? "h3" : "h2" };
     }
-    return { innerHTML: block.content, class: "p-big" };
+    return { innerHTML: block.content, class: "p-semi" };
   } else if (block.type === 'H2') {
     return { innerHTML: block.content, class: props.notitle ? "h3" : "h2" };
   } else if (block.type === 'Caption') {

package/src/modules/events/components/blocks/CardEvent.vue

@@ -1,7 +1,8 @@
 <template>
   <article 
 	  :class="{
-	  	'flex-nowrap flex-v-center flex': type === 'short'
+	  	'flex-nowrap flex-v-center flex': type === 'short',
+	  	'flex flex-column': type !== 'short',
 	  }"
 	  class="pos-relative"
   >
@@ -23,16 +24,16 @@
     />
 
  		<div 
- 			v-if="event.cover && type !== 'short'" 
- 			class="o-hidden pos-relative bg-light mn-b-small w-100"
+ 			v-if="type !== 'short'" 
+ 			class="o-hidden flex-child-default pos-relative bg-black-transp-5 mn-b-small w-100"
  		>
-	    <img loading="lazy" 
+	    <img v-if="event.cover" loading="lazy" 
 	    	:src="(FILE_SERVER_URL || '') + event.cover" 
 	    	alt="Event image" 
 	    	class="pos-relative z-index-1 d-block mn-auto w-max-100 object-fit-contain h-20r"
 	    />
 
-	    <img loading="lazy" 
+	    <img v-if="event.cover"  loading="lazy" 
 	    	:src="(FILE_SERVER_URL || '') + event.cover" 
 	    	alt="Event Background" 
 	    	class="z-index-0 pos-absolute w-100 h-100 pos-t-0 pos-r-0"
@@ -41,12 +42,17 @@
 	    		filter: blur(2rem);
   				-webkit-filter: blur(2rem);"
 	    />
+	    <IconEvents
+	    	v-else
+				class="pos-relative z-index-1 d-block mn-auto w-max-100 object-fit-contain h-20r"
+				fill="rgb(var(--black)"
+			/>
 	  </div>
 
     <section 
     	class="pos-relative w-100"
     	:class="{
-    		'pd-t-zero pd-medium': type !== 'short',
+    		'pd-t-zero h-100 flex flex-column pd-medium': type !== 'short',
     		'flex-nowrap flex flex-v-center': type === 'short'
     	}"
     >
@@ -81,7 +87,7 @@
 
 				<h3 
 	      	v-if="type !== 'short'" 
-	      	class=""
+	      	class="t-trim-1"
 	      >
 	    		{{ event.name }}
 	    	</h3>
@@ -92,38 +98,35 @@
 				
 			</div>
 
-    	<p 
+    	<span 
     		v-if="type !== 'short'" 
-    		class="mn-b-small p-big t-trim-3"
+    		class="h-100 mn-b-regular p-regular t-trim-3"
     	>
     		{{ event.description }}
-    	</p>
+    	</span>
 
       <slot></slot>
       
       <div 
-      	class="flex-wrap flex-child-default gap-micro t-medium p-big justify-start align-center t-trim-2"
+      	class="flex-wrap mn-micro-negative flex-child-default gap-thin t-zero justify-start align-center t-trim-2"
       	:class="{
 	    		'order-1': type === 'short'
     		}"
       >
-        <span v-if="event.date?.start" class="mn-r-nano d-inline-block w-max pd-b-micro pd-t-micro pd-r-thin pd-l-thin radius-small t-medium bg-white">
-          <!-- <IconDate :fill="'rgb(var(--black))'" class="w-1r h-auto"/> -->
-          <!-- {{formatDate(event.date.start)}} -->
-
-						<span 
-				     :class="{
-			    		'p-medium': type === 'short'
-		    		}"
-				    	class="t-semi"
-				    >
-				    	{{ formattedDate }}
-				    </span>
-				    <span 
-				    		v-if="type !== 'short'"
-				    	class="t-semi ">
-				        | {{ formattedTimeRange }}
-				    </span>
+       	<span
+       		v-if="event.date?.start"
+          :key="index"
+          class="d-inline-flex p-semi t-medium mn-nano pd-thin radius-small bg-white"
+          :class="{
+		    		'p-medium': type === 'short'
+	    		}"
+        >
+          {{ formattedDate }}
+          <template
+		    		v-if="type !== 'short'"
+			    >
+		        | {{ formattedTimeRange }}
+			    </template>
         </span>
 
 
@@ -131,7 +134,7 @@
         	v-if="type !== 'short'"
           v-for="(chip, index) in event.tags"
           :key="index"
-          class="d-inline-flex pd-b-micro   pd-t-micro pd-r-thin pd-l-thin radius-small bg-main"
+          class="d-inline-flex mn-nano pd-thin radius-small p-semi t-medium bg-main"
         >
           {{ chip }}
         </span>
@@ -155,6 +158,9 @@
 
 	import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
 
+
+	import IconEvents from '@martyrs/src/modules/icons/entities/IconEvents.vue';
+
 	import CardHeader  from '@martyrs/src/modules/globals/views/components/blocks/CardHeader.vue'
 	import CardFooter  from '@martyrs/src/modules/globals/views/components/blocks/CardFooter.vue'
 	import { ref, computed } from 'vue'

package/src/modules/events/components/pages/Event.vue

@@ -28,7 +28,7 @@
             {{event?.name}}
           </h1>
 
-          <div class="flex flex-wrap gap-micro t-medium p-big mn-b-semi justify-start align-center">
+          <div class="flex flex-wrap gap-micro t-medium p-semi mn-b-semi justify-start align-center">
             <span v-if="event.date?.start" class="mn-r-nano d-inline-block w-max pd-b-micro pd-t-micro pd-r-thin pd-l-thin radius-small t-medium bg-white">
               <IconDate :fill="'rgb(var(--black))'" class="w-1r h-auto"/>
               {{formatDate(event.date.start)}}
@@ -44,7 +44,7 @@
             </span>
           </div>
 
-          <p class="z-index-1  p-big mn-b-semi">
+          <p class="z-index-1  p-semi mn-b-semi">
             {{event?.description}}
           </p>
 
@@ -70,7 +70,7 @@
               />
             </div>
             <div v-if="event?.ticketsTypes?.length > 0" v-for="ticketType in event.ticketsTypes" class="pd-medium w-100 radius-medium bg-white mn-b-small">
-              <div class="flex-nowrap mn-b-small p-big flex">
+              <div class="flex-nowrap mn-b-small p-semi flex">
                   <span class="mn-r-auto">{{ticketType.name}}</span>
                   <span class="t-medium">{{ticketType.price}} {{returnCurrency()}}</span>
               </div>
@@ -105,6 +105,7 @@
           :type="'event'" 
           :target="event._id" 
           :owner="auth.state.user._id"
+          class="bg-light radius-medium mobile:radius-zero pd-medium"
         />
 
       </div>

package/src/modules/events/components/pages/Events.vue

@@ -8,11 +8,11 @@
           dateStart: 0,
           dateEnd: 30
         }"
-        class="bs-black-small br-b br-solid br-black-transp-10 o-hidden bg-white  pd-l-zero pd-r-zero pd-medium"
+        class="bs-black-small br-b br-solid br-black-transp-10 o-hidden bg-white  pd-l-zero pd-r-zero pd-thin"
       />
     </div>
 
-   <section class="pd-big mobile:pd-thin radius-tr-medium radius-tl-medium bg-white"> 
+   <section class="pd-medium mobile:pd-thin radius-tr-medium radius-tl-medium bg-white"> 
 
     <div class="gap-medium radius-medium mn-b-semi">
       <h2
@@ -128,7 +128,7 @@
           :event="event" 
           :user="auth.state.user._id" 
           :type="'normal'"
-          class="bg-light radius-big"
+          class="bg-light radius-medium"
         >
         </CardEvent>
       </Feed>

package/src/modules/events/components/pages/EventsBackoffice.vue

@@ -39,7 +39,7 @@
 					gap-micro pd-t-thin pd-b-thin
 					br-b br-solid br-black-transp
 				"
-				tabClass="bg-light pd-small radius-small w-100"
+				classTab="bg-light pd-small radius-small w-100"
 			/>
 
 			<Feed

package/src/modules/events/components/sections/FeaturedEvents.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="columns-wrapper scroll-hide gap-thin">
-    <div class="column flex flex-column flex-child-default">
+    <div class="column w-100 flex flex-column flex-child-default">
       <h3
         class="mn-b-small"
       >
@@ -8,12 +8,14 @@
       </h3>
       <List
         :user="auth.state.user._id"
-        class="bg-light o-hidden h-100    pd-thin radius-medium"
+        class="bg-light o-hidden h-100 radius-medium"
+        sortParam="date.start"
+        sortOrder="desc"
         :phase="'planned'"
       />
     </div>
 
-    <div class="column flex flex-column flex-child-default">
+    <div class="column w-100 flex flex-column flex-child-default">
       <h3
         class="mn-b-small"
       >
@@ -21,7 +23,9 @@
       </h3>
       <List
         :user="auth.state.user._id"
-        class="bg-light o-hidden h-100  pd-thin radius-medium"
+        sortParam="date.start"
+        sortOrder="desc"
+        class="bg-light o-hidden h-100 radius-medium"
         :phase="'finished'"
       />
     </div>

package/src/modules/events/components/sections/List.vue

@@ -2,39 +2,28 @@
   <section 
     class="today-events"
   >
-    <!-- <transition name="fade">
-      <Loader v-if="isLoading" class="z-index-5 pos-t-50 left-t-50 pos-absolute"/>
-    </transition> -->
 
-    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-white radius-medium">
+    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-light radius-small">
       <SkeletonEventShort
         v-if="isLoading"
         v-for="i in limit" :key="i"
       />
-    </TransitionGroup>
-
-    <transition 
-      name="fade"
-    >
+    
       <EmptyState 
-        v-if="!isLoading && eventsList.length < 1"
+        v-else-if="eventsList.length < 1"
         title="No Planned Events "
         description="No events available. Please check back later."
-        class="pd-medium h-100 bg-white radius-medium"
+        class="pd-medium h-100 bg-light radius-small"
       />
-    </transition>
-
-
-    <TransitionGroup tag="ul" name="fade" class="container">
       <CardEvent 
-        v-if="!isLoading && eventsList.length > 0"
+        v-else
         @click="$router.push({name: 'Event', params: {url: event.url}})" 
         v-for="(event,index) in eventsList" 
         :key="event._id" 
         :event="event" 
         :owner="user" 
         :type="'short'"
-        class="pd-medium mobile:pd-thin"
+        class="pd-small mobile:pd-thin"
         :class="{
           'br-b br-solid br-black-transp-10': index !== eventsList.length - 1
         }"
@@ -86,6 +75,14 @@
     phase: {
       type: String,
       default: null
+    },
+    sortParam: {
+      type: String,
+      default: null
+    },
+    sortOrder: {
+      type: String,
+      default: null
     }
   });
 
@@ -106,7 +103,9 @@
       organization: props.organization,
       period: props.period,
       phase: props.phase,
-      status: props.status
+      status: props.status,
+      sortParam: props.sortParam,
+      sortOrder: props.sortOrder
     });
 
     eventsList.value = data;

package/src/modules/events/components/sections/SelectDate.vue

@@ -11,8 +11,8 @@
         class="bg-light radius-medium pd-medium cursor-pointer"
         @click="handleDateSelect(date)"
       >
-        <h4 class="t-medium">{{ date.label }}</h4>
-        <div class="text-small text-muted">{{ date.range }}</div>
+        <p class="mn-b-small p-semi t-medium">{{ date.label }}</p>
+        <div class="p-regular t-transp">{{ date.range }}</div>
       </div>
     </div>
   </div>

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

@@ -1,16 +1,22 @@
 const controllerFactory = (db, publicPath) => {
   const uploadMultipleFileController = async (req, res, next) => {
     if (!req.files || req.files.length === 0) {
-      return res.status(400).send({ message: 'No files uploaded.' });
+      return res.status(400).send({ 
+        errorCode: 'NO_FILES_UPLOADED',
+        message: 'No files uploaded.' 
+      });
     }
+    
     const convertToRelativePath = absolutePath => {
       if (!absolutePath.startsWith('/')) {
         absolutePath = '/' + absolutePath;
       }
       return absolutePath;
     };
+    
     req.files = req.files.map(file => convertToRelativePath(file));
     console.log(req.files);
+    
     try {
       const fileResponses = req.files.map(file => ({
         message: 'File uploaded successfully.',
@@ -19,11 +25,16 @@ const controllerFactory = (db, publicPath) => {
       res.status(200).send(fileResponses);
     } catch (error) {
       console.error('Error in uploadMultipleFileController:', error);
-      return res.status(500).send({ message: 'Error during files processing.' });
+      return res.status(500).send({ 
+        errorCode: 'FILE_PROCESSING_ERROR',
+        message: 'Error during files processing.' 
+      });
     }
   };
+  
   return {
     uploadMultipleFileController,
   };
 };
-export default controllerFactory;
+
+export default controllerFactory;