From bdb69df52d534f76e97226845ffc8a78dd995d24 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue, 11 Apr 2023 16:16:05 +0100
Subject: [PATCH] Switch bio to be stored in database

---
 app/Http/Controllers/Admin/BioController.php  | 32 +++++++++
 app/Http/Controllers/FrontPageController.php  |  4 ++
 app/Models/Bio.php                            | 11 +++
 database/factories/BioFactory.php             | 23 +++++++
 .../2023_04_11_115837_create_bios_table.php   | 28 ++++++++
 database/seeders/BioSeeder.php                | 17 +++++
 resources/views/admin/bio/show.blade.php      | 19 ++++++
 resources/views/admin/welcome.blade.php       |  5 ++
 resources/views/front-page.blade.php          |  2 -
 resources/views/master.blade.php              |  8 ++-
 resources/views/templates/bio.blade.php       | 32 ---------
 routes/web.php                                |  7 ++
 tests/Feature/Admin/BioTest.php               | 67 +++++++++++++++++++
 tests/Unit/NotesTest.php                      |  2 +-
 14 files changed, 219 insertions(+), 38 deletions(-)
 create mode 100644 app/Http/Controllers/Admin/BioController.php
 create mode 100644 app/Models/Bio.php
 create mode 100644 database/factories/BioFactory.php
 create mode 100644 database/migrations/2023_04_11_115837_create_bios_table.php
 create mode 100644 database/seeders/BioSeeder.php
 create mode 100644 resources/views/admin/bio/show.blade.php
 delete mode 100644 resources/views/templates/bio.blade.php
 create mode 100644 tests/Feature/Admin/BioTest.php

diff --git a/app/Http/Controllers/Admin/BioController.php b/app/Http/Controllers/Admin/BioController.php
new file mode 100644
index 00000000..c760e12c
--- /dev/null
+++ b/app/Http/Controllers/Admin/BioController.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\Bio;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class BioController extends Controller
+{
+    public function show(): View
+    {
+        $bio = Bio::first();
+
+        return view('admin.bio.show', [
+            'bioEntry' => $bio,
+        ]);
+    }
+
+    public function update(Request $request): RedirectResponse
+    {
+        $bio = Bio::firstOrNew();
+        $bio->content = $request->input('content');
+        $bio->save();
+
+        return redirect()->route('admin.bio.show');
+    }
+}
diff --git a/app/Http/Controllers/FrontPageController.php b/app/Http/Controllers/FrontPageController.php
index 9d37c9db..52ff2adf 100644
--- a/app/Http/Controllers/FrontPageController.php
+++ b/app/Http/Controllers/FrontPageController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Article;
+use App\Models\Bio;
 use App\Models\Bookmark;
 use App\Models\Like;
 use App\Models\Note;
@@ -34,8 +35,11 @@ class FrontPageController extends Controller
             ->sortByDesc('updated_at')
             ->paginate(10);
 
+        $bio = Bio::first()?->content;
+
         return view('front-page', [
             'items' => $items,
+            'bio' => $bio,
         ]);
     }
 }
