Skip to content

Commit 15c0d90

Browse files
author
sarthakpranesh
committed
Changes:
1. Updated frontend to work on windows 2. Added build config to application-build.sh Signed-off-by: sarthakpranesh <[email protected]>
1 parent 93cc7f2 commit 15c0d90

16 files changed

+71
-20
lines changed

‎debian-build.sh ‎application-build.sh

+25
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@ packagePlatform="amd64"
44
packageBinName=`jq -r '.binaryname' project.json`
55
packageDisc=`jq -r '.description' project.json`
66

7+
##################################################################
8+
# Creating Windows exe application ###############################
9+
##################################################################
10+
# create required *.exe.manifest file
11+
echo "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
12+
<assembly manifestVersion='1.0' xmlns='urn:schemas-microsoft-com:asm.v1' xmlns:asmv3='urn:schemas-microsoft-com:asm.v3'>
13+
<assemblyIdentity type='win32' name='$packageName' version='$packageVersion' processorArchitecture='$packagePlatform'/>
14+
<description>$packageDisc</description>
15+
<asmv3:application>
16+
<asmv3:windowsSettings>
17+
<dpiAware xmlns='http://schemas.microsoft.com/SMI/2005/WindowsSettings'>true/pm</dpiAware> <!-- fallback for Windows 7 and 8 -->
18+
<dpiAwareness xmlns='http://schemas.microsoft.com/SMI/2016/WindowsSettings'>permonitorv2,permonitor</dpiAwareness> <!-- falls back to per-monitor if per-monitor v2 is not supported -->
19+
<gdiScaling xmlns='http://schemas.microsoft.com/SMI/2017/WindowsSetting'>true</gdiScaling> <!-- enables GDI DPI scaling -->
20+
</asmv3:windowsSettings>
21+
</asmv3:application>
22+
</assembly>" > cpuRoller.exe.manifest
23+
24+
# cross compile for windows platform and package the application
25+
wails build -x windows/amd64 -p
26+
27+
28+
29+
##################################################################
30+
# Creating the .deb package for Debian and Debian based distros###
31+
##################################################################
732
dir="./tmp/"$packageName"_"$packageVersion"_"$packagePlatform
833
mkdir -p $dir
934

‎build/cpuRoller.exe

9.43 MB
Binary file not shown.

‎cpuRoller-res.syso

21.9 KB
Binary file not shown.

‎cpuRoller.exe.manifest

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
3+
<assemblyIdentity type="win32" name="CpuRoller" version="1.1.2.0" processorArchitecture="amd64"/>
4+
<description>Real time system usage and information</description>
5+
<asmv3:application>
6+
<asmv3:windowsSettings>
7+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> <!-- fallback for Windows 7 and 8 -->
8+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2,permonitor</dpiAwareness> <!-- falls back to per-monitor if per-monitor v2 is not supported -->
9+
<gdiScaling xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling> <!-- enables GDI DPI scaling -->
10+
</asmv3:windowsSettings>
11+
</asmv3:application>
12+
</assembly>

‎cpuRoller.ico

20.4 KB
Binary file not shown.

‎cpuRoller.rc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
100 ICON "cpuRoller.ico"
2+
110 24 "cpuRoller.exe.manifest"

‎frontend/package-lock.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"@wailsapp/runtime": "^1.1.1",
88
"core-js": "^3.6.4",
99
"react": "^16.13.1",
10+
"react-app-polyfill": "^1.0.6",
1011
"react-dom": "^16.13.1",
1112
"react-modal": "3.11.2",
1213
"wails-react-scripts": "3.0.1-2"
@@ -24,12 +25,14 @@
2425
"production": [
2526
">0.2%",
2627
"not dead",
27-
"not op_mini all"
28+
"not op_mini all",
29+
"ie 11"
2830
],
2931
"development": [
3032
"last 1 chrome version",
3133
"last 1 firefox version",
32-
"last 1 safari version"
34+
"last 1 safari version",
35+
"ie 11"
3336
]
3437
}
3538
}

‎frontend/package.json.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
15a7bf3d72f355c2753b49893c1c73c0
1+
b7c9505211877e334bac54fb99811e8a

‎frontend/src/App.css

+5-4
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ Secondary Text: #e43f5a
3131
}
3232

3333
.GridContainer {
34-
display: grid;
35-
grid-template-columns: auto auto auto;
36-
margin: 10px;
37-
margin-bottom: 40px;
34+
display: flex;
35+
flex-direction: row;
36+
justify-content: center;
37+
align-items: center;
3838
}
3939

