2024.7-beta.1: Add Download-Manager, change resource page layout and …

…add new library functions
danieldieeins · Jul 4, 2024 · 43342cc · 43342cc
1 parent 4f7a3e1
commit 43342cc
Show file tree

Hide file tree

Showing 16 changed files with 247 additions and 100 deletions.
diff --git a/application-main/pom.xml b/application-main/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.zyneonstudios</groupId>
             <artifactId>nexus-zyndex</artifactId>
-            <version>2024.7.3</version>
+            <version>2024.7.5</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/application-main/src/main/java/com/zyneonstudios/application/frame/FrameConnector.java b/application-main/src/main/java/com/zyneonstudios/application/frame/FrameConnector.java
@@ -6,7 +6,6 @@
 import com.zyneonstudios.application.modules.ApplicationModule;
 import com.zyneonstudios.application.modules.search.ModuleSearch;
 import com.zyneonstudios.nexus.modules.ReadableModule;
-import live.nerotv.shademebaby.file.OnlineConfig;
 
 import java.awt.*;
 import java.net.URI;
@@ -235,9 +234,8 @@ private void syncDiscover(String request) {
         } else if(request.startsWith("details.")) {
             request = request.replaceFirst("details.","");
             if(request.startsWith("module.")) {
-                OnlineConfig module = new OnlineConfig(URLDecoder.decode(request.replaceFirst("module.",""),StandardCharsets.UTF_8));
-
-                frame.executeJavaScript("enableOverlay(\""+initDetails(module.getString("module.info.name"),module.getString("module.meta.id"),"Application module",module.getString("module.info.version"),module.getString("module.info.summary"),module.getString("module.info.authors"),module.getBool("module.meta.isHidden"),module.get("module.meta.tags").toString(),module.getString("module.meta.description"),module.get("module.meta.changelogs").toString(),module.get("module.meta.versions").toString(),module.getString("module.style.info"),module.getString("module.style.card"),module.getString("module.resources.background"),module.getString("module.resources.icon"),module.getString("module.resources.logo"),module.getString("module.resources.thumbnail"))+"\");");
+                ReadableModule module = new ReadableModule(URLDecoder.decode(request.replaceFirst("module.",""),StandardCharsets.UTF_8));
+                frame.executeJavaScript("enableOverlay(\""+initDetails(module.getName(),module.getId(),"Application module",module.getVersion(),module.getSummary(),module.getAuthor(),module.isHidden(),module.getTagString(),module.getDescription(),module.getChangelogs().toString(),module.getVersions().toString(),module.getInfoText(),module.getInfoCard(),module.getBackgroundUrl(),module.getIconUrl(),module.getLogoUrl(),module.getThumbnailUrl())+"\");");
             }
         }
     }

