Skip to content

Commit 57c97eb

Browse files
committed
working dev branch
1 parent 8617b36 commit 57c97eb

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

app/electron/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const {
1919

2020

2121
// The splash screen is what appears while the app is loading
22-
// const { initSplashScreen, OfficeTemplate } = require('electron-splashscreen');
22+
const { initSplashScreen, OfficeTemplate } = require('electron-splashscreen');
2323
const { resolve } = require('app-root-path');
2424

2525
// to install react dev tool extension

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
"localforage": "^1.7.2",
143143
"lodash": "^4.17.20",
144144
"node-fetch": "^2.6.0",
145-
"npm": "^7.6.0",
146145
"passport": "^0.4.1",
147146
"passport-github2": "^0.1.12",
148147
"prettier": "^1.19.1",
@@ -169,6 +168,8 @@
169168
"@emotion/styled": "^11.6.0",
170169
"@material-ui/core": "^4.12.3",
171170
"@material-ui/icons": "^4.11.2",
171+
"@mui/material": "^5.2.8",
172+
"@mui/styled-engine-sc": "^5.1.0",
172173
"@mui/x-data-grid": "^5.2.1",
173174
"@testing-library/jest-dom": "^5.11.5",
174175
"@testing-library/react": "^10.4.6",
@@ -206,7 +207,9 @@
206207
"nodemon": "^2.0.15",
207208
"react": "^17.0.2",
208209
"react-ace": "^9.5.0",
210+
"react-dom": "^17.0.2",
209211
"style-loader": "^0.20.3",
212+
"styled-components": "^5.3.3",
210213
"supertest": "^4.0.2",
211214
"ts-jest": "^25.5.1",
212215
"ts-node": "^8.10.2",

0 commit comments

Comments
 (0)