Skip to content

Commit 931a92c

Browse files
Shanon LeeShanon Lee
authored andcommitted
Functional Slack Login Window popup; by adding process.env.PROD clause in main electron file
1 parent 28cd501 commit 931a92c

File tree

4 files changed

+35
-28
lines changed

4 files changed

+35
-28
lines changed

quasar.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ module.exports = configure(function (ctx) {
4848
vueRouterMode: 'history', // available values: 'hash', 'history'
4949
// Potential fix for fs errors
5050
// extendWebpack(cfg) {
51+
// // cfg.target = ['electron-main', 'electron-renderer']
5152
// cfg.target = ['electron-main', 'electron-renderer']
5253
// },
5354

src-electron/electron-main.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ import isDev from 'electron-is-dev';
44
import path from 'path';
55
import os from 'os';
66

7+
if (process.env.PROD) {
8+
global.__statics = require("path")
9+
.join(__dirname, "statics")
10+
.replace(/\\/g, "\\\\");
11+
}
12+
713
// needed in case process is undefined under Linux
814
const platform = process.platform || os.platform()
915

src/components/slack_login/SlackLoginWindow.vue

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<script>
9292
// import { mapState, mapActions } from 'vuex'
9393
import localforage from "localforage";
94-
import { shell, ipcRenderer } from "electron";
94+
// import { shell, ipcRenderer } from "electron";
9595
9696
export default {
9797
name: "SlackLoginWindow",
@@ -103,30 +103,30 @@ export default {
103103
};
104104
},
105105
created() {
106-
ipcRenderer.on("tokenReceived", (event, data) => {
107-
// console.log("data in SlackLoginWindow: ", data);
108-
// localforage.setItem('slackWebhookURL', data.incoming_webhook.url)
109-
// .then(data => this.closeLogin())
110-
return this.saveToLocalForage(
111-
"slackWebhookURL",
112-
data.incoming_webhook.url
113-
);
114-
});
115-
ipcRenderer.on("slackUser", (event, user) => {
116-
// console.log("user received in SlackLoginWindow: ", user);
117-
// localforage.setItem('slackUser', user)
118-
// .then(data => this.closeLogin())
119-
// .catch(err => {
120-
// console.log('localforage caught an error when trying to set slackUser: ', err)
121-
// this.errorMessage = err
122-
// })
123-
return this.saveToLocalForage("slackUser", user);
124-
});
125-
ipcRenderer.on("slackError", (event, err) => {
126-
// console.log("err received in SlackLoginWindow: ", err);
127-
this.printErrorMessage();
128-
});
129-
// console.log(`process.env: ${process.env}`);
106+
// ipcRenderer.on("tokenReceived", (event, data) => {
107+
// // console.log("data in SlackLoginWindow: ", data);
108+
// // localforage.setItem('slackWebhookURL', data.incoming_webhook.url)
109+
// // .then(data => this.closeLogin())
110+
// return this.saveToLocalForage(
111+
// "slackWebhookURL",
112+
// data.incoming_webhook.url
113+
// );
114+
// });
115+
// ipcRenderer.on("slackUser", (event, user) => {
116+
// // console.log("user received in SlackLoginWindow: ", user);
117+
// // localforage.setItem('slackUser', user)
118+
// // .then(data => this.closeLogin())
119+
// // .catch(err => {
120+
// // console.log('localforage caught an error when trying to set slackUser: ', err)
121+
// // this.errorMessage = err
122+
// // })
123+
// return this.saveToLocalForage("slackUser", user);
124+
// });
125+
// ipcRenderer.on("slackError", (event, err) => {
126+
// // console.log("err received in SlackLoginWindow: ", err);
127+
// this.printErrorMessage();
128+
// });
129+
// // console.log(`process.env: ${process.env}`);
130130
},
131131
methods: {
132132
slackOauth: function() {

src/layouts/MyLayout.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Description:
1818
></i>
1919
</q-btn>
2020
<q-toolbar-title> OverVue </q-toolbar-title>
21-
<!-- <SlackLoginWindow /> -->
21+
<SlackLoginWindow />
2222
<div></div>
2323
<!-- <i
2424
v-if="this.$router.app.$children[0].doneAction.length"
@@ -109,7 +109,7 @@ import Dashboard from "../components/dashboard_items/Dashboard.vue";
109109
// import SaveProjectComponent from "../components/file_system_interface/SaveProjectComponent.vue";
110110
// import OpenProjectComponent from "../c omponents/file_system_interface/OpenProjectComponent.vue";
111111
// import UploadImage from "../components/home_sidebar_items/UploadImage.vue";
112-
// import SlackLoginWindow from "../components/slack_login/SlackLoginWindow.vue";
112+
import SlackLoginWindow from "../components/slack_login/SlackLoginWindow.vue";
113113
// import RouteDisplay from "../components/home_sidebar_items/RouteDisplay.vue";
114114
// import VuexForm from "../components/home_sidebar_items/VuexForm.vue";
115115
// import ComponentTab from "../components/home_sidebar_items/ComponentTab/ComponentTab.vue";
@@ -131,7 +131,7 @@ export default {
131131
// SaveProjectComponent,
132132
// OpenProjectComponent,
133133
// UploadImage,
134-
// SlackLoginWindow,
134+
SlackLoginWindow,
135135
// ComponentTab,
136136
StoreTab,
137137
},

0 commit comments

Comments
 (0)