Skip to content

Commit 2c5a6b2

Browse files
committed
Vuetify updated to 2.0+, Stylus loader replaced with Sass
1 parent f28922c commit 2c5a6b2

File tree

12 files changed

+269
-238
lines changed

12 files changed

+269
-238
lines changed

ClientApp/package-lock.json

Lines changed: 99 additions & 88 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ClientApp/package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,26 @@
1313
"vue-class-component": "^7.1.0",
1414
"vue-property-decorator": "^8.2.2",
1515
"vue-router": "^3.1.3",
16-
"vuetify": "^1.5.18",
16+
"vuetify": "^2.0.18",
1717
"vuex": "^3.1.1",
1818
"vuex-class": "^0.3.2"
1919
},
2020
"devDependencies": {
2121
"@babel/polyfill": "^7.6.0",
22+
"@mdi/font": "^4.4.95",
2223
"@types/node": "^12.7.5",
2324
"@vue/cli-plugin-babel": "^3.11.0",
2425
"@vue/cli-plugin-pwa": "^3.11.0",
2526
"@vue/cli-plugin-typescript": "^3.11.0",
2627
"@vue/cli-service": "^3.11.0",
2728
"axios": "^0.19.0",
2829
"babel-plugin-transform-imports": "^2.0.0",
29-
"stylus": "^0.54.7",
30-
"stylus-loader": "^3.0.2",
30+
"sass": "^1.22.12",
31+
"sass-loader": "^7.1.0",
3132
"typescript": "^3.6.3",
3233
"vue-cli-plugin-axios": "0.0.4",
3334
"vue-cli-plugin-vuetify": "^0.6.3",
34-
"vue-template-compiler": "^2.6.10"
35+
"vue-template-compiler": "^2.6.10",
36+
"vuetify-loader": "^1.3.0"
3537
}
3638
}

ClientApp/src/App.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33

44
<v-navigation-drawer persistent :mini-variant="miniVariant" :clipped="clipped" v-model="drawer" enable-resize-watcher fixed app>
55
<v-list>
6-
<v-list-tile value="true" v-for="(item, i) in items" :key="i" :to="item.link">
7-
<v-list-tile-action>
6+
<v-list-item value="true" v-for="(item, i) in items" :key="i" :to="item.link">
7+
<v-list-item-action>
88
<v-icon v-html="item.icon"></v-icon>
9-
</v-list-tile-action>
10-
<v-list-tile-content>
11-
<v-list-tile-title v-text="item.title"></v-list-tile-title>
12-
</v-list-tile-content>
13-
</v-list-tile>
9+
</v-list-item-action>
10+
<v-list-item-content>
11+
<v-list-item-title v-text="item.title"></v-list-item-title>
12+
</v-list-item-content>
13+
</v-list-item>
1414
</v-list>
1515
</v-navigation-drawer>
1616

17-
<v-toolbar app :clipped-left="clipped">
18-
<v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
19-
<v-btn icon @click.stop="miniVariant = !miniVariant">
17+
<v-app-bar app :clipped-left="clipped" color="info" dark>
18+
<v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
19+
<v-btn class="d-none d-lg-flex" icon @click.stop="miniVariant = !miniVariant">
2020
<v-icon v-html="miniVariant ? 'chevron_right' : 'chevron_left'"></v-icon>
2121
</v-btn>
22-
<v-btn icon @click.stop="clipped = !clipped">
22+
<v-btn class="d-none d-lg-flex" icon @click.stop="clipped = !clipped">
2323
<v-icon>web</v-icon>
2424
</v-btn>
2525
<v-toolbar-title v-text="title"></v-toolbar-title>
2626
<v-spacer></v-spacer>
27-
</v-toolbar>
27+
</v-app-bar>
2828

2929
<v-content>
3030
<router-view/>

ClientApp/src/components/Counter.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<p>Current count (Vuex):
44
<strong>{{ currentCount }}</strong>
55
</p>
6-
<v-btn color="info" @click.prevent="increment">Increment</v-btn>
7-
<v-btn color="info" @click.prevent="reset">Reset</v-btn>
6+
<v-btn class="ma-2" color="info" @click.prevent="increment">Increment</v-btn>
7+
<v-btn class="ma-2" color="info" @click.prevent="reset">Reset</v-btn>
88
</div>
99
</template>
1010

1111
<script lang="ts">
12-
import { State, Action, Getter } from 'vuex-class';
13-
import { Component, Prop, Vue } from 'vue-property-decorator';
12+
import { Action, Getter } from 'vuex-class';
13+
import { Component, Vue } from 'vue-property-decorator';
1414
const namespace: string = 'counter';
1515
1616
@Component

ClientApp/src/main.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import '@babel/polyfill';
22
import Vue from 'vue';
33
import './plugins/axios';
4-
import './plugins/vuetify';
4+
import vuetify from './plugins/vuetify';
55
import App from './App.vue';
66
import router from './router';
77
import store from '@/store/index';
@@ -10,6 +10,7 @@ import './registerServiceWorker';
1010
Vue.config.productionTip = false;
1111

1212
new Vue({
13+
vuetify,
1314
router,
1415
store,
1516
render: (h) => h(App),

0 commit comments

Comments
 (0)