diff --git a/application-main/src/main/java/com/zyneonstudios/application/main/NexusApplication.java b/application-main/src/main/java/com/zyneonstudios/application/main/NexusApplication.java
@@ -162,6 +162,9 @@ private boolean update() {
 
     @SuppressWarnings("unchecked")
     private boolean updateModules() {
+        if(ApplicationConfig.test) {
+            return true;
+        }
         boolean updated = false;
         File modules = new File(ApplicationConfig.getApplicationPath() + "temp/modules/");
         if (modules.exists()) {

diff --git a/application-main/src/main/resources/content.zip b/application-main/src/main/resources/content.zip
diff --git a/application-ui/content/assets/application/css/app-library.css b/application-ui/content/assets/application/css/app-library.css
@@ -128,6 +128,14 @@ body {
     padding: 0.4rem;
 }
 
+.library #library-view {
+    position: absolute;
+    padding: 0;
+    margin: 0;
+    width: calc(100% - 1rem);
+    height: calc(100% - 4.75rem);
+}
+
 .library .library-content #library-overview .card {
     width: calc(100% - 1rem);
     max-width: calc(100% - 1rem);
@@ -141,9 +149,10 @@ body {
 }
 
 .library .library-content #library-view .flex {
-    position: absolute;
-    top: 5rem; right: 0.1rem; left: 0.3rem;
-    max-height: 40%;
+    position: relative;
+    right: 0; left: 0;
+    height: fit-content;
+    max-height: 45%;
     overflow: hidden;
 }
 
@@ -205,14 +214,25 @@ body {
     transition: all 0.25s ease;
     font-family: MPLUS1p-ExtraBold, sans-serif;
     position: absolute;
-    bottom: 1rem; right: 1rem;
+    bottom: 1rem; right: 0;
     padding: 1rem;
     background: var(--background2);
     border: 2px solid var(--background3);
-    font-size: 1.5rem;
+    font-size: 1.75rem;
     box-shadow: 0 0 0.8rem var(--shadow3);
     opacity: 0.9;
     border-radius: 1rem;
+
+    span {
+        padding-left: 2.15rem;
+    }
+
+    i {
+        font-size: 2rem;
+        position: absolute;
+        top: 1.25rem;
+        left: 0.75rem;
+    }
 }
 
 #view-launch:hover {

diff --git a/application-ui/content/assets/application/css/sub-details.css b/application-ui/content/assets/application/css/sub-details.css
@@ -136,34 +136,24 @@ body {
                     #dh-thumbnail {
                         transition: all 0.25s ease;
                         border-radius: 0.5rem;
-                        background: var(--background6);
-                        padding: 0.6rem 0.6rem 0.4rem 0.6rem;
-                        width: calc(100% - 1rem);
+                        width: 100%;
                         position: relative;
                         overflow: hidden;
                         margin: 0 0 0.5rem 0;
 
                         img {
                             transition: all 0.25s ease;
-                            border-radius: 0.5rem;
-                            padding: 0.5rem;
-                            width: calc(100% - 1rem);
+                            border-radius: 1rem;
+                            box-shadow: 0 0 0.4rem var(--shadow3);
+                            width: calc(100% - 2rem);
+                            margin: 1rem;
                         }
                     }
 
                     #dh-thumbnail:hover {
-                        border: none !important;
-                        background: var(--background);
-                        box-shadow: 0 0 0.8rem var(--shadow3);
-                        width: 100%;
-                        padding: 0;
-                        overflow: auto;
-
                         img {
-                            width: 100%;
-                            padding: 0;
-                            border: none !important;
-                            margin: 0;
+                            margin: 0.4rem;
+                            width: calc(100% - 0.8rem);
                         }
                     }
                 }
@@ -225,4 +215,8 @@ body {
 
 #dh-changelog-button, #dh-description-button, #dh-versions-button, #dh-changelog, #dh-versions, #details-custom-card {
     display: none;
+}
+
+#scroll-down {
+    display: none !important;
 }
diff --git a/application-ui/content/de/custom.html b/application-ui/content/de/custom.html
@@ -40,6 +40,10 @@
                             <i class='bx bxs-objects-horizontal-left'></i>
                             <p>Bibliothek</p>
                         </li>
+                        <li id="downloads-button" onclick="window.location.href = 'downloads.html';">
+                            <i class='bx bxs-download'></i>
+                            <p>Downloads</p>
+                        </li>
                         <li id="settings-button" onclick="window.location.href = 'settings.html';">
                             <i class='bx bxs-cog'></i>
                             <p>Einstellungen</p>

diff --git a/application-ui/content/de/discover.html b/application-ui/content/de/discover.html
@@ -15,7 +15,7 @@
         <script src="../assets/cronos/javascript/app-menu.js"></script>
         <script src="../assets/application/javascript/app-shared.js"></script>
         <script src="../assets/application/javascript/app-discover.js"></script>
-        <script>searchTerm = "Klicke zum Suchen"; console.log("[CONNECTOR] init.discover"); init();</script>
+        <script>searchTerm = "Klicke zum Suchen"; init();</script>
     </head>
     <body>
         <div class="flex full">
@@ -41,6 +41,10 @@
                             <i class='bx bxs-objects-horizontal-left'></i>
                             <p>Bibliothek</p>
                         </li>
+                        <li onclick="window.location.href = 'downloads.html';">
+                            <i class='bx bxs-download'></i>
+                            <p>Downloads</p>
+                        </li>
                         <li onclick="window.location.href = 'settings.html';">
                             <i class='bx bxs-cog'></i>
                             <p>Einstellungen</p>
@@ -75,8 +79,8 @@ <h4>Spiele</h4>
                         <div class="buttons" id="search-buttons">
                             <h4 class="danger" id="close-search-button" onclick="closeSearch();">X</h4>
                             <label>
-                                <select id="search-type-select">
-                                    <option value="modules">App-Module</option>
+                                <select id="search-type-select" onchange="location.href = 'discover.html?moduleId='+document.getElementById('search-type-select').value+'&l=search';">
+                                    <option value="-1" id="add-module-option">App-Module</option>
                                 </select>
                             </label>
                         </div>

