Skip to content

Commit 928468c

Browse files
JaceCroweJaceCrowe
authored
Merge pull request #2 from oslabs-beta/Johnny
Johnny
2 parents bf50d77 + 9bc5aaf commit 928468c

File tree

16 files changed

+6188
-5603
lines changed

16 files changed

+6188
-5603
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,25 @@
2828
"@ssthouse/vue3-tree-chart": "^0.2.3",
2929
"core-js": "^3.21.1",
3030
"dotenv": "^16.0.0",
31-
"electron-deeplink": "^1.0.9",
3231
"fs-extra": "^10.0.0",
32+
"http": "^0.0.1-security",
33+
"https": "^1.0.0",
3334
"jest-cli": "^27.5.1",
3435
"localforage": "^1.10.0",
3536
"lodash.clonedeep": "^4.5.0",
3637
"lodash.isequal": "^4.5.0",
3738
"lodash.throttle": "^4.1.1",
3839
"mousetrap": "^1.6.5",
40+
"net": "^1.0.2",
3941
"node-gyp": "^8.4.1",
4042
"prismjs": "^1.27.0",
4143
"quasar": "^2.5.5",
4244
"quasar-dotenv": "^1.0.5",
43-
"vue":"3.2.31",
44-
"vue-router": "4.0.13",
45+
"vue": "^3.2.31",
4546
"vue-draggable-resizable": "^2.3.0",
4647
"vue-multiselect": "^3.0.0-alpha.2",
4748
"vue-prism-editor": "^2.0.0-alpha.2",
49+
"vue-router": "4.0.13",
4850
"vue3-tree": "^0.11.0",
4951
"vued3tree": "^5.1.0",
5052
"vuex": "^4.0.2"
@@ -56,7 +58,7 @@
5658
"@vue/devtools": "^6.0.12",
5759
"@vue/test-utils": "^2.0.0-rc.18",
5860
"@vue/vue3-jest": "^27.0.0-alpha.4",
59-
"electron": "^17.0.1",
61+
"electron": "^17.4.10",
6062
"electron-builder": "^22.14.13",
6163
"electron-is-dev": "^2.0.0",
6264
"electron-packager": "^15.4.0",