4040
.GridItem {
4141
display: flex;
42+
flex-direction: column;
4243
justify-content: center;
4344
align-items: center;
4445
}

‎frontend/src/components/CircularUsage/index.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react'
2-
// import {CircularProgressbarWithChildren} from 'react-circular-progressbar';
32
import ProgressBar from "../ProgressBar/index.js";
43

54
// importing styles and constants
@@ -10,18 +9,17 @@ const CircularUsage = ({percentage=66, title="title", subContent="subs"}) => {
109

1110
return (
1211
<div className="CircularUsageWrapper">
12+
<div className="CircularUsageInfoContainer">
13+
<h1 className="PrimaryText CircularUsageTitle">{title}</h1>
14+
<p className="SecondaryText CircularUsageSubContent">{subContent}</p>
15+
</div>
1316
<ProgressBar
1417
progress={percentage}
1518
strokeWidth={ProgressBarCons.strokeWidth}
1619
strokeColor={ProgressBarCons.strokeColor}
1720
trackStrokeWidth={ProgressBarCons.trackStrokeWidth}
1821
trackStrokeColor={ProgressBarCons.trackStrokeColor}
19-
>
20-
<div>
21-
<h1 className="PrimaryText CircularUsageTitle">{title}</h1>
22-
<p className="SecondaryText CircularUsageSubContent">{subContent}</p>
23-
</div>
24-
</ProgressBar>
22+
/>
2523
</div>
2624
);
2725
}

‎frontend/src/components/CircularUsage/styles.css

+10-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
width: 20vw;
33
height: 20vw;
44
display: flex;
5-
margin: 20px;
65
flex-direction: column;
76
justify-content: center;
87
align-items: center;
8+
margin: 20px;
9+
position: relative;
10+
}
11+
12+
.CircularUsageInfoContainer {
13+
position: absolute;
14+
top: 10vw;
15+
left: 10vw;
16+
transform: translate(-50%, -50%);
917
}
1018

1119
.CircularUsageTitle {
@@ -14,5 +22,6 @@
1422
}
1523

1624
.CircularUsageSubContent {
25+
text-align: center;
1726
margin: 0px;
1827
}

‎frontend/src/components/ProgressBar/index.js

-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class ProgressBar extends Component {
4747
strokeColor,
4848
strokeWidth,
4949
strokeLinecap,
50-
children,
5150
trackTransition,
5251
transition,
5352
} = this.props
@@ -66,9 +65,6 @@ class ProgressBar extends Component {
6665
alignItems: 'center',
6766
textAlign: 'center',
6867
}}>
69-
<div style={{position: 'absolute'}}>
70-
{children || null}
71-
</div>
7268
<svg
7369
width={width}
7470
height={width}

‎frontend/src/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'react-app-polyfill/ie11';
2+
13
import React from 'react';
24
import ReactDOM from 'react-dom';
35
import 'core-js/stable';

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ require (
77
github.com/go-ole/go-ole v1.2.4 // indirect
88
github.com/leaanthony/mewn v0.10.7
99
github.com/shirou/gopsutil v3.20.10+incompatible
10-
github.com/wailsapp/wails v1.10.1
10+
github.com/wailsapp/wails v1.11.0
1111
)

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ github.com/wailsapp/wails v1.9.1 h1:ez/TK8YpU9lvOZ9nkgzUXsWu+xOPFVO57zTy0n5w3hc=
6969
github.com/wailsapp/wails v1.9.1/go.mod h1:XFZunea+USOCMMgBlz0A0JHLL3oWrRhnOl4baZlRpxo=
7070
github.com/wailsapp/wails v1.10.1 h1:WGM5gms/fVI+Pql484sv5A2eDj13fYUQFIejmoIEN7k=
7171
github.com/wailsapp/wails v1.10.1/go.mod h1:XFZunea+USOCMMgBlz0A0JHLL3oWrRhnOl4baZlRpxo=
72+
github.com/wailsapp/wails v1.11.0 h1:bFpZe4a3DGm8MmmjOzWfXm57w8Eed7OvXL/FZM9DABU=
73+
github.com/wailsapp/wails v1.11.0/go.mod h1:XFZunea+USOCMMgBlz0A0JHLL3oWrRhnOl4baZlRpxo=
7274
golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
7375
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
7476
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

0 commit comments

Comments
 (0)