From dbbc2d3692acaf0c3e54647a0b5fc4d03f5d79c3 Mon Sep 17 00:00:00 2001 From: Minteck Date: Sat, 4 Dec 2021 13:14:41 +0100 Subject: New stuff --- TODO | 34 +++++++++---------- data/lang/en.json | 26 ++++++++++++++- htdocs/public/TODO/index.ejs | 2 +- htdocs/public/assets/2D5CECF.jpg | Bin 43806 -> 0 bytes htdocs/public/assets/css/main.css | 26 +++++++++++++++ htdocs/public/code-of-conduct/index.ejs | 6 ++++ htdocs/public/contact/index.ejs | 6 ++++ htdocs/public/creations/dev/index.ejs | 6 ++++ htdocs/public/creations/electrode/index.ejs | 6 ++++ htdocs/public/creations/index.ejs | 6 ++++ htdocs/public/creations/kartik/index.ejs | 6 ++++ htdocs/public/creations/neutron/index.ejs | 6 ++++ htdocs/public/creations/unchained/index.ejs | 6 ++++ htdocs/public/creations/video/index.ejs | 6 ++++ htdocs/public/furry/index.ejs | 6 ++++ htdocs/public/index.ejs | 8 +++-- htdocs/public/me/index.ejs | 20 ++++++++++++ htdocs/public/metranslator/api/index.ejs | 2 +- htdocs/public/metranslator/index.ejs | 49 ++++++++++++++-------------- htdocs/public/oworadio/along/index.ejs | 6 ++++ htdocs/public/oworadio/credits/index.ejs | 6 ++++ htdocs/public/oworadio/dmca/index.ejs | 6 ++++ htdocs/public/oworadio/index.ejs | 6 ++++ htdocs/public/oworadio/source/index.ejs | 6 ++++ htdocs/public/oworadio/vlc/index.ejs | 6 ++++ server/http.js | 5 +++ 26 files changed, 221 insertions(+), 47 deletions(-) delete mode 100644 htdocs/public/assets/2D5CECF.jpg create mode 100644 htdocs/public/code-of-conduct/index.ejs create mode 100644 htdocs/public/contact/index.ejs create mode 100644 htdocs/public/creations/dev/index.ejs create mode 100644 htdocs/public/creations/electrode/index.ejs create mode 100644 htdocs/public/creations/index.ejs create mode 100644 htdocs/public/creations/kartik/index.ejs create mode 100644 htdocs/public/creations/neutron/index.ejs create mode 100644 htdocs/public/creations/unchained/index.ejs create mode 100644 htdocs/public/creations/video/index.ejs create mode 100644 htdocs/public/furry/index.ejs create mode 100644 htdocs/public/me/index.ejs create mode 100644 htdocs/public/oworadio/along/index.ejs create mode 100644 htdocs/public/oworadio/credits/index.ejs create mode 100644 htdocs/public/oworadio/dmca/index.ejs create mode 100644 htdocs/public/oworadio/index.ejs create mode 100644 htdocs/public/oworadio/source/index.ejs create mode 100644 htdocs/public/oworadio/vlc/index.ejs diff --git a/TODO b/TODO index da080c3..0f34e64 100644 --- a/TODO +++ b/TODO @@ -1,20 +1,20 @@ - Migrate pages from v8 - Contents Pages - - /code-of-conduct - - /metranslator + [x] /metranslator - Redirects - - /contact -> /#/contact - - /creations -> https://gitlab.minteck.org/minteck - - /creations/dev -> /creations - - /creations/dev -> /creations - - /creations/electrode -> https://gitlab.minteck.org/minteck/electrode - - /creations/kartik -> https://kartik.minteck.org - - /creations/neutron -> https://gitlab.minteck.org/minteck/neutron - - /creations/unchained -> https://unchained.minteck.org/home - - /furry -> /#/about - - /oworadio -> / - - /oworadio/credits -> / - - /oworadio/dmca -> / - - /oworadio/along -> / - - /oworadio/source -> / - - /oworadio/vlc -> / \ No newline at end of file + [x] /contact -> /#/contact + [x] /creations/dev -> /creations + [x] /creations/video -> /creations + [x] /furry -> /#/about + [x] /oworadio -> / + [x] /oworadio/credits -> / + [x] /oworadio/dmca -> / + [x] /oworadio/along -> / + [x] /oworadio/source -> / + [x] /oworadio/vlc -> / + [x] /code-of-conduct -> / + [x] /creations -> https://gitlab.minteck.org/minteck + [x] /creations/electrode -> https://gitlab.minteck.org/minteck/electrode + [x] /creations/kartik -> https://kartik.minteck.org + [x] /creations/neutron -> https://gitlab.minteck.org/minteck/neutron + [x] /creations/unchained -> https://unchained.minteck.org/home \ No newline at end of file diff --git a/data/lang/en.json b/data/lang/en.json index 8ccbe8b..31484bd 100644 --- a/data/lang/en.json +++ b/data/lang/en.json @@ -115,7 +115,8 @@ }, "general": { "title": "Who am I?", - "description": "I am a French, furry and otherkin non binary girl." + "description": "I am a French, furry and otherkin non binary girl.", + "action": "Read more" }, "history": { "title": "We've come a long way", @@ -180,5 +181,28 @@ "never": "Never released", "released": "Officially released", "download": "Download" + }, + "metranslator": { + "title": "Metroz Translate", + "tip": "Click one of the languages to invert", + "base": "English", + "placeholder": "Start typing here...", + "facts": "No facts available about this text", + "insights": { + "title": "Translator Insights", + "name": "Database Name:", + "version": "Database Version:", + "size": "Database Size:", + "time": "Processing Time:" + }, + "waiting": "Waiting for end of input...", + "processing": "Translating...", + "nothing": "The word '%1' does not have a translation in %2", + "error": "An error occurred, please try again later", + "entries": "entries", + "update": "last update by" + }, + "me": { + "title": "About Me" } } \ No newline at end of file diff --git a/htdocs/public/TODO/index.ejs b/htdocs/public/TODO/index.ejs index 2e2dcaa..7b5edd2 100644 --- a/htdocs/public/TODO/index.ejs +++ b/htdocs/public/TODO/index.ejs @@ -1 +1 @@ -<%- fs.readFileSync(serverRoot + "/TODO") %> \ No newline at end of file +<% res.writeHead(200, { "Content-Type": "text/plain" }); %><%- fs.readFileSync(serverRoot + "/TODO"); %> \ No newline at end of file diff --git a/htdocs/public/assets/2D5CECF.jpg b/htdocs/public/assets/2D5CECF.jpg deleted file mode 100644 index 7d5deaa..0000000 Binary files a/htdocs/public/assets/2D5CECF.jpg and /dev/null differ diff --git a/htdocs/public/assets/css/main.css b/htdocs/public/assets/css/main.css index 93f6bd9..2618049 100644 --- a/htdocs/public/assets/css/main.css +++ b/htdocs/public/assets/css/main.css @@ -259,4 +259,30 @@ html, body, #intro, #main { .sky { display: none; } +} + +.container { + margin-left: 20vw; + margin-right: 20vw; +} + +@media (max-width: 1000px) { + .container { + margin-left: 10vw; + margin-right: 10vw; + } +} + +@media (max-width: 700px) { + .container { + margin-left: 5vw; + margin-right: 5vw; + } +} + +@media (max-width: 500px) { + .container { + margin-left: 0; + margin-right: 0; + } } \ No newline at end of file diff --git a/htdocs/public/code-of-conduct/index.ejs b/htdocs/public/code-of-conduct/index.ejs new file mode 100644 index 0000000..67fabf4 --- /dev/null +++ b/htdocs/public/code-of-conduct/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "/" + slang }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/contact/index.ejs b/htdocs/public/contact/index.ejs new file mode 100644 index 0000000..5631234 --- /dev/null +++ b/htdocs/public/contact/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "/" + slang + "/#/contact" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/creations/dev/index.ejs b/htdocs/public/creations/dev/index.ejs new file mode 100644 index 0000000..e41cbc4 --- /dev/null +++ b/htdocs/public/creations/dev/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "/" + slang + "/creations" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/creations/electrode/index.ejs b/htdocs/public/creations/electrode/index.ejs new file mode 100644 index 0000000..1149834 --- /dev/null +++ b/htdocs/public/creations/electrode/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "https://gitlab.minteck.org/minteck/electrode" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/creations/index.ejs b/htdocs/public/creations/index.ejs new file mode 100644 index 0000000..6105886 --- /dev/null +++ b/htdocs/public/creations/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "https://gitlab.minteck.org/minteck" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/creations/kartik/index.ejs b/htdocs/public/creations/kartik/index.ejs new file mode 100644 index 0000000..1e272a7 --- /dev/null +++ b/htdocs/public/creations/kartik/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "https://kartik.minteck.org" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/creations/neutron/index.ejs b/htdocs/public/creations/neutron/index.ejs new file mode 100644 index 0000000..75029b2 --- /dev/null +++ b/htdocs/public/creations/neutron/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "https://gitlab.minteck.org/minteck/neutron" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/creations/unchained/index.ejs b/htdocs/public/creations/unchained/index.ejs new file mode 100644 index 0000000..56678a0 --- /dev/null +++ b/htdocs/public/creations/unchained/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "https://unchained.minteck.org" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/creations/video/index.ejs b/htdocs/public/creations/video/index.ejs new file mode 100644 index 0000000..e41cbc4 --- /dev/null +++ b/htdocs/public/creations/video/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "/" + slang + "/creations" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/furry/index.ejs b/htdocs/public/furry/index.ejs new file mode 100644 index 0000000..ee5a47f --- /dev/null +++ b/htdocs/public/furry/index.ejs @@ -0,0 +1,6 @@ +<% + + res.writeHead(301, { "Location": "/" + slang + "/#/about" }); + res.end(); + +%> \ No newline at end of file diff --git a/htdocs/public/index.ejs b/htdocs/public/index.ejs index a004f52..65b8e49 100644 --- a/htdocs/public/index.ejs +++ b/htdocs/public/index.ejs @@ -1,7 +1,7 @@ <% global.title = lang.main.page; %> <%- include(`${private}/header.ejs`) %> -TODO +TODO (<%- slang %>)
@@ -212,11 +212,12 @@

