Skip to content

Commit 6e1bfbb

Browse files
committed
server running with electron
1 parent d4cd9d6 commit 6e1bfbb

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

backend/server.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ import * as fakerRouter from "./routes/fakerRoute"
33
import * as modelRouter from "./routes/api"
44
import cors from 'cors';
55

6-
const app = express();
6+
const exp = express();
77

8-
app.use(express.json());
8+
exp.use(express.json());
99

10-
app.use(cors());
10+
exp.use(cors());
1111

12-
app.options('*', cors());
12+
exp.options('*', cors());
1313

14-
app.get('/', (req: Request, res: Response) => {
14+
exp.get('/', (req: Request, res: Response) => {
1515
res.send('<div>Hello World!</div>');
1616
})
1717

18-
app.use("/faker", fakerRouter.router)
19-
app.use("/api", modelRouter.router)
18+
exp.use("/faker", fakerRouter.router)
19+
exp.use("/api", modelRouter.router)
2020

21-
app.listen(30000, () => console.log("listening on port 30000"))
21+
exp.listen(30000, () => console.log("listening on port 30000"))

electron/main.ts

+24-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
//creates shell of desktop application in electron
22
import { app, BrowserWindow, ipcMain, dialog } from "electron";
3-
import express from "express"
43
import * as path from "path";
54
import * as url from "url";
65
import fs from 'fs'
76
import http from 'http'
8-
const server = require('../backend/server');
7+
import express, {Request, Response} from "express";
8+
import * as fakerRouter from "../backend/routes/fakerRoute"
9+
import * as modelRouter from "../backend/routes/api"
10+
import cors from 'cors';
911
// const { remote } = window.require('electron')
1012
// console.log('My path:', remote.app.getAppPath())
1113

@@ -40,6 +42,26 @@ function createWindow() {
4042
mainWindow.on("closed", () => {
4143
mainWindow = null;
4244
});
45+
46+
//load server
47+
const exp = express();
48+
49+
exp.use(express.json());
50+
51+
exp.use(cors());
52+
53+
exp.options('*', cors());
54+
55+
exp.get('/', (req: Request, res: Response) => {
56+
res.send('<div>Welcome to Squrl!</div>');
57+
})
58+
59+
exp.use("/faker", fakerRouter.router)
60+
exp.use("/api", modelRouter.router)
61+
62+
exp.listen(30000, () => console.log("listening on port 30000"))
63+
64+
4365
}
4466
ipcMain.on("download", (event, arg) => {
4567
dialog.showSaveDialog({

webpack.electron.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*https://medium.com/better-programming/start-a-new-electron-app-with-react-and-typescript-cdd6d9997933 */
22

33
const path = require('path');
4-
4+
const webpack = require('webpack')
55
module.exports = {
66
resolve: {
77
extensions: ['.tsx', '.ts', '.js'],
@@ -25,4 +25,7 @@ module.exports = {
2525
path: path.resolve(__dirname, './dist'),
2626
filename: '[name].js',
2727
},
28+
plugins: [
29+
new webpack.IgnorePlugin(/^pg-native$/)
30+
],
2831
};

0 commit comments

Comments
 (0)