Skip to content

Commit

Permalink
updated button style, splash screen; versioned 0.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ubench-org committed Aug 13, 2023
1 parent cee7a7d commit 3046954
Show file tree
Hide file tree
Showing 14 changed files with 182 additions and 94 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ubenchlauncher",
"version": "0.2.0",
"version": "0.3.5",
"description": "UBench Benchmark Launcher",
"author": "UBench Organization",
"main": "./src/ubenchlauncher.js",
Expand Down
50 changes: 26 additions & 24 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ body {
.btn-sm {
font-size: 0.75rem;
padding: 4px 8px;
height: 32px;
margin: 12px;
}

.toolbar > .btn-sm {
margin: 0;
}

.btn:hover {
Expand All @@ -327,6 +333,10 @@ body {
color: white;
}

.m0 {
margin: 0;
}

.right {
float: right;
}
Expand Down Expand Up @@ -487,30 +497,6 @@ select {
.hidden {
visibility: collapse;
}
.spinner-xl {
border: 8px solid white;
border-radius: 50%;
width: 128px;
height: 128px;
animation: pulse 1s linear infinite;
margin: auto;
position: absolute;
top: 46px;
left: calc(50% - 68px);
}


@keyframes pulse {
0% {
opacity: 1;
scale: 0.9;
}

100% {
opacity: 0;
scale: 1.1;
}
}

.spinner {
border: 2px solid var(--dark);
Expand All @@ -537,4 +523,20 @@ select {
.btn-light {
background-color: var(--light);
color: var(--dark);
}


.btn_icon {
min-width: 28px !important;
padding: 2px;
}

.btn-icon {
width: 14px;
height: 14px;
filter: invert();
}

a {
text-decoration: none;
}
14 changes: 14 additions & 0 deletions public/icons/reset.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 1 addition & 26 deletions public/js/app.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,4 @@
let sysinfo = JSON.parse(document.getElementById("sysinfo").innerHTML);
console.log(sysinfo)
let disks = ``;
let gpus = ``;
for (var i = 0; i < sysinfo.disks.length; i++) {
disks += `${sysinfo.disks[i].name} ${sysinfo.disks[i].size} GB<br>`;
}
for (var i = 0; i < sysinfo.gpu.length; i++) {
gpus += `${sysinfo.gpu[i].model} ${sysinfo.gpu[i].vram} MB<br>`;
}
document.getElementById("system_content").innerHTML = `
<p class="sirow"><b>${sysinfo.system.model}</b></p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/os.png"><b class="key">System</b> ${sysinfo.os.distro} ${sysinfo.os.arch}</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/motherboard.png"><b class="key">Board</b> ${sysinfo.board.model}<br>Version ${sysinfo.board.version}<br>Made by ${sysinfo.board.manufacturer}</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/cpu.png"><b class="key">Processor</b> ${sysinfo.cpu.brand}<br>${sysinfo.cpu.processors} x ${sysinfo.cpu.speed} GHz<br>${sysinfo.cpu.cores} Core / ${sysinfo.cpu.threads} Thread</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/gpu.png"><b class="key">Graphics</b> ${gpus}</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/ram.png"><b class="key">Memory</b> ${sysinfo.ram} GB</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/disk.png"><b class="key">Storage</b> ${disks}</p>
<line/>
`;


let v = window.localStorage.getItem("view_id") || "system";
change_selected_menu_item(v);
Expand Down
1 change: 0 additions & 1 deletion public/navbar.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<div id="navbar_bottom" class="bottom">

</div>
<p hidden id="selected_menu_item"><%=menu%></p>

</div>

Expand Down
89 changes: 89 additions & 0 deletions public/splash.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>UBench Launcher</title>

<style>
@font-face {
font-family: 'Roboto';
src: url('./css/fonts/Roboto-Regular.ttf') format('embedded-opentype'),
/* Internet Explorer */
url('./css/fonts/Roboto-Regular.ttf') format('woff2'),
/* Super Modern Browsers */
url('./css/fonts/Roboto-Regular.ttf') format('woff'),
/* Pretty Modern Browsers */
url('./css/fonts/Roboto-Regular.ttf') format('truetype'),
/* Safari, Android, iOS */
url('./css/fonts/Roboto-Regular.ttf') format('svg');
/* Legacy iOS */
}
html {
background-color: #202020;
color: #c1c5c8;
font-family: "Roboto";
}
.spinner-xl {
border: 8px solid white;
border-radius: 50%;
width: 128px;
height: 128px;
animation: pulse 1s linear infinite;
margin: auto;
position: absolute;
top: 52px;
left: calc(50% - 68px);
}
@keyframes pulse {
0% {
opacity: 1;
scale: 0.9;
}
100% {
opacity: 0;
scale: 1.1;
}
}
.logo {
width: 128px;
height: 128px;
top: 60px;
left: calc(50% - 60px);
position: absolute;
}
p {
text-align: center;
width: 200px;
left: calc(50% - 100px);
font-weight: bold;
font-size: 0.75rem;
}
#version {
position: absolute;
bottom: 0;
}
#title {
position: absolute;
text-align: center;
}
</style>
</head>

<body>
<p id="title">&copy; UBench Organization</p>
<img src="./icons/logo.png" class="logo">
<div class="spinner-xl"></div>
<p id="version"><%=version%></p>
</body>

</html>
24 changes: 0 additions & 24 deletions public/splash.html

This file was deleted.

11 changes: 8 additions & 3 deletions public/views/settings.ejs
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<div hidden id="settings_content" class="view">
<div class="row">
<p>System Data</p>
<button class="btn btn-sm">Clear</button>
</div>
<div class="row">
<p>Benchmark Library</p>
<button class="btn btn-sm">Clear</button>
</div>
<p id="version_p">UBench Launcher Version</p>
<p hidden id="version"><%=version%></p>
<p>&copy; UBench Organization</p>

<img src="./icons/logo.png" class="logo">
<div class="spinner-xl"></div>
</div>
<script>
let version = document.getElementById("version").innerHTML; //.toString().split(".");
Expand Down
31 changes: 30 additions & 1 deletion public/views/system.ejs
Original file line number Diff line number Diff line change
@@ -1 +1,30 @@
<div hidden id="system_content" class="view"></div>
<div hidden id="system_content" class="view"></div>

<script>
let sysinfo = JSON.parse(document.getElementById("sysinfo").innerHTML);
console.log(sysinfo)
let disks = ``;
let gpus = ``;
for (var i = 0; i < sysinfo.disks.length; i++) {
disks += `${sysinfo.disks[i].name} ${sysinfo.disks[i].size} GB<br>`;
}
for (var i = 0; i < sysinfo.gpu.length; i++) {
gpus += `${sysinfo.gpu[i].model} ${sysinfo.gpu[i].vram} MB<br>`;
}
document.getElementById("system_content").innerHTML = `
<p class="sirow"><b>${sysinfo.system.model}</b></p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/os.png"><b class="key">System</b> ${sysinfo.os.distro} ${sysinfo.os.arch}</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/motherboard.png"><b class="key">Board</b> ${sysinfo.board.model}<br>Version ${sysinfo.board.version}<br>Made by ${sysinfo.board.manufacturer}</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/cpu.png"><b class="key">Processor</b> ${sysinfo.cpu.brand}<br>${sysinfo.cpu.processors} x ${sysinfo.cpu.speed} GHz<br>${sysinfo.cpu.cores} Core / ${sysinfo.cpu.threads} Thread</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/gpu.png"><b class="key">Graphics</b> ${gpus}</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/disk.png"><b class="key">Storage</b> ${disks}</p>
<line/>
<p class="sirow"><img class="system-icon" src="./icons/grey/ram.png"><b class="key">Memory</b> ${sysinfo.ram} GB</p>
<line/>
`;
</script>
4 changes: 2 additions & 2 deletions public/views/toolbars/account.ejs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="account_toolbar" hidden class="toolbar_view">
<button class="btn btn-sm">Support</button>
<button class="btn btn-sm">Log Out</button>
<button class="btn btn-sm m0">Support</button>
<button class="btn btn-sm m0">Log Out</button>
</div>
8 changes: 4 additions & 4 deletions public/views/toolbars/downloads.ejs
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<div id="downloads_toolbar" hidden class="toolbar_view">
<div class="filter">
<b>UE</b><select id="uev_s" onchange="filter_by_uev(this.value)">
<b>UE</b><select id="uev_s" onchange="filter_by_uev(this.value)" title="Filter by Unreal Engine version">
<option>All</option>
<option>4.27.2</option>
<option>5.0.3</option>
<option>5.1.1</option>
<option>5.2.1</option>
</select>
<b>RHI</b><select id="rhi_s" onchange="filter_by_rhi(this.value)">
<b>RHI</b><select id="rhi_s" onchange="filter_by_rhi(this.value)" title="Filter by RHI">
<option>All</option>
<option>DX11</option>
<option>DX12</option>
<option>Vulkan</option>
<option>Metal</option>
</select>
<b>OS</b><select id="os_s" onchange="filter_by_os(this.value)">
<b>OS</b><select id="os_s" onchange="filter_by_os(this.value)" title="Filter by Platform">
<option>All</option>
<option>Windows</option>
<option>MacOS</option>
<option>Linux</option>
</select>
<button onclick="reset_filters();" class="btn btn-sm">Reset</button>
<button onclick="reset_filters();" class="btn btn_icon" title="Reset Filters"><img class="btn-icon" src="./icons/reset.svg"></button>
</div>
</div>
2 changes: 1 addition & 1 deletion public/views/toolbars/scores.ejs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div id="scores_toolbar" hidden class="toolbar_view">
<button class="btn btn-sm">All Results</button>
<a href="https://www.ubench.org/results.html" target="_blank" class="btn btn-sm m0">All Results</a>
</div>
2 changes: 1 addition & 1 deletion public/views/toolbars/settings.ejs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div id="settings_toolbar" hidden class="toolbar_view">
<button id="btn_update" onclick="check_for_updates();" class="btn btn-sm">Check for Update</button>
<button id="btn_update" onclick="check_for_updates();" class="btn btn-sm m0">Check for Update</button>
</div>
11 changes: 5 additions & 6 deletions src/ubenchlauncher.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,7 @@ function analyze_system() {
checks = 0;
has_sysinfo = true;

ejse.data("version", fs.readJSONSync(path.join(rootDir, "package.json")).version);
ejse.data('sysinfo', JSON.stringify(fs.readJsonSync(path.join(rootDir, "data", "sysinfo.json"))));
ejse.data("menu", "System");
fs.writeJsonSync(path.join(rootDir, "data", "sysinfo.json"), {
"uuid": uuid,
"system": system,
Expand All @@ -184,19 +182,20 @@ function analyze_system() {
let mainWindow;
let splashWindow;

ejse.data("version", fs.readJSONSync(path.join(rootDir, "package.json")).version);
const splash = () => {

splashWindow = new BrowserWindow({
width: 400,
height: 250,
transparent: false,
transparent: true,
frame: false,
alwaysOnTop: true
});
splashWindow.loadFile(path.join(rootDir, "public", "splash.html"))
splashWindow.loadURL(path.join(rootDir, "public", "splash.ejs"))

splashWindow.once('ready-to-show', () => {
splashWindow.center();
splashWindow.center();
})

}
Expand Down

0 comments on commit 3046954

Please sign in to comment.