Skip to content

Commit 32b4b04

Browse files
authored
Merge pull request #13 from drewngyen/master
added upload mockup
2 parents 4455f73 + 4899ba4 commit 32b4b04

File tree

8 files changed

+76
-7
lines changed

8 files changed

+76
-7
lines changed

quasar.conf.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ module.exports = function (ctx) {
5555
'QTabPanels',
5656
'QTabPanel',
5757
'QFab',
58-
'QFabAction'
58+
'QFabAction',
59+
'QUploader',
60+
'QEditor'
5961
],
6062

6163
directives: [

src/components/CodeSnippet.vue

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<template>
2+
<div class="snip">
3+
<q-editor
4+
v-model="editor"
5+
:definitions="{
6+
bold: {label: 'Bold', icon: null, tip: 'My bold tooltip'}
7+
}"
8+
/>
9+
</div>
10+
</template>
11+
12+
<script>
13+
export default {
14+
data () {
15+
return {
16+
editor: 'Here we are overriding the <b>bold</b> command to include a label instead of an icon and also changing its tooltip.'
17+
}
18+
}
19+
}
20+
</script>
21+
22+
<style>
23+
.snip{
24+
height: 150px;
25+
}
26+
</style>

src/components/CreateComponent.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import Icons from './Icons'
2727
import ParentMultiselect from '../components/ParentMultiselect'
2828
import { mapState, mapActions } from 'vuex'
29-
// import * as types from '../store/types.js'
3029
3130
export default {
3231
name: 'HomeSidebar',

src/components/Footer.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
<q-tab-panels v-model="tab" animated class="bg-primary text-white">
2424
<q-tab-panel name="code">
25-
<div class="text-h6">Code Snippet</div>Code Snippet Component Here
26-
<br />asdfadsfasdf
2725
</q-tab-panel>
2826

2927
<q-tab-panel name="tree">
@@ -40,10 +38,12 @@
4038

4139
<script>
4240
import Tree from './Tree'
41+
// import CodeSnippet from './CodeSnippet'
4342
4443
export default {
4544
components: {
4645
Tree
46+
// CodeSnippet
4747
},
4848
data () {
4949
return {

src/components/ParentMultiselect.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div id="parent-select">
33
<br />
44
<multiselect
5-
placeholder="Choose Parent (if applicable)"
5+
placeholder="Parent Component"
66
:multiple="false"
77
:close-on-select="true"
88
:options="options"
@@ -52,5 +52,9 @@ export default {
5252

5353
<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
5454
<style scoped>
55-
55+
#parent-select{
56+
height: 30px;
57+
margin: 0.75rem;
58+
width: 90%;
59+
}
5660
</style>

src/components/Toolbar.vue

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<template>
2+
<div class="home-sidebar">
3+
<q-btn-group>
4+
<q-btn color="secondary" icon="timeline" />
5+
<q-btn color="secondary" icon="visibility" />
6+
<q-btn color="secondary" icon="update" />
7+
</q-btn-group>
8+
</div>
9+
</template>
10+
11+
<style>
12+
.home-sidebar {
13+
margin: 1rem;
14+
border-radius: 5px;
15+
}
16+
</style>

src/components/UploadImage.vue

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<template>
2+
<div class="home-sidebar">
3+
<q-uploader
4+
url="http://localhost:4444/upload"
5+
label="Upload Image Mockups"
6+
color="teal"
7+
flat
8+
bordered
9+
style="max-width: 100%"
10+
/>
11+
</div>
12+
</template>
13+
14+
<style>
15+
.home-sidebar {
16+
margin: 1rem;
17+
border-radius: 5px;
18+
}
19+
</style>

src/layouts/MyLayout.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<q-drawer v-model="left" side="left" behavior="desktop" bordered>
1414
<!-- drawer content -->
1515
<q-list>
16+
<UploadImage />
1617
<HomeSideDropDown />
1718
<CreateComponent />
1819
</q-list>
@@ -29,6 +30,7 @@
2930
import HomeSideDropDown from '../components/HomeSideDropDown'
3031
import Footer from '../components/Footer'
3132
import CreateComponent from '../components/CreateComponent'
33+
import UploadImage from '../components/UploadImage'
3234
3335
export default {
3436
data () {
@@ -40,7 +42,8 @@ export default {
4042
components: {
4143
HomeSideDropDown,
4244
Footer,
43-
CreateComponent
45+
CreateComponent,
46+
UploadImage
4447
}
4548
}
4649
</script>

0 commit comments

Comments
 (0)