diff options
| -rw-r--r-- | locale/en_GB.json | 3 | ||||
| -rw-r--r-- | routes/nodeinfo.php | 18 | ||||
| -rw-r--r-- | static/skeleton.css | 8 | ||||
| -rw-r--r-- | templates/skeleton.php | 11 |
4 files changed, 27 insertions, 13 deletions
diff --git a/locale/en_GB.json b/locale/en_GB.json index 2eac456..12e1ce9 100644 --- a/locale/en_GB.json +++ b/locale/en_GB.json @@ -1,4 +1,6 @@ { + "digitigrade": "Digitigrade", + "version": "Digitigrade @ %s", "user.profile.createdAt": "Joined on %s", "user.profile.openRemote": "Open remote profile page", "user.profile.bio.placeholder": "This user hasn't written a bio yet.", @@ -33,7 +35,6 @@ "placeholder": "There's nothing here.", "placeholder.moreItems": "…and %d more", "placeholder.noMoreItems": "No more items.", - "digitigrade": "Digitigrade", "note.resharedBy": "Reshared by %s", "navigation.login": "Log in", "navigation.logout": "Log out", diff --git a/routes/nodeinfo.php b/routes/nodeinfo.php index 92f1f7b..2fef63b 100644 --- a/routes/nodeinfo.php +++ b/routes/nodeinfo.php @@ -1,5 +1,7 @@ <?php +use Digitigrade\GlobalSettings; +use Digitigrade\Model\UserAccount; use Digitigrade\Router; Router::getInstance()->mount('/.well-known/nodeinfo', function (array $args) { @@ -14,11 +16,12 @@ Router::getInstance()->mount('/.well-known/nodeinfo', function (array $args) { }); Router::getInstance()->mount('/nodeinfo/2.1', function (array $args) { + $s = GlobalSettings::getInstance(); json_response([ 'version' => '2.1', 'software' => [ 'name' => 'Digitigrade', - 'version' => '0.1.0' + 'version' => get_version() ], 'protocols' => ['pawpub'], 'services' => [ @@ -28,12 +31,12 @@ Router::getInstance()->mount('/nodeinfo/2.1', function (array $args) { 'openRegistrations' => false, 'usage' => [ 'users' => [ - 'total' => 1 + 'total' => UserAccount::count() ] ], 'metadata' => [ - 'nodeName' => 'A Digitigrade server', - 'nodeDescription' => 'nodeinfo is hardcoded for now', + 'nodeName' => $s->get('instance.name'), + 'nodeDescription' => $s->get('instance.description'), 'pawpub' => [ 'extensions' => [ // 'https://whatever.example/ext/meow', @@ -44,11 +47,12 @@ Router::getInstance()->mount('/nodeinfo/2.1', function (array $args) { }); Router::getInstance()->mount('/.well-known/pawpub-instance', function (array $args) { + $s = GlobalSettings::getInstance(); json_response([ - 'name' => 'A Digitigrade server', - 'description' => 'metadata is hardcoded for now', + 'name' => $s->get('instance.name'), + 'description' => $s->get('instance.description'), 'softwareName' => 'Digitigrade', - 'softwareVersion' => '0.1.0', + 'softwareVersion' => get_version(), 'softwareDescription' => 'An experimental PawPub server', 'endpoints' => [ 'auth' => path_to_uri('/auth/main'), diff --git a/static/skeleton.css b/static/skeleton.css index e38f49f..b9fcfdc 100644 --- a/static/skeleton.css +++ b/static/skeleton.css @@ -144,6 +144,12 @@ hr { .placeholder { font-style: italic; - color: #555; + color: var(--clr-lesser-foreground); + text-align: center; +} + +.versionInfo { + font-size: var(--font-small-size); + color: var(--clr-lesser-foreground); text-align: center; } diff --git a/templates/skeleton.php b/templates/skeleton.php index 3aaf132..5186b4a 100644 --- a/templates/skeleton.php +++ b/templates/skeleton.php @@ -1,14 +1,16 @@ <?php - use Digitigrade\GlobalSettings; use Digitigrade\Model\FollowRelation; -$user = Digitigrade\Model\UserAccount::findByCurrentSession(); +use Digitigrade\Model\UserAccount; + +$user = UserAccount::findByCurrentSession(); +$settings = GlobalSettings::getInstance(); ?> <!DOCTYPE html> <html lang="en"> <head> - <title><?= $pageTitle ?></title> + <title><?= $pageTitle ?> — <?= $settings->get('instance.name') ?></title> <link rel="stylesheet" href="/static/style.css"> <link rel="stylesheet" href="https://fonts.bunny.net/css?family=dm-sans:400,400i,800,800i"> <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:FILL@0..1"> @@ -29,7 +31,7 @@ $user = Digitigrade\Model\UserAccount::findByCurrentSession(); ]); call_template('navigation_links', ['links' => $links]); ?> - <span id="siteTitle"><?= GlobalSettings::getInstance()->get('instance.name') ?></span> + <span id="siteTitle"><?= $settings->get('instance.name') ?></span> <img id="loadingIndicator" class="htmx-indicator" src="/static/tail-spin.svg"> <?php if ($user == null): call_template('navigation_links', ['links' => [ @@ -61,6 +63,7 @@ $user = Digitigrade\Model\UserAccount::findByCurrentSession(); call_template('side_navigation', ['links' => $links]); } ?> + <p class="versionInfo"><?= sprintf(__('version'), get_version()) ?></p> </section> <section id="centrePane"> <?php if (!isset($renderTitleHeading) || $renderTitleHeading): ?> |