Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
2024.8.1: Add Discover home, web version and add new settings feature…
Browse files Browse the repository at this point in the history 
…s for modules
  • Loading branch information
@danieldieeins
danieldieeins committed Aug 14, 2024
1 parent 0d8906e commit c5ea9a6
Show file tree
Hide file tree
Showing 7 changed files with 103 additions and 32 deletions.
2 changes: 1 addition & 1 deletion application-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<artifactId>application-main</artifactId>
<version>2024.8.1-beta.1</version>
<name>Solus Lupus (2.0.0-beta367)</name>
<name>Solus Lupus (2.0.0-build368)</name>

<properties>
<maven.compiler.source>17</maven.compiler.source>
Expand Down
3 changes: 2 additions & 1 deletion application-main/src/main/java/com/zyneonstudios/application/frame/FrameConnector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@ private void init(String request) {
frame.executeJavaScript("syncDesktop();");
if(request.equals("discover")) {
frame.executeJavaScript("setMenuPanel('','"+ ApplicationStorage.getApplicationVersion()+"','"+ ApplicationStorage.getApplicationName()+"',true);");
if(frame.getBrowser().getURL().contains("&l=search")) {
if(frame.getBrowser().getURL().contains("&l=search")||frame.getBrowser().getURL().contains("?l=search")) {
frame.executeJavaScript("deactivateMenu('menu',true);");
} else {
frame.executeJavaScript("activateMenu('menu',true); document.getElementById('search-bar').disabled = false; document.getElementById('search-bar').placeholder = searchTerm;");
frame.executeJavaScript("document.querySelector('.fes').innerHTML = \"<i class='bx bxs-bug-alt'></i> Force disable search\"; document.querySelector('.fes').onclick = function () { document.getElementById('search-bar').disabled = true; document.getElementById('search-bar').placeholder = 'Search disabled'; }");
}
} else {
frame.executeJavaScript("deactivateMenu('menu',true);");
Expand Down
16 changes: 15 additions & 1 deletion application-ui/content/assets/application/css/app-discover.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
.nexus-logo, .app-logo {
overflow: hidden;
padding: 0;
width: calc(100% - 2rem - 4px);
width: calc(100% - 2rem);
height: 100%;
position: relative;
display: flex;
Expand Down Expand Up @@ -510,4 +510,18 @@
}
}
}
}

#discover-news {
iframe {
position: absolute;
border: none;
top: 4.75rem;
width: calc(100% - 2rem);
height: calc(100% - 4.75rem);
}
}

#discover-games, #games-button {
display: none;
}
5 changes: 2 additions & 3 deletions application-ui/content/de/discover.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h4>Verlinkungen</h4>
<div class="links">
<h3 class="website" onclick="openUrl('https://nexus.zyneonstudios.com');"><i class='bx bx-globe'></i>Webseite</h3>
<h3 class="discord" onclick="openUrl('https://discord.com/invite/Q2AEWfesZW');"><i class='bx bxl-discord-alt'></i> Discord</h3>
<h3 class="webapp" onclick="openUrl('https://nexus.zyneonstudios.com/app/beta');"><i class='bx bx-laptop'></i>Web Version</h3>
<h3 class="webapp" onclick="openUrl('https://danieldieeins.github.io/Zyneon-Application/beta/');"><i class='bx bx-laptop'></i>Web Version</h3>
<div class="line"></div><br>
</div>
</div>
Expand All @@ -141,8 +141,7 @@ <h3 class="fes" onclick="document.getElementById('search-bar').disabled = false;
<div id="discover-news" class="discover-tab">
<div class="discover-background"></div>
<div class="discover-tab-content">
<br><br><br>
Neuigkeiten
<iframe src="https://danieldieeins.github.io/Zyneon-Application/news/news.html?type=new"></iframe>
</div>
</div>
<div id="discover-games" class="discover-tab">
Expand Down
4 changes: 4 additions & 0 deletions application-ui/content/de/settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ <h3>Gruppentitel</h3>
</div>
<h3>Aktionen</h3>
<ul>
<li onclick="location.href = 'https://danieldieeins.github.io/Zyneon-Application/beta/content/index.html'">
<i class='bx bx-play-circle'></i>
<p>Webfrontend benutzen</p>
</li>
<li onclick="location.href = 'firstrun.html?back=true'">
<i class='bx bxs-dashboard'></i>
<p>App-Setup wiederholen</p>
Expand Down
69 changes: 61 additions & 8 deletions application-ui/content/en/discover.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
<div class="card search flex" id="search-card">
<div class="search-buttons flex">
<div class="buttons" id="discover-buttons">
<h4>Start</h4>
<h4>News</h4>
<h4>Games</h4>
<h4 id="home-button" class="discover-button" onclick="showTab('home')">Home</h4>
<h4 id="news-button" class="discover-button" onclick="showTab('news')">News</h4>
<h4 id="games-button" class="discover-button" onclick="showTab('games')">Games</h4>
</div>
<div class="buttons" id="search-buttons">
<h4 class="danger" id="close-search-button" onclick="closeSearch();">X</h4>
Expand All @@ -97,12 +97,65 @@ <h4 class="danger" id="close-search-button" onclick="closeSearch();">X</h4>
</div>
</div>
<div id="discover-start">

