Merge branch 'master' of http://git.hghweb.ir/ali.s/palizvani-front-vite

src/api/models/Classroom.js

@@ -28,20 +28,23 @@ export default class ClassroomAPI extends APIRepository {
     }
     this.CacheList = {
       base: this.name + this.APIAdresses.base,
+      index: (filters) => this.name + this.APIAdresses.base + encodeURI(filters),
       byId: (id) => this.name + this.APIAdresses.byId(id)
     }
   }
 
   index (data) {
+    const normalizedSendData = this.getNormalizedSendData({
+      unit__category__type: null, // String
+      per_page: 10, // Number
+      page: 1 // Number
+    }, data)
     return this.sendRequest({
       apiMethod: 'get',
       api: this.api,
       request: this.APIAdresses.base,
-      data: this.getNormalizedSendData({
-        unit__category__type: null, // String
-        per_page: 10, // Number
-        page: 1 // Number
-      }, data),
+      cacheKey: this.CacheList.index(normalizedSendData),
+      data: normalizedSendData,
       resolveCallback: (response) => {
         const paginate = response.data
         const results = response.data.results

src/api/models/Content.js

@@ -10,7 +10,8 @@ export default class ContentAPI extends APIRepository {
       byId: (id) => '/cma/contents/' + id
     }
     this.CacheList = {
-      base: this.name + this.APIAdresses.base
+      base: this.name + this.APIAdresses.base,
+      index: (filters) => this.name + this.APIAdresses.base + encodeURI(filters)
     }
     this.restUrl = (id) => this.APIAdresses.base + '/' + id
     /* Setting the callback functions for the CRUD operations. */
@@ -23,15 +24,17 @@ export default class ContentAPI extends APIRepository {
   }
 
   index(data) {
+    const normalizedSendData = this.getNormalizedSendData({
+      category: null, // Number
+      per_page: 10, // Number
+      page: 1 // Number
+    }, data)
     return this.sendRequest({
       apiMethod: 'get',
       api: this.api,
       request: this.APIAdresses.base,
-      data: this.getNormalizedSendData({
-        category: null, // Number
-        per_page: 10, // Number
-        page: 1 // Number
-      }, data),
+      cacheKey: this.CacheList.index(normalizedSendData),
+      data: normalizedSendData,
       resolveCallback: (response) => {
         const paginate = response.data
         const results = response.data.results

src/components/Widgets/Content/ContentCarousel/ContentCarousel.vue

@@ -59,7 +59,7 @@ import ContentItem from './componetns/ContentItem.vue'
 import { mixinPrefetchServerData, mixinWidget } from 'src/mixin/Mixins.js'
 
 export default {
-  name: 'EventCarousel',
+  name: 'ContentCarousel',
   components: {
     ContentItem
   },

src/components/Widgets/Event/LastEvents/LastEvents.vue

@@ -63,7 +63,7 @@ import { Classroom, ClassroomList } from 'src/models/Classroom.js'
 import { EventRegistrationList } from 'src/models/EventRegistration.js'
 
 export default {
-  name: 'EventCarousel',
+  name: 'LastEvents',
   components: {
     EventItem
   },

src/pages/Admin/User/show.vue

@@ -334,7 +334,7 @@ export default {
           col: 'col-md-3 col-12'
         },
 
-        { type: 'checkbox', name: 'is_abroad_birth_address', placeholder: ' ', label: 'محل تولد خارج از کشور است؟۳۳۳۳', responseKey: 'is_abroad_birth_address', className: 'require', col: 'col-12' },
+        { type: 'checkbox', name: 'is_abroad_birth_address', placeholder: ' ', label: 'محل تولد خارج از کشور است؟', responseKey: 'is_abroad_birth_address', className: 'require', col: 'col-12' },
         { type: 'input', name: 'birth_country', placeholder: ' ', label: 'کشور محل تولد', responseKey: 'birth_country', col: 'col-md-4 col-12' },
         {
           type: 'select',