@ozdao/prometheus-framework 0.2.322 → 0.2.324

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

@@ -20,6 +20,10 @@
       :theme="headerTheme"
       :logotype="route.meta.header.logotype"
       :location="route.meta.header.location"
+      :class="{
+        'w-100': !globals.state.isOpenSidebar,
+        'w-80': globals.state.isOpenSidebar
+      }"
     />
 
 		<transition name="moveFromTop" mode="out-in" appear>
@@ -43,10 +47,12 @@
 			id="screen" 
 			ref="screen"
 			@scroll="handleScroll"
-			class="transition-ease-in-out o-hidden w-100 pos-relative"
+			class="transition-ease-in-out o-hidden pos-relative"
 			:class="{
 				'': MOBILE_APP === 'ios',
-			}"
+        'w-100': !globals.state.isOpenSidebar,
+        'w-80': globals.state.isOpenSidebar
+      }"
 		>
 			<ShopCart />
 
@@ -98,6 +104,15 @@
     	/>
 		</router-view>
 
+	  <component
+			v-if="!MOBILE_APP && route.meta.footer?.component && !route.meta.hideFooter"
+      ref="footer" 
+      :is="route.meta.footer.component"
+      :theme="headerTheme"
+      :logotype="route.meta.footer.logotype"
+      :location="route.meta.footer.location"
+    />
+
     <component 
       v-if="MOBILE_APP && route.meta.title_hide"
       class="z-index-2"

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

@@ -0,0 +1,88 @@
+<template>
+  <div class="select-country">
+    <p class="h1">🌍</p>
+    <br>
+    <h3 class="mn-b-semi">{{t('title')}}</h3>
+    <!-- Select city -->
+    <div class="mn-b-semi">
+      <!-- Description -->
+      <p class="mn-b-small t-transp p-medium">{{t('description')}}</p> 
+      <!-- Input -->
+      <div class="flex-nowrap flex mn-b-small pd-small radius-small bg-light">
+        <span class="d-block mn-r-auto">{{t('cities[0]')}}</span>
+        <a @click="closePopup()">{{t('choose')}}</a>
+      </div>
+    </div>
+    <!-- Coming soon cities -->
+    <p class="mn-b-small">{{t('comingsoon')}}</p>
+    
+    <div class="cols-4 gap-small mn-b-semi">
+      <!-- Input -->
+      <div class="flex-nowrap flex pd-small radius-small bg-light">
+        <span class="d-block">{{t('cscities[0]')}}</span>
+      </div>
+      <div class="flex-nowrap flex pd-small radius-small bg-light">
+        <span class="d-block">{{t('cscities[1]')}}</span>
+      </div>
+      <div class="flex-nowrap flex pd-small radius-small bg-light">
+        <span class="d-block">{{t('cscities[2]')}}</span>
+      </div>
+      <div class="flex-nowrap flex pd-small radius-small bg-light">
+        <span class="d-block">{{t('cscities[3]')}}</span>
+      </div>
+    </div>
+    <!-- Description -->
+    <p class="mn-b-small t-transp">{{t('helpus')}}</p> 
+    <div class="pd-small p-big radius-small bg-light">
+      <a class="">hello@nms.network</a>
+    </div>
+  </div>
+</template>
+<script setup>
+// Import libs
+import { computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { useI18n } from 'vue-i18n'
+// Define props
+const props = defineProps({
+  isPopupOpen: {
+    type: Boolean,
+    default: false
+  },
+});
+const emits = defineEmits(['close-popup'])
+function closePopup() {
+  emits("close-popup");
+} 
+// Accessing router and store
+const route = useRoute()
+const router = useRouter()
+// Localization
+const text = {
+  messages: {
+    en: {
+      title: "Choose Your City",
+      description: "Please select your city from the list below to see rental options and other relevant information:",
+      choose: "Current",
+      cities: [
+        "Phuket"
+      ],
+      comingsoon: "Coming soon:",
+      cscities: [
+        "Bangkok",
+        "Chiang Mai",
+        "Pha-ngan",
+        "Pattaya",
+      ],
+      helpus: "NMS is your ultimate entertainment and lifestyle guide. Want to partner with us or share ideas? Reach out at:",
+      cultivate: "Let's create unforgettable moments together! 🎵🌴"
+    },
+  }
+}
+const { t } = useI18n(text)
+</script>
+<style lang="scss">
+  .select-country {
+    max-width: 100%;
+  }
+</style>

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

@@ -73,7 +73,7 @@
 		<button  
 			aria-label="menu"
 			@click="() => globals.state.isOpenSidebar = !globals.state.isOpenSidebar" 
-			class="mobile-only menu-btn"
+			class="cursor-pointer menu-btn"
 			:class="{
 				'menu-btn_active': globals.state.isOpenSidebar
 			}"
