Skip to content

Commit 2563da1

Browse files
committed
server files reintegrated
1 parent 3c8aef6 commit 2563da1

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

app/electron/main.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ ipcMain.on('set_cookie', event => {
340340
// this if statement is necessary or the setInterval on main app will constantly run and will emit this event.reply, causing a memory leak
341341
// checking for a cookie inside array will only emit reply when a cookie exists
342342
if (cookie[0]) {
343-
console.log(cookie);
343+
//console.log(cookie);
344344
event.reply('give_cookie', cookie);
345345
}
346346
})
@@ -353,9 +353,6 @@ ipcMain.on('set_cookie', event => {
353353
ipcMain.on('delete_cookie', event => {
354354
session.defaultSession.cookies
355355
.remove(serverUrl, 'ssid')
356-
.then(removed => {
357-
console.log('Cookies deleted', removed);
358-
})
359356
.catch(err => console.log('Error deleting cookie:', err));
360357
});
361358

package.json

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"scripts": {
2828
"postinstall": "ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
2929
"dev-server": "cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js",
30-
"dev": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=development electron .\" -k",
30+
"dev": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
3131
"prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
3232
"prod": "npm run prod-build && electron .",
3333
"pack": "electron-builder --dir",
@@ -36,7 +36,8 @@
3636
"dist-linux": "npm run prod-build && electron-builder --linux",
3737
"dist-windows": "npm run prod-build && electron-builder --windows",
3838
"dist-all": "npm run prod-build && electron-builder --mac --linux --windows",
39-
"test": "cross-env NODE_ENV=test jest --verbose"
39+
"test": "cross-env NODE_ENV=test jest --verbose",
40+
"server": "nodemon server/server.js"
4041
},
4142
"repository": {
4243
"type": "git",
@@ -72,8 +73,12 @@
7273
"diagnostics": false
7374
}
7475
},
75-
"setupFilesAfterEnv": ["<rootDir>/app/setupTests.ts"],
76-
"snapshotSerializers": ["enzyme-to-json/serializer"]
76+
"setupFilesAfterEnv": [
77+
"<rootDir>/app/setupTests.ts"
78+
],
79+
"snapshotSerializers": [
80+
"enzyme-to-json/serializer"
81+
]
7782
},
7883
"bugs": {
7984
"url": "https://github.com/open-source-labs/ReacType/issues"
@@ -96,8 +101,11 @@
96101
"app-root-path": "^3.0.0",
97102
"autoprefixer": "^9.0.1",
98103
"babel-polyfill": "^6.26.0",
104+
"bcryptjs": "^2.4.3",
99105
"concurrently": "^5.1.0",
100106
"connected-react-router": "^6.8.0",
107+
"cookie-parser": "^1.4.5",
108+
"cors": "^2.8.5",
101109
"electron-debug": "^3.1.0",
102110
"electron-devtools-installer": "^2.2.4",
103111
"electron-splashscreen": "^1.0.0",
@@ -106,6 +114,8 @@
106114
"immutable": "^4.0.0-rc.12",
107115
"js-cookie": "^2.2.1",
108116
"localforage": "^1.7.2",
117+
"passport": "^0.4.1",
118+
"passport-github2": "^0.1.12",
109119
"prettier": "^1.19.1",
110120
"prop-types": "^15.6.2",
111121
"react": "^16.13.0",
@@ -148,7 +158,7 @@
148158
"eslint-plugin-react": "^7.20.3",
149159
"html-loader": "^1.1.0",
150160
"html-webpack-plugin": "^3.1.0",
151-
"jest": "^25.2.6",
161+
"jest": "^25.5.4",
152162
"mini-css-extract-plugin": "^0.9.0",
153163
"mongodb": "^3.5.9",
154164
"mongoose": "^5.9.22",
@@ -158,6 +168,7 @@
158168
"sass-loader": "^7.0.3",
159169
"spectron": "^11.1.0",
160170
"style-loader": "^0.20.3",
171+
"supertest": "^4.0.2",
161172
"ts-jest": "^25.3.0",
162173
"ts-node": "^8.10.2",
163174
"typescript": "^3.9.6",

server/.gitignore

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

0 commit comments

Comments
 (0)