Skip to content

Commit 831377f

Browse files
committed
commit after merging with dev
2 parents e00062b + d43111c commit 831377f

29 files changed

+7078
-5822
lines changed

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2022 OSLabs
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

package-lock.json

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

package.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,30 @@
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",
40-
"prismjs": "^1.26.0",
42+
"prismjs": "^1.27.0",
4143
"quasar": "^2.5.5",
4244
"quasar-dotenv": "^1.0.5",
43-
"vue": "3.2.31",
45+
"vue": "^3.2.31",
46+
"vue-accessible-color-picker": "^4.0.3",
4447
"vue-draggable-resizable": "^2.3.0",
4548
"vue-multiselect": "^3.0.0-alpha.2",
4649
"vue-prism-editor": "^2.0.0-alpha.2",
4750
"vue-router": "4.0.13",
51+
"vue3-draggable-resizable": "^1.6.4",
4852
"vue3-tree": "^0.11.0",
4953
"vued3tree": "^5.1.0",
54+
"vuedraggable": "^4.1.0",
5055
"vuex": "^4.0.2"
5156
},
5257
"devDependencies": {
@@ -56,7 +61,7 @@
5661
"@vue/devtools": "^6.0.12",
5762
"@vue/test-utils": "^2.0.0-rc.18",
5863
"@vue/vue3-jest": "^27.0.0-alpha.4",
59-
"electron": "^17.0.1",
64+
"electron": "^17.4.10",
6065
"electron-builder": "^22.14.13",
6166
"electron-is-dev": "^2.0.0",
6267
"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";

0 commit comments

Comments
 (0)