@@ -129,11 +129,11 @@
 
   <div class="flex-nowrap flex">	
 		<!-- NAGIVATION -->
-		<component
+		<!-- <component
       v-if="route.meta.navigation"
       :is="route.meta.navigation"
       class="mn-l-auto desktop-only"
-    />
+    /> -->
 		<Checkbox 
       name="darkmode"
       :label="'Darkmode'"

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

@@ -17,22 +17,22 @@
       </router-link>
     </li>
 
-    <!-- <li>
+    <li>
       <router-link  
         to="/gallery"
      >
         {{ t('HEADER.MENU.GALLERY') }}
       </router-link>
-    </li> -->
+    </li>
     
-   <!--  <li>
+    <li>
       <router-link  
         to="/events"
         class="font-second"
      >
         {{ t('HEADER.MENU.EVENTS') }}
       </router-link>
-    </li> -->
+    </li>
    
     <li>
       <router-link  
@@ -41,7 +41,54 @@
      >
         {{ t('HEADER.MENU.BLOG') }}
       </router-link>
-    </li>
+
+      <ul class="align-self-start pos-sticky h-max pos-t-0 w-100 bg-white radius-medium pd-medium p-medium gap-thin flex-column flex-nowrap flex z-index-2 t-nowrap scroll-hide">
+        <li   
+          :class="{'t-black bg-light': route.params.category === 'featured' }"          
+          @click="() => { blog.state.sort.param = 'createdAt'; router.push({name: 'Blog', params: { category: 'featured' } })}" 
+          class="cursor-pointer flex-v-center flex t-medium  pd-thin radius-extra"
+        >
+          <IconFeatured class="i-medium mn-r-thin t-transp"/>
+          Featured
+        </li>
+        <li   
+          :class="{'t-black bg-light': route.params.category === 'popular' }"                 
+          @click="() => { blog.state.sort.param = 'views'; router.push({name: 'Blog', params: { category: 'popular' } }) }" 
+          class="cursor-pointer t-medium flex-v-center flex  pd-thin radius-extra"
+        > 
+          <IconPopular class="i-medium mn-r-thin t-transp"/>
+          Popular
+        </li>
+        <li   
+          :class="{'t-black bg-light': route.params.category === 'new'}"          
+          @click="() => { blog.state.sort.param = 'createdAt'; router.push({name: 'Blog', params: { category: 'new' } })}" 
+          class="cursor-pointer t-medium flex-v-center flex  pd-thin radius-extra"
+        >
+          <IconRecent class="i-medium mn-r-thin t-transp"/>
+          Recent
+        </li>
+        <li   
+          v-if="auth.state.user._id"
+          :class="{'t-black bg-light': route.params.category === 'following'}"    
+          @click="() => { blog.state.sort.param = 'createdAt'; router.push({name: 'Blog', params: { category: 'following' } })}" 
+          class="cursor-pointer t-medium flex-v-center flex pd-thin radius-extra"
+        >
+          <IconFollowing class="i-medium mn-r-thin t-transp"/>
+          Following
+        </li>
+
+        <router-link 
+          v-if="auth.state.user._id"
+          :to="{
+            name: 'Create BlogPost'
+          }" 
+          class="button radius-big pd-small t-center t-medium bg-main w-100"
+        >
+          Create Post
+        </router-link>
+      </ul>
+     </li>
+
     <li>
       <router-link  
         to="/governance" 
