xroom-dashboard/src/components/CreateSpaceModal.vue

@@ -1,8 +1,8 @@
 <template>
-  <div v-if="isVisible" class="modal-overlay" @click="closeModal">
+  <div v-if="isVisible" class="modal-overlay" @click="$emit('close')">
     <div class="modal-content" @click.stop>
       <div class="popUp-header">
-        <h2>فضا جدید</h2>
+        <h2>ایجاد جلسه جدید</h2>
         <button @click="$emit('close')">
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -31,178 +31,87 @@
         </button>
       </div>
       <div class="popUp-title">
-        <!-- Space Selection Cards -->
+        <h2>اضافه کردن فضای جدید</h2>
-        <div v-if="spaces.length > 0" class="space-selection">
+        <span>برای ایجاد فضای جدید فرم زیر را تکمیل نمایید.</span>
-          <div 
-            v-for="(space, index) in spaces" 
-            :key="index" 
-            class="space-card" 
-            @click="selectSpace(space)"
-            :class="{ selected: selectedSpace === space }"  
-          >
-            <img :src="'http://my.xroomapp.com:8000' + space.img" alt="فضای اختصاصی" class="space-img" />
-            <div class="space-info">
-              <h3 class="space-name">{{ space.name }}</h3>
-              <p class="space-type">{{ space.type }}</p>
-              <p class="space-capacity">حداکثر: {{ space.capacity }} کاربر</p>
       </div>
-          </div>
-        </div> 
-
-        <div v-else class="loading-message">
-          <p>در حال بارگذاری فضاها...</p>
-        </div>
-      </div>
-      
       <div class="popUp-objects">
-        <div class="popUp-title-object">
+        <form @submit.prevent="handleSubmit">
-          <h2>اضافه کردن فضا جدید</h2>
-          <span>برای ایجاد فضای جدید فرم زیر را تکمیل نمایید .</span>
-        </div>
-
-
-        <!-- Form to enter additional information -->
-        <div v-if="selectedSpace" class="space-form">
-          <form @submit.prevent="submitForm">
-
           <div class="form-group">
-              <label for="name">نام:</label>
+            <label for="spaceName">نام:</label>
-              <input type="text" v-model="form.name" id="name" required />
+            <input
+              id="spaceName"
+              v-model="form.name"
+              type="text"
+              required
+            />
           </div>
-            
           <div class="form-group">
-              <label for="capacity">ظرفیت:</label>
+            <label for="spaceCapacity">ظرفیت:</label>
-              <input type="number" v-model="form.capacity" id="capacity" required />
+            <input
+              id="spaceCapacity"
+              v-model.number="form.capacity"
+              type="number"
+              required
+            />
           </div>
-            
           <div class="form-group">
-              <label for="description">توضیحات:</label>
+            <label for="spaceType">امکانات فضای مد نظر:</label>
-              <textarea v-model="form.description" id="description" required></textarea>
+            <textarea
+              id="spaceType"
+              v-model="form.features"
+              required
+            ></textarea>
           </div>
         </form>
       </div>
