@ozdao/martyrs 0.2.518 → 0.2.520

package/src/modules/spots/components/blocks/CardSpot.vue

@@ -24,7 +24,7 @@
           :to="{
           name: 'Spot Edit',
           params: {
-            _id: props.organization._id || props.organization,
+            _id: props.organization?._id || props.organization,
             spot: spot._id
           }
         }"

package/src/modules/spots/components/pages/Spots.vue

@@ -15,135 +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" v-if="currentCategories.length > 0">
-            <h4 class="mn-b-small">
-              {{ route.params.categoryPath ? 'Subcategories' : 'Categories' }}
-            </h4>
-            <div class="gap-micro">
-              <div
-                v-for="category in currentCategories"
-                :key="category._id"
-                @click="selectCategory(category)"
-                class="pd-small radius-small cursor-pointer hover-bg-light transition-all"
-              >
-                {{ category.name }}
-              </div>
-            </div>
-          </div>
-
-          <!-- Location 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">Location</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="searchLocation"
-                  placeholder="Search location..."
-                  type="text"
-                  class="w-100 bg-light pd-small radius-small mn-b-small"
-                />
-                <Checkbox 
-                  v-for="location in locationOptions"
-                  :key="location"
-                  v-model:radio="selectedLocation"
-                  :label="location"
-                  :value="location"
-                  mode="radio"
-                  class="mn-b-micro"
-                />
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Delivery Options -->
-          <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">Delivery Options</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 
-                  v-for="option in deliveryOptions"
-                  :key="option.value"
-                  v-model:checkbox="selectedDeliveryOptions"
-                  :label="option.label"
-                  :value="option.value"
-                  mode="checkbox"
-                  class="mn-b-micro"
-                />
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Payment Options -->
-          <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">Payment Options</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 
-                  v-for="option in paymentOptions"
-                  :key="option.value"
-                  v-model:checkbox="selectedPaymentOptions"
-                  :label="option.label"
-                  :value="option.value"
-                  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="w-100 rows-1 pd-thin pos-relative o-hidden">
         
         <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">
@@ -177,15 +49,12 @@
             limit: 12,
             organization: route.params._id || null,
             user: auth.state.user._id,
-            location: selectedLocation,
-            deliveryOptions: selectedDeliveryOptions,
-            paymentOptions: selectedPaymentOptions,
             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"
         >
           <CardSpot
             v-for="(spot, index) in items"
@@ -206,14 +75,6 @@
           />
         </Feed>
 
-        <button
-          v-if="hasAccess(route.params._id, 'spots', 'create', auth.state.accesses, auth.state.access.roles)"
-          @click="$router.push(`/spots/${route.params._id}/spots/create`)"
-          class="mn-t-medium bg-main button w-100"
-        >
-          Add New Spot
-        </button>
-      </div>
     </div>
   </div>
 </template>
@@ -225,15 +86,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 CardSpot from '@martyrs/src/modules/spots/components/blocks/CardSpot.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';
@@ -254,70 +110,14 @@
     }
   })
 
-  // Categories
+  // Categories for mobile view
   const currentCategories = ref([]);
-  const searchLocation = ref('');
-  const selectedLocation = ref('All');
-  const locationOptions = ref(['All', 'Phuket', 'Bangkok', 'Chiang Mai', 'Pattaya']);
-
-  // Delivery options
-  const deliveryOptions = ref([
-    { label: 'Pickup', value: 'pickup' },
-    { label: 'Delivery', value: 'delivery' },
-    { label: 'Dine-in', value: 'dinein' }
-  ]);
-  const selectedDeliveryOptions = ref([]);
-
-  // Payment options
-  const paymentOptions = ref([
-    { label: 'Cash', value: 'cash' },
-    { label: 'Card', value: 'card' },
-    { label: 'Crypto', value: 'crypto' },
-    { label: 'Bank Transfer', value: 'transfer' }
-  ]);
-  const selectedPaymentOptions = ref([]);
-
-  const availableFilters = ref([
-    {
-      title: 'Location',
-      value: 'location',
-      type: 'radio',
-      options: locationOptions.value.map(loc => ({ label: loc, value: loc }))
-    },
-    {
-      title: 'Type',
-      value: 'type',
-      type: 'checkbox',
-      options: [
-        { label: 'Restaurant', value: 'restaurant' },
-        { label: 'Cafe', value: 'cafe' },
-        { label: 'Bar', value: 'bar' },
-        { label: 'Club', value: 'club' }
-      ]
-    }
-  ])
-
-  const selectedFilters = ref({
-    location: 'All',
-    type: []
-  })
 
   const selectCategory = (category) => {
     // Implementation for category selection
     console.log('Category selected:', category);
   };
 