@@ -54,25 +101,34 @@
 </template>
 
 
-<script setup="props">
-/////////////////////////////
-// COMPONENT DEPENDENCIES
-/////////////////////////////
+<script setup>
 import { computed, } from 'vue';
 import { useRoute,useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 
+import IconFeatured from '@pf/src/modules/icons/entities/IconFeatured.vue'
+import IconPopular from '@pf/src/modules/icons/entities/IconPopular.vue'
+import IconRecent from '@pf/src/modules/icons/entities/IconRecent.vue'
+import IconFollowing from '@pf/src/modules/icons/entities/IconFollowing.vue'
+
 import * as globals from '@pf/src/modules/globals/views/store/globals'
+import * as blog from '@pf/src/modules/community/store/blogposts.js';
+import * as auth from '@pf/src/modules/auth/views/store/auth'
+import * as organizations from '@pf/src/modules/organizations/store/organizations'
+import * as memberships from '@pf/src/modules/organizations/store/memberships'
+
+// State
+const route = useRoute();
+const router = useRouter();
+
+if (route.params.category === 'popular') blog.state.sort.param = 'views'; 
+if (route.params.category === 'new') blog.state.sort.param = 'createdAt'; 
+
 
-/////////////////////////////
-// HELPERS
-/////////////////////////////
+const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
+  memberships.mutations.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
+};
 
-/////////////////////////////
-// CREATED
-/////////////////////////////
-const route = useRoute()
-// Compoted Vars
 const text = {
   messages: {
     en: {
@@ -85,6 +141,7 @@ const text = {
           EVENTS: 'Events',
           BLOG: "Community",
           GOVERNANCE: "Governance",
+          BACKOFFICE: "Backoffice",
         }
       }
     },
@@ -98,6 +155,7 @@ const text = {
           EVENTS: 'События',
           BLOG: "Сообщество",
           GOVERNANCE: "Управление",
+          BACKOFFICE: "Бекофис",
         }
       }
     }
@@ -105,9 +163,6 @@ const text = {
 }
 // Methods
 const { t } = useI18n(text)
-/////////////////////////////
-// MOUNTED
-/////////////////////////////
 </script>
 
 <style lang="scss" scoped>

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

@@ -69,7 +69,7 @@ const props = defineProps(['stateSidebar'])
 const emits = defineEmits(['closeSidebar'])
 
 watch(() => route.path, () => {
-  if (props.stateSidebar === true) emits('closeSidebar');
+  // if (props.stateSidebar === true) emits('closeSidebar');
 });
 
 let vClickOutside = clickOutside
@@ -83,18 +83,11 @@ function clickedOutside(event) {
   if (isMenuButton) { 
     return null;
   } else if  (props.stateSidebar === true) {
-    emits('closeSidebar');
+    // emits('closeSidebar');   
   }
 }
 
 </script>
 
 <style lang="scss" >
-  #sidebar {
-    ul {
-      li {
-        margin-bottom: 1rem;
-      }
-    }
-  }
 </style>

package/src/modules/globals/views/mixins/mixins.js

@@ -48,43 +48,64 @@ export function useGlobalMixins() {
     return `${formattedNumber} ${currency}`;
   }
 