-      </div>
+      <div class="form-actions">
-      <div class="form-actions" v-if="selectedSpace">
+        <button type="button" class="cancel-btn" @click="$emit('close')">بازگشت</button>
-          <button type="button" class="cancel-btn" @click="closeModal">بازگشت</button>
+        <button type="submit" class="submit-btn" @click="handleSubmit">تایید</button>
-          <button type="submit" class="submit-btn" @click="submitForm">تایید</button>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import axios from 'axios';
-
 export default {
+  name: 'CreateSpaceModal',
   props: {
-    isVisible: Boolean,
+    isVisible: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
-      spaces: [],
-      selectedSpace: null,
       form: {
         name: '',
-        capacity: '',
+        capacity: null,
-        description: '',
+        features: '',
       },
     };
   },
   methods: {
-    closeModal() {
+    handleSubmit() {
-      this.$emit('close');
+      if (this.form.name && this.form.capacity && this.form.features) {
-      this.resetForm()
+        console.log('داده‌های فرم:', {
-    },
-    resetForm() {
-      this.spaces = [],
-      this.selectedSpace = null,
-      this.form = {
-        name : '',
-        capacity : '',
-        description : '',
-      }
-    },
-    selectSpace(space) {
-      this.selectedSpace = space;
-    },
-    async fetchSpaces() {
-      try {
-        const token = localStorage.getItem('token');
-        if (!token) {
-          console.error('No token found!');
-          return;
-        }
-
-        const response = await axios.get(
-          'http://my.xroomapp.com:8000/get_assigned_assetbundle_rooms',
-          {
-            headers: {
-              Authorization: `Token ${token}`,
-              'Content-Type': 'application/json',
-            },
-          }
-        );
-
-        console.log(response.data);
-
-        this.spaces = response.data.assetbundle_rooms.map(room => ({
-          name: room.name,
-          img: room.img,
-          capacity: room.maxPerson,
-          type: room.Private ? 'Private' : 'Public',
-          maxPerson: room.maxPerson,
-          id: room.id,
-        }));
-      } catch (error) {
-        console.error('Error fetching spaces:', error);
-      }
-    },
-    async submitForm() {
-      const spaceData = {
-        assetBundleRoomId: this.selectedSpace.id,
           name: this.form.name,
-        description: this.form.description,
           capacity: this.form.capacity,
+          features: this.form.features,
+        });
+        this.form = {
+          name: '',
+          capacity: null,
+          features: '',
         };
-
+        this.$emit('close');
-      try {
-        const token = localStorage.getItem('token');
-        if (!token) {
-          console.error('No token found!');
-          return;
-        }
-
-        const response = await axios.post(
-          'http://my.xroomapp.com:8000/add_space',
-          spaceData,
-          {
-            headers: {
-              Authorization: `Token ${token}`,
-              'Content-Type': 'application/json',
-            },
-          }
-        );
-
-        console.log(response.data);
-        this.$emit('submit', response.data);
-        this.closeModal(); // Close the modal
-        window.location.reload(); // Refresh the page
-      } catch (error) {
-        console.error('Error submitting form:', error);
-        alert('خطا در ارسال اطلاعات، لطفا دوباره تلاش کنید');
-      }
-    },
-  },
-  watch: {
-    isVisible(newVal) {
-      if (newVal) {
-        this.fetchSpaces();
       }
     },
   },
 };
 </script>
 
+
+
 <style scoped>
 .modal-overlay {
   position: fixed;
@@ -226,7 +135,7 @@ export default {
   direction: rtl;
   border-radius: 20px;
   padding-bottom: 1.5rem;
-  height: 95vh;
+  height: max-content;
   overflow-y: auto;
   scrollbar-width: none;
   -ms-overflow-style: none;
@@ -236,8 +145,6 @@ export default {
 .modal-content::-webkit-scrollbar {
   display: none;
 }
-
-
 .popUp-header {
     display: flex;
     align-items: center;
@@ -261,25 +168,20 @@ export default {
 }
 
 .popUp-title {
+    display: flex;
+    flex-direction: column;
+    align-items: start;
     padding: 20px;
     padding-right: 50px;
 }
 
-.popUp-title-object {
+.popUp-title h2 {
-    display: flex;
-    flex-direction: column;
-    align-items: start;
-}
-
-
-
-.popUp-title-object h2{
     font-size: 20px;
     font-weight: 600;
     color: #101010;
 } 
 
-.popUp-title-object span {
+.popUp-title span {
     font-size: 16px;
     font-weight: 500;
     color: #4F5A69;
@@ -287,7 +189,7 @@ export default {
 }
 
 .popUp-objects {
-    margin-top: 0rem !important;
+    margin-top: 1rem !important;
     padding: 20px;
     background-color: #FFFFFF;
     border-radius: 16px;
@@ -318,12 +220,12 @@ export default {
   border: 1px solid #718096;
   border-radius: 8px;
   font-size: 1rem;
-  max-width: 22rem
+  max-width: 25rem
 }
 
 .form-group textarea {
   height: 140px;
-  width: 75%;
+  width: 100%;
   padding: 8px;
   border: 1px solid #718096;
   border-radius: 8px;
@@ -340,77 +242,10 @@ export default {
     outline: none;
 }
 
-
-.space-selection {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 2rem 16px;
-  justify-content: flex-start;
-  margin-bottom: 20px;
-}
-
-.space-card {
-  background: #fff;
-  border-radius: 10px;
-  overflow: hidden;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-  width: 31%;
-  height: 15rem;
-  cursor: pointer;
-  transition: all 0.2s ease;
-}
-
-.space-card:hover {
-  transform: scale(1.05);
-}
-
-/* Add selected class styles */
-.space-card.selected {
-  border: 2px solid #3A57E8;
-  box-shadow: 0 4px 8px rgba(58, 87, 232, 0.5); /* Blue border and shadow */
-}
-
-.space-img {
-  width: 100%;
-  height: 8rem;
-  object-fit: cover;
-  border-bottom: 1px solid #ddd;
-}
-
-.space-info {
-  padding: 10px;
-  text-align: center;
-  gap: 1rem;
-  display: grid;
-}
-
-.space-name {
-  font-size: 16px;
-  font-weight: 600;
-  color: #444;
-  margin-top: 5px;
-}
-
-.space-type, .space-capacity {
-  font-size: 14px;
-  color: #718096;
-}
-
-.loading-message {
-  text-align: center;
-  font-size: 16px;
-  color: #718096;
-  margin-bottom: 1rem;
-}
-
-.space-form {
-  margin-top: 3rem;
-}
-
 .form-actions {
   display: flex;
   justify-content: space-between;
-  padding: 20px 0px; 
+  padding: 20px;
   padding-bottom: 0;
   width: 100%;
   max-width: 620px;
@@ -440,5 +275,4 @@ export default {
   font-weight: 500;
   font-size: 18px;
 }
-
 </style>

xroom-dashboard/src/components/EditBillingModal.vue

@@ -189,8 +189,6 @@ export default {
 .modal-content::-webkit-scrollbar {
   display: none;
 }
-
-
 .popUp-header {
     display: flex;
     align-items: center;

xroom-dashboard/src/pages/dashboard/Spaces.vue

@@ -14,15 +14,51 @@
         </p>
       </div>
 
+      <!-- Page Objects -->
+      <div>
+        <!-- Sharing Filter -->
+        <div class="filter-section">
+          <div class="sharing-filters">
+            <span style="font-size: 17px; font-weight: 600;">فیلتر اشتراک‌گذاری</span>
+            <div class="filter-buttons">
+              <button
+                v-for="filter in sharingFilters"
+                :key="filter.value"
+                :class="activeSharingFilter === filter.value ? 'active-filter' : 'disable-filter'"
+                @click="setActiveSharingFilter(filter.value)"
+              >
+                {{ filter.label }}
+              </button>
+            </div>
+          </div>
+          <div class="space-type-filter">
+            <span style="font-size: 17px; font-weight: 600;">فیلتر نوع فضا</span>
+            <div class="filter-buttons">
+              <button
+                v-for="filter in spaceTypeFilters"
+                :key="filter.value"
+                :class="activeSpaceTypeFilter === filter.value ? 'active-filter' : 'disable-filter'"
+                @click="setActiveSpaceTypeFilter(filter.value)"
+              >
+                {{ filter.label }}
+              </button>
+            </div>
+          </div>
+        </div>
+
         <!-- Add Space Button -->
         <button class="add-space" @click="openCreateSpaceModal">
           + <span style="margin-right: 0.5rem;">اضافه کردن فضای اختصاصی</span>
         </button>
 
-     
+        <!-- Create Space Modal -->
+        <CreateSpaceModal
+          :isVisible="isCreateSpaceModalVisible"
+          @close="closeCreateSpaceModal"
+        />
 
         <!-- Spaces -->
-      <div v-if="filteredSpaces.length > 0 " style="z-index: 0;">
+        <div v-if="filteredSpaces.length > 0">
           <swiper
             :slidesPerView="3.6"
             :spaceBetween="30"
@@ -31,13 +67,117 @@
             class="mySwiper"
           >
             <swiper-slide v-for="(space, index) in filteredSpaces" :key="index" class="card">
-            <img :src="'http://my.xroomapp.com:8000' + space.img" alt="تصویر فضا" />
+              <img :src="space.image" alt="تصویر فضا" />
               <div class="card-texts">
                 <h2>{{ space.name }}</h2>
                 <p class="space-capacity">
+                    <span style="margin-left: 4px;">
+                    <svg
+                        xmlns="http://www.w3.org/2000/svg"
+                        width="16"
+                        height="17"
+                        viewBox="0 0 16 17"
+                        fill="none"
+                    >
+                        <g clip-path="url(#clip0_622_1334)">
+                        <path
+                            d="M3.33203 5.16667C3.33203 5.87391 3.61298 6.55219 4.11308 7.05228C4.61318 7.55238 5.29145 7.83333 5.9987 7.83333C6.70594 7.83333 7.38422 7.55238 7.88432 7.05228C8.38441 6.55219 8.66536 5.87391 8.66536 5.16667C8.66536 4.45942 8.38441 3.78115 7.88432 3.28105C7.38422 2.78095 6.70594 2.5 5.9987 2.5C5.29145 2.5 4.61318 2.78095 4.11308 3.28105C3.61298 3.78115 3.33203 4.45942 3.33203 5.16667Z"
+                            stroke="#718096"
+                            stroke-width="1.5"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                        />
+                        <path
+                            d="M2 14.5V13.1667C2 12.4594 2.28095 11.7811 2.78105 11.281C3.28115 10.781 3.95942 10.5 4.66667 10.5H7.33333C8.04058 10.5 8.71885 10.781 9.21895 11.281C9.71905 11.7811 10 12.4594 10 13.1667V14.5"
+                            stroke="#718096"
+                            stroke-width="1.5"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                        />
+                        <path
+                            d="M10.668 2.58667C11.2416 2.73354 11.75 3.06714 12.1131 3.53488C12.4761 4.00262 12.6732 5.17 12.6732 5.17C12.6732 5.76212 12.4761 6.33739 12.1131 6.80513C11.75 7.27287 11.2416 7.60647 10.668 7.75334"
+                            stroke="#718096"
+                            stroke-width="1.5"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                        />
+                        <path
+                            d="M14 14.5V13.1666C13.9966 12.5781 13.7986 12.0072 13.4368 11.5429C13.0751 11.0786 12.5699 10.7471 12 10.6"
+                            stroke="#718096"
+                            stroke-width="1.5"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                        />
+                        </g>
+                        <defs>
+                        <clipPath id="clip0_622_1334">
+                            <rect width="16" height="16" fill="white" transform="translate(0 0.5)" />
+                        </clipPath>
+                        </defs>
+                    </svg>
+                    </span>
                     حداکثر: {{ space.capacity }} کاربر
                 </p>
                 <p class="space-type">
+                    <span style="margin-left: 4px;">
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="16"
+                            height="17"
+                            viewBox="0 0 16 17"
+                            fill="none"
+                        >
+                            <path
+                            d="M4 15.1667V3.16671C4 2.81309 4.14048 2.47395 4.39052 2.2239C4.64057 1.97385 4.97971 1.83337 5.33333 1.83337H10.6667C11.0203 1.83337 11.3594 1.97385 11.6095 2.2239C11.8595 2.47395 12 2.81309 12 3.16671V15.1667H4Z"
+                            stroke="#3A57E8"
+                            stroke-width="1.25"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            />
+                            <path
+                            d="M3.9987 8.5H2.66536C2.31174 8.5 1.9726 8.64048 1.72256 8.89052C1.47251 9.14057 1.33203 9.47971 1.33203 9.83333V13.8333C1.33203 14.187 1.47251 14.5261 1.72256 14.7761C1.9726 15.0262 2.31174 15.1667 2.66536 15.1667H3.9987"
+                            stroke="#3A57E8"
+                            stroke-width="1.25"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            />
+                            <path
+                            d="M12 6.5H13.3333C13.687 6.5 14.0261 6.64048 14.2761 6.89052C14.5262 7.14057 14.6667 7.47971 14.6667 7.83333V13.8333C14.6667 14.187 14.5262 14.5261 14.2761 14.7761C14.0261 15.0262 13.687 15.1667 13.3333 15.1667H12"
+                            stroke="#3A57E8"
+                            stroke-width="1.25"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            />
+                            <path
+                            d="M6.66797 4.5H9.33464"
+                            stroke="#3A57E8"
+                            stroke-width="1.25"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            />
+                            <path
+                            d="M6.66797 7.16663H9.33464"
+                            stroke="#3A57E8"
+                            stroke-width="1.25"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            />
+                            <path
+                            d="M6.66797 9.83337H9.33464"
+                            stroke="#3A57E8"
+                            stroke-width="1.25"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            />
+                            <path
+                            d="M6.66797 12.5H9.33464"
+                            stroke="#3A57E8"
+                            stroke-width="1.25"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            />
+                        </svg>
+                    </span>
                     {{ space.type }}
                 </p>
               </div>
@@ -49,19 +189,7 @@
         </div>
       </div>
     </div>
-
+  </div>
-
-
-
-
-   <!-- Create Space Modal -->
-      <CreateSpaceModal
-        :isVisible="isCreateSpaceModalVisible"
-        @close="closeCreateSpaceModal"
-        :spaces="spaces"
-        @submit="handleCreateSpaceSubmit"
-      />
-
 </template>
 
 <script>
@@ -71,7 +199,6 @@ import CreateSpaceModal from '@/components/CreateSpaceModal.vue';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import 'swiper/css';
 import { Pagination } from 'swiper/modules';
-import axios from 'axios';
 
 export default {
   name: 'DashboardPage',
@@ -98,8 +225,48 @@ export default {
       ],
       activeSharingFilter: 'all',
       activeSpaceTypeFilter: 'spaces',
-      spaces: [], // Initialize the spaces array
+      spaces: [
-      selectedSpace: null, // Store the selected space
+        {
+          name: 'فضای تیمی ۱',
+          image: require('@/assets/img/img.jpg'),
+          capacity: 33,
+          type: 'فضا تیم',
+          sharing: 'team',
+          spaceType: 'spaces',
+        },
+        {
+          name: 'فضای تیمی ۲',
+          image: require('@/assets/img/img2.jpg'),
+          capacity: 33,
+          type: 'فضا تیم',
+          sharing: 'team',
+          spaceType: 'spaces',
+        },
+        {
+          name: 'فضای خصوصی ۱',
+          image: require('@/assets/img/img3.jpg'),
+          capacity: 33,
+          type: 'فضا خصوصی',
+          sharing: 'private',
+          spaceType: 'spaces',
+        },
+        {
+          name: 'قالب ۱',
+          image: require('@/assets/img/img4.jpg'),
+          capacity: 33,
+          type: 'قالب',
+          sharing: 'team',
+          spaceType: 'templates',
+        },
+        {
+          name: 'فضای تیمی ۳',
+          image: require('@/assets/img/img.jpg'),
+          capacity: 33,
+          type: 'فضا تیم',
+          sharing: 'team',
+          spaceType: 'spaces',
+        },
+      ],
     };
   },
   computed: {
@@ -126,61 +293,18 @@ export default {
     closeCreateSpaceModal() {
       this.isCreateSpaceModalVisible = false;
     },
-    async fetchSpaces() {
-      try {
-        const token = localStorage.getItem('token'); // Retrieve the token from localStorage
-        if (!token) {
-          console.error('No token found!');
-          return;
-        }
-
-        const response = await axios.get(
-          'http://my.xroomapp.com:8000/get_spaces', // API endpoint
-          {
-            headers: {
-              Authorization: `Token ${token}`,
-              'Content-Type': 'application/json',
-            },
-          }
-        );
-
-        // Store the spaces data in the spaces array
-        this.spaces = response.data.spaces.map(space => ({
-          name: space.name,
-          img: space.assetBundleRoomId.img,  // Assuming 'img' exists in the API response
-          capacity: space.capacity,
-          type: space.Private ? 'Private' : 'Public', // Adjust if you have a different field
-          sharing: space.Private ? 'private' : 'team',
-          spaceType: 'spaces',
-          description: space.description, // Store description from response
-        }));
-      } catch (error) {
-        console.error('Error fetching spaces:', error);
-      }
-    },
-    handleCreateSpaceSubmit(space) {
-      // Handle form submission here, space will contain the selected space and the additional fields
-      console.log('Form submitted with:', space);
-      this.closeCreateSpaceModal(); // Close the modal after submission
-    },
-  },
-  mounted() {
-    this.fetchSpaces(); // Fetch spaces when the component is mounted
   },
 };
 </script>
 
 <style scoped>
-/* Add your CSS styling here */
-</style>
 
-<style scoped>
 .dashboard-page {
     margin-right: 360px;
     padding: 20px;
     direction: rtl;
     font-family: IRANSansXFaNum, sans-serif;
-}
+  }
 .content {
     background-color: #f8f9fa;
     border-radius: 20px;
@@ -250,6 +374,7 @@ export default {
     margin-top: 1rem;
 }
 
+
 .add-space {
     display: block;
     padding: 12px 24px 12px 24px;
@@ -328,4 +453,6 @@ export default {
     margin-bottom: 12rem;
     text-align: center;
 }
+
+
 </style>