Skip to content

Commit 69bfbbe

Browse files
committed
pre merge
1 parent a844ec8 commit 69bfbbe

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

package-lock.json

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

quasar.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ module.exports = function(ctx) {
184184
},
185185

186186
electron: {
187-
bundler: "packager",
187+
bundler: "builder",
188188
// bundler: 'builder', // or 'packager'
189189

190190
extendWebpack(cfg) {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function slackErrorHandler(err) {
4848
}
4949

5050
function sendTokenRequest() {
51-
logEverywhere("inside sendTokenRequest");
51+
// logEverywhere("inside sendTokenRequest");
5252

5353
// Send Post request for user information
5454
const request = net.request({
@@ -72,7 +72,7 @@ function sendTokenRequest() {
7272
request.on("response", response => {
7373
// logEverywhere("request.on response received");
7474
response.on("end", () => {
75-
logEverywhere("Response ended ");
75+
// logEverywhere("Response ended ");
7676
});
7777
response.on("data", data => {
7878
const decoded = JSON.parse(data.toString())
@@ -99,7 +99,7 @@ function getSlackUser (token, userId) {
9999
})
100100
request.on('response', response => {
101101
response.on('end', () => {
102-
logEverywhere('User data recieved')
102+
// logEverywhere('User data recieved')
103103
})
104104
response.on('data', data => {
105105
const decoded = JSON.parse(data.toString());
@@ -135,7 +135,7 @@ function setOauthListener() {
135135
// logEverywhere(`process.env.SLACK_CLIENT_SECRET in electron-main: ${process.env.SLACK_CLIENT_SECRET}`);
136136

137137
return deeplink.on("received", link => {
138-
logEverywhere(`auth worked here link: ${link}`);
138+
// logEverywhere(`auth worked here link: ${link}`);
139139
// Extracts Slack authorization code from deep link
140140
authCode = link.split("=")[1];
141141
sendTokenRequest();
@@ -157,8 +157,8 @@ function createWindow() {
157157
}
158158
});
159159

160-
logEverywhere(`Current deeplink Protocol: ${deeplink.getProtocol()}`);
161-
logEverywhere(`process.execPath: ${process.execPath}`);
160+
// logEverywhere(`Current deeplink Protocol: ${deeplink.getProtocol()}`);
161+
// logEverywhere(`process.execPath: ${process.execPath}`);
162162
mainWindow.loadURL(process.env.APP_URL);
163163

164164
mainWindow.on("closed", () => {

src/components/file_system_interface/SaveProjectComponent.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export default {
4444
},
4545
// deletes anything attached to html element
4646
parseAndDelete (htmlList) {
47+
console.log(htmlList)
4748
htmlList.forEach(element => {
4849
if (element.children.length > 0) {
4950
// console.log('in recurse')

0 commit comments

Comments
 (0)