‎package.json_notes.txt

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
"dependencies": {
2+
"@quasar/extras": "^1.12.5", //quasar
3+
"@ssthouse/vue3-tree-chart": "^0.2.3", //Vue D3 flow charts
4+
"core-js": "^3.21.1", //javascript function library?
5+
"dotenv": "^16.0.0", // loads environment variables .env
6+
"electron-deeplink": "^1.0.9", //Electron
7+
"fs-extra": "^10.0.0", //adds promise support in fs
8+
"jest-cli": "^27.5.1", //TTD
9+
"localforage": "^1.10.0", //promotes offline experience by using async storage (indexedDB or WebSQL)
10+
"lodash.clonedeep": "^4.5.0", // library that adds array manipulation and a lot of javascript functions
11+
"lodash.isequal": "^4.5.0",
12+
"lodash.throttle": "^4.1.1",
13+
"mousetrap": "^1.6.5", //keyboard shortcuts! Like ctrl-C
14+
"node-gyp": "^8.4.1", //addon compiler for VS code?
15+
"prismjs": "^1.27.0", //syntax hightlighting library
16+
"quasar": "^2.5.5", //Vue that builds UIs
17+
"quasar-dotenv": "^1.0.5", //deprecated?
18+
"vue":"3.2.31",
19+
"vue-router": "4.0.13",
20+
"vue-draggable-resizable": "^2.3.0", //creates elements that are resizable/draggable
21+
"vue-multiselect": "^3.0.0-alpha.2", //dropdown library?
22+
"vue-prism-editor": "^2.0.0-alpha.2", //code editor that does syntax highlighting
23+
"vue3-tree": "^0.11.0", //search filter library
24+
"vued3tree": "^5.1.0", //vue components to display graphics based on D3.js
25+
"vuex": "^4.0.2" //state management library
26+
},
27+
"devDependencies": {
28+
"@babel/eslint-parser": "^7.17.0",
29+
"@quasar/app": "^3.3.3",
30+
"@quasar/quasar-app-extension-testing-unit-jest": "^3.0.0-alpha.7",
31+
"@vue/devtools": "^6.0.12",
32+
"@vue/test-utils": "^2.0.0-rc.18",
33+
"@vue/vue3-jest": "^27.0.0-alpha.4",
34+
"electron": "^17.0.1",
35+
"electron-builder": "^22.14.13",
36+
"electron-is-dev": "^2.0.0",
37+
"electron-packager": "^15.4.0",
38+
"eslint": "^8.9.0",
39+
"eslint-config-prettier": "^8.3.0",
40+
"eslint-plugin-jest": "^26.1.1",
41+
"eslint-plugin-vue": "^8.4.1",
42+
"eslint-webpack-plugin": "^3.1.1"
43+
44+
45+
"electron-deeplink": "^1.0.10",

‎quasar.conf.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,19 @@ module.exports = configure(function (ctx) {
8181
chain.plugin('eslint-webpack-plugin')
8282
.use(ESLintPlugin, [{ extensions: [ 'js', 'vue' ] }]);
8383

84+
chain.resolve.alias.set('child_process', false);// Added this
85+
chain.resolve.alias.set('crypto', false);
86+
chain.resolve.alias.set('fs', false);
87+
chain.resolve.alias.set('http', false);
88+
chain.resolve.alias.set('https', false);
89+
chain.resolve.alias.set('os', false);
90+
chain.resolve.alias.set('path', false);
91+
chain.resolve.alias.set('stream', false);
92+
chain.resolve.alias.set('tls', false);
93+
chain.resolve.alias.set('tty', false);
94+
chain.resolve.alias.set('url', false);
95+
chain.resolve.alias.set('util', false);
96+
chain.resolve.alias.set('zlib', false);
8497
},
8598
},
8699

‎src-electron/electron-main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { app, BrowserWindow, nativeTheme, dialog, ipcMain } from "electron";
2-
import { Deeplink } from "electron-deeplink";
2+
// import { Deeplink } from "electron-deeplink";
33
import isDev from "electron-is-dev";
44
import path from "path";
55
import os from "os";

‎src/components/composables/useExportComponent.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ export function useExportComponent() {
4848
"list-ul": ["<ul>", "</ul>"],
4949
input: ["<input />", ""],
5050
navbar: ["<nav>", "</nav>"],
51+
header:["<header>", "</header>"],
52+
footer:["<footer>", "</footer>"],
53+
meta: ["<meta>", "</meta>"],
54+
h1:["<h1>", "</h1>"],
55+
h2:["<h2>", "</h2>"],
56+
h3:["<h3>", "</h3>"],
57+
h4:["<h4>", "</h4>"],
58+
h5:["<h5>", "</h5>"],
59+
h6:["<h6>", "</h6>"],
5160
};
5261
// function to loop through nested elements
5362
const writeNested = (childrenArray, indent) => {

‎src/components/left-sidebar/ComponentTab/ImportComponent.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,15 @@ export default {
124124
"list-ul": ["<ul>", "</ul>"],
125125
input: ["<input />", ""],
126126
navbar: ["<nav>", "</nav>"],
127+
header:["<header>", "</header>"],
128+
footer:["<footer>", "</footer>"],
129+
meta: ["<meta>", "</meta>"],
130+
h1:["<h1>", "</h1>"],
131+
h2:["<h2>", "</h2>"],
132+
h3:["<h3>", "</h3>"],
133+
h4:["<h4>", "</h4>"],
134+
h5:["<h5>", "</h5>"],
135+
h6:["<h6>", "</h6>"],
127136
};
128137
129138

‎src/components/nav-buttons/ExportMenu.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,15 @@ export default {
133133
"list-ul": ["<ul>", "</ul>"],
134134
input: ["<input />", ""],
135135
navbar: ["<nav>", "</nav>"],
136+
header:["<header>", "</header>"],
137+
footer:["<footer>", "</footer>"],
138+
meta: ["<meta>", "</meta>"],
139+
h1:["<h1>", "</h1>"],
140+
h2:["<h2>", "</h2>"],
141+
h3:["<h3>", "</h3>"],
142+
h4:["<h4>", "</h4>"],
143+
h5:["<h5>", "</h5>"],
144+
h6:["<h6>", "</h6>"],
136145
};
137146
// function to loop through nested elements
138147
function writeNested(childrenArray, indent) {

‎src/components/right-sidebar/CodeSnippet.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,15 @@ export default {
9595
"list-ul": ["<ul>", "</ul>"],
9696
input: ["<input />", ""],
9797
navbar: ["<nav>", "</nav>"],
98+
header:["<header>", "</header>"],
99+
footer:["<footer>", "</footer>"],
100+
meta: ["<meta>", "</meta>"],
101+
h1:["<h1>", "</h1>"],
102+
h2:["<h2>", "</h2>"],
103+
h3:["<h3>", "</h3>"],
104+
h4:["<h4>", "</h4>"],
105+
h5:["<h5>", "</h5>"],
106+
h6:["<h6>", "</h6>"],
98107
};
99108
100109
// Helper function that recursively iterates through the given html element's children and their children's children.

‎src/components/right-sidebar/ComponentDetails.vue

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@ Description:
1212
<q-card id="code-window" class="no-shadow" v-if="this.activeComponentObj">
1313
<q-tabs
1414
v-model="tab"
15-
dense
15+
dense=""
1616
class="bg-subaccent text-white"
1717
active-color="secondary"
1818
indicator-color="secondary"
1919
align="left"
2020
>
2121
<q-tab name="code" label="Code Snippet" class="label-text" />
2222
<q-tab name="html" label="HTML Elements" class="label-text" />
23-
<q-tab name="state" label="Component State" class="label-text" />
24-
<q-tab name="actions" label="Component Actions" class="label-text" />
25-
<q-tab name="props" label="Component Props" class="label-text" />
23+
<q-tab name="state" label="Component Properties" class="label-text" />
2624
</q-tabs>
2725
<q-tab-panels v-model="tab" animated class="html-bg text-white">
2826
<q-tab-panel name="code">
@@ -32,6 +30,8 @@ Description:
3230
<HTMLQueue />
3331
</q-tab-panel>
3432
<q-tab-panel name="state">
33+
<div class ="componentProperties">
34+
<q-expansion-item default-closed label="Component State">
3535
<p v-if="!this?.activeComponentObj?.state?.length">
3636
{{this.activeComponent ? `No state in ${this.activeComponent}` : 'Select a component.' }}
3737
</p>
@@ -43,9 +43,11 @@ Description:
4343
{{ comp }}
4444
</li>
4545
</ul>
46-
</q-tab-panel>
47-
<q-tab-panel name="actions">
48-
<p v-if="!this?.activeComponentObj?.actions?.length">
46+
</q-expansion-item>
47+
</div>
48+
<div class ="componentProperties">
49+
<q-expansion-item default-closed label="Component Actions">
50+
<p v-if="!this?.activeComponentObj?.actions?.length">
4951
{{this.activeComponent ? `No actions in ${this.activeComponent}` : 'Select a component.' }}
5052
</p>
5153
<p v-else>
@@ -56,9 +58,11 @@ Description:
5658
{{ comp }}
5759
</li>
5860
</ul>
59-
</q-tab-panel>
60-
<q-tab-panel name="props">
61-
<p v-if="!this?.activeComponentObj?.props?.length">
61+
</q-expansion-item>
62+
</div>
63+
<div class ="componentProperties">
64+
<q-expansion-item default-closed label="Component Props">
65+
<p v-if="!this?.activeComponentObj?.props?.length">
6266
{{this.activeComponent ? `No props in ${this.activeComponent}` : 'Select a component.' }}
6367
</p>
6468
<p v-else>
@@ -69,6 +73,8 @@ Description:
6973
{{ comp }}
7074
</li>
7175
</ul>
76+
</q-expansion-item>
77+
</div>
7278
</q-tab-panel>
7379
</q-tab-panels>
7480
</q-card>
@@ -195,4 +201,10 @@ i {
195201
align-content: stretch;
196202
max-height: 95%;
197203
}
204+
205+
.componentProperties {
206+
margin-bottom:2em;
207+
208+
}
209+
198210
</style>

0 commit comments

Comments
 (0)