Skip to content

Commit 592c2d6

Browse files
authored
Merge pull request #7 from oslabs-beta/shanon
Shanon
2 parents 13c7a58 + 506ef14 commit 592c2d6

16 files changed

+984
-1048
lines changed

package-lock.json

Lines changed: 39 additions & 896 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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"dependencies": {
1919
"@quasar/extras": "^1.0.0",
2020
"@vue/compiler-sfc": "^3.1.0",
21-
"@vueform/toggle": "^2.0.1",
2221
"core-js": "^3.6.5",
2322
"dotenv": "^10.0.0",
2423
"electron-deeplink": "^1.0.9",
@@ -31,16 +30,14 @@
3130
"node-gyp": "^8.4.1",
3231
"quasar": "^2.0.0",
3332
"quasar-dotenv": "^1.0.5",
34-
"vue-draggable-resizable": "^2.3.0",
35-
"vue-multiselect": "^2.1.6",
33+
"vue-multiselect": "^3.0.0-alpha.1",
3634
"vue-prism-editor": "^2.0.0-alpha.2",
3735
"vued3tree": "^5.1.0",
3836
"vuex": "^4.0.1"
3937
},
4038
"devDependencies": {
4139
"@babel/eslint-parser": "^7.13.14",
4240
"@quasar/app": "^3.0.0",
43-
"@vue/devtools": "^5.3.4",
4441
"electron": "^16.0.4",
4542
"electron-builder": "^22.14.5",
4643
"electron-is-dev": "^2.0.0",

quasar.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module.exports = configure(function (ctx) {
2626
// --> boot files are part of "main.js"
2727
// https://quasar.dev/quasar-cli/boot-files
2828
boot: [
29+
// "globals"
2930
],
3031

3132
// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css

src-electron/electron-main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ ipcMain.handle('openProject', async (event, arg) => {
5656
return result;
5757
})
5858

59-
6059
// ************** Slack OAuth functions **********************
6160
// Sends request to Slack for User's information,
6261
// then sends user information back to renderer process

src-electron/electron-preload.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
const {ipcRenderer, shell, contextBridge} = require('electron');
2121
const path = require('path');
2222
const fs = require('fs-extra');
23-
2423
// ipcRenderer contextBridge
2524
// on: used in SlackLoginWindow
2625
//
@@ -46,4 +45,3 @@ const fs = require('fs-extra');
4645
contextBridge.exposeInMainWorld("path", {
4746
join: (...paths) => path.join(...paths)
4847
})
49-

0 commit comments

Comments
 (0)