Skip to content

Commit 01bfae7

Browse files
committed
fixed some box styling
2 parents 8b29f4b + dc93c88 commit 01bfae7

File tree

12 files changed

+1904
-55
lines changed

12 files changed

+1904
-55
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"eslint": "^5.10.0",
3838
"eslint-loader": "^2.1.1",
3939
"eslint-plugin-vue": "^5.0.0",
40-
"strip-ansi": "^3.0.1"
40+
"strip-ansi": "^3.0.1",
41+
"vue-cli-plugin-electron-builder": "^1.3.6"
4142
},
4243
"engines": {
4344
"node": ">= 8.9.0",

quasar.conf.js

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

src/components/CodeSnippet.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
:line-numbers="lineNumbers"
99
class="code-editor"
1010
:style="{ height: `${height}vh`}"
11+
readonly="true"
1112
/>
1213
</div>
1314
</template>

src/components/ComponentDisplay.vue

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@
1515
@dragging="onDrag"
1616
@resizing="onResize"
1717
>
18-
<h3>{{ componentData.componentName }}</h3>
18+
19+
<div class="component-title">
20+
<p>{{ componentData.componentName }}</p>
21+
</div>
22+
<div class="component-children">
23+
<p>children: </p>
24+
<!-- <p v-for="child in childList" :key="childList.indexOf(child)"> {{ child.text }}</p> -->
25+
</div>
1926
</VueDraggableResizable>
2027
</div>
2128
</template>
@@ -46,17 +53,18 @@ export default {
4653
},
4754
computed: {
4855
...mapState(['routes', 'activeRoute', 'activeComponent', 'componentMap']),
49-
// used in VueDraggableResizeable component
5056
activeRouteArray () {
51-
// console.log('active route array method', this.routes[this.activeRoute])
57+
console.log('active route array method', this.routes[this.activeRoute])
5258
return this.routes[this.activeRoute]
5359
},
5460
// used to delete components
5561
activeComponentData () {
56-
// find out what this does
5762
return this.activeRouteArray.filter(componentData => {
5863
return componentData.componentName === this.activeComponent
5964
})[0]
65+
},
66+
childList () {
67+
return this.componentMap[componentData.componentName].children
6068
}
6169
},
6270
methods: {
@@ -96,6 +104,24 @@ export default {
96104
</script>
97105

98106
<style scoped>
107+
.component-title {
108+
position: relative;
109+
font-size: 16px;
110+
top: -18px;
111+
left: 2px;
112+
color: black;
113+
font-weight: 800;
114+
/* background: rgba(0, 0, 0, 0.678); */
115+
/* width: 1rem; */
116+
line-height: 1.2;
117+
/* margin: 10px; */
118+
}
119+
.component-children {
120+
position: absolute;
121+
top: 0rem;
122+
left: 2px;
123+
color: black;
124+
}
99125
.component-display {
100126
/* border: 3px dashed rgb(159, 122, 122); */
101127
/* height: 500px; */
@@ -130,15 +156,17 @@ export default {
130156
#269;
131157
behavior: url(/pie/PIE.htc);
132158
}
133-
134159
.component-box {
135160
color: white;
136161
border: 1px dashed rgb(227, 203, 71);
137162
background-color: rgba(186, 99, 99, 0.529);
163+
-webkit-transition: background-color 200ms linear;
164+
-ms-transition: background-color 200ms linear;
165+
transition: background-color 200ms linear;
138166
}
139167
140168
.active {
141169
background-color: rgba(57, 63, 84, 0.5);
142-
border: 10px dashed rgb(227, 203, 71);
170+
border: 1px dashed rgb(227, 203, 71);
143171
}
144172
</style>

0 commit comments

Comments
 (0)