diff --git a/application-ui/content/de/downloads.html b/application-ui/content/de/downloads.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="de">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Downloads</title>
+        <link rel="stylesheet" href="../assets/cronos/css/app-base.css">
+        <link rel="stylesheet" id="css-colors" href="../assets/cronos/css/app-colors-dark.css">
+        <link rel="stylesheet" id="css-menu" href="../assets/cronos/css/app-menu-side.css">
+        <link rel="stylesheet" id="css-card" href="../assets/cronos/css/app-cards.css">
+        <link rel="stylesheet" id="css-shared" href="../assets/application/css/app-shared.css">
+        <link rel="stylesheet" id="css-page" href="../assets/application/css/app-downloads.css">
+        <link href='https://unpkg.com/[email protected]/css/boxicons.min.css' rel='stylesheet'>
+        <script src="../assets/cronos/javascript/app-base.js"></script>
+        <script src="../assets/cronos/javascript/app-menu.js"></script>
+        <script src="../assets/application/javascript/app-shared.js"></script>
+        <script src="../assets/application/javascript/app-downloads.js"></script>
+        <script>init();</script>
+    </head>
+    <body>
+        <div class="flex full">
+            <div class="flex">
+                <div class="side-menu" id="menu">
+                    <div class="menu-title">
+                        <img alt="The logo of the Zyneon NEXUS App" src="../assets/application/images/icons/app.png">
+                        <p>
+                            Zyneon Studios<br>
+                            <span class="bold">NEXUS Application</span>
+                        </p>
+                    </div>
+                    <ul>
+                        <li onclick="toggleMainMenu();">
+                            <i class='bx bx-menu'></i>
+                            <p>Menü schließen</p>
+                        </li>
+                        <li onclick="window.location.href = 'discover.html';">
+                            <i class='bx bx-world'></i>
+                            <p>Entdecken</p>
+                        </li>
+                        <li onclick="window.location.href = 'library.html';">
+                            <i class='bx bxs-objects-horizontal-left'></i>
+                            <p>Bibliothek</p>
+                        </li>
+                        <li class="highlighted">
+                            <i class='bx bxs-download'></i>
+                            <p>Downloads</p>
+                        </li>
+                        <li onclick="window.location.href = 'settings.html';">
+                            <i class='bx bxs-cog'></i>
+                            <p>Einstellungen</p>
+                        </li>
+                        <li id="side-menu-item">
+                            <img class="invisible" alt="button icon" src="">
+                            <i class='bx bx-loader-circle bx-spin'></i>
+                            <p></p>
+                        </li>
+                    </ul>
+                    <div class="menu-panel" id="menu-panel">
+                        <img alt="menu panel image" id="panel-image" class="hover-wiggle pointer" onclick="toggleMainMenu();" src="">
+                        <p>
+                            <span class="bold" id="panel-title"></span>
+                            <br><span id="panel-description"></span>
+                        </p>
+                    </div>
+                </div>
+            </div><script>initMenu('menu');</script>
+            <div class="downloads-content">
+                <div id="overlay">
+                    <iframe id="overlay-frame"></iframe>
+                    <a class="close-overlay button danger hover-wiggle wiggle-low" onclick="disableOverlay();">Schließen <i class='bx bx-x'></i></a>
+                </div>
+
+                <div id="waiting-downloads"></div>
+                <div id="failed-downloads"></div>
+                <div id="finished-downloads"></div>
+
+                <div class="card download-card" id="template-download-card">
+                    <h2><span class="download-title"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span> <span class="download-state"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></h2>
+                    <div class="flex">
+                        <div class="row" style="text-align: left;">
+                            <p>Vergangene Zeit: <span class="download-elapsed-time"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+                            <p>Downloadgröße: <span class="download-size"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+                        </div>
+                        <div class="row">
+                            <p>Geschwindigkeit: <span class="download-speed"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+                            <p>Dateigröße: <span class="download-file-size"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+                        </div>
+                        <div class="row" style="text-align: right;">
+                            <p>Verbleibende Zeit: <span class="download-estimated-time"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+                            <p>ID: <span class="download-id"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+                        </div>
+                    </div>
+                    <br>
+                    <p>Download-URL: <span class="download-url"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+                    <p>Dateipfad: <span class="download-path"><i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...</span></p>
+
+                    <span class="download-progress">
+                        <i class='bx bx-loader-alt bx-spin'></i> Ladevorgang...
+                    </span>
+                    <div class="download-bar">
+                        <div class="progress-bar"></div>
+                    </div>
+                    <p></p>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/application-ui/content/de/firstrun.html b/application-ui/content/de/firstrun.html
@@ -41,31 +41,32 @@
                 <div id="language" class="start-full">
                     <div class="card card-disabled">
                         <h1>Willkommen</h1>
