From 901cf7ffb53142e6e0e4d4de1d77f19d506aec8b Mon Sep 17 00:00:00 2001
From: ReznoRMichael <mic3arena@gmail.com>
Date: Wed, 21 Oct 2020 21:16:38 +0200
Subject: [PATCH] Reorganized files and folders

---
 .gitignore                                    |   1 +
 style.css => css/style.css                    |   6 ++---
 .../thumbnail1200x628.jpg                     | Bin
 index.html                                    |  13 +++++----
 .../HKCheckCompletion.js                      |   0
 loadJson.js => js/LoadJson.js                 |  25 +++++++++---------
 6 files changed, 23 insertions(+), 22 deletions(-)
 rename style.css => css/style.css (97%)
 rename thumbnail1200x628.jpg => img/thumbnail1200x628.jpg (100%)
 rename HKCheckCompletion.js => js/HKCheckCompletion.js (100%)
 rename loadJson.js => js/LoadJson.js (75%)

diff --git a/.gitignore b/.gitignore
index ff96694..1aed96b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 fontello/
 images/
 save/
+files/
 config.json
\ No newline at end of file
diff --git a/style.css b/css/style.css
similarity index 97%
rename from style.css
rename to css/style.css
index fce3ed2..cf49163 100644
--- a/style.css
+++ b/css/style.css
@@ -50,7 +50,7 @@ body {
 
 ::-webkit-scrollbar-track,
 ::-webkit-scrollbar-track-piece {
-    background: url("img/scrollbar-track.png") repeat-y !important;
+    background: url("../img/scrollbar-track.png") repeat-y !important;
 }
 
 ::-webkit-resizer {
@@ -66,7 +66,7 @@ body {
     left: 0;
     width: 100%;
     height: 100%;
-    background-image: url("img/hk-background.jpg");
+    background-image: url("../img/hk-background.jpg");
     background-size: auto 100%;
     background-position: center top;
     background-repeat: no-repeat;
@@ -172,7 +172,7 @@ p {
     margin: 1rem 0;
     height: 1.5rem;
     width: 100%;
-    background-image: url("img/fleur-divide.png");
+    background-image: url("../img/fleur-divide.png");
     background-size: auto 100%;
     background-position: center top;
     background-repeat: no-repeat;
diff --git a/thumbnail1200x628.jpg b/img/thumbnail1200x628.jpg
similarity index 100%
rename from thumbnail1200x628.jpg
rename to img/thumbnail1200x628.jpg
diff --git a/index.html b/index.html
index 52beaaa..2f81d68 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
     <link href="favicon.png" rel="icon">
     <link href="https://fonts.googleapis.com/css2?family=Heebo:wght@300;400;500;700&display=swap" rel="stylesheet">
     <link href="css/fontello.css" rel="stylesheet">
-    <link href="style.css" rel="stylesheet">
+    <link href="css/style.css" rel="stylesheet">
     <title>Hollow Knight: Analyze Save Completion</title>
     <meta name="description" content="A simple open source tool for checking what you missed for your Game Completion Percentage.">
 	<meta name="keywords" content="hollow knight, tool, online, save, game, completion, check, checker, percentage, percent, left">
@@ -16,14 +16,14 @@
     <meta property="og:type" content="website">
 	<meta property="og:title" content="Hollow Knight: Analyze Save Completion">
 	<meta property="og:description" content="A simple open source tool for checking what you missed for your Game Completion Percentage.">
-	<meta property="og:image" content="http://reznortech.rf.gd/hollow-knight-completion/thumbnail1200x628.jpg">
+	<meta property="og:image" content="http://reznortech.rf.gd/hollow-knight-completion/img/thumbnail1200x628.jpg">
     <meta property="og:url" content="http://reznortech.rf.gd/hollow-knight-completion/">
     
     <!-- Twitter -->
     <meta property="twitter:title" content="Hollow Knight: Analyze Save Completion">
     <meta property="twitter:description" content="A simple open source tool for checking what you missed for your Game Completion Percentage.">
     <meta property="twitter:card" content="summary_large_image">
-    <meta property="twitter:image" content="http://reznortech.rf.gd/hollow-knight-completion/thumbnail1200x628.jpg">
+    <meta property="twitter:image" content="http://reznortech.rf.gd/hollow-knight-completion/img/thumbnail1200x628.jpg">
     <meta property="twitter:url" content="http://reznortech.rf.gd/hollow-knight-completion/">
 
 	<meta name="author" content="ReznoR Michael">
@@ -31,8 +31,7 @@
 <body>
 
     <!-- To do:
-        - Upload a save file directly (option) 
-        - Maps found (count)
+        - Upload a save file directly (option)
         - Hunter's Journal completion
         - Censored names H***** when not defeated/found?
     -->
@@ -93,10 +92,10 @@
 </html>
 
 <!-- Instantly load test file (Debugging script) -->
-<!-- <script src="loadJson.js"></script> -->
+<!-- <script src="js/LoadJson.js"></script> -->
 
 <!-- Main script -->
-<script src="HKCheckCompletion.js"></script>
+<script src="js/HKCheckCompletion.js"></script>
 
 <!-- Populate HTML at load (before img and css) -->
 <script>
diff --git a/HKCheckCompletion.js b/js/HKCheckCompletion.js
similarity index 100%
rename from HKCheckCompletion.js
rename to js/HKCheckCompletion.js
diff --git a/loadJson.js b/js/LoadJson.js
similarity index 75%
rename from loadJson.js
rename to js/LoadJson.js
index 32100e1..5616223 100644
--- a/loadJson.js
+++ b/js/LoadJson.js
@@ -18,9 +18,9 @@ var fileName = [
 
 /**
  * Reads the .json file and parses it to a JS object (jsonObj).
- * @param callback Asynchronous function.
+ * @param callback Function to be called when the request completes
  */
-function loadJSON(filename, callback) {
+function LoadJSON(filename, callback) {
     // new Http request object (asynchronous), both the web page and the XML file it tries to load, must be located on the same server.
     var xobj = new XMLHttpRequest();
 
@@ -39,18 +39,19 @@ function loadJSON(filename, callback) {
         if (xobj.readyState == 4 && xobj.status == "200") {
             // Required use of an anonymous callback as .open will NOT return a value but simply returns undefined in asynchronous mode
             // Returns the response data as a string
-            callback(xobj.responseText);
-        }
+            return callback(xobj.responseText);
+        } else return false;
     };
     // Sends the request to the server - Used for GET requests
     xobj.send(null);
 }
 
-loadJSON("save/" + fileName[5],
-    function JSONparse(response) {
-        // Parse JSON string into object
-        jsonObj = JSON.parse(response);
-        document.getElementById("save-area").value = response;
-        // console.log(jsonObj);
-    }
-);
\ No newline at end of file
+function JSONparse(response) {
+    // Parse JSON string into object
+    let jsonObject = JSON.parse(response);
+    document.getElementById("save-area").value = response;
+    return jsonObject;
+    // console.log(jsonObj);
+}
+
+jsonObj = LoadJSON("../save/" + fileName[5], JSONparse(response));
\ No newline at end of file