Skip to content

Commit

Permalink
chore: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
asvae committed Mar 28, 2019
1 parent 528652c commit 0a68ca7
Show file tree
Hide file tree
Showing 139 changed files with 1,415 additions and 1,065 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'comma-dangle': ['error', 'only-multiline'],
'curly': 'error',
},
parserOptions: {
parser: 'babel-eslint',
Expand Down
4 changes: 2 additions & 2 deletions .postcssrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
plugins: {
autoprefixer: {}
}
autoprefixer: {},
},
}
4 changes: 2 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
'@vue/app'
]
'@vue/app',
],
}
2 changes: 1 addition & 1 deletion config/dev.env.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ const merge = require('webpack-merge')
const prodEnv = require('./prod.env')

module.exports = merge(prodEnv, {
NODE_ENV: '"development"'
NODE_ENV: '"development"',
})
6 changes: 3 additions & 3 deletions config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
// View the bundle analyzer report after build finishes:
// `npm run build --report`
// Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report
bundleAnalyzerReport: process.env.npm_config_report,
},
dev: {
env: require('./dev.env'),
Expand All @@ -34,6 +34,6 @@ module.exports = {
// (https://github.com/webpack/css-loader#sourcemaps)
// In our experience, they generally work as expected,
// just be aware of this issue when enabling this option.
cssSourceMap: false
}
cssSourceMap: false,
},
}
2 changes: 1 addition & 1 deletion config/prod.env.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'use strict'
module.exports = {
NODE_ENV: '"production"'
NODE_ENV: '"production"',
}
12 changes: 6 additions & 6 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ module.exports = {
'js',
'jsx',
'json',
'vue'
'vue',
],
transform: {
'^.+\\.vue$': 'vue-jest',
'.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
'^.+\\.jsx?$': 'babel-jest'
'^.+\\.jsx?$': 'babel-jest',
},
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1'
'^@/(.*)$': '<rootDir>/src/$1',
},
snapshotSerializers: [
'jest-serializer-vue'
'jest-serializer-vue',
],
testMatch: [
'**/src/**/*.spec.(js|jsx|ts|tsx)'
'**/src/**/*.spec.(js|jsx|ts|tsx)',
],
testURL: 'http://localhost/'
testURL: 'http://localhost/',
}
4 changes: 2 additions & 2 deletions src/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
env: {
jest: true
}
jest: true,
},
}
3 changes: 2 additions & 1 deletion src/app/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<script>
export default {
name: 'app'
name: 'app',
}
</script>