diff --git a/app/Models/Bio.php b/app/Models/Bio.php
new file mode 100644
index 00000000..b9a0e78b
--- /dev/null
+++ b/app/Models/Bio.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Bio extends Model
+{
+    use HasFactory;
+}
diff --git a/database/factories/BioFactory.php b/database/factories/BioFactory.php
new file mode 100644
index 00000000..b2493014
--- /dev/null
+++ b/database/factories/BioFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Bio>
+ */
+class BioFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'content' => $this->faker->paragraph,
+        ];
+    }
+}
diff --git a/database/migrations/2023_04_11_115837_create_bios_table.php b/database/migrations/2023_04_11_115837_create_bios_table.php
new file mode 100644
index 00000000..4f26ec18
--- /dev/null
+++ b/database/migrations/2023_04_11_115837_create_bios_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('bios', function (Blueprint $table) {
+            $table->id();
+            $table->text('content');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('bios');
+    }
+};
diff --git a/database/seeders/BioSeeder.php b/database/seeders/BioSeeder.php
new file mode 100644
index 00000000..093d0609
--- /dev/null
+++ b/database/seeders/BioSeeder.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Bio;
+use Illuminate\Database\Seeder;
+
+class BioSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        Bio::factory()->create();
+    }
+}
diff --git a/resources/views/admin/bio/show.blade.php b/resources/views/admin/bio/show.blade.php
new file mode 100644
index 00000000..e8bc5532
--- /dev/null
+++ b/resources/views/admin/bio/show.blade.php
@@ -0,0 +1,19 @@
+@extends('master')
+
+@section('title')Edit Bio « Admin CP « @stop
+
+@section('content')
+    <h1>Edit bio</h1>
+    <form action="/admin/bio" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('PUT') }}
+        <div>
+            <label for="content">Content:</label>
+            <br>
+            <textarea name="content" id="content" rows="10" cols="50">{{ old('content', $bioEntry?->content) }}</textarea>
+        </div>
+        <div>
+            <button type="submit" name="save">Save</button>
+        </div>
+    </form>
+@stop
diff --git a/resources/views/admin/welcome.blade.php b/resources/views/admin/welcome.blade.php
index 46ac746f..4ca4c4d0 100644
--- a/resources/views/admin/welcome.blade.php
+++ b/resources/views/admin/welcome.blade.php
@@ -46,4 +46,9 @@
         You can either <a href="/admin/syndication/create">create</a> new syndication targets,
         or <a href="/admin/syndication">edit</a> them.
     </p>
+
+    <h2>Bio</h2>
+    <p>
+        Edit your <a href="/admin/bio">bio</a>.
+    </p>
 @stop
diff --git a/resources/views/front-page.blade.php b/resources/views/front-page.blade.php
index a3f0bc8c..44eca1d4 100644
--- a/resources/views/front-page.blade.php
+++ b/resources/views/front-page.blade.php
@@ -27,6 +27,4 @@
     </div>
 
     {{ $items->links('templates.pagination') }}
-
-    @include('templates.bio')
 @stop
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 7ab40938..df94fe72 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -43,9 +43,11 @@
         </header>
 
         <main>
-@yield('content')
-@section('bio')
-@show
+            @yield('content')
+
+            @isset($bio)
+                {!! $bio !!}
+            @endisset
         </main>
 
         <footer>
diff --git a/resources/views/templates/bio.blade.php b/resources/views/templates/bio.blade.php
deleted file mode 100644
index 2f709288..00000000
--- a/resources/views/templates/bio.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-@section('bio')
-            <div class="h-card personal-bio">
-                <p>My name is <span class="p-name p-author">Jonny Barnes</span>, and
-                    <a rel="me" href="https://jonnybarnes.uk" class="u-url">
-                        <code>jonnybarnes.uk</code>
-                    </a> is my site. I’m from
-                    <a href="https://en.wikipedia.org/wiki/Manchester" class="h-adr p-adr">
-                        <span class="p-locality">Manchester</span>,
-                        <abbr class="p-country-name" title="United Kingdom">UK</abbr>
-                    </a>.</p>
-                <p>I am active to varying degrees on several
-                    <a href="https://indieweb.org/silo">silos</a>:</p>
-                <ul>
-                    <li>I keep in touch with friends on <a rel="me" href="https://www.facebook.com/jonnybarnes" class="u-url">Facebook</a></li>
-                    <li>I follow people I find interesting on <a rel="me" href="https://twitter.com/jonnybarnes" class="u-url">Twitter</a></li>
-                    <li>I toot on the fediverse with my own instance of <a rel="me" href="https://mastodon.thebeeches.house/@jonny" class="u-url">Mastodon</a></li>
-                    <li>I push code to <a rel="me" href="https://github.com/jonnybarnes" class="u-url">GitHub</a></li>
-                    <li>I scrobble songs to <a rel="me" href="https://last.fm/user/jonnymbarnes" class="u-url">last.fm</a> that I listen to on <a rel="me" href="https://open.spotify.com/user/jonnybarnes89" class="u-url">Spotify</a> or <a rel="me" href="https://music.apple.com/profile/jonnybarnes" class="u-url">Apple Music</a></li>
-                    <li>I post photos to <a rel="me" href="https://www.instagram.com/jonnybarnes/" class="u-url">Instagram</a></li>
-                </ul>
-                <p>My usual online nickname is normally <code class="nickname">
-                jonnybarnes</code> for other services. I also syndicate my content
-                to the IndieWeb friendly site
-                <a rel="me" href="https://micro.blog/jonnybarnes" class="u-url">micro.blog</a>.
-                Here’s a <a href="/assets/img/jmb-bw.png" class="u-photo photo">
-                profile pic</a>. I also have a
-                <a class="pgpkey" href="/assets/jonnybarnes-public-key-ecc.asc">PGP
-                key</a>, with <a href="/notes/5g">fingerprint</a>. You can email me
-                at jonny at my domain, or message me on
-                <a href="xmpp:jonny@chat.jonnybarnes.uk">XMPP</a>.</p>
-            </div>
-@stop
diff --git a/routes/web.php b/routes/web.php
index 2a536f10..81976c0d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,6 +12,7 @@
 */
 
 use App\Http\Controllers\Admin\ArticlesController as AdminArticlesController;
