Skip to content

Commit 5109197

Browse files
authored
FUCK ESLINT
Dean
2 parents 8353f4f + 97a810f commit 5109197

26 files changed

+1702
-197
lines changed

package-lock.json

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

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,26 @@
1616
"localforage": "^1.7.3",
1717
"mousetrap": "^1.6.3",
1818
"quasar": "^1.0.0",
19+
"vue-drag-resize": "^1.3.2",
1920
"vue-draggable-resizable": "^2.0.0-rc2",
21+
"vue-loader": "^15.7.0",
2022
"vue-multiselect": "^2.1.6",
21-
"vued3tree": "^3.7.1"
23+
"vued3tree": "^3.7.1",
24+
"vuex": "^3.1.1"
2225
},
2326
"devDependencies": {
2427
"@quasar/app": "^1.0.0",
2528
"@vue/eslint-config-standard": "^4.0.0",
2629
"babel-eslint": "^10.0.1",
2730
"devtron": "^1.4.0",
2831
"electron": "^5.0.6",
32+
"electron-builder": "^20.44.4",
2933
"electron-debug": "^3.0.1",
3034
"electron-devtools-installer": "^2.2.4",
3135
"eslint": "^5.10.0",
3236
"eslint-loader": "^2.1.1",
33-
"eslint-plugin-vue": "^5.0.0"
37+
"eslint-plugin-vue": "^5.0.0",
38+
"strip-ansi": "^3.0.1"
3439
},
3540
"engines": {
3641
"node": ">= 8.9.0",

quasar.conf.js

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,7 @@ module.exports = function (ctx) {
4343
'QList',
4444
'QItem',
4545
'QItemSection',
46-
'QItemLabel',
47-
'QExpansionItem',
48-
'QInput',
49-
'QBar',
50-
'QFooter',
51-
'QAvatar',
52-
'QTabs',
53-
'QTab',
54-
'QRouteTab',
55-
'QTabPanels'
46+
'QItemLabel'
5647
],
5748

5849
directives: [
@@ -75,15 +66,6 @@ module.exports = function (ctx) {
7566
// analyze: true,
7667
// extractCSS: false,
7768
extendWebpack (cfg) {
78-
cfg.module.rules.push({
79-
enforce: 'pre',
80-
test: /\.(js|vue)$/,
81-
loader: 'eslint-loader',
82-
exclude: /node_modules/,
83-
options: {
84-
formatter: require('eslint').CLIEngine.getFormatter('stylish')
85-
}
86-
})
8769
}
8870
},
8971

@@ -104,9 +86,9 @@ module.exports = function (ctx) {
10486
// workboxPluginMode: 'InjectManifest',
10587
// workboxOptions: {}, // only for NON InjectManifest
10688
manifest: {
107-
// name: 'PreVue 2.0',
108-
// short_name: 'PreVue 2.0',
109-
// description: 'Vue Prototype DevTool',
89+
// name: 'Quasar App',
90+
// short_name: 'Quasar App',
91+
// description: 'A Quasar Framework app',
11092
display: 'standalone',
11193
orientation: 'portrait',
11294
background_color: '#ffffff',
@@ -170,8 +152,8 @@ module.exports = function (ctx) {
170152
builder: {
171153
// https://www.electron.build/configuration/configuration
172154

173-
// appId: 'prevue2'
155+
// appId: 'quasar-example'
174156
}
175157
}
176158
}
177-
}
159+
}

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/ComponentDisplay.vue

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
:w="componentData.w"
1010
:h="componentData.h"
1111
:parent="true"
12+
class-name-resizable="my-resizable-class"
1213
@activated="onActivated(componentData)"
1314
@deactivated="onDeactivated(componentData)"
1415
@dragging="onDrag"
1516
@resizing="onResize"
16-
@dblclick.native="onDoubleClick(componentData)"
1717
>
1818
<h3>{{ componentData.componentName }}</h3>
1919
</VueDraggableResizable>
@@ -22,6 +22,7 @@
2222
<script>
2323
import { mapState, mapActions } from 'vuex'
2424
import VueDraggableResizable from 'vue-draggable-resizable'
25+
import 'vue-draggable-resizable/dist/VueDraggableResizable.css'
2526
2627
export default {
2728
name: 'ComponentDisplay',
@@ -47,6 +48,7 @@ export default {
4748
...mapState(['routes', 'activeRoute', 'activeComponent', 'componentMap']),
4849
// used in VueDraggableResizeable component
4950
activeRouteArray () {
51+
// console.log('active route array method', this.routes[this.activeRoute])
5052
return this.routes[this.activeRoute]
5153
},
5254
// used to delete components
@@ -58,7 +60,7 @@ export default {
5860
}
5961
},
6062
methods: {
61-
...mapActions(['setActiveComponent', 'updateOpenModal']),
63+
...mapActions(['setActiveComponent']),
6264
onResize: function (x, y, width, height) {
6365
this.activeComponentData.x = x
6466
this.activeComponentData.y = y
@@ -75,26 +77,54 @@ export default {
7577
},
7678
onDeactivated () {
7779
this.activeComponentData.isActive = false
78-
},
79-
onDoubleClick (compData) {
80-
this.setActiveComponent(compData.componentName)
81-
this.activeComponentData.isActive = true
8280
}
81+
// @dblclick.native="onDoubleClick(componentData)"
82+
// onDoubleClick (compData) {
83+
// this.setActiveComponent(compData.componentName)
84+
// this.activeComponentData.isActive = true
85+
// }
8386
}
8487
}
8588
</script>
8689

8790
<style scoped>
8891
.component-display {
89-
border: 2px dotted rgb(14, 14, 14);
90-
background-color: rgba(242, 234, 228, 0.61);
91-
height: 70vh;
92-
width: 70vw;
92+
/* border: 3px dashed rgb(159, 122, 122); */
93+
/* height: 500px; */
94+
/* width: 500px; */
95+
/* original is 70vh */
96+
height: 87vh;
97+
width: 100vw;
9398
position: relative;
99+
background-color: rgba(124, 126, 145, 0.44);
100+
/* background-color: #269; */
101+
background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;
102+
background-position: -2px -2px, -2px -2px, -1px -1px, -1px -1px;
103+
background-image: -webkit-linear-gradient(white 2px, transparent 2px),
104+
-webkit-linear-gradient(0, white 2px, transparent 2px),
105+
-webkit-linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px),
106+
-webkit-linear-gradient(0, rgba(255, 255, 255, 0.3) 1px, transparent 1px);
107+
background-image: -moz-linear-gradient(white 2px, transparent 2px),
108+
-moz-linear-gradient(0, white 2px, transparent 2px),
109+
-moz-linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px),
110+
-moz-linear-gradient(0, rgba(255, 255, 255, 0.3) 1px, transparent 1px);
111+
background-image: linear-gradient(white 2px, transparent 2px),
112+
linear-gradient(90deg, white 2px, transparent 2px),
113+
linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px),
114+
linear-gradient(90deg, rgba(255, 255, 255, 0.3) 1px, transparent 1px);
115+
-pie-background: linear-gradient(white 2px, transparent 2px) -2px -2px / 100px,
116+
linear-gradient(90deg, white 2px, transparent 2px) -2px -2px / 100px,
117+
linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px) -1px -1px /
118+
20px,
119+
linear-gradient(90deg, rgba(255, 255, 255, 0.3) 1px, transparent 1px) -1px -1px /
120+
20px,
121+
#269;
122+
behavior: url(/pie/PIE.htc);
94123
}
95124
96125
.component-box {
97126
color: white;
98-
border: 1px solid salmon;
127+
border: 3px dashed rgb(227, 203, 71);
128+
background-color: rgba(186, 99, 99, 0.529);
99129
}
100130
</style>

