@ozdao/martyrs 0.2.518 → 0.2.520

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

@@ -15,154 +15,7 @@
       </button>
     </header>
 
-    <div class="cols-2-1_3 br-1px br-solid br-light z-index-3 pos-relative">
-
-      <div class="o-y-scroll br-r br-solid br-light pd-medium z-index-2 desktop-only h-100 pos-relative">
-        <div class="w-100 o-y-scroll h-100">
-          <!-- Categories -->
-          <div class="mn-b-medium">
-            <h4 class="mn-b-small">Categories</h4>
-            <div class="gap-micro">
-              <div
-                v-for="category in postCategories"
-                :key="category.value"
-                @click="selectCategory(category.value)"
-                :class="{ 'bg-light': selectedCategory === category.value }"
-                class="pd-small radius-small cursor-pointer hover-bg-light transition-all"
-              >
-                {{ category.label }}
-              </div>
-            </div>
-          </div>
-
-          <!-- Tags Filter -->
-          <Spoiler 
-            class="o-hidden mn-b-medium"
-            :status="true"
-          >
-            <template #header="{ isOpen }">
-              <div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
-                <h4 class="w-100">Tags</h4>
-                <div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
-                  <IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
-                </div>
-              </div>
-            </template>
-
-            <template #content>
-              <div class="mn-t-small">
-                <Field
-                  v-model="searchTag"
-                  placeholder="Search tags..."
-                  type="text"
-                  class="w-100 bg-light pd-small radius-small mn-b-small"
-                />
-                <Checkbox 
-                  v-for="tag in filteredTags"
-                  :key="tag"
-                  v-model:checkbox="selectedTags"
-                  :label="tag"
-                  :value="tag"
-                  mode="checkbox"
-                  class="mn-b-micro"
-                />
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Date Range Filter -->
-          <Spoiler 
-            class="o-hidden mn-b-medium"
-            :status="true"
-          >
-            <template #header="{ isOpen }">
-              <div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
-                <h4 class="w-100">Date Range</h4>
-                <div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
-                  <IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
-                </div>
-              </div>
-            </template>
-
-            <template #content>
-              <div class="mn-t-small">
-                <div 
-                  v-for="option in dateRangeOptions"
-                  :key="option.value"
-                  @click="selectDateRange(option.value)"
-                  :class="{ 'bg-light': selectedDateRange === option.value }"
-                  class="pd-small radius-small cursor-pointer hover-bg-light transition-all mn-b-micro"
-                >
-                  {{ option.label }}
-                </div>
-                
-                <div 
-                  @click="() => { tempSelectedDates = selectedDates; showDatePickerPopup = true; }"
-                  :class="{ 'bg-light': selectedDateRange === 'custom' }"
-                  class="pd-small radius-small cursor-pointer hover-bg-light transition-all mn-b-micro"
-                >
-                  {{ selectedDates ? `${formatDate(selectedDates.start, { dayMonth: true, language: 'en' })} - ${formatDate(selectedDates.end, { dayMonth: true, language: 'en' })}` : 'Select custom dates'}} 
-                </div>
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Author Filter -->
-          <Spoiler 
-            class="o-hidden mn-b-medium"
-            :status="true"
-          >
-            <template #header="{ isOpen }">
-              <div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
-                <h4 class="w-100">Author</h4>
-                <div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
-                  <IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
-                </div>
-              </div>
-            </template>
-
-            <template #content>
-              <div class="mn-t-small">
-                <Checkbox 
-                  label="My Posts Only"
-                  v-model:checkbox="showMyPostsOnly"
-                  mode="checkbox"
-                  class="mn-b-micro"
-                />
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Clear Filters Button -->
-          <button 
-            @click="clearFilters"
-            class="bg-main w-100 button mn-t-medium"
-          >
-            Clear Filters
-          </button>
-        </div>
-      </div>
-
-      <div class="w-100 rows-1 pd-thin pos-relative o-hidden">
-        <Filters
-          v-model:filters="availableFilters"
-          v-model:selected="selectedFilters"
-        />
-
-        <div class="mn-b-thin w-100 o-y-scroll scroll-hide scroll-snap-type-x-mandatory scroll-pd-regular">
-          <div class="gap-thin flex-nowrap flex">
-            <div
-              v-for="category in postCategories"
-              :key="category.value"
-              @click="selectCategory(category.value)"
-              :class="{ 'bg-main t-white': selectedCategory === category.value }"
-              class="flex-child-default bg-light flex t-nowrap pd-medium radius-medium cursor-pointer hover-bg-light transition-all"
-            >
-              {{ category.label }}
-            </div>
-          </div>
-        </div>
-
+    <div class="w-100 rows-1 pd-thin pos-relative o-hidden">
         <Feed
           :search="true"
           v-model:filter="blog.state.filter"
