From a2ad3160a8b8b3a9cd4ea0007640f446095aee24 Mon Sep 17 00:00:00 2001 From: Alexander Boriskin Date: Wed, 31 Jul 2019 16:45:18 +0300 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20bug=20=E2=84=968,=20bug=20=E2=84=961?= =?UTF-8?q?0,=20bug=20=E2=84=9616,=20bug=20=E2=84=9628,=20bug=20=E2=84=963?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/app-sidebar/NavigationRoutes.js | 76 ++++----- .../dashboard/DashboardInfoBlock.vue | 24 ++- .../pages/404-pages/CategoriesConfig.js | 146 +++++++++++------- .../pages/404-pages/VaPageNotFound.vue | 13 +- .../404-pages/VaPageNotFoundLargeText.vue | 2 +- .../pages/404-pages/VaPageNotFoundSearch.vue | 8 +- src/components/ui/grid/Grid.vue | 24 +-- src/components/ui/tabs/Tabs.vue | 129 ++++++++++++++++ src/i18n/en.json | 1 + src/router/index.js | 8 + src/store/modules/app.js | 3 + 11 files changed, 314 insertions(+), 120 deletions(-) create mode 100644 src/components/ui/tabs/Tabs.vue diff --git a/src/components/admin/app-sidebar/NavigationRoutes.js b/src/components/admin/app-sidebar/NavigationRoutes.js index f18760cd0..021a569b1 100644 --- a/src/components/admin/app-sidebar/NavigationRoutes.js +++ b/src/components/admin/app-sidebar/NavigationRoutes.js @@ -79,29 +79,41 @@ export const navigationRoutes = { }, disabled: true, children: [ - { - name: 'typography', - displayName: 'menu.typography', - }, { name: 'buttons', displayName: 'menu.buttons', }, + { + name: 'cards', + displayName: 'menu.cards', + }, + { + name: 'chat', + displayName: 'menu.chat', + }, + { + name: 'chips', + displayName: 'menu.chips', + }, { name: 'collapses', displayName: 'menu.collapses', }, + { + name: 'colors', + displayName: 'menu.colors', + }, { name: 'color-pickers', displayName: 'menu.colorPickers', }, { - name: 'timelines', - displayName: 'menu.timelines', + name: 'file-upload', + displayName: 'menu.fileUpload', }, { - name: 'notifications', - displayName: 'menu.notifications', + name: 'grid', + displayName: 'menu.grid', }, { name: 'icon-sets', @@ -113,57 +125,49 @@ export const navigationRoutes = { }, ], }, - { - name: 'spinners', - displayName: 'menu.spinners', - }, - { - name: 'grid', - displayName: 'menu.grid', - }, { name: 'modals', displayName: 'menu.modals', }, { - name: 'file-upload', - displayName: 'menu.fileUpload', - }, - { - name: 'chips', - displayName: 'menu.chips', + name: 'notifications', + displayName: 'menu.notifications', }, { - name: 'cards', - displayName: 'menu.cards', + name: 'popovers', + displayName: 'menu.popovers', }, { - name: 'tree-view', - displayName: 'menu.treeView', + name: 'rating', + displayName: 'menu.rating', }, { - name: 'colors', - displayName: 'menu.colors', + name: 'sliders', + displayName: 'menu.sliders', }, { name: 'spacing', displayName: 'menu.spacing', }, { - name: 'sliders', - displayName: 'menu.sliders', + name: 'spinners', + displayName: 'menu.spinners', }, { - name: 'popovers', - displayName: 'menu.popovers', + name: 'tabs', + displayName: 'menu.tabs', }, { - name: 'chat', - displayName: 'menu.chat', + name: 'timelines', + displayName: 'menu.timelines', }, { - name: 'rating', - displayName: 'menu.rating', + name: 'tree-view', + displayName: 'menu.treeView', + }, + { + name: 'typography', + displayName: 'menu.typography', }, ], }, diff --git a/src/components/dashboard/DashboardInfoBlock.vue b/src/components/dashboard/DashboardInfoBlock.vue index ba06e79d4..ce057099a 100644 --- a/src/components/dashboard/DashboardInfoBlock.vue +++ b/src/components/dashboard/DashboardInfoBlock.vue @@ -25,16 +25,16 @@
-

3

-

{{$t('dashboard.info.users')}}

+

3

+

{{$t('dashboard.info.users')}}

-

24

-

{{$t('dashboard.info.points')}}

+

24

+

{{$t('dashboard.info.points')}}

-

91

-

{{$t('dashboard.info.units')}}

+

91

+