src/components/CreateComponent.vue

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,25 @@
1313
>
1414
</q-input>
1515
</form>
16-
1716
<div class="icon-container">
1817
<Icons @getClickedIcon="addToSelectedElementList" />
1918
</div>
20-
<!-- <ChildrenMultiselect /> -->
19+
<ParentMultiselect />
2120
<br />
22-
<!-- <button
23-
class="button is-primary"
24-
id="add-component-btn"
25-
@click="handleClick"
26-
:disabled="!componentNameInputValue"
27-
>Add Component</button> -->
2821
<q-btn id="add-component-btn" class="primary" color="secondary" label="Create Component" icon-right="add" @click="handleClick" :disabled="!componentNameInputValue" />
2922
</div>
3023
</template>
3124

3225
<script>
3326
import Icons from './Icons'
34-
// import ChildrenMultiselect from '@/components/ChildrenMultiselect';
27+
import ParentMultiselect from '../components/ParentMultiselect'
3528
import { mapState, mapActions } from 'vuex'
36-
// import * as types from '../store/types.js'
3729
3830
export default {
3931
name: 'HomeSidebar',
4032
components: {
41-
// ChildrenMultiselect,
42-
Icons
33+
Icons,
34+
ParentMultiselect
4335
},
4436
computed: {
4537
...mapState(['componentMap', 'selectedElementList']),

src/components/Footer.vue

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<template>
2+
<q-footer reveal elevated class="gradient text-white" :style="{ height: `${height}vh` }">
3+
<q-toolbar>
4+
<q-btn flat color="subaccentbtn" round @click="openBottomDrawer">
5+
<i :class="[open ? down : up]"></i>
6+
</q-btn>
7+
<q-toolbar-title>Dashboard</q-toolbar-title>
8+
</q-toolbar>
9+
<q-card>
10+
<q-tabs
11+
v-model="tab"
12+
dense
13+
class="bg-subaccent text-white"
14+
active-color="secondary"
15+
indicator-color="secondary"
16+
align="left"
17+
>
18+
<q-tab name="code" label="Code" />
19+
<q-tab name="tree" label="Tree" />
20+
<q-tab name="html" label="HTML Elements" />
21+
</q-tabs>
22+
23+
<q-tab-panels v-model="tab" animated class="bg-primary text-white">
24+
<q-tab-panel name="code">
25+
</q-tab-panel>
26+
27+
<q-tab-panel name="tree">
28+
<Tree />
29+
</q-tab-panel>
30+
31+
<q-tab-panel name="html">
32+
<div class="text-h6">HTML Elements</div>HTML Element Component Here
33+
</q-tab-panel>
34+
</q-tab-panels>
35+
</q-card>
36+
</q-footer>
37+
</template>
38+
39+
<script>
40+
import Tree from './Tree'
41+
// import CodeSnippet from './CodeSnippet'
42+
43+
export default {
44+
components: {
45+
Tree
46+
// CodeSnippet
47+
},
48+
data () {
49+
return {
50+
tab: 'code',
51+
open: true,
52+
height: 35,
53+
up: 'fas fa-chevron-up',
54+
down: 'fas fa-chevron-down'
55+
}
56+
},
57+
methods: {
58+
openBottomDrawer () {
59+
this.height === 35 ? (this.height = 6.5) : (this.height = 35)
60+
this.open === true ? this.open = false : this.open = true
61+
}
62+
}
63+
}
64+
</script>
65+
66+
<style lang="stylus">
67+
.q-footer {
68+
// height: 35vh;
69+
transition-timing-function: ease-in;
70+
transition: 0.2s;
71+
}
72+
73+
.q-tab-panel {
74+
background: rgb(69,77,102);
75+
background: linear-gradient(180deg, rgba(69,77,102,1) 0%, rgba(54,60,78,1) 100%);
76+
}
77+
78+
.q-tab-panels {
79+
height: 24vh;
80+
}
81+
82+
.q-tabs {
83+
background: #2c384d;
84+
}
85+
</style>

src/components/FooterTabView.vue

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)