Skip to content

Commit

Permalink
Merge remote-tracking branch 'epicmaxco/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderBoriskin committed Jun 14, 2018
2 parents d2355e6 + 75eb986 commit 64affd8
Show file tree
Hide file tree
Showing 49 changed files with 1,240 additions and 974 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"flag-icon-css": "^2.9.0",
"font-awesome": "^4.7.0",
"gemini-scrollbar": "^1.5.1",
"google-maps": "^3.2.1",
"google-maps": "^3.3.0",
"ionicons": "^3.0.0",
"kewler": "^1.0.8",
"leaflet-map": "^0.2.1",
Expand All @@ -41,6 +41,7 @@
"vue-router": "^3.0.1",
"vue-slider-component": "2.3.3",
"vue-toasted": "^1.1.24",
"vue-yandex-maps": "^0.7.9",
"vue2-circle-progress": "^1.0.3",
"vuetable-2": "1.7.5",
"vuex": "^3.0.1",
Expand Down
19 changes: 2 additions & 17 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,27 +1,12 @@
<template>
<div id="app" class="app">
<layout v-if="!isAuth"/>
<auth-layout v-else></auth-layout>
<router-view/>
</div>
</template>

<script>
import Layout from 'components/layout/Layout'
import AuthLayout from 'components/layout/AuthLayout'
import VuesticPreLoader from 'vuestic-components/vuestic-preloader/VuesticPreLoader.vue'
export default {
name: 'app',
components: {
VuesticPreLoader,
AuthLayout,
Layout
},
computed: {
isAuth () {
return this.$route.path.match('auth')
}
}
name: 'app'
}
</script>

Expand Down
45 changes: 45 additions & 0 deletions src/components/admin/AppLayout.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<template>
<vuestic-layout>
<app-navbar :isOpen="opened" @toggle-menu="toggleSidebar"/>
<app-sidebar :isOpen="opened"/>
<main slot="content" id="content" class="content" role="main">
<vuestic-breadcrumbs/>
<vuestic-pre-loader v-show="isLoading" ref="preLoader" class="pre-loader"></vuestic-pre-loader>
<router-view></router-view>
</main>
<span slot="footer">©2018. Made by&nbsp;<a href="http://epicmax.co" target="_blank">Epicmax </a></span>
</vuestic-layout>
</template>

<script>
import VuesticLayout from '../../vuestic-theme/vuestic-components/vuestic-layout/VuesticLayout'
import AppNavbar from './app-navbar/AppNavbar'
import AppSidebar from './app-sidebar/AppSidebar'
import {mapGetters} from 'vuex'
export default {
name: 'app-layout',
components: {
VuesticLayout,
AppNavbar,
AppSidebar
},
data () {
return {
opened: true
}
},
methods: {
toggleSidebar (opened) {
this.opened = opened
}
},
computed: {
...mapGetters([
'isLoading'
])
}
}
</script>
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<template>