-                        <h3>Danke für's Benutzen der NEXUS Application!</h3>
+                        <h3>Danke für's Benutzen der NEXUS App!</h3>
                         <div class="line"></div>
-                        <h2>Bitte wähle eine Sprache aus</h2>
+                        <h2>Bitte wähle eine Sprache</h2>
+                        <h3>Please select a language</h3>
                         <div class="flex">
                             <ul>
-                                <li onclick="location.href = '../en/firstrun.html';"><p>English | Englisch</p></li>
-                                <li class="highlighted"><p>German | Deutsch</p></li>
+                                <li onclick="location.href = '../en/firstrun.html';"><p>Englisch | English</p></li>
+                                <li class="highlighted"><p>Deutsch | German</p></li>
                             </ul>
                         </div>
 
                         <a class="button back disabled" id="fs-back">Zurück</a>
-                        <a class="button proceed hover-wiggle" onclick="syncLang('de');" id="firstrun-continue-button" href="#theme">Weiter</a>
+                        <a class="button proceed hover-wiggle" onclick="syncLang('en');" id="firstrun-continue-button" href="#theme">Weiter</a>
                     </div>
                 </div>
                 <div id="theme" class="start-full">
                     <div class="card card-disabled">
-                        <h1>Aussehen</h1>
-                        <h3>Passe die App an!</h3>
+                        <h1>Erscheinung</h1>
+                        <h3>Passe das Aussehen der App an!</h3>
                         <div class="line"></div>
-                        <h2>Bitte wähle ein Farbschema aus</h2>
+                        <h2>Bitte wähle ein Farbschema</h2>
                         <div class="flex">
                             <ul>
                                 <li onclick="setTheme('automatic');" id="automatic"><p>Standard: System</p></li>
-                                <li onclick="setTheme('../assets/cronos/css/app-colors-dark.css');" id="../assets/cronos/css/app-colors-dark.css"><p>Standard: Dark</p></li>
-                                <li onclick="setTheme('../assets/cronos/css/app-colors-light.css')" id="../assets/cronos/css/app-colors-light.css"><p>Standard: Light</p></li>
+                                <li onclick="setTheme('../assets/cronos/css/app-colors-dark.css');" id="../assets/cronos/css/app-colors-dark.css"><p>Standard: Dunkel</p></li>
+                                <li onclick="setTheme('../assets/cronos/css/app-colors-light.css')" id="../assets/cronos/css/app-colors-light.css"><p>Standard: Hell</p></li>
                                 <li onclick="setTheme('../assets/application/css/app-colors-oled.css')" id="../assets/application/css/app-colors-oled.css"><p>Standard: OLED</p></li>
                                 <li onclick="setTheme('../assets/application/css/app-colors-zyneon.css')" id="../assets/application/css/app-colors-zyneon.css"><p>Standard: Zyneon</p></li>
                             </ul>
@@ -78,13 +79,13 @@ <h2>Bitte wähle ein Farbschema aus</h2>
                 <div id="linux" class="start-full">
                     <div class="card card-disabled">
                         <h1>Du benutzt Linux</h1>
-                        <h3>Und das ist cool!</h3>
+                        <h3>und das ist cool!</h3>
                         <div class="line"></div>
-                        <h2>Bitte wähle einen Fenstertypen aus</h2>
+                        <h2>Bitte wähle den Fenstertypen</h2>
                         <div class="flex">
                             <ul>
-                                <li onclick="connector('sync.firstrun.linuxFrame.on');" id="linux-frame"><p>cUnix-Fenster (empfohlen)</p></li>
-                                <li onclick="connector('sync.firstrun.linuxFrame.off');" id="default-frame"><p>Desktop-Fenster (fallback)</p></li>
+                                <li onclick="connector('sync.firstrun.linuxFrame.on');" id="linux-frame"><p>cUnix Frame (empfohlen)</p></li>
+                                <li onclick="connector('sync.firstrun.linuxFrame.off');" id="default-frame"><p>Desktop Frame (fallback)</p></li>
                             </ul>
                         </div>