From aeb1f7a2d3206d456a41546ae248483060ed526e Mon Sep 17 00:00:00 2001 From: RemainingDev <161089154+RemainingDev@users.noreply.github.com> Date: Sun, 16 Feb 2025 19:48:22 +0100 Subject: [PATCH 1/2] Style registration and minecraft pages --- src/extensions/invite/index.ts | 7 ++-- src/extensions/invite/register.html | 16 ++++---- src/extensions/invite/static/register.css | 48 +++++++++++++++++++++++ src/extensions/minecraft/index.html | 7 +++- src/extensions/minecraft/index.ts | 2 + src/extensions/minecraft/static/index.css | 42 ++++++++++++++++++++ src/templates/layout.html | 2 + 7 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 src/extensions/invite/static/register.css create mode 100644 src/extensions/minecraft/static/index.css diff --git a/src/extensions/invite/index.ts b/src/extensions/invite/index.ts index d909461..a2c3073 100644 --- a/src/extensions/invite/index.ts +++ b/src/extensions/invite/index.ts @@ -17,13 +17,15 @@ export default class extends ExtensionBase { } override requires_admin: Extension['requires_admin'] = (path) => { - if (['register', 'create_acc'].includes(path.at(0)??'')) { + console.log(path) + if (['register', 'create_acc', 'register.css'].includes(path.at(0)??'')) { return false } return true } override requires_login: Extension['requires_login'] = (path) => { - if (['register', 'create_acc'].includes(path.at(0)??'')) { + console.log("login? ",path) + if (['register', 'create_acc', 'register.css'].includes(path.at(0)??'')) { return false } return true @@ -32,7 +34,6 @@ export default class extends ExtensionBase { override handle: Extension['handle'] = async (ctx) => { let [knex]: [Knex] = this.get_dependencies('Knex') let location = ctx.path.shift() - switch (location) { case '': case undefined:{ diff --git a/src/extensions/invite/register.html b/src/extensions/invite/register.html index e30ec71..bacdfa4 100644 --- a/src/extensions/invite/register.html +++ b/src/extensions/invite/register.html @@ -1,17 +1,19 @@ {% extends "layout.html" %} {% block head %} - + {% endblock %} {% block body %} -
+

Registration

+
+ - + @@ -20,15 +22,15 @@ - + - + +
(optional)
- -
{{auth_err}} +
{% endblock %} diff --git a/src/extensions/invite/static/register.css b/src/extensions/invite/static/register.css new file mode 100644 index 0000000..62a2365 --- /dev/null +++ b/src/extensions/invite/static/register.css @@ -0,0 +1,48 @@ + +div{ + display: flex; + align-items: center; + justify-content: center; + margin: 2%; +} + +form { + display: flex; + flex-wrap: nowrap; +} +form input { + background-color: silver; + border-radius: 5px; + border: solid 2px darkgrey; + outline: none; +} +form input:focus { + background-color: rgb(221, 221, 221); +} + +.form-button, +.form-button:visited { + all: unset; + background-color: rgb(221, 221, 221); + padding: 5px 10px; + border-radius: var(--margin-small); + display: inline-block; + width: fit-content; + height: 16px; + font-size: 15px; + box-shadow: 0 0 2px black; + text-decoration: none; + color: black; + margin-left: 2px; + box-sizing: content-box; + cursor: pointer; + + margin: 5px; + display: flex; + align-items: center; + justify-content: center; +} + +.form-button:hover { + background-color: darkgrey; +} \ No newline at end of file diff --git a/src/extensions/minecraft/index.html b/src/extensions/minecraft/index.html index 0757e23..a86863b 100644 --- a/src/extensions/minecraft/index.html +++ b/src/extensions/minecraft/index.html @@ -1,14 +1,19 @@ {% extends "extension.html" %} +{% block head %} + +{% endblock %} + {% block body %} +
+
- {{auth_err}}
diff --git a/src/extensions/minecraft/index.ts b/src/extensions/minecraft/index.ts index 3bb36c2..73f140f 100644 --- a/src/extensions/minecraft/index.ts +++ b/src/extensions/minecraft/index.ts @@ -64,6 +64,8 @@ export default class extends ExtensionBase { } return this.return(ctx, undefined, location='/minecraft') + }default: { + return this.return_file(ctx, location) } } } diff --git a/src/extensions/minecraft/static/index.css b/src/extensions/minecraft/static/index.css new file mode 100644 index 0000000..a124500 --- /dev/null +++ b/src/extensions/minecraft/static/index.css @@ -0,0 +1,42 @@ +form{ + display: flex; + align-items: center; + justify-content: center; + margin-top: 5%; +} + +td{ + padding: 5px; +} + +.form-button, +.form-button:visited { + all: unset; + background-color: rgb(221, 221, 221); + padding: 5px 10px; + border-radius: var(--margin-small); + display: inline-block; + width: fit-content; + height: 16px; + font-size: 15px; + box-shadow: 0 0 2px black; + text-decoration: none; + color: black; + margin-left: 2px; + box-sizing: content-box; + cursor: pointer; +} + +.form-button:hover { + background-color: darkgrey; +} + +form input { + background-color: silver; + border-radius: 5px; + border: solid 2px darkgrey; + outline: none; +} +form input:focus { + background-color: rgb(221, 221, 221); +} \ No newline at end of file diff --git a/src/templates/layout.html b/src/templates/layout.html index 04103b7..07ca694 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -9,6 +9,8 @@ Keuknet + {% block head %} + {% endblock %} From cc6df5b4ccef7e61ff1fd947faa6aad1c13aba1a Mon Sep 17 00:00:00 2001 From: RemainingDev <161089154+RemainingDev@users.noreply.github.com> Date: Sun, 16 Feb 2025 20:37:13 +0100 Subject: [PATCH 2/2] cleanup --- src/extensions/invite/index.ts | 3 +-- src/extensions/invite/static/register.css | 2 +- src/extensions/minecraft/index.ts | 3 ++- src/extensions/minecraft/static/index.css | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/extensions/invite/index.ts b/src/extensions/invite/index.ts index a2c3073..67d7d33 100644 --- a/src/extensions/invite/index.ts +++ b/src/extensions/invite/index.ts @@ -17,14 +17,12 @@ export default class extends ExtensionBase { } override requires_admin: Extension['requires_admin'] = (path) => { - console.log(path) if (['register', 'create_acc', 'register.css'].includes(path.at(0)??'')) { return false } return true } override requires_login: Extension['requires_login'] = (path) => { - console.log("login? ",path) if (['register', 'create_acc', 'register.css'].includes(path.at(0)??'')) { return false } @@ -34,6 +32,7 @@ export default class extends ExtensionBase { override handle: Extension['handle'] = async (ctx) => { let [knex]: [Knex] = this.get_dependencies('Knex') let location = ctx.path.shift() + switch (location) { case '': case undefined:{ diff --git a/src/extensions/invite/static/register.css b/src/extensions/invite/static/register.css index 62a2365..5ff0d17 100644 --- a/src/extensions/invite/static/register.css +++ b/src/extensions/invite/static/register.css @@ -45,4 +45,4 @@ form input:focus { .form-button:hover { background-color: darkgrey; -} \ No newline at end of file +} diff --git a/src/extensions/minecraft/index.ts b/src/extensions/minecraft/index.ts index 73f140f..4fbed5b 100644 --- a/src/extensions/minecraft/index.ts +++ b/src/extensions/minecraft/index.ts @@ -64,7 +64,8 @@ export default class extends ExtensionBase { } return this.return(ctx, undefined, location='/minecraft') - }default: { + } + default: { return this.return_file(ctx, location) } } diff --git a/src/extensions/minecraft/static/index.css b/src/extensions/minecraft/static/index.css index a124500..5ab529b 100644 --- a/src/extensions/minecraft/static/index.css +++ b/src/extensions/minecraft/static/index.css @@ -39,4 +39,4 @@ form input { } form input:focus { background-color: rgb(221, 221, 221); -} \ No newline at end of file +}