diff --git a/resources/app/files/assets/bootstrap/css/bootstrap.min.css b/resources/app/assets/bootstrap/css/bootstrap.min.css similarity index 100% rename from resources/app/files/assets/bootstrap/css/bootstrap.min.css rename to resources/app/assets/bootstrap/css/bootstrap.min.css diff --git a/resources/app/files/assets/bootstrap/js/bootstrap.min.js b/resources/app/assets/bootstrap/js/bootstrap.min.js similarity index 100% rename from resources/app/files/assets/bootstrap/js/bootstrap.min.js rename to resources/app/assets/bootstrap/js/bootstrap.min.js diff --git a/resources/app/files/assets/css/openfusion.css b/resources/app/assets/css/openfusion.css similarity index 100% rename from resources/app/files/assets/css/openfusion.css rename to resources/app/assets/css/openfusion.css diff --git a/resources/app/files/assets/css/styles.css b/resources/app/assets/css/styles.css similarity index 100% rename from resources/app/files/assets/css/styles.css rename to resources/app/assets/css/styles.css diff --git a/resources/app/files/assets/fonts/fa-brands-400.eot b/resources/app/assets/fonts/fa-brands-400.eot similarity index 100% rename from resources/app/files/assets/fonts/fa-brands-400.eot rename to resources/app/assets/fonts/fa-brands-400.eot diff --git a/resources/app/files/assets/fonts/fa-brands-400.svg b/resources/app/assets/fonts/fa-brands-400.svg similarity index 100% rename from resources/app/files/assets/fonts/fa-brands-400.svg rename to resources/app/assets/fonts/fa-brands-400.svg diff --git a/resources/app/files/assets/fonts/fa-brands-400.ttf b/resources/app/assets/fonts/fa-brands-400.ttf similarity index 100% rename from resources/app/files/assets/fonts/fa-brands-400.ttf rename to resources/app/assets/fonts/fa-brands-400.ttf diff --git a/resources/app/files/assets/fonts/fa-brands-400.woff b/resources/app/assets/fonts/fa-brands-400.woff similarity index 100% rename from resources/app/files/assets/fonts/fa-brands-400.woff rename to resources/app/assets/fonts/fa-brands-400.woff diff --git a/resources/app/files/assets/fonts/fa-brands-400.woff2 b/resources/app/assets/fonts/fa-brands-400.woff2 similarity index 100% rename from resources/app/files/assets/fonts/fa-brands-400.woff2 rename to resources/app/assets/fonts/fa-brands-400.woff2 diff --git a/resources/app/files/assets/fonts/fa-regular-400.eot b/resources/app/assets/fonts/fa-regular-400.eot similarity index 100% rename from resources/app/files/assets/fonts/fa-regular-400.eot rename to resources/app/assets/fonts/fa-regular-400.eot diff --git a/resources/app/files/assets/fonts/fa-regular-400.svg b/resources/app/assets/fonts/fa-regular-400.svg similarity index 100% rename from resources/app/files/assets/fonts/fa-regular-400.svg rename to resources/app/assets/fonts/fa-regular-400.svg diff --git a/resources/app/files/assets/fonts/fa-regular-400.ttf b/resources/app/assets/fonts/fa-regular-400.ttf similarity index 100% rename from resources/app/files/assets/fonts/fa-regular-400.ttf rename to resources/app/assets/fonts/fa-regular-400.ttf diff --git a/resources/app/files/assets/fonts/fa-regular-400.woff b/resources/app/assets/fonts/fa-regular-400.woff similarity index 100% rename from resources/app/files/assets/fonts/fa-regular-400.woff rename to resources/app/assets/fonts/fa-regular-400.woff diff --git a/resources/app/files/assets/fonts/fa-regular-400.woff2 b/resources/app/assets/fonts/fa-regular-400.woff2 similarity index 100% rename from resources/app/files/assets/fonts/fa-regular-400.woff2 rename to resources/app/assets/fonts/fa-regular-400.woff2 diff --git a/resources/app/files/assets/fonts/fa-solid-900.eot b/resources/app/assets/fonts/fa-solid-900.eot similarity index 100% rename from resources/app/files/assets/fonts/fa-solid-900.eot rename to resources/app/assets/fonts/fa-solid-900.eot diff --git a/resources/app/files/assets/fonts/fa-solid-900.svg b/resources/app/assets/fonts/fa-solid-900.svg similarity index 100% rename from resources/app/files/assets/fonts/fa-solid-900.svg rename to resources/app/assets/fonts/fa-solid-900.svg diff --git a/resources/app/files/assets/fonts/fa-solid-900.ttf b/resources/app/assets/fonts/fa-solid-900.ttf similarity index 100% rename from resources/app/files/assets/fonts/fa-solid-900.ttf rename to resources/app/assets/fonts/fa-solid-900.ttf diff --git a/resources/app/files/assets/fonts/fa-solid-900.woff b/resources/app/assets/fonts/fa-solid-900.woff similarity index 100% rename from resources/app/files/assets/fonts/fa-solid-900.woff rename to resources/app/assets/fonts/fa-solid-900.woff diff --git a/resources/app/files/assets/fonts/fa-solid-900.woff2 b/resources/app/assets/fonts/fa-solid-900.woff2 similarity index 100% rename from resources/app/files/assets/fonts/fa-solid-900.woff2 rename to resources/app/assets/fonts/fa-solid-900.woff2 diff --git a/resources/app/files/assets/fonts/fontawesome-all.min.css b/resources/app/assets/fonts/fontawesome-all.min.css similarity index 100% rename from resources/app/files/assets/fonts/fontawesome-all.min.css rename to resources/app/assets/fonts/fontawesome-all.min.css diff --git a/resources/app/files/assets/img/btn-danger-bg.png b/resources/app/assets/img/btn-danger-bg.png similarity index 100% rename from resources/app/files/assets/img/btn-danger-bg.png rename to resources/app/assets/img/btn-danger-bg.png diff --git a/resources/app/files/assets/img/btn-primary-bg.png b/resources/app/assets/img/btn-primary-bg.png similarity index 100% rename from resources/app/files/assets/img/btn-primary-bg.png rename to resources/app/assets/img/btn-primary-bg.png diff --git a/resources/app/files/assets/img/btn-success-bg.png b/resources/app/assets/img/btn-success-bg.png similarity index 100% rename from resources/app/files/assets/img/btn-success-bg.png rename to resources/app/assets/img/btn-success-bg.png diff --git a/resources/app/files/assets/img/of-3.png b/resources/app/assets/img/of-3.png similarity index 100% rename from resources/app/files/assets/img/of-3.png rename to resources/app/assets/img/of-3.png diff --git a/resources/app/files/assets/img/spinner.gif b/resources/app/assets/img/spinner.gif similarity index 100% rename from resources/app/files/assets/img/spinner.gif rename to resources/app/assets/img/spinner.gif diff --git a/resources/app/files/assets/img/unity_dexlabs.png b/resources/app/assets/img/unity_dexlabs.png similarity index 100% rename from resources/app/files/assets/img/unity_dexlabs.png rename to resources/app/assets/img/unity_dexlabs.png diff --git a/resources/app/files/assets/img/unity_loadingbar.png b/resources/app/assets/img/unity_loadingbar.png similarity index 100% rename from resources/app/files/assets/img/unity_loadingbar.png rename to resources/app/assets/img/unity_loadingbar.png diff --git a/resources/app/files/assets/img/unity_loadingframe.png b/resources/app/assets/img/unity_loadingframe.png similarity index 100% rename from resources/app/files/assets/img/unity_loadingframe.png rename to resources/app/assets/img/unity_loadingframe.png diff --git a/resources/app/files/assets/img/welcome.png b/resources/app/assets/img/welcome.png similarity index 100% rename from resources/app/files/assets/img/welcome.png rename to resources/app/assets/img/welcome.png diff --git a/resources/app/files/assets/js/bs-init.js b/resources/app/assets/js/bs-init.js similarity index 100% rename from resources/app/files/assets/js/bs-init.js rename to resources/app/assets/js/bs-init.js diff --git a/resources/app/files/assets/js/eastereggs.js b/resources/app/assets/js/eastereggs.js similarity index 100% rename from resources/app/files/assets/js/eastereggs.js rename to resources/app/assets/js/eastereggs.js diff --git a/resources/app/files/assets/js/gameclient.js b/resources/app/assets/js/gameclient.js similarity index 100% rename from resources/app/files/assets/js/gameclient.js rename to resources/app/assets/js/gameclient.js diff --git a/resources/app/files/assets/js/jquery.min.js b/resources/app/assets/js/jquery.min.js similarity index 100% rename from resources/app/files/assets/js/jquery.min.js rename to resources/app/assets/js/jquery.min.js diff --git a/resources/app/files/assets/js/serverselector.js b/resources/app/assets/js/serverselector.js similarity index 100% rename from resources/app/files/assets/js/serverselector.js rename to resources/app/assets/js/serverselector.js diff --git a/resources/app/files/assets/js/snowflakes.min.js b/resources/app/assets/js/snowflakes.min.js similarity index 100% rename from resources/app/files/assets/js/snowflakes.min.js rename to resources/app/assets/js/snowflakes.min.js diff --git a/resources/app/files/assets/js/uuidv4.min.js b/resources/app/assets/js/uuidv4.min.js similarity index 100% rename from resources/app/files/assets/js/uuidv4.min.js rename to resources/app/assets/js/uuidv4.min.js diff --git a/resources/app/default_config.json b/resources/app/defaults/config.json similarity index 100% rename from resources/app/default_config.json rename to resources/app/defaults/config.json diff --git a/resources/app/default_servers.json b/resources/app/defaults/servers.json similarity index 100% rename from resources/app/default_servers.json rename to resources/app/defaults/servers.json diff --git a/resources/app/default_versions.json b/resources/app/defaults/versions.json similarity index 100% rename from resources/app/default_versions.json rename to resources/app/defaults/versions.json diff --git a/resources/app/files/assetInfo.php b/resources/app/files/assetInfo.php deleted file mode 100644 index a3b14b0..0000000 --- a/resources/app/files/assetInfo.php +++ /dev/null @@ -1 +0,0 @@ -http://ht.cdn.turner.com/ff/big/beta-20100104/ \ No newline at end of file diff --git a/resources/app/files/images.php b/resources/app/files/images.php deleted file mode 100644 index 812f2ac..0000000 --- a/resources/app/files/images.php +++ /dev/null @@ -1 +0,0 @@ -assets/img/welcome.png \ No newline at end of file diff --git a/resources/app/files/loginInfo.php b/resources/app/files/loginInfo.php deleted file mode 100644 index adf3222..0000000 --- a/resources/app/files/loginInfo.php +++ /dev/null @@ -1 +0,0 @@ -144.202.52.9:23000 \ No newline at end of file diff --git a/resources/app/files/rankurl.txt b/resources/app/files/rankurl.txt deleted file mode 100644 index 0dae520..0000000 --- a/resources/app/files/rankurl.txt +++ /dev/null @@ -1 +0,0 @@ -http://api.dexlabs.systems/getranks \ No newline at end of file diff --git a/resources/app/files/sponsor.php b/resources/app/files/sponsor.php deleted file mode 100644 index 812f2ac..0000000 --- a/resources/app/files/sponsor.php +++ /dev/null @@ -1 +0,0 @@ -assets/img/welcome.png \ No newline at end of file diff --git a/resources/app/files/index.html b/resources/app/index.html similarity index 100% rename from resources/app/files/index.html rename to resources/app/index.html diff --git a/resources/app/index.js b/resources/app/index.js index bde790f..478e69a 100644 --- a/resources/app/index.js +++ b/resources/app/index.js @@ -17,7 +17,7 @@ function copyFile(src, dst) { function initialSetup() { // Display a small window to inform the user that the app is working setupWindow = new BrowserWindow({width: 275, height: 450, resizable: false, center:true, frame:false}); - setupWindow.loadUrl('file://' + __dirname + '/files/initialsetup.html'); + setupWindow.loadUrl('file://' + __dirname + '/initialsetup.html'); // Exec installUnity.bat and wait for it to finish. var child = require('child_process').spawn('cmd.exe', ['/c', 'utils\\installUnity.bat']); child.on('exit', function() { @@ -83,7 +83,7 @@ app.on('ready', function() { function showMainWindow() { // and load the index.html of the app. - mainWindow.loadUrl('file://' + __dirname + '/files/index.html'); + mainWindow.loadUrl('file://' + __dirname + '/index.html'); // Reduces white flash when opening the program // Eliminating it entirely requires a newer Electron ver :( diff --git a/resources/app/files/initialsetup.html b/resources/app/initialsetup.html similarity index 100% rename from resources/app/files/initialsetup.html rename to resources/app/initialsetup.html