Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic Window Sizing for Improved Display Compatibility #84

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f674850
Add dynamic window sizing
KagemaNjoroge Dec 11, 2023
0628ff5
Bump express from 4.17.1 to 4.19.2
dependabot[bot] Apr 10, 2024
8b2bd3c
Bump semver from 5.7.1 to 5.7.2
dependabot[bot] Apr 10, 2024
ce49e9e
Merge pull request #1 from KagemaNjoroge/dependabot/npm_and_yarn/expr…
KagemaNjoroge Apr 10, 2024
55f898b
Merge pull request #2 from KagemaNjoroge/dependabot/npm_and_yarn/semv…
KagemaNjoroge Apr 10, 2024
4d08bea
Bump socket.io-parser from 3.3.2 to 3.3.3
dependabot[bot] Apr 10, 2024
3dcafb3
Bump electron from 13.6.6 to 22.3.25
dependabot[bot] Apr 10, 2024
70ec298
Bump json5 from 2.1.3 to 2.2.3
dependabot[bot] Apr 10, 2024
57386f6
Merge pull request #3 from KagemaNjoroge/dependabot/npm_and_yarn/elec…
KagemaNjoroge Apr 10, 2024
d3feaca
Bump decode-uri-component from 0.2.0 to 0.2.2
dependabot[bot] Apr 10, 2024
3ce3e58
Bump http-cache-semantics from 4.1.0 to 4.1.1
dependabot[bot] Apr 10, 2024
8835cbf
Merge pull request #7 from KagemaNjoroge/dependabot/npm_and_yarn/json…
KagemaNjoroge Apr 10, 2024
f805eac
Bump minimatch from 3.0.4 to 3.1.2
dependabot[bot] Apr 10, 2024
152a883
Bump minimist from 1.2.5 to 1.2.8
dependabot[bot] Apr 10, 2024
a873ce6
Merge pull request #4 from KagemaNjoroge/dependabot/npm_and_yarn/sock…
KagemaNjoroge Apr 10, 2024
3c643d5
Bump moment from 2.29.1 to 2.29.4
dependabot[bot] Apr 10, 2024
72206e1
Merge pull request #10 from KagemaNjoroge/dependabot/npm_and_yarn/mom…
KagemaNjoroge Apr 10, 2024
f7a8cc6
Bump async from 2.6.3 to 2.6.4
dependabot[bot] Apr 10, 2024
ff31f49
Merge pull request #11 from KagemaNjoroge/dependabot/npm_and_yarn/asy…
KagemaNjoroge Apr 10, 2024
769dd66
Merge pull request #9 from KagemaNjoroge/dependabot/npm_and_yarn/mini…
KagemaNjoroge Apr 10, 2024
008ec35
Bump ansi-regex from 3.0.0 to 3.0.1
dependabot[bot] Apr 10, 2024
5b83dc7
Merge pull request #5 from KagemaNjoroge/dependabot/npm_and_yarn/mini…
KagemaNjoroge Apr 10, 2024
515ac2b
Merge pull request #12 from KagemaNjoroge/dependabot/npm_and_yarn/ans…
KagemaNjoroge Apr 10, 2024
0d11f8d
Merge pull request #8 from KagemaNjoroge/dependabot/npm_and_yarn/deco…
KagemaNjoroge Apr 10, 2024
aea49bd
Merge pull request #6 from KagemaNjoroge/dependabot/npm_and_yarn/http…
KagemaNjoroge Apr 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
}
},
"dependencies": {
"async": "^2.6.0",
"async": "^2.6.4",
"body-parser": "^1.18.2",
"btoa": "^1.2.1",
"electron": ">=13.6.6",
"electron": ">=22.3.25",
"electron-context-menu": "^0.15.1",
"electron-store": "^5.1.0",
"electron-winstaller": "^4.0.0",
"express": "^4.16.2",
"express": "^4.19.2",
"express-fileupload": "^1.1.6",
"html2canvas": "^1.0.0-rc.5",
"http": "0.0.0",
Expand All @@ -29,7 +29,7 @@
"jsbarcode": "^3.11.0",
"jspdf": "^2.3.1",
"macaddress": "^0.2.9",
"moment": "^2.24.0",
"moment": "^2.29.4",
"multer": "^1.4.2",
"nedb": "^1.8.0",
"nodemon": "^1.14.12",
Expand Down
15 changes: 7 additions & 8 deletions start.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,25 @@ const setupEvents = require('./installers/setupEvents')
if (setupEvents.handleSquirrelEvent()) {
return;
}

const server = require('./server');
const {app, BrowserWindow, ipcMain} = require('electron');
const {app, BrowserWindow, ipcMain, screen} = require('electron');
const path = require('path')

const contextMenu = require('electron-context-menu');

let mainWindow

function createWindow() {
var primaryDisplay = screen.getPrimaryDisplay();
var screenDimensions = primaryDisplay.workAreaSize;
mainWindow = new BrowserWindow({
width: 1500,
height: 1200,
width: screenDimensions.width,
height: screenDimensions.height,
frame: false,
minWidth: 1200,
minHeight: 750,

webPreferences: {
nodeIntegration: true,
enableRemoteModule: true,
Expand Down Expand Up @@ -87,7 +90,3 @@ contextMenu({
],

});




Loading