<%- lang.main.about.archives.title %>

<%- lang.main.about.archives.description %>

- <%- lang.main.about.archives.action %> → + <%- lang.main.about.archives.action %> →

<%- lang.main.about.general.title %>

<%- lang.main.about.general.description %>

+ <%- lang.main.about.general.action %> →

<%- lang.main.about.history.title %>

@@ -239,7 +240,8 @@ fs.readFileSync(serverRoot + "/.git/" + fs.readFileSync(serverRoot + "/.git/HEAD").toString().trim().substr(5)).toString().trim().substr(0, 8) %> · <%- lang.global.source %> · <%- lang.global.legal %> · <%- lang.global.account %> · <%- lang.global.legal %> · <%- lang.metranslator.title %> · <%- lang.global.account %> · Kartik Online · UnchainedTech · Minteck Trunk diff --git a/htdocs/public/me/index.ejs b/htdocs/public/me/index.ejs new file mode 100644 index 0000000..36feb43 --- /dev/null +++ b/htdocs/public/me/index.ejs @@ -0,0 +1,20 @@ +<% global.title = lang.me.title; %> +<%- include(`${private}/header.ejs`) %> + +← <%- lang.global.back %> + +
+
+<% data = child_process.execSync("curl https://jae.fi/me").toString(); %> + +
+ +
+
+

