Skip to content

Commit d843b40

Browse files
author
Jeffrey Sul
committed
package-lock issues
2 parents de14e9f + d4b456f commit d843b40

File tree

14 files changed

+320
-26831
lines changed

14 files changed

+320
-26831
lines changed

.env.example

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#DO NOT DELETE THIS FILE, and follow instructions:
2+
# Required for Slack Oauth features
3+
# Create TWO files, one named ".env" and the second named ".env.development" in this directory, and give them the following variables
4+
# Any environment variables you create MUST also be created here in .env.example
5+
6+
SLACK_CLIENT_SECRET = "ENTER_CLIENT_SECRET_HERE"
7+
SLACK_CLIENT_ID = "ENTER_CLIENT_ID_HERE"
8+
SLACK_WEBHOOK_URL = "ENTER WEBHOOK URL HERE"
9+
SLACK_REDIRECT_URI = "REDIRECT URL HERE"
10+
11+
# https://www.npmjs.com/package/dotenv
12+
# https://www.npmjs.com/package/quasar-dotenv
13+
# https://v1.quasar.dev/quasar-cli/handling-process-env
14+
# https://v1.quasar.dev/quasar-cli/quasar-conf-js#using-dotenv

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#secret Api keys, Webhook URLs etc
22
slackApiStuff.js
33
.env
4+
.env.development
45
#
56
.quasar
67
.DS_Store

.vsls.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "http://json.schemastore.org/vsls",
3+
"gitignore":"none"
4+
}

package-lock.json

Lines changed: 0 additions & 26566 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"dotenv": "^10.0.0",
3030
"electron-deeplink": "^1.0.8",
3131
"fs-extra": "^8.1.0",
32+
"jwt-decode": "^3.1.2",
3233
"localforage": "^1.7.3",
3334
"lodash": "^4.17.21",
3435
"lodash.isequal": "^4.5.0",
@@ -37,6 +38,7 @@
3738
"npm": "^6.14.14",
3839
"prismjs": "^1.24.1",
3940
"quasar": "^1.0.0",
41+
"quasar-dotenv": "^1.0.5",
4042
"vue-custom-context-menu": "^3.0.1",
4143
"vue-drag-resize": "^1.3.2",
4244
"vue-draggable-nested-tree": "^2.2.17",

quasar.conf.js

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
// Configuration for your app
22
// https://quasar.dev/quasar-cli/quasar-conf-js
33