@@ -183,17 +36,12 @@
             status: 'published',
             user: auth.state.user._id,
             owner: route.params._id || null,
-            category: selectedCategory !== 'all' ? selectedCategory : null,
-            tags: selectedTags.length > 0 ? selectedTags : null,
-            author: showMyPostsOnly ? auth.state.user._id : null,
-            dateStart: selectedDates?.start,
-            dateEnd: selectedDates?.end,
             search: route.query.search
           }"
           v-slot="{ 
             items 
           }"
-          class="cols-3 pos-relative w-100 rows-1 gap-thin"
+          class="cols-1 pos-relative w-100 rows-1 gap-thin"
         >
           <CardBlogpost 
             v-for="item in items" 
@@ -211,49 +59,7 @@
           />
         </Feed>
 
-        <button
-          v-if="hasAccess(route.params._id, 'posts', 'create', auth.state.accesses, auth.state.access.roles)"
-          @click="$router.push({
-            name: route.params?._id ? 'Organization_PostAdd' : 'CreateBlogPost'
-          })"
-          class="mn-t-medium bg-main button w-100"
-        >
-          Create New Post
-        </button>
-      </div>
     </div>
-  
-    <!-- Date Picker Popup -->
-    <Popup
-      :isPopupOpen="showDatePickerPopup"
-      @close-popup="showDatePickerPopup = false"
-      class="pd-medium bg-white radius-medium"
-      style="min-width: 350px;"
-    >
-      <h3 class="mn-b-medium">Select Date Range</h3>
-      
-      <Calendar
-        v-model:date="tempSelectedDates"
-        :allowRange="true"
-        :disablePastDates="false"
-        class="mn-b-medium"
-      />
-      
-      <div class="flex gap-small">
-        <button 
-          @click="applyDateFilter"
-          class="bg-main button flex-child-full"
-        >
-          Apply
-        </button>
-        <button 
-          @click="showDatePickerPopup = false"
-          class="bg-light button flex-child-full"
-        >
-          Cancel
-        </button>
-      </div>
-    </Popup>
   </div>
 </template>
 
@@ -264,17 +70,10 @@
 
   // Import components
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
-  import Filters from '@martyrs/src/modules/globals/views/components/sections/Filters.vue'
-  import Spoiler from "@martyrs/src/components/Spoiler/Spoiler.vue"
-  import Field from "@martyrs/src/components/Field/Field.vue"
-  import Checkbox from "@martyrs/src/components/Checkbox/Checkbox.vue"
-  import Calendar from "@martyrs/src/components/Calendar/Calendar.vue"
-  import Popup from "@martyrs/src/components/Popup/Popup.vue"
 
   import CardBlogpost from '@martyrs/src/modules/community/components/blocks/CardBlogpost.vue'
 
   import IconPlus from '@martyrs/src/modules/icons/navigation/IconPlus.vue'
-  import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
 
   // Accessing router and store
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
@@ -285,7 +84,7 @@
 
   const route = useRoute()
   const router = useRouter()