-  const clearFilters = () => {
-    selectedLocation.value = 'All';
-    selectedDeliveryOptions.value = [];
-    selectedPaymentOptions.value = [];
-    searchLocation.value = '';
-    selectedFilters.value = {
-      location: 'All',
-      type: []
-    };
-  };
-
   globals.state.navigation_bar.actions = [{
     component: IconPlus,
     props: {

package/src/styles/base/all.scss

@@ -15,21 +15,6 @@
 .unactive { opacity: 0.0; }
 .hide { display: block; position: absolute; opacity: 0; pointer-events: none; }
 
-.t-truncate {
-  overflow: hidden; /* Скрывает все, что выходит за пределы блока */
-  text-overflow: ellipsis; /* Добавляет многоточие, если текст обрезается */
-  display: -webkit-box; /* Устанавливает элемент как блочный контейнер */
-  -webkit-line-clamp: 1; /* Ограничивает количество строк до 3 */
-  -webkit-box-orient: vertical; /* Устанавливает вертикальное направление расположения строк */
-}
-
-.t-trimmed {
-  overflow: hidden; /* Скрывает все, что выходит за пределы блока */
-  text-overflow: ellipsis clip;
-  display: -webkit-box; /* Устанавливает элемент как блочный контейнер */
-  -webkit-line-clamp: 1; /* Ограничивает количество строк до 3 */
-  -webkit-box-orient: vertical; /* Устанавливает вертикальное направление расположения строк */
-}
 
 
 body { 

package/src/styles/responsive.scss

@@ -32,7 +32,7 @@ $xxl-desktop-min:                   1921px;
   
   @media screen and (max-width:  $desktop-max) {
     html, body {
-      font-size: 18px;
+      font-size: 16px;
     }
   }
   
@@ -85,35 +85,6 @@ $xxl-desktop-min:                   1921px;
     .cols-6 {
       grid-template-columns: 1fr 1fr 1fr!important;
     }
-
-    .footer {
-      text-align: center;
-
-      .logo-link {
-        img {
-          margin: 0 auto;
-          margin-bottom: 2rem;
-        }
-      }
-
-      .twocols {
-        column-count: 1 !important;
-      }
-
-      .socials {
-        justify-content: center;
-      }
-    }
-
-     .catalog-wrapper {
-        grid-template-columns: 1fr !important; 
-
-        .grid-layout {
-          grid-template-columns: 1fr 1fr !important; 
-          gap: 1rem !important;
-        }
-      }
-
     
   }
   
@@ -138,7 +109,6 @@ $xxl-desktop-min:                   1921px;
 /*    h3, .h3 { font-size: 1.5rem }*/
 
    
-
     // Margins
     .mn-r-extra {
       margin-right: 2rem;

package/src/styles/typography.scss

@@ -29,8 +29,6 @@ h1,h2,h3,h4,h5,span,p {
   text-box-trim: none;
 }
 
-
-
 .text-box-trim {
   text-box: trim-both cap alphabetic;
 }
@@ -101,6 +99,23 @@ a:hover   { cursor: pointer;}
 .lh-regular { line-height: 1.125; }
 .lh-light  	{ line-height: 1.000; }
 
+.t-truncate {
+  overflow: hidden; 
+  text-overflow: ellipsis; /* Добавляет многоточие, если текст обрезается */
+  display: -webkit-box; /* Устанавливает элемент как блочный контейнер */
+  -webkit-line-clamp: 1; /* Ограничивает количество строк до 3 */
+  -webkit-box-orient: vertical; /* Устанавливает вертикальное направление расположения строк */
+}
+
+.t-trimmed {
+/*  overflow: hidden;*/
+  text-overflow: ellipsis clip;
+  display: -webkit-box; /* Устанавливает элемент как блочный контейнер */
+  -webkit-line-clamp: 1; /* Ограничивает количество строк до 3 */
+  -webkit-box-orient: vertical; /* Устанавливает вертикальное направление расположения строк */
+}
+
+
 .t-trim {
   white-space: nowrap;
   overflow: hidden;
@@ -110,21 +125,21 @@ a:hover   { cursor: pointer;}
 .t-trim-1 {
 	display: -webkit-box;
   -webkit-box-orient: vertical;  
-  overflow: hidden;
+/*  overflow: hidden;*/
   -webkit-line-clamp: 1;
 }
 
 .t-trim-2 {
 	display: -webkit-box;
   -webkit-box-orient: vertical;  
-  overflow: hidden;
+/*  overflow: hidden;*/
   -webkit-line-clamp: 2;
 }
 
 .t-trim-3 {
 	display: -webkit-box;
   -webkit-box-orient: vertical;  
-  overflow: hidden;
+/*  overflow: hidden;*/
   -webkit-line-clamp: 3;
 }