+use App\Http\Controllers\Admin\BioController;
 use App\Http\Controllers\Admin\ClientsController;
 use App\Http\Controllers\Admin\ContactsController as AdminContactsController;
 use App\Http\Controllers\Admin\HomeController;
@@ -133,6 +134,12 @@ Route::group(['domain' => config('url.longurl')], function () {
             Route::put('/{syndicationTarget}', [SyndicationTargetsController::class, 'update']);
             Route::delete('/{syndicationTarget}', [SyndicationTargetsController::class, 'destroy']);
         });
+
+        // Bio
+        Route::group(['prefix' => 'bio'], function () {
+            Route::get('/', [BioController::class, 'show'])->name('admin.bio.show');
+            Route::put('/', [BioController::class, 'update']);
+        });
     });
 
     // Blog pages using ArticlesController
diff --git a/tests/Feature/Admin/BioTest.php b/tests/Feature/Admin/BioTest.php
new file mode 100644
index 00000000..7f1328ea
--- /dev/null
+++ b/tests/Feature/Admin/BioTest.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Admin;
+
+use App\Models\Bio;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class BioTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function adminBiosPageLoads(): void
+    {
+        $user = User::factory()->make();
+
+        $response = $this->actingAs($user)
+            ->get('/admin/bio');
+        $response->assertSeeText('Edit bio');
+    }
+
+    /** @test */
+    public function adminCanCreateBio(): void
+    {
+        $user = User::factory()->make();
+
+        $this->actingAs($user)
+            ->post('/admin/bio', [
+                '_method' => 'PUT',
+                'content' => 'Bio content',
+            ]);
+        $this->assertDatabaseHas('bios', ['content' => 'Bio content']);
+    }
+
+    /** @test */
+    public function adminCanLoadExistingBio(): void
+    {
+        $user = User::factory()->make();
+        $bio = Bio::factory()->create([
+            'content' => 'This is <em>my</em> bio. It uses <strong>HTML</strong>.',
+        ]);
+
+        $response = $this->actingAs($user)
+            ->get('/admin/bio');
+        $response->assertSeeText('This is <em>my</em> bio. It uses <strong>HTML</strong>.');
+    }
+
+    /** @test */
+    public function adminCanEditBio(): void
+    {
+        $user = User::factory()->make();
+        $bio = Bio::factory()->create();
+
+        $this->actingAs($user)
+            ->post('/admin/bio', [
+                '_method' => 'PUT',
+                'content' => 'This bio has been edited',
+            ]);
+        $this->assertDatabaseHas('bios', [
+            'content' => 'This bio has been edited',
+        ]);
+    }
+}
diff --git a/tests/Unit/NotesTest.php b/tests/Unit/NotesTest.php
index cda66fc2..0a8d0725 100644
--- a/tests/Unit/NotesTest.php
+++ b/tests/Unit/NotesTest.php
@@ -412,7 +412,7 @@ class NotesTest extends TestCase
             'in_reply_to' => 'https://twitter.com/someRando/status/933662564587855877',
         ]);
 
-        $this->assertSame($tempContent, $note->twitter);
+        $this->assertEquals($tempContent, $note->twitter);
     }
 
     /** @test */