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

Commit

Permalink
Add new library page with module support
Browse files Browse the repository at this point in the history
  • Loading branch information
danieldieeins committed Jun 10, 2024
1 parent 11377ce commit 56b219a
Show file tree
Hide file tree
Showing 32 changed files with 859 additions and 367 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ public void resolveRequest(String request) {
private void init(String request) {
frame.executeJavaScript("syncDesktop(); setColors('"+ApplicationConfig.theme+"');");
if(request.equals("discover")) {
frame.executeJavaScript("activateMenu('menu',true); document.getElementById('search-bar').disabled = false; document.getElementById('search-bar').placeholder = 'Click to search';");
} else if(request.equals("settings")) {
frame.executeJavaScript("deactivateMenu('menu',true);");
frame.executeJavaScript("syncVersion(\""+ApplicationConfig.getApplicationVersion().replace("\"","''")+"\");");
} else if(request.equals("library")) {

frame.executeJavaScript("activateMenu('menu',true); document.getElementById('search-bar').disabled = false; document.getElementById('search-bar').placeholder = searchTerm;");
} else {
frame.executeJavaScript("deactivateMenu('menu',true);");
}
if(request.equals("settings")) {
frame.executeJavaScript("syncVersion(\""+ApplicationConfig.getApplicationVersion().replace("\"","''")+"\");");
}
}

// Method to synchronize settings and updates
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Locale;
import java.util.UUID;

public record ApplicationConfig(String[] args) {

Expand All @@ -28,6 +29,7 @@ public record ApplicationConfig(String[] args) {
public static boolean test = false;

// non-changeable variables
private static UUID applicationId = UUID.randomUUID();
private static String applicationVersion = "unknown";
private static String applicationPath = null;
private static Config configuration = null;
Expand All @@ -36,6 +38,7 @@ public record ApplicationConfig(String[] args) {

private static String[] arguments = null;


// Constructor for ApplicationConfig class
public ApplicationConfig(String[] args) {
this.args = args;
Expand Down Expand Up @@ -69,6 +72,10 @@ else if(arg.startsWith("--test")) {
getSettings().checkEntry("settings.language","en");
}

// Resolving application id
getSettings().checkEntry("settings.applicationId", applicationId);
applicationId = UUID.fromString(getSettings().getString("settings.applicationId"));

// Resolving landing page
if(getSettings().get("settings.startPage")!=null) {
startPage = getSettings().getString("settings.startPage");
Expand Down Expand Up @@ -162,8 +169,13 @@ public static Config getUpdateSettings() {
return updateConfig;
}

//Method to get the application version
// Method to get the application version
public static String getApplicationVersion() {
return applicationVersion;
}

// Method to get the application id
public static UUID getApplicationId() {
return applicationId;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ public void restart() {
args.append(arg).append(" ");
}
}
System.out.println(ApplicationConfig.getApplicationPath().replace("\\","/").replace("/experimental/","/app.jar"));
File updater = new File(ApplicationConfig.getApplicationPath().replace("\\","/").replace("/experimental/","/app.jar"));
if(updater.exists()) {
jarPath = updater.getAbsolutePath();
Expand Down
Binary file modified application-main/src/main/resources/modules.zip
Binary file not shown.
53 changes: 0 additions & 53 deletions application-ui/content/assets/application/css/app-discover.css
Original file line number Diff line number Diff line change
Expand Up @@ -188,57 +188,4 @@
width: calc(100% - 15rem);
max-width: calc(100% - 15rem);
overflow-y: auto;
}

.discover-content #discover-search .search-flex #search-content .search-result {
position: relative;
margin: 1.25rem 0 0 0;
padding: 0;
width: calc(100% - 0.45rem);
max-width: calc(100% - 0.45rem);
height: 11rem;
max-height: 11rem;
overflow: hidden;
}

.discover-content #discover-search .search-flex #search-content .search-result .flex {
position: absolute;
width: 100%;
height: 11rem;
max-height: 11rem;
max-width: 100%;
}

.discover-content #discover-search .search-flex #search-content .search-result .flex .search-image {
width: 11rem;
height: 11rem;
}


.discover-content #discover-search .search-flex #search-content .search-result .flex .search-image img {
width: calc(9.5rem - 4px);
height: calc(9.5rem - 4px);
border-radius: 0.5rem;
border: 2px solid var(--background2) !important;
transition: all 0.25s ease;
box-shadow: 0 0 0.8rem var(--shadow3);
margin: 0.75rem;
}

.discover-content #discover-search .search-flex #search-content .search-result .flex .search-image img:hover {
width: calc(10rem);
height: calc(10rem);
rotate: 1deg;
border: none !important;
box-shadow: 0 0 0.8rem var(--shadow);
margin: 0.5rem;
}

.discover-content #discover-search .search-flex #search-content .search-result .flex .search-details {
position: absolute;
right: 0; top: 0;
width: calc(100% - 12.5rem);
height: 9rem;
padding: 0.75rem 0.75rem 0.75rem 0;
overflow-y: auto;
}
135 changes: 99 additions & 36 deletions application-ui/content/assets/application/css/app-library.css
Original file line number Diff line number Diff line change
@@ -1,65 +1,128 @@
body {
overflow: hidden !important;
}

