From 41622031afff7a5a68cb2b11e6d5a4ab0a7c7ea8 Mon Sep 17 00:00:00 2001 From: Ari Archer Date: Sun, 29 Jan 2023 06:44:05 +0200 Subject: [PATCH] js/shell : improve config of pages Signed-off-by: Ari Archer --- content/js/config/index.js | 40 +++++++++++++++++++------------------- content/js/shell/func.js | 23 +++++++++++----------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/content/js/config/index.js b/content/js/config/index.js index 66e7af3..3ee5e19 100644 --- a/content/js/config/index.js +++ b/content/js/config/index.js @@ -12,115 +12,115 @@ const boot_message = { }, }; const do_sleep = true; -const locations = { - 0: { +const locations = [ + { url: "/git", desc: "The source code of this website", aliases: ["src", "source", "git", "github"], }, - 1: { + { url: "/", desc: "The home page", aliases: ["home", "root", "index"], }, - 2: { + { url: "/page/reset", desc: "Reset your account", aliases: ["reset", "erase", "del", "delete"], }, - 3: { + { url: "/page/minimal.txt", desc: "The minimal page", aliases: ["mini", "minimal", "txt", "min"], }, - 4: { + { url: "/page/blog", desc: "Blog page", aliases: ["blog", "news", "blogs", "articles"], }, - 5: { + { url: "/dotfiles", desc: "My dotfiles-cleaned github repository", aliases: ["rice", "dotfiles", "dots", "dwm"], }, - 6: { + { url: "/page/novpn", desc: "A page about how you shouldn't use VPNs", aliases: ["vpn", "novpn"], }, - 7: { + { url: "/mp", desc: "My music playlist", aliases: ["music", "playlist"], }, - 8: { + { url: "/tdotfiles", desc: "My dotfiles-termux github repository", aliases: ["trice", "tdotfiles", "tdots", "termux"], }, - 9: { + { url: "/page/ttytheme", desc: "TTY theme generator", aliases: ["tty", "ttytheme", "ttheme", "tty-theme"], }, - 10: { + { url: "/user", desc: "Ari-web comments", aliases: ["comment", "user", "usr", "chat"], }, - 11: { + { url: "/api", desc: "Ari-web api(s)", aliases: ["api", "API"], }, - 12: { + { url: "/page/amiunique", desc: "'Am I unique?' test", aliases: ["uniqueness", "unqtest", "unique", "unqquiz"], }, - 13: { + { url: "/page/90s", desc: "90s page", aliases: ["90s", "90", "vintage", "old"], }, - 14: { + { url: "/page/export", desc: "Export and/or import your ari-web data", aliases: ["export", "import", "data"], }, - 15: { + { url: "/m", desc: "Favourite song", aliases: ["song", "favsong"], }, - 16: { + { url: "/page/info", desc: "Important ari-web info", aliases: ["info", "important"], }, - 17: { + { url: "/etc", desc: "Random ari-web pages, projects, etc.", aliases: ["etc", "projects", "urandom"], }, -}; +]; const escape_HTML = (str) => str.replace( /[&<>'"]/g, diff --git a/content/js/shell/func.js b/content/js/shell/func.js index 9c4af48..a68976c 100644 --- a/content/js/shell/func.js +++ b/content/js/shell/func.js @@ -53,9 +53,9 @@ function show(dest) { if (!dst) return help(["show"]); else - for (const l in locations) { - if (locations[l]["aliases"].includes(dst)) { - iframe.setAttribute("src", locations[l]["url"]); + for (const l of locations) { + if (l["aliases"].includes(dst)) { + iframe.setAttribute("src", l["url"]); break; } } @@ -71,10 +71,10 @@ function cd(dest) { window.location = "/"; return "Returning to the home page"; } else { - for (const l in locations) { - if (locations[l]["aliases"].includes(dst)) { - window.location = locations[l]["url"]; - return `Going to ${locations[l]["url"]}`; + for (const l of locations) { + if (l["aliases"].includes(dst)) { + window.location = l["url"]; + return `Going to ${l["url"]}`; } } } @@ -85,11 +85,10 @@ function cd(dest) { function list() { let locs = ""; - for (const l in locations) { - let loc = locations[l]; - locs += `URL: ${loc["url"]}
`; - locs += `DESCRIPTION: ${loc["desc"]}
`; - locs += `ALIASES: ${loc["aliases"].join(", ")}
`; + for (const l of locations) { + locs += `URL: ${l["url"]}
`; + locs += `DESCRIPTION: ${l["desc"]}
`; + locs += `ALIASES: ${l["aliases"].join(", ")}
`; locs += `
`; }