<vuestic-navbar>
<header-selector slot="selector" v-model="valueProxy"/>
<header-selector slot="selector" :isOpen.sync="valueProxy"/>
<span slot="logo" class="i-vuestic"></span>
<div slot="center" class="navbar-text offset-md-1 col-md-7 d-none d-lg-flex align-items-center justify-content-center">
<span slot="center">
{{$t('navbar.messageUs')}}&nbsp;<a href="mailto:[email protected]">[email protected]</a>
</div>
<message-dropdown slot="message"></message-dropdown>
<notification-dropdown slot="notification"></notification-dropdown>
<language-dropdown slot="language"></language-dropdown>
<profile-dropdown slot="profile">
</span>
<message-dropdown/>
<notification-dropdown/>
<language-dropdown/>
<profile-dropdown>
<img src="http://i.imgur.com/nfa5itq.png"/>
</profile-dropdown>
</vuestic-navbar>
Expand Down Expand Up @@ -37,19 +37,18 @@
},
props: {
value: {
isOpen: {
type: Boolean,
required: true
}
},
computed: {
valueProxy: {
get () {
return this.value
return this.isOpen
},
set (value) {
this.$emit('toggle-menu', value)
set (opened) {
this.$emit('toggle-menu', opened)
},
}
},
Expand Down
29 changes: 29 additions & 0 deletions src/components/admin/app-navbar/components/HeaderSelector.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<template>
<span class="header-selector"
:class="{ 'i-menu-expanded': !isOpen, 'i-menu-collapsed': isOpen }"
@click="$emit('update:isOpen', !isOpen)"
/>
</template>

<script>
export default {
name: 'header-selector',
props: {
isOpen: {
type: Boolean,
required: true
},
}
}
</script>

<style lang="scss">
@import "../../../../sass/mixins";
.header-selector {
@include flex-center();
cursor: pointer;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<template>
<div class="language-selector dropdown" v-dropdown.closeOnMenuClick>
<a class="language-selector-button dropdown-toggle" href="#">
<div class="language-dropdown dropdown" v-dropdown.closeOnMenuClick>
<a class="language-dropdown-button dropdown-toggle" href="#">
<span class="flag-icon flag-icon-large" :class="flagIconClass(currentLanguage())"></span>
</a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" :class="{ active: option.code === currentLanguage() }"
v-for="(option, id) in options" :key="id" @click="setLanguage(option.code)">
<a class="dropdown-item"
:class="{ active: option.code === currentLanguage() }"
v-for="(option, id) in options"
:key="id"
@click="setLanguage(option.code)">
<span class="flag-icon flag-icon-small" :class="flagIconClass(option.code)"></span>
<span class="dropdown-item-text ellipsis">
{{ `language.${option.name}` | translate }}
Expand All @@ -24,18 +27,16 @@
props: {
options: {
type: Array,
default () {
return [
{
code: 'gb',
name: 'english'
},
{
code: 'es',
name: 'spanish'
}
]
}
default: () => [
{
code: 'gb',
name: 'english'
},
{
code: 'es',
name: 'spanish'
}
]
}
},
Expand All @@ -62,7 +63,7 @@
@import "../../../../../../node_modules/bootstrap/scss/functions";
@import "../../../../../../node_modules/bootstrap/scss/variables";
.language-selector {
.language-dropdown {
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -72,7 +73,7 @@
height: 100%;
padding: 0;
.language-selector-button {
.language-dropdown-button {
display: flex;
align-items: center;
justify-content: center;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="col nav-item dropdown navbar-dropdown" v-dropdown>
<a class="nav-link dropdown-toggle" href="#">
<span class="i-nav-messages notify"></span>
<span class="i-nav-messages"></span>
</a>
<div class="dropdown-menu">
<div class="dropdown-menu-content">
Expand All @@ -23,19 +23,37 @@
props: {
options: {
type: Array,
default () {
return [
{
name: 'new',
details: { name: 'Oleg M' }
},
{
name: 'new',
details: { name: 'Andrei H' }
},
]
}
default: () => [
{
name: 'new',
details: { name: 'Oleg M' }
},
{
name: 'new',
details: { name: 'Andrei H' }
},
]
}
},
}
</script>

<style lang="scss">
@import "../../../../../sass/variables";
.i-nav-messages {
position: relative;
&::after {
content: '';
position: absolute;
right: -6px;
top: -6px;
background-color: $brand-primary;
height: 12px;
width: 12px;
border-radius: 50%;
}
}
</style>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="col nav-item dropdown navbar-dropdown" v-dropdown>
<a class="nav-link dropdown-toggle" href="#">
<span class="i-nav-notification notify"></span>
<span class="i-nav-notification"></span>
</a>
<div class="dropdown-menu">
<div class="dropdown-menu-content">
Expand All @@ -23,22 +23,20 @@
props: {
options: {
type: Array,
default () {
return [
{
name: 'sentMessage',
details: { name: 'Vasily S' }
},
{
name: 'uploadedZip',
details: { name: 'Oleg M', type: 'typography component' }
},
{
name: 'startedTopic',
details: { name: 'Andrei H' }
}
]
}
default: () => [
{
name: 'sentMessage',
details: { name: 'Vasily S' }
},
{
name: 'uploadedZip',
details: { name: 'Oleg M', type: 'typography component' }
},
{
name: 'startedTopic',
details: { name: 'Andrei H' }
}
],
}
},
}
Expand All @@ -47,7 +45,7 @@
<style lang="scss">
@import "../../../../../sass/variables";
.notify {
.i-nav-notification {
position: relative;
&::after {
Expand All @@ -62,7 +60,7 @@
}
}
.i-nav-notification.notify::after {
.i-nav-notification::after {
right: -4px;
top: 0;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="col nav-item dropdown navbar-dropdown" v-dropdown>
<div class="profile-dropdown col nav-item dropdown navbar-dropdown" v-dropdown>
<a class="nav-link dropdown-toggle" href="#">
<span class="profile-section-avatar-container">
<slot></slot>
Expand All @@ -23,16 +23,14 @@
props: {
options: {
type: Array,
default () {
return [
{
name: 'profile'
},
{
name: 'logout'
}
]
}
default: () => [
{
name: 'profile'
},
{
name: 'logout'
}
]
}
},
}
Expand All @@ -41,7 +39,7 @@
<style lang="scss">
@import "../../../../../sass/variables";
.dropdown.navbar-dropdown {
.profile-dropdown {
.profile-section-avatar-container {
display: inline-block;
Expand Down
Loading

0 comments on commit 64affd8

Please sign in to comment.