Minteck | Mia

+

Software Developer, Sysadmin, Furry

+
+
+
+ +<%- include(`${private}/footer.ejs`) %> \ No newline at end of file diff --git a/htdocs/public/metranslator/api/index.ejs b/htdocs/public/metranslator/api/index.ejs index 47800bd..388331b 100644 --- a/htdocs/public/metranslator/api/index.ejs +++ b/htdocs/public/metranslator/api/index.ejs @@ -25,7 +25,7 @@ } aw = JSON.parse(child_process.execSync(`cd /mnt/metranslator-api && node index.js api ${target} "${text}"`).toString()); - last = child_process.execSync("cd /mnt/metranslator-api && git log -1 --pretty=format:'%an'") + last = child_process.execSync("cd /mnt/metranslator-api && git log -1 --pretty=format:'%an'").toString() aw["system"]["version"] = aw["system"]["version"] + "-" + fs.readFileSync("/mnt/metranslator-api/.git/refs/heads/trunk").toString().substr(0, 8); aw["system"]["last_author"] = last; aw["call"] = "cd /mnt/metranslator-api && node index.js api {$target} \"{$text}\""; diff --git a/htdocs/public/metranslator/index.ejs b/htdocs/public/metranslator/index.ejs index 943d772..1433c81 100644 --- a/htdocs/public/metranslator/index.ejs +++ b/htdocs/public/metranslator/index.ejs @@ -1,4 +1,4 @@ -<% global.title = "MeTranslator"; %> +<% global.title = lang.metranslator.title; %> <%- include(`${private}/header.ejs`) %> ← <%- lang.global.back %> @@ -15,15 +15,15 @@ } -

Metroz Translate

-

💡 Click one of the languages to invert

+

<%- lang.metranslator.title %>

+

💡 <%- lang.metranslator.tip %>

- English

 -