diff --git a/constants.json b/constants.json
index e9d097e..39ed2ca 100644
--- a/constants.json
+++ b/constants.json
@@ -67,6 +67,7 @@
"Fedi": "rgb(175, 125, 200)",
"Matrix": "limegreen",
"Element": "rgb(100, 255, 200)",
+ "Code": "rgb(150, 175, 255)",
"Codeberg": "rgb(0, 255, 255)",
"Docker": "blue",
"Github": "gray",
@@ -83,7 +84,6 @@
"CSS": "rgb(50, 200, 255)",
"Thumbor": "rgb(225, 225, 255)",
"Spotify": "limegreen",
- "Ultrakill": "red",
- "Code": "rgb(150, 175, 255)"
+ "Ultrakill": "red"
}
}
\ No newline at end of file
diff --git a/pageUpdater.js b/pageUpdater.js
index 1fc99c8..2bf3732 100644
--- a/pageUpdater.js
+++ b/pageUpdater.js
@@ -21,7 +21,6 @@ var commitCount = "500+"
var lanyardData = undefined
var uptime = Date.now()
-var reloads = 0
function firstToUpper(str) {
return str.charAt(0).toUpperCase() + str.slice(1)
@@ -100,7 +99,6 @@ function converter(html) {
},
"SPINCOUNT": globalSpins,
"UPTIME": timeFormatter((Date.now() - uptime) / 1000),
- "RELOAD_COUNT": reloads,
"WEATHER_MODIFIER": randomThemer.returnTheme(),
"WEATHER_TEXT": "",
"ANNOUNCEMENT": fs.readFileSync(path.join(__dirname, "config/announcement.html")),
@@ -109,6 +107,25 @@ function converter(html) {
}
replacers.ALL_KEYWORDS = "{" + Object.keys(replacers).join("}{") + "} "
+
+ while (html.includes("{PATH_")) {
+ var pagePath = html.substring(html.indexOf("{PATH_"))
+ pagePath = pagePath.substring(6, pagePath.indexOf('}'))
+
+ var stringIndex = `{PATH_${pagePath}}`
+ pagePath = pagePath.toLowerCase()
+
+ var pageHTML = fs.readFileSync(path.join(__dirname, 'static', pagePath, 'index.html')).toString()
+ pageHTML = pageHTML.substring(pageHTML.indexOf('') + 6, pageHTML.indexOf(''))
+ html = html.replaceAll(stringIndex, pageHTML)
+ }
+
+ var rpTable = Object.keys(replacers)
+
+ for (let index = 0; index < rpTable.length; index++) {
+ const text = rpTable[index];
+ html = html.replaceAll(`{${text}}`, replacers[text])
+ }
if (html.includes("
")) {
var bodyHTML = htmlMinifier.minify(html.substring(html.indexOf("") + 6, html.lastIndexOf("")))
@@ -117,42 +134,24 @@ function converter(html) {
var parsedHTML = himalaya.parse(html)
}
- function scanParsedHTML(json) {
- for (var i = 0; i < json.length; i++) {
- var element = json[i]
- if (element.type == "element") {
- if (element.children.length > 0) {
- element.children = scanParsedHTML(element.children)
- }
- } else if (element.type == "text") {
- while (element.content.includes("{PATH_")) {
- var pagePath = element.content.substring(element.content.indexOf("{PATH_"))
- pagePath = pagePath.substring(6, pagePath.indexOf('}'))
+ // function scanParsedHTML(json) {
+ // for (var i = 0; i < json.length; i++) {
+ // var element = json[i]
+ // if (element.type == "element") {
+ // if (element.children.length > 0) {
+ // element.children = scanParsedHTML(element.children)
+ // }
+ // } else if (element.type == "text") {
- var stringIndex = `{PATH_${pagePath}}`
- pagePath = pagePath.toLowerCase()
+
- var pageHTML = fs.readFileSync(path.join(__dirname, 'static', pagePath, 'index.html')).toString()
- pageHTML = pageHTML.substring(pageHTML.indexOf('') + 6, pageHTML.indexOf(''))
- element.content = element.content.replaceAll(stringIndex, pageHTML)
- }
+ // json[i] = element
+ // }
+ // }
- var rpTable = Object.keys(replacers)
-
- for (let index = 0; index < rpTable.length; index++) {
- const text = rpTable[index];
- element.content = element.content.replaceAll(`{${text}}`, replacers[text])
- }
-
- // console.log(element.content, himalaya.parse(element.content))
-
- json[i] = element
- }
- }
-
- return json
- }
+ // return json
+ // }
// var highTable = Object.keys(highlightedWords)
@@ -166,9 +165,9 @@ function converter(html) {
// element.content = element.content.replaceAll("TEMPORARY_REPLACE", `${term}`)
// }
- parsedHTML = scanParsedHTML(parsedHTML)
+ // parsedHTML = scanParsedHTML(parsedHTML)
- parsedHTML = himalaya.parse(himalaya.stringify(parsedHTML))
+ // parsedHTML = himalaya.parse(himalaya.stringify(parsedHTML))
function highlighter(json) {
for (var i = 0; i < json.length; i++) {
diff --git a/static/socials/index.html b/static/socials/index.html
index 33d6575..e8249b0 100644
--- a/static/socials/index.html
+++ b/static/socials/index.html
@@ -51,7 +51,7 @@
diff --git a/static/stats/index.html b/static/stats/index.html
index 310a47b..6ae3c2a 100644
--- a/static/stats/index.html
+++ b/static/stats/index.html
@@ -37,13 +37,7 @@
- Page generation time: {LOAD_TIME}
- Uptime: {UPTIME}
- - Total reloads: {RELOAD_COUNT} *1
- - Cached Images: {CACHED_IMAGES} *2
-
-
-
- - Increments by 1 EVERY time ANY page is loaded.
- - Cached Images are cleared on server restart.
+ - Cached Images: {CACHED_IMAGES}