Bläddra i källkod

main side menu bug fix

ali 3 år sedan
förälder
incheckning
d3ed322ec7

+ 2 - 0
src/components/Menu/SideMenu/MenuItem.vue

@@ -133,6 +133,8 @@ export default {
         return { name: 'Public.Home', query: { 'tags[]': item.tags } }
       } else if (item.href) {
         return { path: item.href }
+      } else if (item.route) {
+        return item.route
       } else if (!item.routeName) {
         return undefined
       }

+ 2 - 2
src/components/Template/Footer/MainFooter.vue

@@ -27,14 +27,14 @@
         <div class="col-content">
           <div class="col-items">
             <div class="col-item">
-              <q-btn :to="{name: 'Public.Public.AboutUs'}"
+              <q-btn :to="{name: 'Public.AboutUs'}"
                      flat
                      dense>
                 درباره ما
               </q-btn>
             </div>
             <div class="col-item">
-              <q-btn :to="{name: 'Public.Public.Rules'}"
+              <q-btn :to="{name: 'Public.Rules'}"
                      flat
                      dense>
                 قوانین و مقررات

+ 6 - 6
src/components/Template/Header/MainHeader.vue

@@ -6,7 +6,7 @@
       <div class="right-side">
         <q-toolbar>
           <q-btn class="lt-md q-mr-md"
-                 icon="isax:menu-1"
+                 icon="menu"
                  color="primary"
                  round
                  flat
@@ -26,12 +26,12 @@
             <q-btn stretch
                    flat
                    label="اخبار و اطلاعیه ها"
-                   :to="{name: 'Public.Post.List.News'}"
+                   :to="{ name: 'Public.Post.List.News' }"
                    class="top-menu-item" />
             <q-btn stretch
                    flat
                    label="راهنما"
-                   :to="{name: 'Public.Post.List.Guide'}"
+                   :to="{ name: 'Public.Post.List.Guide' }"
                    class="top-menu-item" />
             <q-btn stretch
                    flat
@@ -57,17 +57,17 @@
             <q-btn stretch
                    flat
                    label="درباره ما"
-                   :to="{name: 'Public.Public.AboutUs'}"
+                   :to="{ name: 'Public.AboutUs' }"
                    class="top-menu-item" />
             <q-btn stretch
                    flat
                    label="تماس با ما"
-                   :to="{name: 'Public.Public.ContactUs'}"
+                   :to="{ name: 'Public.ContactUs' }"
                    class="top-menu-item" />
             <q-btn stretch
                    flat
                    label="سوالات متداول"
-                   :to="{name: 'Public.FAQ'}"
+                   :to="{ name: 'Public.FAQ' }"
                    class="top-menu-item" />
           </div>
         </q-toolbar>

+ 14 - 94
src/components/Template/SideBard/Main.vue

@@ -48,56 +48,30 @@ export default {
       menuItems: [
         {
           title: 'اخبار و رویدادها',
-          externalLink: '/',
+          route: { name: 'Public.Post.List.News' },
           type: 'itemMenu',
           permission: 'all',
           show: true
         },
         {
-          title: 'سامانه آموزش',
-          externalLink: '/',
+          title: 'راهنما',
+          route: { name: 'Public.Post.List.Guide' },
           type: 'itemMenu',
           permission: 'all',
           show: true
         },
         {
-          title: 'آرشیو محتوایی',
+          title: 'فروشگاه',
           type: 'simpleMenu',
           children: [
             {
-              title: 'عنوان یک',
-              children: [
-                {
-                  title: 'زیر عنوان'
-                },
-                {
-                  title: 'زیر عنوان'
-                }
-              ],
+              title: 'کتب سطح یک',
+              externalLink: 'https://formafzar.com/form/iv9cq',
               show: true
             },
             {
-              title: 'عنوان یک',
-              children: [
-                {
-                  title: 'زیر عنوان'
-                },
-                {
-                  title: 'زیر عنوان'
-                }
-              ],
-              show: true
-            },
-            {
-              title: 'عنوان یک',
-              children: [
-                {
-                  title: 'زیر عنوان'
-                },
-                {
-                  title: 'زیر عنوان'
-                }
-              ],
+              title: 'کتب جریان‌شناسی',
+              externalLink: 'https://formafzar.com/form/ch1om',
               show: true
             }
           ],
@@ -105,80 +79,26 @@ export default {
           mobileMode: true
         },
         {
-          title: 'فروشگاه',
-          externalLink: '/',
-          type: 'itemMenu',
-          permission: 'all',
-          show: true
-        },
-        {
-          title: 'پخش زنده',
-          externalLink: '/',
+          title: 'درباره ما',
+          route: { name: 'Public.AboutUs' },
           type: 'itemMenu',
           permission: 'all',
           show: true
         },
         {
-          title: 'درباره ما',
-          externalLink: '/',
+          title: 'تماس با ما',
+          route: { name: 'Public.ContactUs' },
           type: 'itemMenu',
           permission: 'all',
           show: true
         },
         {
-          title: 'تماس با ما',
-          externalLink: '/',
+          title: 'سوالات متداول',
+          route: { name: 'Public.FAQ' },
           type: 'itemMenu',
           permission: 'all',
           show: true
         }
-      ],
-      examsPlan: [
-        {
-          divider: true
-        },
-        {
-          name: 'دهم تجربی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_tajrobi_dahom.pdf'
-        },
-        {
-          name: 'دهم ریاضی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_riyazi_dahom.pdf'
-        },
-        {
-          name: 'دهم انسانی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_ensani_dahom.pdf'
-        },
-        {
-          divider: true
-        },
-        {
-          name: 'یازدهم تجربی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_tajrobi_yazdahom.pdf'
-        },
-        {
-          name: 'یازدهم ریاضی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_riyazi_yazdahom.pdf'
-        },
-        {
-          name: 'یازدهم انسانی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_ensani_yazdahom.pdf'
-        },
-        {
-          divider: true
-        },
-        {
-          name: 'دوازدهم تجربی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_tajrobi_davazdahom.pdf'
-        },
-        {
-          name: 'دوازدهم ریاضی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_riyazi_davazdahom.pdf'
-        },
-        {
-          name: 'دوازدهم انسانی',
-          link: 'https://nodes.alaatv.com/aaa/pdf/1401_plan_ensani_davazdahom.pdf'
-        }
       ]
     }
   },

+ 3 - 3
src/router/routes.js

@@ -121,7 +121,7 @@ const routes = [
             component: () => import('src/pages/Public/FAQ.vue')
           },
           {
-            name: 'Public.Public.Rules',
+            name: 'Public.Rules',
             path: 'rules',
             meta: {
               hasDynamicSetting: true
@@ -129,7 +129,7 @@ const routes = [
             component: () => import('src/pages/Public/Rules.vue')
           },
           {
-            name: 'Public.Public.AboutUs',
+            name: 'Public.AboutUs',
             path: 'about-us',
             meta: {
               hasDynamicSetting: true
@@ -137,7 +137,7 @@ const routes = [
             component: () => import('src/pages/Public/AboutUs.vue')
           },
           {
-            name: 'Public.Public.ContactUs',
+            name: 'Public.ContactUs',
             path: 'contact-us',
             meta: {
               hasDynamicSetting: true