-  const formatDate = (d, options = {}) => {
-    var fixedDate = new Date(d);
-    var yyyy = fixedDate.getFullYear().toString();
-    var mm = (fixedDate.getMonth() + 1).toString();
-    var dd = fixedDate.getDate().toString();
-    var hh = fixedDate.getHours().toString();
-    var minmin = fixedDate.getMinutes().toString();
-
-    var format = {
-      dateOnly: options.dateOnly || false,
-      timeOnly: options.timeOnly || false,
-      dayMonth: options.dayMonth || false,
-      dayTime: options.dayTime || false,
-      monthYear: options.monthYear || false,
-      yearOnly: options.yearOnly || false,
-      custom: options.custom || ""
-    };
-
-    if (format.dateOnly) {
-      return yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
-    } else if (format.timeOnly) {
-      return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
-    } else if (format.dayMonth) {
-      return (dd[1] ? dd : "0" + dd[0]) + '.' + (mm[1] ? mm : "0" + mm[0]);
-    } else if (format.dayTime) {
-      return (dd[1] ? dd : "0" + dd[0]) + " в " + (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
-    } else if (format.monthYear) {
-      return (mm[1] ? mm : "0" + mm[0]) + '.' + yyyy;
-    } else if (format.yearOnly) {
-      return yyyy;
-    } else if (format.custom) {
-      return format.custom.replace("yyyy", yyyy).replace("mm", (mm[1] ? mm : "0" + mm[0])).replace("dd", (dd[1] ? dd : "0" + dd[0])).replace("hh", (hh[1] ? hh : "0" + hh[0])).replace("min", (minmin[1] ? minmin : "0" + minmin[0]));
-    }
-
-    return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]) + ", " + yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
+const formatDate = (d, options = {}) => {
+  var fixedDate = new Date(d);
+
+  // Определяем параметры локализации
+  const formatOptions = {
+    year: 'numeric',
+    month: 'long', // название месяца
+    day: '2-digit', // день с ведущим нулем
+    hour: '2-digit', // часы с ведущим нулем
+    minute: '2-digit', // минуты с ведущим нулем
+    hour12: false, // 24-часовой формат времени
+    ...options // дополнительные настройки
+  };
+
+  // Язык, по умолчанию "ru" (русский)
+  const locale = options.language || 'ru';
+
+  // Используем Intl.DateTimeFormat для локализации
+  const dateFormatter = new Intl.DateTimeFormat(locale, formatOptions);
+
+  var format = {
+    dateOnly: options.dateOnly || false,
+    timeOnly: options.timeOnly || false,
+    dayMonth: options.dayMonth || false,
+    dayTime: options.dayTime || false,
+    monthYear: options.monthYear || false,
+    yearOnly: options.yearOnly || false,
+    custom: options.custom || "",
+    monthName: options.monthName || false, // Новый параметр для вывода названия месяца
+    language: options.language || 'ru' // Язык, по умолчанию русский
+  };
+
+  if (format.dateOnly) {
+    return dateFormatter.format(fixedDate).split(',')[0]; // Выводим только дату
+  } else if (format.timeOnly) {
+    return new Intl.DateTimeFormat(locale, { hour: '2-digit', minute: '2-digit', hour12: false }).format(fixedDate); // Выводим только время
+  } else if (format.dayMonth) {
+    return new Intl.DateTimeFormat(locale, { day: '2-digit', month: 'short' }).format(fixedDate); // день и месяц
+  } else if (format.dayTime) {
+    return new Intl.DateTimeFormat(locale, { day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit', hour12: false }).format(fixedDate); // день и время
+  } else if (format.monthYear) {
+    return new Intl.DateTimeFormat(locale, { month: 'long', year: 'numeric' }).format(fixedDate); // месяц и год
+  } else if (format.yearOnly) {
+    return new Intl.DateTimeFormat(locale, { year: 'numeric' }).format(fixedDate); // только год
+  } else if (format.custom) {
+    // Для пользовательского формата с подстановкой
+    return format.custom.replace("yyyy", fixedDate.getFullYear())
+      .replace("mm", ("0" + (fixedDate.getMonth() + 1)).slice(-2)) // добавление ведущего нуля
+      .replace("dd", ("0" + fixedDate.getDate()).slice(-2)) // добавление ведущего нуля
+      .replace("hh", ("0" + fixedDate.getHours()).slice(-2)) // добавление ведущего нуля
+      .replace("min", ("0" + fixedDate.getMinutes()).slice(-2)); // добавление ведущего нуля
   }
 
+  // Вернуть полную дату в стандартном формате
+  return dateFormatter.format(fixedDate);
+}
+
+
   const normalizeUrlParam = (param) => {
     if (!param) param = ''