Skip to content

Commit 3caa792

Browse files
Dean OhashiDean Ohashi
authored andcommitted
Merge branch 'ipc' of https://github.com/cs29-wobbegong/prevue2 into ipc
2 parents fdec3d5 + 49922a2 commit 3caa792

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

quasar.conf.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ module.exports = function (ctx) {
7979
// analyze: true,
8080
// extractCSS: false,
8181
extendWebpack (cfg) {
82-
cfg.module.rules.push({
83-
enforce: 'pre',
84-
test: /\.(js|vue)$/,
85-
loader: 'eslint-loader',
86-
exclude: /node_modules/,
87-
options: {
88-
formatter: require('eslint').CLIEngine.getFormatter('stylish')
89-
}
90-
})
82+
// cfg.module.rules.push({
83+
// enforce: 'pre',
84+
// test: /\.(js|vue)$/,
85+
// loader: 'eslint-loader',
86+
// exclude: /node_modules/,
87+
// options: {
88+
// formatter: require('eslint').CLIEngine.getFormatter('stylish')
89+
// }
90+
// })
9191
}
9292
},
9393

src/components/ExportProject.vue

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<template>
2+
<q-btn class="glossy" color="teal" label="Export Project" />
3+
</template>
4+
5+
<script>
6+
export default {
7+
name: 'ExportProjectComponent'
8+
}
9+
</script>
10+
11+
<style>
12+
13+
</style>

src/components/Routes.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<template>
2+
23
<div>
34
<!--<div class="route-view">-->
45
<a

src/layouts/MyLayout.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<q-toolbar-title>
88
<q-avatar></q-avatar>PreVue 2.0
99
</q-toolbar-title>
10+
<ExportProjectComponent />
1011
</q-toolbar>
1112
</q-header>
1213

@@ -30,6 +31,7 @@
3031
import HomeSideDropDown from '../components/HomeSideDropDown'
3132
import Footer from '../components/Footer'
3233
import CreateComponent from '../components/CreateComponent'
34+
import ExportProjectComponent from '../components/ExportProject'
3335
// import UploadImage from '../components/UploadImage'
3436
3537
export default {
@@ -42,7 +44,8 @@ export default {
4244
components: {
4345
HomeSideDropDown,
4446
Footer,
45-
CreateComponent
47+
CreateComponent,
48+
ExportProjectComponent
4649
// UploadImage
4750
}
4851
}

0 commit comments

Comments
 (0)