Skip to content

Commit cfdd8e7

Browse files
committed
made updates to edit name
2 parents 0cac021 + fb8284a commit cfdd8e7

28 files changed

+6301
-5299
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"@quasar/app": "^1.0.0",
5151
"@quasar/quasar-app-extension-testing": "^1.0.0",
5252
"@quasar/quasar-app-extension-testing-unit-jest": "^1.0.0",
53+
"@vue/devtools": "^5.3.4",
5354
"@vue/eslint-config-standard": "^4.0.0",
5455
"babel-eslint": "^10.0.1",
5556
"devtron": "^1.4.0",

src/components/ComponentDisplay.vue

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,17 @@ Description:
3333
<div class="component-title">
3434
<p>{{ componentData.componentName }}</p>
3535
</div>
36-
<!-- <p> Elements in Component: </p>
37-
<p
38-
v-for="htmlElement in componentMap[componentData.componentName]
39-
.htmlList"
40-
:key="htmlElement"
41-
>
42-
{{ htmlElement.text }}
43-
</p> -->
36+
<!-- <div class="component-html-info"> -->
37+
<!-- <p>Elements in Component:</p> -->
38+
<!-- <p
39+
class="component-html-info"
40+
v-for="htmlElement in componentMap[componentData.componentName]
41+
.htmlList"
42+
:key="htmlElement"
43+
>
44+
{{ htmlElement.text }}
45+
</p> -->
46+
<!-- </div> -->
4447
<q-menu context-menu>
4548
<q-list color="black" class="menu">
4649
<q-item clickable v-ripple v-close-popup @click="handleAddChild">
@@ -339,7 +342,7 @@ export default {
339342
},
340343
341344
// deactivated is emitted before activated
342-
onDeactivated (componentData) {
345+
onDeactivated () {
343346
if (this.activeComponent !== '') {
344347
this.activeComponentData.isActive = false
345348
}
@@ -378,8 +381,13 @@ export default {
378381
}
379382
},
380383
watch: {
381-
activeComponent: function(){
382-
this.onActivated(this.activeComponentObj)
384+
activeComponent: function () {
385+
if (this.activeComponent){
386+
this.onActivated(this.activeComponentObj)
387+
}
388+
else{
389+
this.onDeactivated()
390+
}
383391
}
384392
}
385393
}
@@ -397,6 +405,19 @@ export default {
397405
line-height: 1.2;
398406
z-index: -1;
399407
}
408+
409+
.component-html-info {
410+
display: flex;
411+
font-size: 14px;
412+
/* flex-basis: auto; */
413+
flex-direction: column;
414+
/* flex-wrap: wrap; */
415+
/* justify-content: center; */
416+
/* flex-flow: column wrap; */
417+
/* align-content: stretch; */
418+
/* align-items: flex-start; */
419+
font-weight: 800;
420+
}
400421
.component-children {
401422
position: relative;
402423
top: 0rem;
@@ -466,4 +487,4 @@ export default {
466487
#counter {
467488
margin-top: 20px;
468489
}
469-
</style>
490+
</style>

src/components/CodeSnippet.vue renamed to src/components/dashboard_items/CodeSnippet.vue

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<!--
22
Description:
3-
Dynamically renders Code Snippet in Footer
3+
Located under Component Details in Dashboard
4+
Dynamically renders Code Snippet in Dashboard
45
Functionality includes: Displays children components and (nested) HTML elements in order of selection.
56
-->
67

78
<template>
89
<div class="codesnippet-container">
9-
<div class="top-p" v-if="activeComponent === ''">Select a component</div>
10-
<div v-else>{{ `${activeComponent}.vue` }}</div>
10+
<div class="top-p" v-if="this.activeComponent === ''">Select a component</div>
11+
<div v-else>{{ `${this.activeComponent}.vue` }}</div>
1112
<prism-editor
1213
v-model="code"
1314
language="js"
@@ -171,18 +172,28 @@ export default {
171172
beforeDestroy () {
172173
window.removeEventListener('resize', this.getWindowHeight)
173174
},
174-
watch: {
175-
// If HTML elements or components are added, rerenders Code Snippet
176-
componentMap: {
177-
deep: true,
178-
handler () {
179-
// console.log('component Map has changed');
180-
if (this.componentMap[this.activeComponent]) {
181-
this.code = `${this.createCodeSnippet(
182-
this.activeComponent,
183-
this.componentMap[this.activeComponent].children
184-
)}`
185-
}
175+
// watch: {
176+
// activeComponent: {
177+
// handler () {
178+
// if (this.componentMap[this.activeComponent]) {
179+
// this.code = `${this.createCodeSnippet(
180+
// this.activeComponent,
181+
// this.componentMap[this.activeComponent].children
182+
// )}`
183+
// }
184+
// }
185+
// }
186+
// },
187+
// If HTML elements or components are added, rerenders Code Snippet
188+
componentMap: {
189+
deep: true,
190+
handler () {
191+
// console.log('component Map has changed');
192+
if (this.componentMap[this.activeComponent]) {
193+
this.code = `${this.createCodeSnippet(
194+
this.activeComponent,
195+
this.componentMap[this.activeComponent].children
196+
)}`
186197
}
187198
}
188199
}

src/components/ComponentDetails.vue renamed to src/components/dashboard_items/ComponentDetails.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<q-tab-panel name="code">
2020
<CodeSnippet/>
2121
</q-tab-panel>
22-
<q-tab-panel name="html" :style="{height: `${height}vh`}">
23-
<HomeQueue />
22+
<q-tab-panel name="html">
23+
<HTMLQueue />
2424
</q-tab-panel>
2525
<q-tab-panel name="state">
2626
<ul id="stateList">
@@ -51,13 +51,13 @@
5151

5252
<script>
5353
import { mapState } from 'vuex'
54-
import HomeQueue from './HomeQueue'
54+
import HTMLQueue from './HTMLQueue'
5555
import CodeSnippet from './CodeSnippet'
5656
5757
export default {
5858
name: 'ComponentDetails',
5959
components: {
60-
HomeQueue,
60+
HTMLQueue,
6161
CodeSnippet
6262
},
6363
computed: {
@@ -84,13 +84,13 @@ i
8484
font-size 8px
8585
margin 5px
8686
87-
// styling for the entire footer
87+
// styling for the entire dashboard
8888
.q-footer
8989
transition-timing-function ease-in
9090
transition .2s
9191
background $subsecondary
9292
93-
// changes the footer toolbar height
93+
// changes the dashboard toolbar height
9494
.q-toolbar
9595
min-height 25px !important
9696
padding 0 6px !important

src/components/Footer.vue renamed to src/components/dashboard_items/Dashboard.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Description:
3-
Displays OverVue's footer containing Code Snippet, component details (TBD), Project Tree, and HTML Elements tabs
3+
Displays OverVue's dashboard containing Component Details, Vuex Store, and the Project Tree
44
Functionality includes: opening/closing drawer, deselecting active html, and
55
toggling to html elements tab during component creation
66
-->
@@ -13,7 +13,7 @@ Description:
1313
</q-btn>
1414
<q-toolbar-title>Dashboard</q-toolbar-title>
1515
</q-toolbar>
16-
<q-card id="footer-cards">
16+
<q-card id="dashboard-cards">
1717
<q-tabs
1818
v-model="tab"
1919
dense
@@ -67,7 +67,7 @@ export default {
6767
},
6868
methods: {
6969
...mapActions(['setActiveHTML']),
70-
// toggles open/close action of footer drawer
70+
// toggles open/close action of dashboard drawer
7171
openBottomDrawer () {
7272
// 15in mb pro - 1027 px 3.75
7373
// big screens 2.5
@@ -85,23 +85,23 @@ export default {
8585
}
8686
}
8787
},
88-
// toggles footer to "html" tab when existing component is not in focus
88+
// toggles dashboard to "html" tab when existing component is not in focus
8989
watch: {
9090
activeComponent: function () {
91-
// console.log('watching activeComponent in Footer');
91+
// console.log('watching activeComponent in Dashboard');
9292
if (this.activeComponent === '' && this.selectedElementList.length !== 0) {
9393
this.tab = 'html'
9494
}
9595
},
96-
// toggles footer to "html" tab if component name has value & elements are in queue
96+
// toggles dashboard to "html" tab if component name has value & elements are in queue
9797
componentNameInputValue: function () {
9898
// console.log('watching componentNameInputVal')
9999
if (this.componentNameInputValue !== '' && this.selectedElementList.length !== 0 && this.activeComponent === '') {
100100
// console.log(this.selectedElementList)
101101
this.tab = 'html'
102102
}
103103
},
104-
// toggles footer to "html" tab if elements are added to queue on component creation
104+
// toggles dashboard to "html" tab if elements are added to queue on component creation
105105
selectedElementList: function () {
106106
// console.log('watching selectedElementList')
107107
if (this.activeComponent === '' && this.selectedElementList.length !== 0) {
@@ -122,14 +122,14 @@ i {
122122
margin: 5px;
123123
}
124124
125-
// styling for the entire footer
125+
// styling for the entire dashboard
126126
.q-footer {
127127
transition-timing-function: ease-in;
128128
transition: 0.2s;
129129
background: $subsecondary;
130130
}
131131
132-
// changes the footer toolbar height
132+
// changes the dashboard toolbar height
133133
.q-toolbar {
134134
min-height: 25px !important;
135135
padding: 0 6px !important;
@@ -174,7 +174,7 @@ i {
174174
background: black;
175175
}
176176
177-
#footer-cards {
177+
#dashboard-cards {
178178
height: 100%;
179179
border-radius: 0px;
180180
background: #737578;

src/components/DashboardVuexStore.vue renamed to src/components/dashboard_items/DashboardVuexStore.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ i
6262
font-size 8px
6363
margin 5px
6464
65-
// styling for the entire footer
65+
// styling for the entire Dashboard
6666
.q-footer
6767
transition-timing-function ease-in
6868
transition .2s
6969
background $subsecondary
7070
71-
// changes the footer toolbar height
71+
// changes the Dashboard toolbar height
7272
.q-toolbar
7373
min-height 25px !important
7474
padding 0 6px !important

src/components/HomeQueue.vue renamed to src/components/dashboard_items/HTMLQueue.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ Description:
3434
<script>
3535
3636
import { mapState, mapActions } from 'vuex'
37-
import { setSelectedElementList, deleteSelectedElement, deleteFromComponentHtmlList } from '../store/types'
38-
import { breadthFirstSearch } from '../utils/search.util'
37+
import { setSelectedElementList, deleteSelectedElement, deleteFromComponentHtmlList } from '../../store/types'
38+
import { breadthFirstSearch } from '../../utils/search.util'
3939
4040
export default {
41-
name: 'HomeQueue',
41+
name: 'HTML Queue',
4242
props: {
4343
name: {
4444
type: String
@@ -105,7 +105,7 @@ export default {
105105
},
106106
watch: {
107107
activeComponent: function () {
108-
// console.log('watching activeComponent in HomeQueue')
108+
// console.log('watching activeComponent in HTMLQueue')
109109
if (this.activeComponent !== '') {
110110
this.component = true
111111
} else {

src/components/Tree.vue renamed to src/components/dashboard_items/Tree.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Description:
3-
Displays project tree in Footer
3+
Displays project tree in Dashboard
44
Functionality includes: formating componentMap object to displaying in tree form
55
-->
66

0 commit comments

Comments
 (0)