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

Commit

Permalink
Beta 2
Browse files Browse the repository at this point in the history
  • Loading branch information
danieldieeins committed May 27, 2024
1 parent a63fabf commit 3a4d15b
Show file tree
Hide file tree
Showing 23 changed files with 458 additions and 869 deletions.
4 changes: 2 additions & 2 deletions application-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.zyneonstudios</groupId>
<artifactId>nexus-application</artifactId>
<version>2024.5-beta.1</version>
<version>2024.6</version>
</parent>

<artifactId>application-main</artifactId>
<version>2024.5-beta.1</version>
<version>2024.5-beta.2</version>

<properties>
<maven.compiler.source>21</maven.compiler.source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public void resolveRequest(String request) {

private void init(String request) {
frame.executeJavaScript("syncDesktop(); setColors('"+ApplicationConfig.theme+"');");
if(request.equals("start")) {
frame.executeJavaScript("activateMenu('menu',true);");
if(request.equals("discover")) {
frame.executeJavaScript("activateMenu('menu',true); document.getElementById('search-bar').disabled = false; document.getElementById('search-bar').placeholder = 'Click to search';");
} else {
frame.executeJavaScript("deactivateMenu('menu',true);");
}
Expand All @@ -71,6 +71,9 @@ private void sync(String request) {
} else if(request_[0].equalsIgnoreCase("../assets/cronos/css/app-colors-light.css")) {
background = Color.white;
foreground = Color.black;
} else if(request_[0].equalsIgnoreCase("../assets/application/css/app-colors-oled.css")) {
background = Color.black;
foreground = Color.white;
} else if(request_[0].startsWith("automatic-")) {
request = request_[0].replaceFirst("automatic-","");
if(request.equals("dark")) {
Expand Down Expand Up @@ -139,7 +142,7 @@ private void syncSettings(String request) {
channel = ApplicationConfig.getUpdateSettings().getString("updater.settings.updateChannel");
}
// Execute JavaScript to update the UI with retrieved settings
frame.executeJavaScript("updates = "+autoUpdate+"; document.getElementById('updater-settings-enable-updates').checked = updates; document.getElementById('updater-settings-update-channel').value = \""+channel+"\"; document.getElementById('updater-settings').style.display = 'inherit'; document.getElementById('general-settings-start-page').value = '"+ApplicationConfig.startPage+"';");
frame.executeJavaScript("updates = "+autoUpdate+"; document.getElementById('updater-settings-enable-updates').checked = updates; document.getElementById('updater-settings-update-channel').value = \""+channel+"\"; document.getElementById('updater-settings').style.display = 'inherit'; document.getElementById('general-settings-start-page').value = '"+ApplicationConfig.startPage+"'; document.getElementById('updater-settings').style.display = 'inherit';");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public record ApplicationConfig(String[] args) {

public static String language = "en";
public static String urlBase = "file://" + getApplicationPath() + "temp/ui/";
public static String startPage = "start.html";
public static String startPage = "discover.html";
public static String theme = "automatic";
public static boolean test = false;

Expand Down
Binary file modified application-main/src/main/resources/modules.zip
Binary file not shown.
35 changes: 35 additions & 0 deletions application-ui/content/assets/application/css/app-colors-oled.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
:root {
--background: #0a0a0a;
--background1: var(--background);
--background2: #000000;
--background3: #0a0a0a;
--background4: #0a0a0a;
--background5: #000000;
--background6: #0a0a0a;

--border: var(--background);
--border1: var(--border);
--border2: #1c1c1c;

--shadow: #ffffff99;
--shadow1: var(--shadow);
--shadow2: #00000050;
--shadow3: #000000;
--shadow4: #ffffff99;

--foreground: #ffffff;
--foreground1: var(--foreground);
--foreground2: #e3e3e3;

--highlight: #ffffff;
--accent: #8732ec;
}

body {
background: var(--background);
transition: background ease 0ms !important;
}

.search {
background: black !important;
}
233 changes: 142 additions & 91 deletions application-ui/content/assets/application/css/app-discover.css
Original file line number Diff line number Diff line change
@@ -1,145 +1,196 @@
.search-table {
padding: 0;
margin: 0;
.discover-content {
position: relative;
width: 100%;
height: calc(100%) !important;
}

.search-table .search-menu {
padding: 1rem 0.5rem 1rem 1rem;
width: 18rem;
height: 100%;
background: var(--background);
border-top-left-radius: 1.5rem;
overflow: hidden;
overflow-y: auto;
}

.search-table .search-content {
position: relative !important;
padding: 1rem 1rem 1rem 0.5rem;
width: calc(100% - 18rem);
overflow: hidden;
.discover-content #discover-start {
position: relative;
padding: 0.5rem;
width: calc(100% - 1rem);
height: calc(100% - 1rem);
}

.search-table .search-content .search-results {
.discover-content #discover-search {
transition: all 0.5s ease;
position: absolute;
width: calc(100% - 2.65rem);
padding: 1.4rem 0.5rem 0.5rem;
height: 100%;
overflow: hidden;
overflow-y: auto;
top: 4.5rem;
z-index: 0;
top: 0; left: 0;
padding: 0.5rem;
width: calc(100% - 1rem);
height: calc(100% - 1rem);
background: var(--background5);
opacity: 0;
z-index: -1;
}

.search-result {
.discover-content #discover-search.active {
z-index: 100;
background: var(--background6);
opacity: 1;
}

.search {
position: absolute;
width: calc(100% - 3.25rem);
margin: 1rem;
padding: 0.5rem;
height: 2.5rem;
background: var(--background6);
backdrop-filter: blur(5px);

border: 2px solid transparent !important;
transition: all 0.25s ease !important;
z-index: 101;
}

.search-result .flex {
position: relative !important;
.search:hover {
border: 2px solid var(--border1) !important;
background: var(--background2) ;
}

.search-result .result-image {
background: var(--background);
box-shadow: 0 0 0.4rem var(--shadow3);
border-radius: 1rem;
margin-right: 0.5rem;
width: 8rem;
height: 8rem;
.search.active {
border: 2px solid var(--border1) !important;
background: var(--background2) ;
}

.search-result .result-image img {
width: inherit;
height: inherit;
.search.active:hover {
border: 2px solid var(--border2) !important;
background: var(--background3) ;
}

.search-result .result-details {
margin-left: 0.5rem;
width: calc(100% - 9rem);
.search .search-buttons {
position: absolute;
white-space: nowrap;
overflow: hidden;
width: 75%;
max-width: 75%;
transition: all 0.25s ease !important;
}

.search-result .result-panel {
#discover-buttons.active, #search-buttons {
display: none;
}

#search-buttons.active, #discover-buttons {
display: inherit;
}

.search-table .card {
width: calc(100% - 2.25rem);
.search .search-buttons .buttons {
position: relative;
display: flex;
}

.search-bar {
width: fit-content;
z-index: 2;
.search .search-buttons .buttons h4 {
padding: 0.5rem;
margin-right: 0.5rem;
background: var(--background1);
border-radius: 0.4rem;
font-size: 1rem;
transition: all 0.25s ease;
}

.search-bar i {
font-size: 1.5rem;
.search .search-buttons h4:hover {
background: var(--highlight);
cursor: pointer;
color: var(--background5);
box-shadow: 0 0 0.25rem var(--highlight);
position: relative;
z-index: 50 !important;
}

.search-bar input {
height: 1.45rem;
margin-left: 0.5rem;
padding: 0 0 0 0.5rem;
border-radius: 0.5rem;
font-size: 1.1rem;
background: var(--background2);
color: var(--highlight);
.search .search-bar {
position: absolute;
width: 22% !important;
max-width: 22% !important;
right: 1rem;
transition: all 0.25s ease !important;
}

.filter-card div {
padding: 0.25rem 1rem 1rem 1rem;
.search .search-bar input {
position: absolute;
font-size: 1rem;
padding: 0.65rem;
width: calc(100% - 1rem);
background: var(--background1);
border-radius: 0.4rem;
transition: all 0.25s ease;
color: var(--foreground2);
}

.filter-card div * {
font-weight: 1;
padding: 0 !important;
margin: 0.1rem 0 !important;
.search .search-bar input:hover {
color: var(--foreground1);
}

.filter-card div .flex div {
padding: 0 0.5rem !important;
.search:hover .search-bar input {
transition: all 0.25s ease;
background: var(--background6);
}

.filter-card:hover {
background: var(--background2) !important;
cursor: unset !important;
animation: none !important;
.search .search-bar i {
transition: none !important;
position: absolute;
font-size: 1.5rem;
top: 0.45rem;
right: 0.25rem;
color: var(--foreground2);
z-index: 0;
}

.filter-card:hover h3, .filter-card:hover input, .filter-card:hover select, .filter-card:hover select option {
cursor: pointer !important;
.search.active .search-buttons {
width: 30% !important;
max-width: 30% !important;
}

.filter-card:hover h3.bold {
cursor: unset !important;
.search.active .search-bar {
width: 65% !important;
max-width: 65% !important;
}

#resourcepack-features-filters, #shader-features-filters, #category-filters, #resourcepack-category-filters, #shader-category-filters, #modpack-category-filters, #loader-filters, #resolution-filters, #performance-filters, #environment-filters {
display: none;
.search #search-buttons select {
background: var(--background2);
font-size: 1rem;
padding: 0.65rem;
width: 100%;
background: var(--background1);
border-radius: 0.4rem;
transition: all 0.25s ease;
color: var(--foreground2);
}

.filter-card .active {
display: inherit !important;
.search #search-buttons select:hover {
color: var(--foreground1);
cursor: pointer;
}

.filter-card select {
background: var(--background);
font-size: 1rem;
padding: 0.25rem !important;
border: 2px solid var(--border) !important;
border-radius: 0.5rem;
color: var(--foreground) !important;
width: fit-content;
.discover-content #discover-search .search-flex {
height: 100%;
}

.filter-card select:hover {
background: var(--background2);
border: 2px solid var(--border2) !important;
transition: all 0.25s !important;
.discover-content #discover-search .search-flex .card-disabled {
margin: 5rem 0.5rem 0.5rem 0.5rem;
width: 15rem;
max-width: 15rem;
height: calc(100% - 7.75rem);
max-height: calc(100% - 7.75rem);
}

li.placeholder {
opacity: 0;
.discover-content #discover-search .search-flex #search-content {
margin: 3.75rem 0.5rem 0.5rem 0.5rem;
height: calc(100% - 4.5rem);
max-height: calc(100% - 4.5rem);
width: calc(100% - 15rem);
max-width: calc(100% - 15rem);
overflow-y: auto;
}

li.placeholder:hover {
cursor: unset !important;
.discover-content #discover-search .search-flex #search-content .search-result {
margin: 1.25rem 0 0 0;
width: calc(100% - 2.45rem);
max-width: calc(100% - 2.45rem);
height: 9rem;
max-height: 9rem;
overflow: hidden;
}
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
}

/*Disable inactive elements*/
.settings .settings-menu .settings-menu-card .settings-modules-section, #settings-module-template, #settings-general {
.settings .settings-menu .settings-menu-card .settings-modules-section, #settings-module-template, #settings-general, #updater-settings {
display: none;
}

Expand Down Expand Up @@ -173,6 +173,11 @@
transition: all 0.25s ease;
}

.settings .settings-content .settings-content-card .group {
transition: all 0.25s ease !important;
padding: 0.5rem 0 0.5rem 0;
}

.settings .settings-content .settings-content-card .group:hover {
background: var(--background);
padding: 0.5rem;
Expand Down
Loading

0 comments on commit 3a4d15b

Please sign in to comment.