.library {
padding: 0;
margin: 0;
width: 100%;
height: calc(100%) !important;
position: absolute;
width: calc(100% - 1rem);
height: calc(100% - 1rem);
padding: 0.5rem;
}

.library .flex {
height: 100%;
}

.library .library-menu {
padding: 1rem 0.5rem 1rem 1rem;
position: relative;
padding: 0.5rem;
width: 18rem;
overflow: hidden;
overflow-y: auto;
}

.library #add-game-module, .library #game-content, .library #add-module-advanced, .library #game-module-advanced {
display: none;
.library .library-menu .title-card {
transition: none !important;
padding: 1rem 0 1rem 0.5rem;
width: 18rem;
max-width: 18rem;
height: 3.75rem;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 1.25rem;
color: var(--foreground);
}

.library #add-game-module.active, .library #add-module-advanced.active, .library #game-module-advanced.active, .library #game-content.active {
display: inherit;
.library .library-menu .title-card:hover {
transition: all 0.25s ease !important;
}

.library .library-content {
position: relative !important;
padding: 1rem 1rem 1rem 0.5rem;
width: calc(100% - 18rem);
.library .library-menu .menu-card {
padding: 1rem; width: calc(16rem - 4px);
overflow: hidden;
overflow-y: auto;
height: calc(100% - 7rem);
transition: none !important;
}

.library .card {
width: calc(100% - 2.25rem);
#menu-group-template, #group-actions-entry {
display: none;
}

.library #game-module-title {
.library .library-content {
position: relative;
padding: 0.5rem;
width: calc(100% - 20rem);
}

.library .library-content .title-menu-card {
width: calc(100% - 0.25rem);
transition: none !important;
padding: 0;
height: calc(3.75rem - 4px);
overflow: hidden;
white-space: nowrap;
}

.library #game-module-title #select-game-module {
color: var(--foreground2);
font-size: 1.05rem;
.library .library-content .title-menu-card .flex {
position: relative;
width: 100%;
height: 100%;
}

.library #game-module-title #select-game-module option {
background: var(--background);
.library .library-content .title-menu-card .flex img {
width: 2.9rem;
height: 2.9rem;
margin: 0.3rem 0 0.3rem 0.3rem;
border-radius: 0.75rem;
display: none;
}

.search-bar {
width: fit-content;
.library .library-content .title-menu-card .flex img:hover {
width: 3rem;
height: 3rem;
margin: 0.28rem 0 0.28rem 0.28rem;
transition: all 0.25s ease;
}

.search-bar i {
font-size: 1.5rem;
.library .library-content .title-menu-card .flex h2 {
padding: 0.35rem 0.35rem 0.35rem 0.8rem;
font-size: 1.75rem;
height: 2.7rem;
}

.search-bar input {
height: 1.45rem;
margin-left: 0.5rem;
padding: 0 0 0 0.5rem;
border-radius: 0.5rem;
font-size: 1.1rem;
.library .library-content .title-menu-card .flex .title-options {
position: absolute;
right: 0; top: 0;
padding: 0.7rem 1.2rem 0.7rem 0.25rem;
font-size: 1.3rem;
background: var(--background2);
color: var(--highlight);
display: none;
}

.library .library-content .title-menu-card .flex .title-options .options-transition {
position: absolute;
background: linear-gradient(90deg, #00000000, var(--background2));
height: 100%; width: 1rem;
top: 0;
left: -1rem;
}

.library .library-content #library-overview {
position: absolute;
width: calc(100% - 1rem);
height: calc(100% - 4.75rem);
z-index: -1;
opacity: 0;
transition: all 0.25s ease;
background: var(--background1);
padding: 0.4rem;
}

.library .library-content #library-overview .card {
width: calc(100% - 1rem);
max-width: calc(100% - 1rem);
margin: 0 0 1rem 0;
}

.library .library-content #library-overview.active {
opacity: 1;
z-index: 100;
overflow-y: auto;
}
89 changes: 0 additions & 89 deletions application-ui/content/assets/application/css/app-settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,95 +48,6 @@
Settings menu window
*/

/*Initializing the menu list*/
.settings .settings-menu .settings-menu-card ul {
position: relative;
list-style: none;
}

/*Initializing the menu list entries*/
.settings .settings-menu .settings-menu-card ul li {
box-shadow: 0 0 0.4rem var(--shadow3);
background: var(--background);
border: solid 1px var(--border) !important;
position: relative;
height: 1.75rem;
padding: 0.25rem;
margin-bottom: 0.5rem;
border-radius: 0.5rem;
transition: all 0.5s ease;
}

/*Adding hover effect to list entry*/
.settings .settings-menu .settings-menu-card ul li:hover {
background: var(--highlight);
box-shadow: 0 0 0.4rem var(--highlight);
border: solid 1px var(--highlight) !important;
cursor: pointer;
}

/*Fix dangers border for menu entry*/
.settings .settings-menu .settings-menu-card ul li.danger:hover {
border: solid 1px red !important;
animation: linear wiggle 1ms infinite;
}

/*Keyframes for danger animation*/
@keyframes wiggle {
0% { transform: rotate(0deg); }
80% { transform: rotate(0deg); }
85% { transform: rotate(5deg); }
95% { transform: rotate(-5deg); }
100% { transform: rotate(0deg); }
}

/*Changing entry font color while hovering*/
.settings .settings-menu .settings-menu-card ul li:hover i, .settings .settings-menu .settings-menu-card ul li:hover span {
transition: all 0.5s ease;
color: var(--background5);
box-shadow: none;
}

/*Initializing the menu list entry icons*/
.settings .settings-menu .settings-menu-card ul li i, .settings .settings-menu .settings-menu-card ul li img {
padding: 0 !important; margin: 0 !important;
position: absolute; width: 1.75rem !important; height: 1.75rem !important;
font-size: 1.75rem;
z-index: 1;
}

/*Fixing css for i*/
.settings .settings-menu .settings-menu-card ul li i {
top: 0.25rem; left: 0.25rem;
z-index: 0;
}

/*Initializing the menu list entry text*/
.settings .settings-menu .settings-menu-card ul li span {
margin: 0.5rem 0 0 2.25rem !important;
font-size: 1.1rem;
}

/*Setting color for highlighted menu entries*/
.settings .settings-menu .settings-menu-card ul li.highlighted, .settings .settings-menu .settings-menu-card ul li.active {
background: var(--accent) !important;
box-shadow: 0 0 0.4rem var(--accent) !important;
border: solid 1px #a458ff !important;
}

/*Setting color for highlighted menu entry contents*/
.settings .settings-menu .settings-menu-card ul li.highlighted *, .settings .settings-menu .settings-menu-card ul li.active * {
background: var(--accent) !important;
color: white !important;
box-shadow: none !important;
}

/*Initializing settings menu subtitles*/
.settings .settings-menu .settings-menu-card h3 {
color: var(--foreground2);
margin-bottom: 0.25rem;
}

/*Disable inactive elements*/
.settings .settings-menu .settings-menu-card .settings-modules-section, #settings-module-template, #settings-general, #settings-global, #settings-indexes, #settings-modules, #settings-about, #updater-settings, #settings-custom {
display: none;
Expand Down
Loading

0 comments on commit 56b219a

Please sign in to comment.