<div id="discover-home" class="discover-tab">
<div class="discover-background"></div>
<div class="discover-tab-content">
<div class="flex home-quick warning">
<div class="card warning">
<h4>Warning: This is a beta version of the Zyneon Studios NEXUS App. Errors may occur!</h4>
</div>
</div>
<div class="flex home-quick">
<div class="app-logo">
<img alt="The Zyneon Studios NEXUS App logo" src="../assets/application/images/logos/app.png">
</div>
<div class="card quick-links">
<h4>Quick links</h4>
<div class="line"></div>
<div class="links">
<h3 class="website" onclick="openUrl('https://nexus.zyneonstudios.com');"><i class='bx bx-globe'></i>Website</h3>
<h3 class="discord" onclick="openUrl('https://discord.com/invite/Q2AEWfesZW');"><i class='bx bxl-discord-alt'></i> Discord</h3>
<h3 class="webapp" onclick="openUrl('https://danieldieeins.github.io/Zyneon-Application/beta/');"><i class='bx bx-laptop'></i>Web version</h3>
<div class="line"></div><br>
</div>
</div>
</div>
<div class="flex home-quick">
<div class="card quick-access">
<h4>Quick actions</h4>
<div class="line"></div>
<div class="links">
<h3 class="reload" onclick="location.reload();"><i class='bx bx-refresh'></i>Reload app</h3>
<h3 class="restart" onclick="connector('sync.restart');"><i class='bx bx-revision'></i>Restart app</h3>
<h3 class="fes" onclick="document.getElementById('search-bar').disabled = false; document.getElementById('search-bar').placeholder = searchTerm;"><i class='bx bxs-bug-alt'></i>Force enable search</h3>
<div class="line"></div><br>
</div>
</div>
<div class="nexus-logo">
<img alt="The Zyneon NEXUS logo" src="../assets/application/images/logos/nexus.png">
</div>
</div>
<br><br><br>
</div>
</div>
<div id="discover-news" class="discover-tab">
<div class="discover-background"></div>
<div class="discover-tab-content">
<iframe src="https://danieldieeins.github.io/Zyneon-Application/news/news.html?type=new"></iframe>
</div>
</div>
<div id="discover-games" class="discover-tab">
<div class="discover-background"></div>
<div class="discover-tab-content">
<br><br><br>
Games
</div>
</div>
</div>
<div id="discover-search">
<div class="flex search-flex">
<div class="card card-disabled">
<div id="search-filter">
<div class="card card-disabled filter-card">
<div class="search-filter">
<div class="filter-group" id="filter-group-template">
<h4></h4>
<div class="filter-toggle" id="toggle-template">
Expand Down Expand Up @@ -138,7 +191,7 @@ <h4></h4>
<div class="result-details">
<div class="flex">
<h2 class="result-title">title</h2>
<h2 class="result-author">by <span class="result-authors">authors</span></h2>
<h2 class="result-author">by <span class="result-authors">Authors</span></h2>
</div>
<p class="result-description">
description
Expand All @@ -147,7 +200,7 @@ <h2 class="result-author">by <span class="result-authors">authors</span></h2>
meta
</p>
<div class="result-actions">
<a><i class='bx bx-spreadsheet'></i> More</a>
<a><i class='bx bx-spreadsheet'></i> more</a>
</div>
</div>
</div>
Expand Down
36 changes: 18 additions & 18 deletions application-ui/content/en/settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,33 +100,37 @@ <h3>Navigation</h3>
</li>
</ul>
<div class="settings-modules-section" id="settings-group-template">
<h3>group title</h3>
<h3>New Group</h3>
<ul>
<li id="settings-module-template">
<i></i>
<img alt="settings menu entry icon" src="">
<p>loading group entry...</p>
<p>New Group Entry</p>
</li>
</ul>
<script>connector('init.settings.modules');</script>
</div>
<h3>Actions</h3>
<ul>
<li onclick="location.href = 'https://danieldieeins.github.io/Zyneon-Application/beta/content/index.html'">
<i class='bx bx-play-circle'></i>
<p>Use web frontend</p>
</li>
<li onclick="location.href = 'firstrun.html?back=true'">
<i class='bx bxs-dashboard'></i>
<p>Rerun app setup</p>
</li>
<li onclick="connector('sync.refresh')">
<i class='bx bx-refresh'></i>
<p>Refresh application</p>
<p>Reload app</p>
</li>
<li onclick="connector('sync.restart')">
<i class='bx bx-revision'></i>
<p>Restart application</p>
<p>Restart app</p>
</li>
<li onclick="connector('sync.exit')" class="danger">
<i class='bx bx-exit'></i>
<p>Exit application</p>
<p>Close app</p>
</li>
</ul>
</div>
Expand All @@ -138,9 +142,9 @@ <h2 id="settings-title"></h2>
<div class="card settings-content-card card-disabled">
<div id="settings-general">
<div class="group" id="settings-general-startup">
<h4>Startup</h4>
<h4>On startup</h4>
<h3>
Start page
Landing page
<span class="select">
<label>
<select id="general-settings-start-page" onchange="syncStartPage();">
Expand Down Expand Up @@ -182,7 +186,7 @@ <h3>
<div class="group" id="settings-general-appearance">
<h4>Appearance</h4>
<h3>
Theme
Color scheme
<span class="select">
<label>
<select id="appearance-settings-theme" onchange="syncTheme();">
Expand All @@ -201,7 +205,7 @@ <h3>
<label>
<select id="appearance-settings-language" onchange="syncLanguage();">
<option value="en">English (English)</option>
<option value="de">Deutsch (German)</option>
<option value="de">German (Deutsch)</option>
</select>
</label>
</span>
Expand All @@ -221,34 +225,30 @@ <h3 id="linux-settings-custom-frame">
</h3>
</div>
<div class="group template" id="general-group-template">
<h4>group template title</h4>
<h4>New settings group</h4>
</div>
</div>
<div id="settings-global">

<div class="group template" id="global-group-template">
<h4>group template title</h4>
<h4>New settings group</h4>
</div>
</div>
<div id="settings-indexes">

<div class="group template" id="indexes-group-template">
<h4>group template title</h4>
<h4>New settings group</h4>
</div>
</div>
<div id="settings-modules">

<div class="group template" id="modules-group-template">
<h4>group template title</h4>
<h4>New settings group</h4>
</div>
</div>
<div id="settings-about">
<div class="card">
<span id="settings-global-application-version">${application.version}</span>
</div>

<div class="group template" id="about-group-template">
<h4>group template title</h4>
<h4>New settings group</h4>
</div>
</div>
<!--TODO: Add other setting pages-->
Expand Down

0 comments on commit c5ea9a6

Please sign in to comment.