Skip to content

Commit

Permalink
add simple layout and eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
bakai-dev committed Feb 2, 2019
1 parent 906d84e commit 6f59515
Show file tree
Hide file tree
Showing 50 changed files with 946 additions and 974 deletions.
16 changes: 0 additions & 16 deletions frontend/assets/sass/_variables.scss

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/assets/sass/app.scss
Original file line number Diff line number Diff line change
@@ -1,9 +0,0 @@
@import 'variables';
@import '~bootstrap/scss/bootstrap';
@import '~sweetalert2/src/sweetalert2';
@import '@fortawesome/fontawesome/styles.css';

@import 'elements/card';
@import 'elements/navbar';
@import 'elements/buttons';
@import 'elements/transitions';
25 changes: 0 additions & 25 deletions frontend/assets/sass/elements/_buttons.scss

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/assets/sass/elements/_card.scss

This file was deleted.

19 changes: 0 additions & 19 deletions frontend/assets/sass/elements/_navbar.scss

This file was deleted.

17 changes: 0 additions & 17 deletions frontend/assets/sass/elements/_transitions.scss

This file was deleted.

2 changes: 0 additions & 2 deletions frontend/assets/style/app.styl

This file was deleted.

1 change: 0 additions & 1 deletion frontend/assets/style/variables.styl

This file was deleted.

64 changes: 0 additions & 64 deletions frontend/components/App.vue

This file was deleted.

63 changes: 34 additions & 29 deletions frontend/components/FeedbackMessage.vue
Original file line number Diff line number Diff line change
@@ -1,38 +1,43 @@
<template>
<v-layout row justify-center>
<v-dialog v-if="responseMessage.modal" :value.sync="responseMessage.show" persistent>
<v-card>
<v-card-title class="headline white--text" :class="responseMessage.type">{{ responseMessage.title }}
</v-card-title>
<v-divider></v-divider>
<v-card-text>{{ responseMessage.text }}</v-card-text>
<v-layout row justify-center>
<v-btn :color="responseMessage.type" flat="flat" @click.native="close">{{ $t('ok') }}</v-btn>
</v-layout>
</v-card>
</v-dialog>
<v-snackbar v-else top v-model="responseMessage.show" :color="responseMessage.type">
{{ responseMessage.text }}
<v-btn dark flat @click.native="close">{{ $t('close') }}</v-btn>
</v-snackbar>
</v-layout>
<v-layout row justify-center>
<v-dialog v-if="responseMessage.modal" :value.sync="responseMessage.show" persistent>
<v-card>
<v-card-title class="headline white--text" :class="responseMessage.type">
{{ responseMessage.title }}
</v-card-title>
<v-divider />
<v-card-text>{{ responseMessage.text }}</v-card-text>
<v-layout row justify-center>
<v-btn :color="responseMessage.type" flat="flat" @click.native="close">
{{ $t('ok') }}
</v-btn>
</v-layout>
</v-card>
</v-dialog>
<v-snackbar v-else v-model="responseMessage.show" top :color="responseMessage.type">
{{ responseMessage.text }}
<v-btn dark flat @click.native="close">
{{ $t('close') }}
</v-btn>
</v-snackbar>
</v-layout>
</template>

<script>
import {mapGetters} from 'vuex'
import { mapGetters } from 'vuex'
export default {
name: 'feedback-message',
computed: mapGetters({
responseMessage: 'message/responseMessage'
}
),
methods: {
close() {
this.$store.dispatch('message/clearMessage')
}
}
export default {
name: 'FeedbackMessage',
computed: mapGetters({
responseMessage: 'message/responseMessage'
}
),
methods: {
close() {
this.$store.dispatch('message/clearMessage')
}
}
}
</script>

<style lang="stylus" scoped>
Expand Down
35 changes: 35 additions & 0 deletions frontend/components/LocaleDropdown.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<template>
<v-menu offset-y>
<v-btn slot="activator" flat>
{{ locales[locale] }}
</v-btn>

<v-list>
<v-list-tile v-for="(value, key) in locales" :key="key" @click.prevent="setLocale(key)">
{{ value }}
</v-list-tile>
</v-list>
</v-menu>
</template>

<script>
import { mapGetters } from 'vuex'
import { loadMessages } from '~/plugins/i18n'
export default {
computed: mapGetters({
locale: 'lang/locale',
locales: 'lang/locales'
}),
methods: {
setLocale(locale) {
if (this.$i18n.locale !== locale) {
loadMessages(locale)
this.$store.dispatch('lang/setLocale', { locale })
}
}
}
}
</script>
13 changes: 7 additions & 6 deletions frontend/components/NavMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
</v-list-tile>
</v-list>
</v-toolbar>
<v-divider></v-divider>
<v-divider />
<v-list>
<v-list-tile
value="true"
v-for="(item, i) in items"
:key="i"
value="true"
:to="item.route"
>
<v-list-tile-action>
<v-icon light v-html="item.icon"></v-icon>
<v-icon>{{ item.icon }}</v-icon>
</v-list-tile-action>
<v-list-tile-content>
<v-list-tile-title v-text="item.title"></v-list-tile-title>
<v-list-tile-title v-text="item.title" />
</v-list-tile-content>
</v-list-tile>
</v-list>
Expand All @@ -30,12 +30,13 @@

<script>
export default {
data () {
data() {
return {
name: this.$t('nav_menu_title'),
items: [
{ title: 'Dashboard', icon: 'dashboard', route: { name: 'home' } },
{ title: 'Account', icon: 'account_box', route: { name: 'settings.profile' } }
{ title: 'Account', icon: 'account_box', route: { name: 'settings.profile' } },
{ title: 'Welcome', icon: 'menu', route: { name: 'index' } }
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/PageFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<script>
export default {
data () {
data() {
return {
fixed: false
}
Expand Down
13 changes: 6 additions & 7 deletions frontend/components/ProgressBar.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<template>
<v-progress-linear
:indeterminate="true"
:color="color"
height="4"
<v-progress-linear
v-if="show"
>
</v-progress-linear>
:indeterminate="true"
:color="color"
height="4"
/>
</template>

<script>
export default {
name: 'progress-bar',
name: 'ProgressBar',
props: {
show: {
type: [Boolean, String],
Expand Down
Loading

0 comments on commit 6f59515

Please sign in to comment.