Skip to content

Commit bddbc0e

Browse files
Merge branch 'release/v1.3.1'
2 parents 4f97154 + dfecc4e commit bddbc0e

File tree

22 files changed

+1230
-269
lines changed

22 files changed

+1230
-269
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
VUE_APP_PACKAGE_JSON=''
33

44
# TAG must be corresponding with the version tag in package.json, need to modify it when new version releases
5-
TAG=1.3.0
5+
TAG=1.3.1

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ module.exports = {
4747
'vue/html-quotes': 'error',
4848
'vue/mustache-interpolation-spacing': 'error',
4949
'vue/html-self-closing': 'error',
50-
'no-unused-vars': 'error'
50+
'no-unused-vars': 'error',
51+
'yoda': 'off'
5152
},
5253
parserOptions: {
5354
parser: '@typescript-eslint/parser',

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
## [1.3.1](https://github.com/johnnymillergh/vuetify-typescript-playground/compare/v1.3.0...v1.3.1) (2020-01-03)
2+
3+
4+
### Features
5+
6+
* **$App:** use YouTube-like layout ([dd61af0](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/dd61af02e5b42ea1494558a4f4f2a616b433a1c6))
7+
* **$Demo:** change ripple effect ([2a221d5](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/2a221d553c225eb82453c812090dbc9e47ecc8cc))
8+
* **$Icon:** add dependency `@mdi/js` ([2d48f33](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/2d48f33fa8d6bc4894808e625b2c46ea97a68f89))
9+
* **$Toast:** new Vue plugin `Vuetify Toast` ([faf96f0](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/faf96f047a9d0a74baa0da86a0f16fd93ad724a9))
10+
* **$Validation:** add field validation ([9170df2](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/9170df2bf10e5be044b4744d0ce793e2eee6df12))
11+
12+
13+
### Performance Improvements
14+
15+
* **$ClassValidator:** integrate Class Validator ([7a44a3f](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/7a44a3fd6c8f056597472f97ed0bfc4c3866e0d4))
16+
* **$ESLint:** update ESLint rule `yoda` ([1473f79](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/1473f797bde18668d8511429b627b24c99dc8604))
17+
* **$package.json:** add dependencies axios, class-validator, mock.js ([9f98264](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/9f9826484cbc6ee8e1093243f4a7087e1240c20c))
18+
* **$package.json:** integrate axios-mock-adapter ([f890d6f](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/f890d6f69f4926c8acec33d73e18a9ba1c7125c0))
19+
* **$package.json:** upgrade dependencies: [email protected], @typescript-eslint/eslint-plugin@2.14.0, @typescript-eslint/parser@2.14.0, @vue/cli-plugin-babel@4.1.2, @vue/cli-plugin-eslint@4.1.2, @vue/cli-plugin-router@4.1.2, @vue/cli-plugin-typescript@4.1.2, @vue/cli-plugin-unit-jest@4.1.2, @vue/cli-plugin-vuex@4.1.2, @vue/cli-service@4.1.2, [email protected], [email protected] ([4122050](https://github.com/johnnymillergh/vuetify-typescript-playground/commit/41220506241848558edd7afd2ac2fcdc1eb98427))
20+
21+
22+
### BREAKING CHANGES
23+
24+
* **$Icon:** support @mdi/js
25+
* **$App:** use YouTube-like layout
26+
27+
28+
129
# [1.3.0](https://github.com/johnnymillergh/vuetify-typescript-playground/compare/v1.2.0...v1.3.0) (2019-12-31)
230

331

package.json

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vuetify-typescript-playground",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"license": "Apache-2.0",
55
"description": "Vuetify Typescript Playground",
66
"author": {
@@ -34,29 +34,33 @@
3434
},
3535
"dependencies": {
3636
"@mdi/font": "4.7.95",
37+
"@mdi/js": "4.7.95",
3738
"@types/lodash": "4.14.149",
39+
"axios": "0.19.0",
40+
"axios-mock-adapter": "1.17.0",
41+
"class-validator": "0.11.0",
3842
"core-js": "3.6.1",
3943
"lodash": "4.17.15",
4044
"roboto-fontface": "*",
4145
"vue": "2.6.11",
4246
"vue-class-component": "7.1.0",
4347
"vue-property-decorator": "8.3.0",
4448
"vue-router": "3.1.3",
45-
"vuetify": "2.1.15",
49+
"vuetify": "2.2.1",
4650
"vuex": "3.1.2"
4751
},
4852
"devDependencies": {
49-
"@babel/plugin-proposal-optional-chaining": "^7.7.5",
53+
"@babel/plugin-proposal-optional-chaining": "7.7.5",
5054
"@types/jest": "^24.0.19",
51-
"@typescript-eslint/eslint-plugin": "2.13.0",
52-
"@typescript-eslint/parser": "2.13.0",
53-
"@vue/cli-plugin-babel": "4.1.1",
54-
"@vue/cli-plugin-eslint": "4.1.1",
55-
"@vue/cli-plugin-router": "4.1.1",
56-
"@vue/cli-plugin-typescript": "4.1.1",
57-
"@vue/cli-plugin-unit-jest": "4.1.1",
58-
"@vue/cli-plugin-vuex": "4.1.1",
59-
"@vue/cli-service": "4.1.1",
55+
"@typescript-eslint/eslint-plugin": "2.14.0",
56+
"@typescript-eslint/parser": "2.14.0",
57+
"@vue/cli-plugin-babel": "4.1.2",
58+
"@vue/cli-plugin-eslint": "4.1.2",
59+
"@vue/cli-plugin-router": "4.1.2",
60+
"@vue/cli-plugin-typescript": "4.1.2",
61+
"@vue/cli-plugin-unit-jest": "4.1.2",
62+
"@vue/cli-plugin-vuex": "4.1.2",
63+
"@vue/cli-service": "4.1.2",
6064
"@vue/eslint-config-standard": "5.0.1",
6165
"@vue/eslint-config-typescript": "5.0.1",
6266
"@vue/test-utils": "1.0.0-beta.29",
@@ -66,14 +70,14 @@
6670
"eslint-plugin-node": "11.0.0",
6771
"eslint-plugin-promise": "4.2.1",
6872
"eslint-plugin-standard": "4.0.1",
69-
"eslint-plugin-vue": "6.0.2",
73+
"eslint-plugin-vue": "6.1.2",
7074
"eslint-plugin-vue-libs": "4.0.0",
7175
"lint-staged": "9.5.0",
7276
"node-sass": "4.13.0",
7377
"sass": "1.24.0",
7478
"sass-loader": "8.0.0",
7579
"typescript": "3.7.4",
76-
"vue-cli-plugin-vuetify": "2.0.2",
80+
"vue-cli-plugin-vuetify": "2.0.3",
7781
"vue-template-compiler": "2.6.11",
7882
"vuetify-loader": "1.4.3"
7983
},

src/App.vue

Lines changed: 4 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,11 @@
11
<template>
2-
<v-app id="app-container">
3-
<v-app-bar app color="primary" dark>
4-
<div class="d-flex align-center">
5-
<v-img alt="Vuetify Logo" class="shrink mr-2" contain
6-
src="https://cdn.vuetifyjs.com/images/logos/vuetify-logo-dark.png" transition="scale-transition"
7-
width="40"/>
8-
<span id="app-name">{{ appName }}</span>
9-
<span id="version">{{ version }}</span>
10-
<span id="environment">{{ environment }}</span>
11-
</div>
12-
<v-spacer/>
13-
<v-btn href="https://github.com/vuetifyjs/vuetify/releases/latest" target="_blank" text>
14-
<span class="mr-2">Latest Release</span>
15-
<v-icon>mdi-open-in-new</v-icon>
16-
</v-btn>
17-
</v-app-bar>
18-
<v-content>
19-
<v-sheet class="text-center">
20-
<router-link to="/">Home</router-link>
21-
<span>|</span>
22-
<router-link to="/vuetify-demo">Vuetify Demo</router-link>
23-
</v-sheet>
24-
<transition name="fade-transform" mode="out-in">
25-
<router-view class="app-container"/>
26-
</transition>
27-
</v-content>
2+
<v-app id="app">
3+
<transition name="fade-transform" mode="out-in">
4+
<router-view/>
5+
</transition>
286
</v-app>
297
</template>
308

31-
<script lang="ts">
32-
import Vue from 'vue'
33-
import { AppUtil } from '@/utils/app-util.ts'
34-
35-
export default Vue.extend({
36-
name: 'App',
37-
data: () => ({
38-
appName: '',
39-
version: '',
40-
environment: ''
41-
}),
42-
mounted (): void {
43-
this.appName = AppUtil.getName()
44-
.replace(/-/g, ' ')
45-
.split(' ')
46-
.map(word => word[0].toUpperCase() + word.substr(1).toLowerCase())
47-
.join(' ')
48-
this.version = AppUtil.getVersionInfo()
49-
this.environment = `Environment: ${process.env.NODE_ENV} (${process.env.VUE_APP_ENV})`
50-
}
51-
})
52-
</script>
53-
549
<!--suppress CssUnusedSymbol -->
5510
<style lang="scss" scoped>
5611
.fade-transform-leave-active, .fade-transform-enter-active {
@@ -72,20 +27,5 @@ export default Vue.extend({
7227
font-size: 32px;
7328
font-weight: bold;
7429
}
75-
76-
#version {
77-
text-align: right;
78-
font-size: 32px;
79-
position: relative;
80-
left: 8px;
81-
}
82-
83-
#environment {
84-
text-align: right;
85-
font-size: 18px;
86-
position: relative;
87-
top: 4px;
88-
left: 16px;
89-
}
9030
}
9131
</style>

src/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import '@mdi/font/css/materialdesignicons.css'
88
import '@/directives/throttled-click'
99
import '@/directives/debounced-click'
1010
import { listenToColorScheme } from '@/plugins/adaptive-color-scheme'
11+
import '@/plugins/axios-mock-adapter'
1112

1213
Vue.config.productionTip = false
1314

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
const axios = require('axios')
2+
const MockAdapter = require('axios-mock-adapter')
3+
4+
// All requests using this instance will have a 2 seconds delay:
5+
const mock = new MockAdapter(axios, { delayResponse: 2000 })
6+
7+
// Mock GET request to /users when param `searchText` is 'John'
8+
// arguments for reply are (status, data, headers)
9+
mock.onGet('/api/getDemo').reply(200, {
10+
message: '/api/getDemo success!'
11+
})
12+
13+
mock.onGet('/api/delay').reply(200, {
14+
message: 'delay message'
15+
})

0 commit comments

Comments
 (0)