Skip to content

Commit a4df093

Browse files
rdbenderrdbender
authored
Merge pull request #118 from open-source-labs/alex/update-readme
Alex/update readme
2 parents 7281235 + 340e747 commit a4df093

File tree

7 files changed

+84
-66
lines changed

7 files changed

+84
-66
lines changed

‎.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SLACK_CLIENT_SECRET = "6a6206cc93da2e49243ee9683f958438"
2+
SLACK_CLIENT_ID = "2696943977700.2696948669268"
3+
SLACK_REDIRECT_URI = "overvue://slack"

‎.env.development‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SLACK_CLIENT_SECRET = "6a6206cc93da2e49243ee9683f958438"
2+
SLACK_CLIENT_ID = "2696943977700.2696948669268"
3+
SLACK_REDIRECT_URI = "overvuedev://test"

‎src/components/dashboard_items/CodeSnippet.vue‎

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import 'vue-prism-editor/dist/VuePrismEditor.css'
3232
export default {
3333
data () {
3434
return {
35-
code: `Your component boilerplate will be displayed here.`,
35+
// code: `Your component boilerplate will be displayed here.`,
3636
lineNumbers: true,
3737
height: null
3838
}
@@ -42,7 +42,17 @@ export default {
4242
},
4343
computed: {
4444
// needs access to current component aka activeComponent
45-
...mapState(['componentMap', 'activeComponent', 'activeComponentObj'])
45+
...mapState(['componentMap', 'activeComponent', 'activeComponentObj']),
46+
code: function() {
47+
let computedCode = 'Your component boilerplate will be displayed here.'
48+
if (this.activeComponent) {
49+
computedCode = this.createCodeSnippet(
50+
this.activeComponentObj.componentName,
51+
this.activeComponentObj.children
52+
)
53+
}
54+
return computedCode
55+
}
4656
},
4757
methods: {
4858
getWindowHeight (e) {
@@ -227,24 +237,24 @@ export default {
227237
},
228238
watch: {
229239
// watches activeComponentObj for changes to make it reactive upon mutation
230-
activeComponentObj: {
231-
handler () {
232-
// console.log(this.activeComponentObj.children)
233-
this.code = this.createCodeSnippet(
234-
this.activeComponentObj.componentName,
235-
this.activeComponentObj.children
236-
)
237-
}
238-
},
240+
// activeComponentObj: {
241+
// handler () {
242+
// // console.log(this.activeComponentObj.children)
243+
// this.code = this.createCodeSnippet(
244+
// this.activeComponentObj.componentName,
245+
// this.activeComponentObj.children
246+
// )
247+
// }
248+
// },
239249
// watches componentMap for changes to make it reactive upon mutation
240-
componentMap: {
241-
handler () {
242-
this.code = this.createCodeSnippet(
243-
this.activeComponentObj.componentName,
244-
this.activeComponentObj.children
245-
)
246-
}
247-
}
250+
// componentMap: {
251+
// handler () {
252+
// this.code = this.createCodeSnippet(
253+
// this.activeComponentObj.componentName,
254+
// this.activeComponentObj.children
255+
// )
256+
// }
257+
// }
248258
},
249259
mounted () {
250260
// https://vuejs.org/v2/api/#Vue-nextTick
@@ -256,17 +266,17 @@ export default {
256266
})
257267
},
258268
// Updates code snippet when adding children
259-
updated () {
260-
if (this.componentMap[this.activeComponent]) {
261-
this.code = `${this.createCodeSnippet(
262-
this.activeComponent,
263-
this.componentMap[this.activeComponent].children
264-
)}`
265-
// else if there is not existing component/no active component
266-
} else {
267-
this.code = `Your component boilerplate will be displayed here.`
268-
}
269-
},
269+
// updated () {
270+
// if (this.componentMap[this.activeComponent]) {
271+
// this.code = `${this.createCodeSnippet(
272+
// this.activeComponent,
273+
// this.componentMap[this.activeComponent].children
274+
// )}`
275+
// // else if there is not existing component/no active component
276+
// } else {
277+
// this.code = `Your component boilerplate will be displayed here.`
278+
// }
279+
// },
270280
beforeDestroy () {
271281
window.removeEventListener('resize', this.getWindowHeight)
272282
}

‎src/components/dashboard_items/Tree.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Description:
1414
type="tree"
1515
:zoomable="true"
1616
:radius="4"
17+
:duration="10"
1718
></tree>
1819
</div>
1920
</template>
@@ -36,7 +37,8 @@ export default {
3637
},
3738
data () {
3839
return {
39-
tree: null
40+
tree: null,
41+
treeKey: 'key'
4042
}
4143
},
4244
methods: {

‎src/components/home_sidebar_items/Icons.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Description:
2222

2323
<script>
2424
import { mapState } from 'vuex'
25-
import { breadthFirstSearch } from '../../utils/search.util'
25+
// import { breadthFirstSearch } from '../../utils/search.util'
2626
2727
export default {
2828
data () {

‎src/index.template.html‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<title><%= htmlWebpackPlugin.options.productName %></title>
5-
6-
<meta charset="utf-8">
7-
<meta name="description" content="<%= htmlWebpackPlugin.options.productDescription %>">
8-
<meta name="format-detection" content="telephone=no">
9-
<meta name="msapplication-tap-highlight" content="no">
10-
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
11-
12-
<link rel="icon" type="image/png" href="statics/app-logo-128x128.png">
13-
<link rel="icon" type="image/png" sizes="16x16" href="statics/icons/favicon-16x16.png">
14-
<link rel="icon" type="image/png" sizes="32x32" href="statics/icons/favicon-32x32.png">
15-
<link rel="icon" type="image/png" sizes="96x96" href="statics/icons/favicon-96x96.png">
16-
<link rel="icon" type="image/ico" href="statics/icons/favicon.ico">
17-
<link
18-
rel="stylesheet"
19-
href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"
20-
integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU"
21-
crossorigin="anonymous"
22-
/>
23-
<!-- below script to allow vue devtools to connect to our electron dev app - https://devtools.vuejs.org/-->
24-
<script src="http://localhost:8098"></script>
25-
26-
</head>
27-
<body>
28-
<!-- DO NOT touch the following DIV -->
29-
<div id="q-app"></div>
30-
</body>
31-
</html>
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title><%= htmlWebpackPlugin.options.productName %></title>
5+
6+
<meta charset="utf-8">
7+
<meta name="description" content="<%= htmlWebpackPlugin.options.productDescription %>">
8+
<meta name="format-detection" content="telephone=no">
9+
<meta name="msapplication-tap-highlight" content="no">
10+
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
11+
12+
<link rel="icon" type="image/png" href="statics/app-logo-128x128.png">
13+
<link rel="icon" type="image/png" sizes="16x16" href="statics/icons/favicon-16x16.png">
14+
<link rel="icon" type="image/png" sizes="32x32" href="statics/icons/favicon-32x32.png">
15+
<link rel="icon" type="image/png" sizes="96x96" href="statics/icons/favicon-96x96.png">
16+
<link rel="icon" type="image/ico" href="statics/icons/favicon.ico">
17+
<link
18+
rel="stylesheet"
19+
href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"
20+
integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU"
21+
crossorigin="anonymous"
22+
/>
23+
<!-- below script allows OverVue to connect to vue devtools - https://devtools.vuejs.org/-->
24+
<!-- <script src="http://localhost:8098"></script> -->
25+
26+
</head>
27+
<body>
28+
<!-- DO NOT touch the following DIV -->
29+
<div id="q-app"></div>
30+
</body>
31+
</html>

‎src/store/mutations.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ const mutations = {
261261
[types.COPY_ACTIVE_COMPONENT]: (state, payload) => {
262262
// copy activeComponentObj and place in the state but without children
263263
const copy = { ...state.activeComponentObj };
264-
copy.componentName;
264+
// copy.componentName;
265265
copy.children = [];
266266
copy.isActive = false;
267267
state.copiedComponent = copy;
@@ -278,7 +278,7 @@ const mutations = {
278278
copiedComponent.y += 20;
279279
const pastedComponent = { ...copiedComponent }
280280
state.componentMap[pastedComponent.componentName += ` (${state.copyNumber})`] = pastedComponent;
281-
281+
282282
// increment copyNumber
283283
state.copyNumber += 1;
284284
// track for pastedComponent
@@ -608,7 +608,7 @@ const mutations = {
608608
[types.UPDATE_ACTIVE_COMPONENT_CHILDREN_VALUE]: (state, payload) => {
609609
const temp = state.componentMap[state.activeComponent].children
610610
// delete block
611-
console.log('UPDATE_ACTIVE_COMPONENT_CHILDREN_VALUEs payload', payload)
611+
// console.log('UPDATE_ACTIVE_COMPONENT_CHILDREN_VALUEs payload', payload)
612612
if (payload.length < temp.length) {
613613
const child = temp.filter(el => !payload.includes(el))
614614
// console.log('delete child: ', child)

0 commit comments

Comments
 (0)