Expand All @@ -15,6 +15,7 @@ export default {
body {
height: 100%;
#app {
height: 100%;
}
Expand Down
1 change: 0 additions & 1 deletion src/app/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Polyfills
import 'es6-promise/auto'
import 'babel-polyfill'

// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
Expand Down
8 changes: 5 additions & 3 deletions src/assets/icons/menu-collapsed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions src/assets/icons/menu-expanded.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/components/admin/app-breadcrumbs/Breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const breadcrumbs = {
},
{
name: 'filters',
displayName: 'menu.filters'
displayName: 'menu.filters',
},
{
name: 'color-pickers',
Expand Down Expand Up @@ -123,12 +123,12 @@ export const breadcrumbs = {
},
{
name: 'spacing',
displayName: 'menu.spacing'
displayName: 'menu.spacing',
},
{
name: 'sliders',
displayName: 'menu.sliders'
}
displayName: 'menu.sliders',
},
],
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export default {
.language-dropdown {
cursor: pointer;
.flag-icon-large {
display: block;
width: 31px;
Expand Down
8 changes: 4 additions & 4 deletions src/components/admin/app-sidebar/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@
</sidebar-link>
<!-- NOTE Dropdowns are not presentation ready yet. See https://github.com/epicmaxco/vuestic-admin/issues/438 -->
<!--<sidebar-link-->
<!--:to="{ name: 'dropdowns' }"-->
<!--:to="{ name: 'dropdowns' }"-->
<!--&gt;-->
<!--<span slot="title">-->
<!--<span>{{ $t('menu.dropdowns') }}</span>-->
<!--</span>-->
<!--<span slot="title">-->
<!--<span>{{ $t('menu.dropdowns') }}</span>-->
<!--</span>-->
<!--</sidebar-link>-->
<sidebar-link
:to="{ name: 'filters' }">
Expand Down
5 changes: 5 additions & 0 deletions src/components/admin/app-sidebar/components/SidebarLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,27 @@ export default {
align-items: center;
cursor: pointer;
text-decoration: none;
&.router-link-active,
&:hover {
color: $white;
background-color: $sidebar-link-active-bg;
.sidebar-menu-item-icon,
.expand-icon {
color: $white;
}
}
&:hover {
background-color: $hover-black;
}
.sidebar-menu-item-icon {
font-size: $sidebar-menu-item-icon-size;
color: $vue-green;
margin-right: 14px;
&.fa-dashboard {
/* Temp fix */
position: relative;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
name: 'sidebar-link-group',
components: {
SidebarLink,
Expanding
Expanding,
},
data () {
return {
Expand Down Expand Up @@ -69,6 +69,7 @@ export default {
font-weight: bold;
transition: transform 0.3s ease;
}
&.expanded {
.expand-icon {
transform: rotate(180deg);
Expand All @@ -79,10 +80,12 @@ export default {
.sidebar-submenu {
list-style: none;
padding-left: 0;
li {
display: block;
padding-left: 0;
}
.sidebar-link__router-link {
height: $sidebar-submenu-link-height;
padding-left: $sidebar-submenu-link-pl;
Expand Down
6 changes: 6 additions & 0 deletions src/components/auth/AuthLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ export default {
background-color: $top-nav-bg;
overflow: hidden;
@include va-flex-center();
&__logo {
z-index: 2;
position: absolute;
height: $auth-wallpaper-ivuestic-h;
width: 100%;
}
.va-icon-vuestic {
height: $auth-wallpaper-ivuestic-h;
width: 100%;
Expand All @@ -69,11 +71,13 @@ export default {
display: none;
height: $top-mobile-nav-height;
background-color: $top-nav-bg;
.va-icon-vuestic {
height: $auth-mobile-nav-ivuestic-h;
width: 100%;
}
}
.main {
height: 100vh;
Expand All @@ -89,9 +93,11 @@ export default {
.main {
height: $auth-mobile-main-h;
.auth-content {
align-items: flex-start;
}
.auth-wallpaper {
display: none;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/login/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<script>
export default {
name: 'login'
name: 'login',
}
</script>

Expand Down
6 changes: 4 additions & 2 deletions src/components/auth/signup/Signup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
<div class="form-group">
<div class="input-group">
<input type="text" id="email" required="required"/>
<label class="control-label" for="email">{{ $t('auth.email') }}</label><va-icon icon="bar"/>
<label class="control-label" for="email">{{ $t('auth.email') }}</label>
<va-icon icon="bar"/>
</div>
</div>
<div class="form-group">
<div class="input-group">
<input type="password" id="password" required="required"/>
<label class="control-label" for="password">{{ $t('auth.password') }}</label><va-icon icon="bar"/>
<label class="control-label" for="password">{{ $t('auth.password') }}</label>
<va-icon icon="bar"/>
</div>
</div>
<vuestic-checkbox name="agree-to-terms" v-model="agreedToTerms">
Expand Down
12 changes: 6 additions & 6 deletions src/components/dashboard/Dashboard.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<template>
<div class="dashboard">

<dashboard-info-widgets />
<dashboard-info-widgets/>

<va-card no-padding>
<vuestic-tabs
:names="[$t('dashboard.dataVisualization'), $t('dashboard.usersAndMembers'), $t('dashboard.setupProfile'), $t('dashboard.features')]"
ref="tabs">
<div :slot="$t('dashboard.dataVisualization')">
<data-visualisation-tab />
<data-visualisation-tab/>
</div>
<div :slot="$t('dashboard.usersAndMembers')">
<users-members-tab />
<users-members-tab/>
</div>
<div :slot="$t('dashboard.setupProfile')">
<setup-profile-tab />
<setup-profile-tab/>
</div>
<div :slot="$t('dashboard.features')">
<features-tab />
<features-tab/>
</div>
</vuestic-tabs>
</va-card>

<dashboard-bottom-widgets />
<dashboard-bottom-widgets/>

</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/DashboardBottomWidgets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="va-row dashboard-bottom-widgets">
<div class="flex md6 xs12">
<va-card no-padding>
<vuestic-feed :initialPosts="posts" />
<vuestic-feed :initialPosts="posts"/>
</va-card>
</div>
<div class="flex md6 xs12">
Expand Down
Loading

0 comments on commit 0a68ca7

Please sign in to comment.