Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/bugs #622

Merged
merged 3 commits into from
Aug 1, 2019
Merged

Fix/bugs #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2ad316
fix: bug №8, bug №10, bug №16, bug №28, bug №36
AlexanderBoriskin Jul 31, 2019
96b5003
update with latest release
AlexanderBoriskin Jul 31, 2019
a33949a
revert google map changes
AlexanderBoriskin Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 40 additions & 36 deletions src/components/admin/app-sidebar/NavigationRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
},
],
},
Expand Down
24 changes: 16 additions & 8 deletions src/components/dashboard/DashboardInfoBlock.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
<va-card>
<div class="row row-separated">
<div class="flex xs4">
<p class="display-2 mb-0" :style="{color: this.$themes.primary}">3</p>
<p>{{$t('dashboard.info.users')}}</p>
<p class="display-2 mb-0 text--center" :style="{color: this.$themes.primary}">3</p>
<p class="text--center">{{$t('dashboard.info.users')}}</p>
</div>
<div class="flex xs4">
<p class="display-2 mb-0" :style="{color: this.$themes.info}">24</p>
<p>{{$t('dashboard.info.points')}}</p>
<p class="display-2 mb-0 text--center" :style="{color: this.$themes.info}">24</p>
<p class="text--center">{{$t('dashboard.info.points')}}</p>
</div>
<div class="flex xs4">
<p class="display-2 mb-0" :style="{color: this.$themes.warning}">91</p>
<p>{{$t('dashboard.info.units')}}</p>
<p class="display-2 mb-0 text--center" :style="{color: this.$themes.warning}">91</p>
<p class="text--center">{{$t('dashboard.info.units')}}</p>
</div>
</div>
</va-card>
Expand Down Expand Up @@ -105,7 +105,15 @@ export default {
</script>

<style lang="scss">
.row-separated .flex + .flex{
border-left: 1px solid #e3eaeb;
.row-separated {
.flex + .flex {
border-left: 1px solid #e3eaeb;
}

@include media-breakpoint-down(xs) {
p:not(.display-2){
font-size: 0.875rem;
}
}
}
</style>
146 changes: 91 additions & 55 deletions src/components/pages/404-pages/CategoriesConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
},
],
},
Expand All @@ -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',
},
],
},
Expand Down
Loading