4-
module.exports = function (ctx) {
5-
console.log('webpack\'s context parameter: ', ctx)
4+
module.exports = function(ctx) {
5+
const env = ctx.dev
6+
? require("quasar-dotenv").config({ path: '.env.development' })
7+
: require("quasar-dotenv").config()
8+
9+
// console.log('ctx: ', ctx)
610
return {
711
// app boot file (/src/boot)
812
// --> boot files are part of "main.js"
9-
boot: [
10-
],
13+
boot: [],
1114

12-
css: [
13-
'app.styl'
14-
],
15+
css: ["app.styl"],
1516

1617
extras: [
1718
// 'ionicons-v4',
@@ -21,8 +22,8 @@ module.exports = function (ctx) {
2122
// 'themify',
2223
// 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
2324

24-
'roboto-font', // optional, you are not bound to it
25-
'material-icons' // optional, you are not bound to it
25+
"roboto-font", // optional, you are not bound to it
26+
"material-icons" // optional, you are not bound to it
2627
],
2728

2829
framework: {
@@ -32,61 +33,56 @@ module.exports = function (ctx) {
3233
// all: true, // --- includes everything; for dev only!
3334

3435
components: [
35-
'QLayout',
36-
'QHeader',
37-
'QDrawer',
38-
'QPageContainer',
39-
'QPage',
40-
'QToolbar',
41-
'QToolbarTitle',
42-
'QBtn',
43-
'QIcon',
44-
'QList',
45-
'QItem',
46-
'QItemSection',
47-
'QItemLabel',
48-
'QExpansionItem',
49-
'QInput',
50-
'QBar',
51-
'QFooter',
52-
'QAvatar',
53-
'QTabs',
54-
'QTab',
55-
'QRouteTab',
56-
'QTabPanels',
57-
'QDialog',
58-
'QSelect',
59-
'QTabPanel',
60-
'QFab',
61-
'QFabAction',
62-
'QMenu',
63-
'QUploader',
64-
'QEditor',
65-
'QCard',
66-
'QChip'
36+
"QLayout",
37+
"QHeader",
38+
"QDrawer",
39+
"QPageContainer",
40+
"QPage",
41+
"QToolbar",
42+
"QToolbarTitle",
43+
"QBtn",
44+
"QIcon",
45+
"QList",
46+
"QItem",
47+
"QItemSection",
48+
"QItemLabel",
49+
"QExpansionItem",
50+
"QInput",
51+
"QBar",
52+
"QFooter",
53+
"QAvatar",
54+
"QTabs",
55+
"QTab",
56+
"QRouteTab",
57+
"QTabPanels",
58+
"QDialog",
59+
"QSelect",
60+
"QTabPanel",
61+
"QFab",
62+
"QFabAction",
63+
"QMenu",
64+
"QUploader",
65+
"QEditor",
66+
"QCard",
67+
"QChip"
6768
],
6869

69-
directives: [
70-
'Ripple',
71-
'ClosePopup'
72-
],
70+
directives: ["Ripple", "ClosePopup"],
7371

7472
// Quasar plugins
75-
plugins: [
76-
'Notify'
77-
]
73+
plugins: ["Notify"]
7874
},
7975

8076
supportIE: false,
8177

8278
build: {
83-
scopeHoisting: true,
79+
// scopeHoisting: true,
8480
// vueRouterMode: 'history',
8581
// vueCompiler: true,
8682
// gzip: true,
8783
// analyze: true,
8884
// extractCSS: false,
89-
extendWebpack (cfg) {
85+
extendWebpack(cfg) {
9086
// cfg.module.rules.push({
9187
// enforce: 'pre',
9288
// test: /\.(js|vue)$/,
@@ -96,13 +92,17 @@ module.exports = function (ctx) {
9692
// formatter: require('eslint').CLIEngine.getFormatter('stylish')
9793
// }
9894
// })
99-
}
95+
},
96+
env: env,
10097
},
10198

10299
devServer: {
103-
// https: true,
100+
https: true,
104101
// port: 8080,
102+
// public: 'overvuedev',
103+
// host: 'overvuedev',
105104
open: true // opens browser window automatically
105+
106106
},
107107

108108
// animations: 'all', // --- includes all animations
@@ -119,35 +119,35 @@ module.exports = function (ctx) {
119119
// name: 'Quasar App',
120120
// short_name: 'Quasar App',
121121
// description: 'A Quasar Framework app',
122-
display: 'standalone',
123-
orientation: 'portrait',
124-
background_color: '#ffffff',
125-
theme_color: '#027be3',
122+
display: "standalone",
123+
orientation: "portrait",
124+
background_color: "#ffffff",
125+
theme_color: "#027be3",
126126
icons: [
127127
{
128-
'src': 'statics/icons/icon-128x128.png',
129-
'sizes': '128x128',
130-
'type': 'image/png'
128+
src: "statics/icons/icon-128x128.png",
129+
sizes: "128x128",
130+
type: "image/png"
131131
},
132132
{
133-
'src': 'statics/icons/icon-192x192.png',
134-
'sizes': '192x192',
135-
'type': 'image/png'
133+
src: "statics/icons/icon-192x192.png",
134+
sizes: "192x192",
135+
type: "image/png"
136136
},
137137
{
138-
'src': 'statics/icons/icon-256x256.png',
139-
'sizes': '256x256',
140-
'type': 'image/png'
138+
src: "statics/icons/icon-256x256.png",
139+
sizes: "256x256",
140+
type: "image/png"
141141
},
142142
{
143-
'src': 'statics/icons/icon-384x384.png',
144-
'sizes': '384x384',
145-
'type': 'image/png'
143+
src: "statics/icons/icon-384x384.png",
144+
sizes: "384x384",
145+
type: "image/png"
146146
},
147147
{
148-
'src': 'statics/icons/icon-512x512.png',
149-
'sizes': '512x512',
150-
'type': 'image/png'
148+
src: "statics/icons/icon-512x512.png",
149+
sizes: "512x512",
150+
type: "image/png"
151151
}
152152
]
153153
}
@@ -159,10 +159,10 @@ module.exports = function (ctx) {
159159
},
160160

161161
electron: {
162-
bundler: 'packager',
162+
bundler: "packager",
163163
// bundler: 'builder', // or 'packager'
164164

165-
extendWebpack (cfg) {
165+
extendWebpack(cfg) {
166166
// do something with Electron main process Webpack cfg
167167
// chainWebpack also available besides this extendWebpack
168168
},
@@ -171,10 +171,10 @@ module.exports = function (ctx) {
171171
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
172172

173173
// OS X / Mac App Store
174-
appBundleId: 'overvue',
174+
appBundleId: "overvue",
175175
// appCategoryType: '',
176176
// osxSign: '',
177-
protocol: 'overvue'
177+
protocol: "overvue"
178178

179179
// Windows only
180180
// win32metadata: { ... }
@@ -183,17 +183,17 @@ module.exports = function (ctx) {
183183
builder: {
184184
// https://www.electron.build/configuration/configuration
185185

186-
appId: 'com.electron.OverVue',
186+
appId: "com.electron.OverVue",
187187
win: {
188-
target: 'nsis'
188+
target: "nsis"
189189
},
190190
protocols: [
191191
{
192-
name: 'overvue',
193-
schemes: ['overvue']
192+
name: "overvue",
193+
schemes: ["overvue"]
194194
}
195195
]
196196
}
197197
}
198-
}
199-
}
198+
};
199+
};

secretStuff/secretStuff_instructions.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

src-electron/main-process/electron-main.dev.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,8 @@
55
* environment.
66
*/
77

8-
// NOTE Aug 2021 - VUEJS DevTools not loading, need to debug why is does not in Dev mode
9-
108
// Install `electron-debug` with `devtron`
119
require('electron-debug')({ showDevTools: true })
1210

13-
// Install `vue-devtools`
14-
// require('electron').app.on('ready', () => {
15-
// let installExtension = require('electron-devtools-installer')
16-
// installExtension.default(installExtension.VUEJS_DEVTOOLS)
17-
// .then(() => {})
18-
// .catch(err => {
19-
// console.log('Unable to install `vue-devtools`: \n', err)
20-
// })
21-
// })
22-
2311
// Require `main` process to boot app
2412
require('./electron-main')

0 commit comments

Comments
 (0)