8000 feat: use eslint-plugin-vue · clarkdo/hare@cdf9ae8 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit cdf9ae8

Browse files
clarkdoclarkdo
committed
feat: use eslint-plugin-vue
1 parent 00eec76 commit cdf9ae8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+656
-646
lines changed

‎.eslintrc.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
module.exports = {
22
root: true,
3-
parser: 'babel-eslint',
43
env: {
54
browser: true,
65
node: true
76
},
8-
extends: 'standard',
9-
// required to lint *.vue files
10-
plugins: [
11-
'html'
7+
parserOptions: {
8+
parser: 'babel-eslint',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
12+
},
13+
extends: [
14+
'@nuxtjs',
15+
'plugin:nuxt/recommended'
1216
],
13-
// add your custom rules here
14-
rules: {},
15-
globals: {}
17+
rules: {
18+
'nuxt/no-cjs-in-config': 'off'
19+
}
1620
}

‎client/components/Footer.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<footer class="footer">
33
<div class="container">
44
<div class="footer-main">
5-
<p class="footer-main-title">Hare 2.0</p>
5+
<p class="footer-main-title">
6+
Hare 2.0
7+
</p>
68
<a href="//github.com/clarkdo/hare/issues" class="footer-main-link" target="_blank">Feedback</a>
79
<a href="//github.com/clarkdo/hare/graphs/contributors" class="footer-main-link" target="_blank">Contributors</a>
810
</div>
@@ -12,12 +14,15 @@
1214
placement="top"
1315
width="120"
1416
popper-class="footer-popover"
15-
trigger="hover">
16-
<div class="footer-popover-title">CFC</div>
17+
trigger="hover"
18+
>
19+
<div class="footer-popover-title">
20+
CFC
21+
</div>
1722
</el-popover>
18-
<i class="icon-wechat element-icons" v-popover:wechat></i>
23+
<i v-popover:wechat class="icon-wechat element-icons" />
1924
<a href="//github.com/clarkdo/hare" target="_blank">
20-
<i class="icon-github element-icons"></i>
25+
<i class="icon-github element-icons" />
2126
</a>
2227
</div>
2328
</div>

‎client/components/Headbar.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
<template>
22
<div class="headbar">
3-
<header class="header" ref="header">
3+
<header ref="header" class="header">
44
<el-row>
55
<el-col :span="5">
66
<div class="nav-icon" :class="{hide: !isMenuHidden}" @click="toggleMenu">
7-
<span></span>
8-
<span></span>
9-
<span></span>
10-
<span></span>
7+
<span />
8+
<span />
9+
<span />
10+
<span />
1111
</div>
1212
</el-col>
1313
<el-col :offset="11" :span="3">
1414
<p v-if="!!displayName">
1515
<el-tooltip :content="displayName">
16-
<img src="~/assets/img/avatar.svg" />
16+
<img src="~/assets/img/avatar.svg">
1717
</el-tooltip>
18-
<span> {{displayName}}</span>
18+
<span> {{ displayName }}</span>
1919
</p>
2020
</el-col>
2121
<el-col :span="3">
2222
<p @click="$router.push('/account/token')">
2323
<el-tooltip :content="$t('head.pwd')">
2424
<img src="~/assets/img/pwd.svg"></img>
2525
</el-tooltip>
26-
<span> {{$t("head.pwd")}}</span>
26+
<span> {{ $t("head.pwd") }}</span>
2727
</p>
2828
</el-col>
2929
<el-col :span="2">
3030
<p @click="logout">
3131
<img src="~/assets/img/exit.svg"></img>
32-
<span> {{$t("head.exit")}}</span>
32+
<span> {{ $t("head.exit") }}</span>
3333
</p>
3434
</el-col>
3535
</el-row>
@@ -51,7 +51,7 @@ export default class Headbar extends Vue {
5151
@Getter isMenuHidden
5252
@Getter authUser
5353
@Getter displayName
54-
async logout () {
54+
async logout() {
5555
await this.$store.dispatch('logout', async () => {
5656
await this.$router.push('/login')
5757
})

‎client/components/Navbar.vue

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
<template>
22
<div class="navbar">
3-
<el-menu class="el-menu-demo" :default-active="$route.path"
4-
background-color="#324157" text-color="#bfcbd9">
3+
<el-menu
4+
class="el-menu-demo"
5+
:default-active="$route.path"
6+
background-color="#324157"
7+
text-color="#bfcbd9"
8+
>
59
<header>
6-
<el-row>
7-
<el-col :span="20">
8-
<img src="~/assets/img/logo.svg" alt="Element">
9-
</el-col>
10-
<el-col :span="4">
11-
<div class="nav-icon open" :class="{hide: isMenuHidden}" @click="toggleMenu">
12-
<span></span>
13-
<span></span>
14-
<span></span>
15-
<span></span>
16-
</div>
17-
</el-col>
18-
</el-row>
10+
<el-row>
11+
<el-col :span="20">
12+
<img src="~/assets/img/logo.svg" alt="Element">
13+
</el-col>
14+
<el-col :span="4">
15+
<div class="nav-icon open" :class="{hide: isMenuHidden}" @click="toggleMenu">
16+
<span />
17+
<span />
18+
<span />
19+
<span />
20+
</div>
21+
</el-col>
22+
</el-row>
1923
</header>
2024
<div v-for="menu in menus" :key="menu.id">
2125
<el-submenu v-if="menu.children && menu.children.length" :index="menu.url || menu.name">
22-
<template slot="title"><i v-if="menu.icon" :class="menu.icon"></i>{{menu.name}}</template>
26+
<template slot="title">
27+
<i v-if="menu.icon" :class="menu.icon" />{{ menu.name }}
28+
</template>
2329
<nuxt-link v-for="subMenu in menu.children" :key="subMenu.id" :to="subMenu.url" exact>
2430
<el-menu-item :index="subMenu.url || subMenu.name">
25-
<i v-if="subMenu.icon" :class="subMenu.icon"></i>{{subMenu.name}}
31+
<i v-if="subMenu.icon" :class="subMenu.icon" />{{ subMenu.name }}
2632
</el-menu-item>
2733
</nuxt-link>
2834
</el-submenu>
2935
<nuxt-link v-else :to="menu.url" exact>
3036
<el-menu-item :index="menu.url || menu.name">
31-
<i v-if="menu.icon" :class="menu.icon"></i>{{menu.name}}
32-
</el-menu-item>
37+
<i v-if="menu.icon" :class="menu.icon" />{{ menu.name }}
38+
</el-menu-item>
3339
</nuxt-link>
3440
</div>
3541
</el-menu>
@@ -53,14 +59,14 @@ export default class Navbar extends Vue {
5359
@Getter isMenuHidden
5460
@MenuGetter menus
5561
56-
async beforeMount () {
57-
let {data: menus} = await axios.get('/hpi/ui/menu')
62+
async beforeMount() {
63+
const { data: menus } = await axios.get('/hpi/ui/menu')
5864
if (Array.isArray(menus) && menus.length) {
5965
this.$store.dispatch('menu/addAll', this.translateMenus(menus))
6066
}
6167
}
6268
63-
translateMenus (menus) {
69+
translateMenus(menus) {
6470
return menus.map((menu) => {
6571
const subMenus = menu.children
6672
if (Array.isArray(subMenus) && subMenus.length) {

‎client/components/examples/activity/NewActivity.vue

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<template>
22
<div class="new-activity">
3-
<el-form :model="formData" :rules="formRules" ref="newActivity" label-width="100px" class="activity-form">
3+
<el-form ref="newActivity" :model="formData" :rules="formRules" label-width="100px" class="activity-form">
44
<el-row type="flex" justify="flex-start">
55
<el-col :xs="24" :sm="10">
66
<el-form-item :label="$t('activity.account')" prop="account">
7-
<el-input v-model="formData.account"></el-input>
7+
<el-input v-model="formData.account" />
88
</el-form-item>
99
</el-col>
1010
<el-col :xs="24" :sm="{span: 10, offset: 2}">
1111
<el-form-item :label="$t('activity.area')" prop="region">
1212
<el-select v-model="formData.region" filterable allow-create :placeholder="$t('activity.holder.area')">
1313
<el-option
14-
v-for="item in cities"
15-
v-if="!item.disabled"
14+
v-for="item in activeCities"
1615
:key="item.label"
1716
:label="$t(item.label)"
1817
:value="item.value"
@@ -29,46 +28,49 @@
2928
v-for="item in labels"
3029
:key="item.label"
3130
:label="$t(item.label)"
32-
:value="item.value">
33-
</el-option>
31+
:value="item.value"
32+
/>
3433
</el-select>
3534
</el-form-item>
3635
</el-col>
3736
<el-col :xs="24" :sm="{span: 3, offset: 2}">
3837
<el-form-item :label="$t('activity.instDist')" prop="delivery">
39-
<el-switch active-text="" inactive-text="" v-model="formData.delivery"></el-switch>
38+
<el-switch v-model="formData.delivery" active-text="" inactive-text="" />
4039
</el-form-item>
4140
</el-col>
4241
</el-row>
4342
<el-row type="flex" justify="flex-start">
4443
<el-col :xs="24" :sm="10">
4544
<el-form-item :label="$t('activity.type')" prop="type">
4645
<el-checkbox-group v-model="formData.type">
47-
<el-checkbox :label="$t('activity.price')"></el-checkbox>
48-
<el-checkbox :label="$t('activity.rights')"></el-checkbox>
46+
<el-checkbox :label="$t('activity.price')" />
47+
<el-checkbox :label="$t('activity.rights')" />
4948
</el-checkbox-group>
5049
</el-form-item>
5150
</el-col>
5251
<el-col :xs="24" :sm="{span: 10, offset: 2}">
5352
<el-form-item :label="$t('activity.priority')" prop="priority">
5453
<el-radio-group v-model="formData.priority">
55-
<el-radio :label="$t('activity.medium')"></el-radio>
56-
<el-radio :label="$t('activity.high')"></el-radio>
54+
<el-radio :label="$t('activity.medium')" />
55+
<el-radio :label="$t('activity.high')" />
5756
</el-radio-group>
5857
</el-form-item>
5958
</el-col>
6059
</el-row>
6160
<el-row type="flex" justify="flex-start">
6261
<el-col :xs="24" :sm="10">
6362
<el-form-item :label="$t('activity.rate')" prop="rate">
64-
<el-rate v-model="formData.rate" :colors="['#99A9BF', '#F7BA2A', '#FF9900']"></el-rate>
63+
<el-rate v-model="formData.rate" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" />
6564
</el-form-item>
6665
</el-col>
6766
<el-col :xs="24" :sm="{span: 10, offset: 2}">
6867
<el-form-item :label="$t('activity.organizer')" prop="organizer">
69-
<el-cascader :options="organizers" v-model="formData.organizer"
70-
:placeholder="$t('example.selPh')" change-on-select>
71-
</el-cascader>
68+
<el-cascader
69+
v-model="formData.organizer"
70+
:options="organizers"
71+
:placeholder="$t('example.selPh')"
72+
change-on-select
73+
/>
7274
</el-form-item>
7375
</el-col>
7476
</el-row>
@@ -77,13 +79,15 @@
7779
<el-form-item :label="$t('activity.date')" required>
7880
<el-col :span="11">
7981
<el-form-item prop="date1">
80-
<el-date-picker :placeholder="$t('activity.holder.date')" v-model="formData.date1" style="width: 100%;"></el-date-picker>
82+
<el-date-picker v-model="formData.date1" :placeholder="$t('activity.holder.date')" style="width: 100%;" />
8183
</el-form-item>
8284
</el-col>
83-
<el-col class="line" :span="1" :offset="1">-</el-col>
85+
<el-col class="line" :span="1" :offset="1">
86+
-
87+
</el-col>
8488
<el-col :span="11">
8589
<el-form-item prop="date2">
86-
<el-time-picker :placeholder="$t('activity.holder.time')" v-model="formData.date2" style="width: 100%;"></el-time-picker>
90+
<el-time-picker v-model="formData.date2" :placeholder="$t('activity.holder.time')" style="width: 100%;" />
8791
</el-form-item>
8892
</el-col>
8993
</el-form-item>
@@ -92,13 +96,17 @@
9296
<el-row type="flex" justify="flex-start">
9397
<el-col :xs="24" :sm="22">
9498
<el-form-item :label="$t('activity.desc')" prop="desc">
95-
<el-input type="textarea" v-model="formData.desc"></el-input>
99+
<el-input v-model="formData.desc" type="textarea" />
96100
</el-form-item>
97101
</el-col>
98102
</el-row>
99103
<el-row type="flex" justify="center">
100-
<el-button type="primary" @click="submit('newActivity')">{{$t('activity.create')}}</el-button>
101-
<el-button @click="reset('newActivity')">{{$t('activity.reset')}}</el-button>
104+
<el-button type="primary" @click="submit('newActivity')">
105+
{{ $t('activity.create') }}
106+
</el-button>
107+
<el-button @click="reset('newActivity')">
108+
{{ $t('activity.reset') }}
109+
</el-button>
102110
</el-row>
103111
</el-form>
104112
</div>
@@ -114,7 +122,7 @@ const ExampleGetter = namespace('examples/index', Getter)
114122
props: {
115123
formData: {
116124
type: Object,
117-
default () {
125+
default() {
118126
return {
119127
account: '',
120128
region: 'activity.city.ly',
@@ -131,7 +139,7 @@ const ExampleGetter = namespace('examples/index', Getter)
131139
}
132140
}
133141
},
134-
data () {
142+
data() {
135143
return {
136144
formRules: {
137145
account: [
@@ -168,14 +176,19 @@ export default class NewActivity extends Vue {
168176
@ExampleGetter organizers
169177
@ExampleGetter cities
170178
171-
submit (formName) {
179+
get activeCities() {
180+
return this.cities.filter(city => !city.disable)
181+
}
182+
183+
submit(formName) {
172184
/**
173185
* Example of how we can see each field value
174186
*/
175-
let formData = {}
187+
const formData = {}
176188
for (const v of Object.keys(this.formData)) {
177189
formData[v] = this.formData[v]
178190
}
191+
// eslint-disable-next-line no-console
179192
console.log('NewActivity submit formData', formData)
180193
181194
this.$refs[formName].validate((valid) => {
@@ -192,7 +205,7 @@ export default class NewActivity extends Vue {
192205
}
193206
})
194207
}
195-
reset (formName) {
208+
reset(formName) {
196209
this.$refs[formName].resetFields()
197210
}
198211
}

‎client/components/examples/charts/BarDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Bar } from 'vue-chartjs'
66
extends: Bar
77
})
88
export default class BarDemo {
9-
mounted () {
9+
mounted() {
1010
this.renderChart({
1111
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
1212
datasets: [

‎client/components/examples/charts/DoughnutDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Doughnut } from 'vue-chartjs'
66
extends: Doughnut
77
})
88
export default class DoughnutDemo {
9-
mounted () {
9+
mounted() {
1010
this.renderChart({
1111
labels: ['VueJs', 'EmberJs', 'ReactJs', 'AngularJs'],
1212
datasets: [

‎client/components/examples/charts/LineDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default class LineDemo extends Vue {
3030
}
3131
]
3232
}
33-
mounted () {
33+
mounted() {
3434
this.renderChart(this.chartData, {
3535
tooltips: {
3636
callbacks: {

0 commit comments

Comments
 (0)
0