{{$t('dashboard.info.units')}}

 @@ -105,7 +105,15 @@ export default { diff --git a/src/components/pages/404-pages/CategoriesConfig.js b/src/components/pages/404-pages/CategoriesConfig.js index 1ce20b08e..6f018b76b 100644 --- a/src/components/pages/404-pages/CategoriesConfig.js +++ b/src/components/pages/404-pages/CategoriesConfig.js @@ -1,52 +1,49 @@ export default [ { - categoryName: 'Forms', + categoryName: 'Dashboard', items: [ { - itemName: 'Form Elements', - itemLink: '/admin/forms/form-elements', - }, - { - itemName: 'Form Wizards', - itemLink: '/admin/forms/form-wizards', - }, - { - itemName: 'Medium Editor', - itemLink: '/admin/forms/medium-editor', + itemName: 'Dashboard', + itemLink: '/admin/dashboard', }, ], }, { - categoryName: 'Maps', + categoryName: 'Statistics', items: [ { - itemName: 'Google Maps', - itemLink: '/admin/maps/google-maps', - }, - { - itemName: 'Yandex Maps', - itemLink: '/admin/maps/yandex-maps', + itemName: 'Charts', + itemLink: '/admin/statistics/charts', }, { - itemName: 'Leaflet Maps', - itemLink: '/admin/maps/leaflet-maps', + itemName: 'Progress bars', + itemLink: '/admin/statistics/progress-bars', }, + ], + }, + { + categoryName: 'Forms', + items: [ { - itemName: 'Bubble Maps', - itemLink: '/admin/maps/bubble-maps', + itemName: 'Form Elements', + itemLink: '/admin/forms/form-elements', }, { - itemName: 'Line Maps', - itemLink: '/admin/maps/line-maps', + itemName: 'Medium Editor', + itemLink: '/admin/forms/medium-editor', }, ], }, { - categoryName: 'Dashboard', + categoryName: 'Tables', items: [ { - itemName: 'Dashboard', - itemLink: '/admin/dashboard', + itemName: 'Markup Tables', + itemLink: '/admin/tables/markup', + }, + { + itemName: 'Data Tables', + itemLink: '/admin/tables/data', }, ], }, @@ -62,70 +59,109 @@ export default [ itemLink: '/admin/ui/buttons', }, { - itemName: 'Color Pickers', - itemLink: '/admin/ui/color-pickers', + itemName: 'Cards', + itemLink: '/admin/ui/cards', }, { - itemName: 'Notifications', - itemLink: '/admin/ui/notifications', + itemName: 'Chat', + itemLink: '/admin/ui/chat', }, { - itemName: 'Icons', - itemLink: '/admin/ui/icons', + itemName: 'Chips', + itemLink: '/admin/ui/chips', }, { - itemName: 'Spinners', - itemLink: '/admin/ui/spinners', + itemName: 'Collapses', + itemLink: '/admin/ui/collapses', + }, + { + itemName: 'Colors', + itemLink: '/admin/ui/colors', + }, + { + itemName: 'Color Pickers', + itemLink: '/admin/ui/color-pickers', + }, + { + itemName: 'File Upload', + itemLink: '/admin/ui/file-upload', }, { itemName: 'Grid', itemLink: '/admin/ui/grid', }, + { + itemName: 'Icons', + itemLink: '/admin/ui/icons', + }, { itemName: 'Modals', itemLink: '/admin/ui/modals', }, { - itemName: 'File Upload', - itemLink: '/admin/ui/file-upload', + itemName: 'Notifications', + itemLink: '/admin/ui/notifications', }, { - itemName: 'Tree View', - itemLink: '/admin/ui/tree-view', + itemName: 'Popovers', + itemLink: '/admin/ui/popovers', + }, + { + itemName: 'Rating', + itemLink: '/admin/ui/rating', + }, + { + itemName: 'Sliders', + itemLink: '/admin/ui/sliders', }, { itemName: 'Spacing', itemLink: '/admin/ui/spacing', }, { - itemName: 'Popovers', - itemLink: '/admin/ui/popovers', + itemName: 'Spinners', + itemLink: '/admin/ui/spinners', + }, + { + itemName: 'Tabs', + itemLink: '/admin/ui/tabs', + }, + { + itemName: 'Timelines', + itemLink: '/admin/ui/timelines', }, - ], - }, - { - categoryName: 'Auth', - items: [ { - itemName: 'Login', - itemLink: '/auth/login', + itemName: 'Tree View', + itemLink: '/admin/ui/tree-view', }, { - itemName: 'Sign up', - itemLink: '/auth/signup', + itemName: 'Typography', + itemLink: '/admin/ui/typography', }, ], }, { - categoryName: 'Statistics', + categoryName: 'Maps', items: [ { - itemName: 'Charts', - itemLink: '/admin/statistics/charts', + itemName: 'Google Maps', + itemLink: '/admin/maps/google-maps', }, { - itemName: 'Progress bars', - itemLink: '/admin/statistics/progress-bars', + itemName: 'Yandex Maps', + itemLink: '/admin/maps/yandex-maps', + }, + { + itemName: 'Leaflet Maps', + itemLink: '/admin/maps/leaflet-maps', + }, + { + itemName: 'Bubble Maps', + itemLink: '/admin/maps/bubble-maps', + }, + { + itemName: 'Line Maps', + itemLink: '/admin/maps/line-maps', }, ], }, diff --git a/src/components/pages/404-pages/VaPageNotFound.vue b/src/components/pages/404-pages/VaPageNotFound.vue index 2f0e6b578..945feea74 100644 --- a/src/components/pages/404-pages/VaPageNotFound.vue +++ b/src/components/pages/404-pages/VaPageNotFound.vue @@ -3,7 +3,7 @@
{{$t('404.title')}}
-
+
{{$t('404.text')}} @@ -52,6 +52,9 @@ export default { font-size: 3rem; line-height: 1.25em; font-weight: 500; + @include media-breakpoint-down(xs) { + font-size: 1.5rem; + } } &__text { margin-bottom: 2.5rem; @@ -61,17 +64,13 @@ export default { position: absolute; bottom: 0; left: 1rem; - width: 44%; - height: 59%; + width: 30%; + height: 40%; background-color: transparent; background-image: url("../../../assets/petro.svg"); background-repeat: no-repeat; background-size: contain; background-position: bottom center; - @include media-breakpoint-up(xl) { - width: 30%; - height: 40%; - } @include media-breakpoint-down(xs) { display: none; } diff --git a/src/components/pages/404-pages/VaPageNotFoundLargeText.vue b/src/components/pages/404-pages/VaPageNotFoundLargeText.vue index feca09a90..1b3b4ead5 100644 --- a/src/components/pages/404-pages/VaPageNotFoundLargeText.vue +++ b/src/components/pages/404-pages/VaPageNotFoundLargeText.vue @@ -22,7 +22,7 @@ export default { color: $white; font-weight: 600; @include media-breakpoint-down(xs) { - font-size: 16rem; + font-size: 12rem; } } } diff --git a/src/components/pages/404-pages/VaPageNotFoundSearch.vue b/src/components/pages/404-pages/VaPageNotFoundSearch.vue index 4ccfd7126..48e955c26 100644 --- a/src/components/pages/404-pages/VaPageNotFoundSearch.vue +++ b/src/components/pages/404-pages/VaPageNotFoundSearch.vue @@ -7,9 +7,9 @@ v-model="inputValue" class="va-page-not-found-search__input mb-4" /> -
+
    @@ -22,8 +22,8 @@ {{ item.itemName }} - -
+ +
diff --git a/src/components/ui/grid/Grid.vue b/src/components/ui/grid/Grid.vue index f8fe5fd74..cc337dda7 100644 --- a/src/components/ui/grid/Grid.vue +++ b/src/components/ui/grid/Grid.vue @@ -35,7 +35,7 @@
-
+
-
+
-
+
-
+
xs2 md4
+ >xs3 md4
-
+
xs8 md4
+ >xs6 md4
-
+
xs2 md4
+ >xs3 md4
@@ -165,6 +165,12 @@ export default { min-height: 3rem; color: $white; border-radius: 0.5rem; + + @include media-breakpoint-down(xs) { + padding: 0.5rem; + text-align: center; + font-size: 0.75rem; + } } } diff --git a/src/components/ui/tabs/Tabs.vue b/src/components/ui/tabs/Tabs.vue new file mode 100644 index 000000000..3b7d11f54 --- /dev/null +++ b/src/components/ui/tabs/Tabs.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/i18n/en.json b/src/i18n/en.json index 7508c9b48..175e11f3a 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -293,6 +293,7 @@ "markupTables": "Markup Tables", "dataTables": "Data Tables", "chips": "Chips", + "tabs": "Tabs", "typography": "Typography", "uiElements": "UI Elements", "treeView": "Tree view", diff --git a/src/router/index.js b/src/router/index.js index 8474e766d..a1eae8987 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -316,6 +316,14 @@ export default new Router({ wikiLink: 'https://github.com/epicmaxco/vuestic-admin/wiki/Chat', }, }, + { + name: 'tabs', + path: 'tabs', + component: () => import('../components/ui/tabs/Tabs'), + meta: { + wikiLink: 'https://github.com/epicmaxco/vuestic-admin/wiki/Tabs', + }, + }, ], }, { diff --git a/src/store/modules/app.js b/src/store/modules/app.js index ae155ec03..116ac124e 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -3,6 +3,9 @@ const state = { opened: false, }, config: { + googleMaps: { + apiKey: 'AIzaSyBNAqPrTQoz9P4NBlDDyfxrnKiafkaL8iQ', + }, palette: { primary: '#4ae387', danger: '#e34a4a', From a33949a3e98e2249ae8d6ae89b2234e42ade4e10 Mon Sep 17 00:00:00 2001 From: Alexander Boriskin Date: Wed, 31 Jul 2019 17:24:11 +0300 Subject: [PATCH 2/2] revert google map changes --- src/store/modules/app.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 116ac124e..ae155ec03 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -3,9 +3,6 @@ const state = { opened: false, }, config: { - googleMaps: { - apiKey: 'AIzaSyBNAqPrTQoz9P4NBlDDyfxrnKiafkaL8iQ', - }, palette: { primary: '#4ae387', danger: '#e34a4a',