diff --git a/kanga.world/content/2_about/rightlogo.txt b/kanga.world/content/2_about/rightlogo.txt new file mode 100644 index 0000000..9d0a17f --- /dev/null +++ b/kanga.world/content/2_about/rightlogo.txt @@ -0,0 +1,18 @@ +Title: About + +---- + +Text: + +**Kanga World** is (link: https://kangaroopunch.com text: Kangaroo Punch Studio's target: _blank) retro online gaming service. + +While currently heavily under construction, our goal is to provide: + +- Multi-player DOS gaming via (link: https://dosbox-staging.github.io/ text: DOSBox Staging target: _blank) or real hardware. +- Multi-player BBS doors. +- Multi-player interactive fiction. +- Multi-player JoeyNet-based retro gaming on all (link: https://joeylib.com text: JoeyLib target: _blank) supported platforms. + +Our first test client will be for DOSBox and provide limited BBS door gaming in order to test our network code and server infrastructure. + +Want to follow along or contribute? (link: https://discord.gg/AMA8zbYwQD text: Stop by our official chat! target: _blank) \ No newline at end of file diff --git a/kanga.world/content/register/register.txt b/kanga.world/content/register/register.txt index 4cc5d32..5717f6a 100644 --- a/kanga.world/content/register/register.txt +++ b/kanga.world/content/register/register.txt @@ -15,3 +15,7 @@ Password: Password ---- Button: Register + +---- + +Minlength: 8 diff --git a/kanga.world/content/user/user.txt b/kanga.world/content/user/user.txt index 8e9603c..a888f98 100644 --- a/kanga.world/content/user/user.txt +++ b/kanga.world/content/user/user.txt @@ -6,15 +6,15 @@ Alert: Invalid email or password ---- -Email: New Email +Email: Email ---- -Password: New Password +Password: Password ---- -Button: Update User +Button: Save ---- @@ -30,4 +30,4 @@ Delete-button: Delete Account ---- -Delete-warning: Are you sure? This action cannot be reversed! \ No newline at end of file +Delete-warning: Are you sure? This action cannot be reversed! diff --git a/kanga.world/site/blueprints/pages/activated.yml b/kanga.world/site/blueprints/pages/activated.yml index 9ec00f5..7e15fb1 100644 --- a/kanga.world/site/blueprints/pages/activated.yml +++ b/kanga.world/site/blueprints/pages/activated.yml @@ -1,4 +1,4 @@ -title: Avtivated User Landing Page +title: Activated User Landing Page preset: page fields: text: diff --git a/kanga.world/site/blueprints/pages/home.yml b/kanga.world/site/blueprints/pages/home.yml index 105e4e8..74bc2c7 100644 --- a/kanga.world/site/blueprints/pages/home.yml +++ b/kanga.world/site/blueprints/pages/home.yml @@ -1,29 +1,18 @@ title: News icon: document +sections: + drafts: + extends: sections/news + headline: Drafts + status: draft -columns: - left: - width: 1/2 - fields: - text: - type: textarea - size: large + unlisted: + extends: sections/news + headline: In Review + status: unlisted - right: - width: 1/2 - sections: - drafts: - extends: sections/news - headline: Drafts - status: draft - - unlisted: - extends: sections/news - headline: In Review - status: unlisted - - listed: - extends: sections/news - headline: Published - status: listed - layout: cards + listed: + extends: sections/news + headline: Published + status: listed + layout: cards diff --git a/kanga.world/site/blueprints/pages/rightlogo.yml b/kanga.world/site/blueprints/pages/rightlogo.yml new file mode 100644 index 0000000..0ba46d4 --- /dev/null +++ b/kanga.world/site/blueprints/pages/rightlogo.yml @@ -0,0 +1,7 @@ +title: Right-Hand Logo Default Page +preset: page +fields: + text: + label: Text + type: textarea + size: large diff --git a/kanga.world/site/controllers/login.php b/kanga.world/site/controllers/login.php index 171b989..ceabb21 100644 --- a/kanga.world/site/controllers/login.php +++ b/kanga.world/site/controllers/login.php @@ -54,7 +54,6 @@ return function ($kirby) { // SUCCESSFUL if (empty($alert) === true) { - $data = []; go(); } @@ -66,4 +65,4 @@ return function ($kirby) { 'alert' => $alert, 'data' => $data ?? false ]; -}; \ No newline at end of file +}; diff --git a/kanga.world/site/plugins/helpers/index.php b/kanga.world/site/plugins/helpers/index.php new file mode 100644 index 0000000..649368c --- /dev/null +++ b/kanga.world/site/plugins/helpers/index.php @@ -0,0 +1,15 @@ +user()->name() && strlen($kirby->user()->name()) > 1) { + $friendly = esc($kirby->user()->name(), 'html'); + } else { + $friendly = esc($kirby->user()->email(), 'html'); + } + + return $friendly; +} + +?> diff --git a/kanga.world/site/snippets/menu.php b/kanga.world/site/snippets/menu.php index ae66f34..526baa1 100644 --- a/kanga.world/site/snippets/menu.php +++ b/kanga.world/site/snippets/menu.php @@ -31,14 +31,7 @@ user() && !$kirby->session()->get('kpNewUser')) { ?>