-  const { hasAccess, formatDate } = useGlobalMixins()
+  const { hasAccess } = useGlobalMixins()
 
   // Props
   const props = defineProps({
@@ -295,130 +94,6 @@
     }
   })
 
-  // Categories
-  const postCategories = ref([
-    { label: 'All Posts', value: 'all' },
-    { label: 'News', value: 'news' },
-    { label: 'Updates', value: 'updates' },
-    { label: 'Events', value: 'events' },
-    { label: 'Announcements', value: 'announcements' },
-    { label: 'Stories', value: 'stories' }
-  ]);
-  const selectedCategory = ref('all');
-
-  // Tags
-  const searchTag = ref('');
-  const selectedTags = ref([]);
-  const availableTags = ref(['featured', 'important', 'trending', 'community', 'official']);
-  const filteredTags = computed(() => {
-    if (!searchTag.value) return availableTags.value;
-    return availableTags.value.filter(tag => 
-      tag.toLowerCase().includes(searchTag.value.toLowerCase())
-    );
-  });
-
-  // Date Range
-  const dateRangeOptions = ref([
-    { label: 'All Time', value: 'all' },
-    { label: 'Today', value: 'today' },
-    { label: 'This Week', value: 'week' },
-    { label: 'This Month', value: 'month' },
-    { label: 'This Year', value: 'year' }
-  ]);
-  const selectedDateRange = ref('all');
-  const showDatePickerPopup = ref(false);
-  const selectedDates = ref(null);
-  const tempSelectedDates = ref(null);
-
-  // Author
-  const showMyPostsOnly = ref(false);
-
-  const availableFilters = ref([
-    {
-      title: 'Category',
-      value: 'category',
-      type: 'radio',
-      options: postCategories.value
-    },
-    {
-      title: 'Status',
-      value: 'status',
-      type: 'radio',
-      options: [
-        { label: 'Published', value: 'published' },
-        { label: 'Draft', value: 'draft' },
-        { label: 'Archived', value: 'archived' }
-      ]
-    }
-  ])
-
-  const selectedFilters = ref({
-    category: 'all',
-    status: 'published'
-  })
-
-  const selectCategory = (category) => {
-    selectedCategory.value = category;
-    selectedFilters.value.category = category;
-  };
-
-  const selectDateRange = (range) => {
-    selectedDateRange.value = range;
-    const today = new Date();
-    
-    switch(range) {
-      case 'all':
-        selectedDates.value = null;
-        break;
-      case 'today':
-        selectedDates.value = {
-          start: today,
-          end: today
-        };
-        break;
-      case 'week':
-        const weekStart = new Date(today);
-        weekStart.setDate(today.getDate() - today.getDay());
-        selectedDates.value = {
-          start: weekStart,
-          end: today
-        };
-        break;
-      case 'month':
-        const monthStart = new Date(today.getFullYear(), today.getMonth(), 1);
-        selectedDates.value = {
-          start: monthStart,
-          end: today
-        };
-        break;
-      case 'year':
-        const yearStart = new Date(today.getFullYear(), 0, 1);
-        selectedDates.value = {
-          start: yearStart,
-          end: today
-        };
-        break;
-    }
-  };
-
-  const applyDateFilter = () => {
-    selectedDates.value = tempSelectedDates.value;
-    selectedDateRange.value = 'custom';
-    showDatePickerPopup.value = false;
-  };
-
-  const clearFilters = () => {
-    selectedCategory.value = 'all';
-    selectedTags.value = [];
-    selectedDateRange.value = 'all';
-    selectedDates.value = null;
-    showMyPostsOnly.value = false;
-    searchTag.value = '';
-    selectedFilters.value = {
-      category: 'all',
-      status: 'published'
-    };
-  };
 
   globals.state.navigation_bar.actions = [{
     component: IconPlus,

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

@@ -108,7 +108,7 @@
             {{ticket.client_refactor?.email || 'No email'}}
           </p>
 
-           <span class="pd-r-thin pd-l-thin pd-b-nano pd-t-nano bg-second radius-extra t-white t-medium d-block w-max uppercase">
+           <span class="pd-thin ]bg-second radius-extra t-white t-medium d-block w-max uppercase">
             {{ticket.status}}
           </span>
         </div>

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

@@ -160,13 +160,13 @@
   // Import state
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
   import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js'
-  import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
+  import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js'
 
 
   import * as events from '@martyrs/src/modules/events/store/events.js'; 
 
   const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
-    memberships.mutations.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
+    membershipsStore.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
   };
   // State
   const route = useRoute();

package/src/modules/globals/controllers/classes/globals.cache.js

@@ -1,34 +1,20 @@
 import NodeCache from 'node-cache';
+
 class Cache {
   constructor(options = {}) {
-    const { ttlSeconds = 60 * 5 } = options; // По умолчанию 5 минут
+    const { ttlSeconds = 60 * 5 } = options;
     this.cache = new NodeCache({ stdTTL: ttlSeconds });
-    this.tagStore = new Map(); // Хранилище тегов: tag -> Set(key)
+    this.tagStore = new Map();
   }
-  /**
-   * Получение значения по ключу
-   * @param {string} key - Ключ
-   * @returns {Promise<any>} Значение из кэша
-   */
+
   async get(key) {
     return this.cache.get(key);
   }
-  /**
-   * Установка значения по ключу
-   * @param {string} key - Ключ
-   * @param {any} value - Значение
-   * @returns {Promise<boolean>} Успешность операции
-   */
+
   async set(key, value) {
     return this.cache.set(key, value);
   }
-  /**
-   * Установка значения с тегами
-   * @param {string} key - Ключ
-   * @param {any} value - Значение
-   * @param {string[]} tags - Массив тегов
-   * @returns {Promise<boolean>} Успешность операции
-   */
+
   async setWithTags(key, value, tags = []) {
     const success = this.cache.set(key, value);
     if (success && tags.length > 0) {
@@ -41,15 +27,10 @@ class Cache {
     }
     return success;
   }
-  /**
-   * Удаление по ключу или ключам
-   * @param {string|string[]} keys - Ключ или массив ключей
-   * @returns {Promise<number>} Количество удаленных элементов
-   */
+
   async del(keys) {
     const keyArray = Array.isArray(keys) ? keys : [keys];
     const deletedCount = this.cache.del(keyArray);
-    // Обновляем tagStore
     for (const key of keyArray) {
       for (const [tag, keySet] of this.tagStore.entries()) {
         if (keySet.has(key)) {
@@ -62,23 +43,15 @@ class Cache {
     }
     return deletedCount;
   }
-  /**
-   * Удаление всех ключей, связанных с тегом
-   * @param {string} tag - Тег
-   * @returns {Promise<number>} Количество удаленных элементов
-   */
+
   async delByTag(tag) {
     if (!this.tagStore.has(tag)) return 0;
     const keys = Array.from(this.tagStore.get(tag));
     const deletedCount = await this.del(keys);
-    this.tagStore.delete(tag); // Тег больше не нужен
+    this.tagStore.delete(tag);
     return deletedCount;
   }
-  /**
-   * Удаление всех ключей, связанных с массивом тегов
-   * @param {string[]} tags - Массив тегов
-   * @returns {Promise<number>} Количество удаленных элементов
-   */
+
   async delByTags(tags) {
     let totalDeleted = 0;
     for (const tag of tags) {
@@ -86,26 +59,16 @@ class Cache {
     }
     return totalDeleted;
   }
-  /**
-   * Полная очистка кэша
-   * @returns {Promise<void>}
-   */
+
   async flush() {
     this.cache.flushAll();
     this.tagStore.clear();
   }
-  /**
-   * Получение всех ключей в кэше
-   * @returns {Promise<string[]>} Массив ключей
-   */
+
   async keys() {
     return this.cache.keys();
   }
-  /**
-   * Получение тегов для ключа
-   * @param {string} key - Ключ
-   * @returns {Promise<string[]>} Массив тегов
-   */
+
   async getTagsForKey(key) {
     const tags = [];
     for (const [tag, keySet] of this.tagStore.entries()) {
@@ -115,10 +78,7 @@ class Cache {
     }
     return tags;
   }
-  /**
-   * Получение статистики кэша
-   * @returns {Promise<object>} Статистика
-   */
+
   async stats() {
     return {
       keys: this.cache.keys().length,
@@ -127,4 +87,53 @@ class Cache {
     };
   }
 }
-export default Cache;
+
+// Хранилище экземпляров по namespace
+const instances = new Map();
+
+// Экспортируем конструктор с поддержкой namespace
+export default class CacheNamespaced {
+  constructor(namespaceOrOptions, options) {
+    let namespace = 'global';
+    let cacheOptions = {};
+
+    // Определяем, что передали - namespace или options
+    if (typeof namespaceOrOptions === 'string') {
+      namespace = namespaceOrOptions;
+      cacheOptions = options || {};
+    } else if (typeof namespaceOrOptions === 'object') {
+      cacheOptions = namespaceOrOptions || {};
+    }
+
+    // Если экземпляр для namespace уже существует, возвращаем его
+    if (instances.has(namespace)) {
+      return instances.get(namespace);
+    }
+
+    // Создаем новый экземпляр для namespace
+    const instance = new Cache(cacheOptions);
+    instances.set(namespace, instance);
+    
+    return instance;
+  }
+
+  // Статический метод для получения всех namespace'ов
+  static getNamespaces() {
+    return Array.from(instances.keys());
+  }
+
+  // Статический метод для очистки конкретного namespace
+  static async flushNamespace(namespace) {
+    if (instances.has(namespace)) {
+      await instances.get(namespace).flush();
+    }
+  }
+
+  // Статический метод для удаления namespace (полностью)
+  static removeNamespace(namespace) {
+    if (instances.has(namespace)) {
+      instances.get(namespace).flush();
+      instances.delete(namespace);
+    }
+  }
+}

package/src/modules/globals/controllers/classes/globals.logger.js

@@ -1,9 +1,8 @@
-// Переделанный класс Logger
 class Logger {
   constructor(db) {
-    // Теперь просто используем модель, которая уже определена в db
     this.LogModel = db.log;
   }
+
   async log(level, message) {
     const logEntry = new this.LogModel({
       level,
@@ -16,12 +15,49 @@ class Logger {
       console.error('Logging error:', err);
     }
   }
-  // Удобные методы для различных уровней логирования
+
   async info(message) {
     await this.log('info', message);
   }
+
   async error(message) {
     await this.log('error', message);
   }
 }
-export default Logger;
+
+// Хранилище экземпляров по namespace
+const instances = new Map();
+
+// Экспортируем конструктор с поддержкой namespace
+export default class LoggerNamespaced {
+  constructor(namespaceOrDb, db) {
+    // Если передали только db (старый способ)
+    if (!db && namespaceOrDb && typeof namespaceOrDb === 'object') {
+      const namespace = 'global';
+      
+      if (instances.has(namespace)) {
+        return instances.get(namespace);
+      }
+      
+      const instance = new Logger(namespaceOrDb);
+      instances.set(namespace, instance);
+      return instance;
+    }
+    
+    // Если передали namespace и db
+    const namespace = namespaceOrDb;
+    
+    if (instances.has(namespace)) {
+      return instances.get(namespace);
+    }
+    
+    const instance = new Logger(db);
+    instances.set(namespace, instance);
+    return instance;
+  }
+
+  // Статический метод для получения всех namespace'ов
+  static getNamespaces() {
+    return Array.from(instances.keys());
+  }
+}