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

Commit

Permalink
v.2.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Junynx committed Mar 11, 2024
1 parent 0ff5ad5 commit dd7b2c4
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 28 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "osfrlauncher",
"version": "2.1.4",
"version": "2.1.5",
"description": "A Launcher For Open-Source-Free-Realms",
"main": "index.js",
"scripts": {
Expand Down
27 changes: 19 additions & 8 deletions src/www/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ button:not(#minimize, #maximize, #close):disabled {
transition: ease-in-out 0.3s;
rotate: 90deg;
}
#info {
#error {
transition: ease-in-out 0.3s;
position: absolute;
bottom: -18px;
Expand Down Expand Up @@ -417,7 +417,7 @@ input:focus {
-webkit-font-smoothing: antialiased;
}

#infoprompt {
#errorprompt {
position: absolute;
z-index: 1000;
background-color: rgba(24, 31, 39, 0.5);
Expand All @@ -430,7 +430,7 @@ input:focus {
display: none;
}

#infoprompt #title {
#errorprompt #title {
position: absolute;
top: 0;
left: 0;
Expand All @@ -443,7 +443,7 @@ input:focus {
color: #dcdcdc;
}

#infoprompt #closeinfoprompt {
#errorprompt #closeerrorprompt {
position: absolute;
top: 0;
right: 0;
Expand All @@ -456,15 +456,26 @@ input:focus {
z-index: 1000;
}

#infoprompt #infolist {
position: absolute;
#errorprompt #errorlist {
position: relative;
top: 30px;
left: 0;
width: 100%;
height: 370px;
height: 30px;
overflow-x: visible;
}

hr {
display: block;
margin-top: 0.5em;
margin-bottom: 0.5em;
margin-left: auto;
margin-right: auto;
border-style: inset;
border-width: 1px;
width: 99%;
}

#jsonprompt {
position: absolute;
z-index: 1000;
Expand Down Expand Up @@ -550,7 +561,7 @@ input:focus {
display: none;
}

#info-window {
#error-window {
position: absolute;
top: 0;
left: 0;
Expand Down
16 changes: 10 additions & 6 deletions src/www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@
<div id=title>Select a file</div>
<div id=filelist></div>
</div>
<div id=info-window></div>
<div id=infoprompt>
<div id=closeinfoprompt></div>
<div id=error-window></div>
<div id=errorprompt>
<div id=closeerrorprompt></div>
<div id=title>Common Errors</div>
<div id=infolist></div>
<p id=infolist class=message>• FreeRealms.exe is not recognized as an internal or external command? <a href="https://shorturl.at/kHN79" style="color:#dcdcdc;">By downloading directx9 will help resolve the problem!</p></a>
<div id=errorlist></div>
<hr>
<p>• Failed to load role gateaway.dll? Unblock the geteaway.dll, by right clicking on properties, and tick 'unblock' > apply! Located in resources/app/Server </p>
<hr>
<p> • FreeRealms.exe is not recognized as an internal or external command? <a href="https://shorturl.at/kHN79" style="color:#dcdcdc;">By downloading directx9 will help resolve the problem!</p></a>
<hr>
</div>
<div id=side-bar>
<div id=menuitems>
Expand All @@ -45,7 +49,7 @@
<button id=uninstall disabled>Uninstall</button>
<button id=logs disabled>Logs</button>
<p id=settings class=material-symbols-outlined>settings</p>
<p id=info class=material-symbols-outlined>info</p>
<p id="error" class=material-symbols-outlined>error</p>
</div>
</div>
<div id=content>
Expand Down
22 changes: 11 additions & 11 deletions src/www/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const close = document.getElementById('close');
const minimize = document.getElementById('minimize');
const maximize = document.getElementById('maximize');
const closejsonprompt = document.getElementById('closejsonprompt');
const closeinfoprompt = document.getElementById('closeinfoprompt');
const closeerrorprompt = document.getElementById('closeerrorprompt');
const opacitywindow = document.getElementById('opacity-window');
const infowindow = document.getElementById('info-window');
const errorwindow = document.getElementById('error-window');
const os = require('os');
const package = fs.readFileSync(path.join(__dirname, '..', '..', 'package.json'), 'utf8');
const data = JSON.parse(package);
Expand Down Expand Up @@ -100,7 +100,7 @@ const progressBarContainer = document.getElementById('progress-container');
const progressBar = document.getElementById('progress');
const progressText = document.getElementById('progress-text');
const logbtn = document.getElementById('logs');
const infobtn = document.getElementById('info');
const errorbtn = document.getElementById('error');
(function () {
var old = console.log;
const consoleContent = document.getElementById('console-content');
Expand Down Expand Up @@ -820,16 +820,16 @@ closejsonprompt.addEventListener('click', async () => {
opacitywindow.style.display = 'none';
});

infobtn.addEventListener('click', async () => {
const containerinfo = document.getElementById('infolist');
containerinfo.innerHTML = '';
infoprompt.style.display = 'block';
infowindow.style.display = 'block';
errorbtn.addEventListener('click', async () => {
const containererror = document.getElementById('errorlist');
containererror.innerHTML = '';
errorprompt.style.display = 'block';
errorwindow.style.display = 'block';
});

closeinfoprompt.addEventListener('click', async () => {
infoprompt.style.display = 'none';
infowindow.style.display = 'none';
closeerrorprompt.addEventListener('click', async () => {
errorprompt.style.display = 'none';
errorwindow.style.display = 'none';
});

logbtn.addEventListener('click', async () => {
Expand Down

0 comments on commit dd7b2c4

Please sign in to comment.