From 0f52d80ca67a49258b235f5831163dd72fbd54cf Mon Sep 17 00:00:00 2001
From: Frankie B <git@diskfloppy.me>
Date: Tue, 11 Jun 2024 18:02:01 +0100
Subject: Merge MVC rewrite into master (#21)

* Just commit it all

* Require auth

* crap

* Update homepage

* Block AI scrapers

* Update cache update script

* Add dummy file

* Remove unnecessary lastfm config var

* Use withQueryParameters for LastFM API

* Fix embeds

* Update example env

* Smard
---
 database/factories/BookmarkCategoryFactory.php     | 23 ++++++++++++++
 database/factories/BookmarkSiteFactory.php         | 27 +++++++++++++++++
 ...31_204730_create_bookmark__categories_table.php | 29 ------------------
 ...4_01_31_204742_create_bookmark__sites_table.php | 33 --------------------
 ...4_01_31_204815_create_guestbook__bans_table.php | 29 ------------------
 ...1_31_204820_create_guestbook__entries_table.php | 33 --------------------
 ..._210227_populate_bookmark__categories_table.php | 34 ---------------------
 ...13_230402_create_bookmark__categories_table.php | 29 ++++++++++++++++++
 ...4_02_13_230457_create_bookmark__sites_table.php | 35 ++++++++++++++++++++++
 ...2_25_151527_create_guestbook__entries_table.php | 32 ++++++++++++++++++++
 database/seeders/BookmarkCategoriesTableSeeder.php | 30 +++++++++++++++++++
 database/seeders/DatabaseSeeder.php                | 22 --------------
 12 files changed, 176 insertions(+), 180 deletions(-)
 create mode 100644 database/factories/BookmarkCategoryFactory.php
 create mode 100644 database/factories/BookmarkSiteFactory.php
 delete mode 100644 database/migrations/2024_01_31_204730_create_bookmark__categories_table.php
 delete mode 100644 database/migrations/2024_01_31_204742_create_bookmark__sites_table.php
 delete mode 100644 database/migrations/2024_01_31_204815_create_guestbook__bans_table.php
 delete mode 100644 database/migrations/2024_01_31_204820_create_guestbook__entries_table.php
 delete mode 100644 database/migrations/2024_01_31_210227_populate_bookmark__categories_table.php
 create mode 100644 database/migrations/2024_02_13_230402_create_bookmark__categories_table.php
 create mode 100644 database/migrations/2024_02_13_230457_create_bookmark__sites_table.php
 create mode 100644 database/migrations/2024_02_25_151527_create_guestbook__entries_table.php
 create mode 100644 database/seeders/BookmarkCategoriesTableSeeder.php
 delete mode 100644 database/seeders/DatabaseSeeder.php

(limited to 'database')

diff --git a/database/factories/BookmarkCategoryFactory.php b/database/factories/BookmarkCategoryFactory.php
new file mode 100644
index 0000000..ca49ce5
--- /dev/null
+++ b/database/factories/BookmarkCategoryFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\BookmarkCategory>
+ */
+class BookmarkCategoryFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->word,
+        ];
+    }
+}
diff --git a/database/factories/BookmarkSiteFactory.php b/database/factories/BookmarkSiteFactory.php
new file mode 100644
index 0000000..c77c011
--- /dev/null
+++ b/database/factories/BookmarkSiteFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use App\Models\BookmarkCategory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\BookmarkSite>
+ */
+class BookmarkSiteFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->name,
+            'description' => $this->faker->sentence,
+            'url' => $this->faker->url,
+            'category' => BookmarkCategory::factory(),
+        ];
+    }
+}
diff --git a/database/migrations/2024_01_31_204730_create_bookmark__categories_table.php b/database/migrations/2024_01_31_204730_create_bookmark__categories_table.php
deleted file mode 100644
index 68bf949..0000000
--- a/database/migrations/2024_01_31_204730_create_bookmark__categories_table.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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('bookmark__categories', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->float('priority');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('bookmark__categories');
-    }
-};
diff --git a/database/migrations/2024_01_31_204742_create_bookmark__sites_table.php b/database/migrations/2024_01_31_204742_create_bookmark__sites_table.php
deleted file mode 100644
index 775c6bb..0000000
--- a/database/migrations/2024_01_31_204742_create_bookmark__sites_table.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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('bookmark__sites', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name', 50);
-            $table->string('description', 150);
-            $table->string('url', 100);
-            $table->float('priority');
-            $table->integer('category_id')->unsigned();
-            $table->foreign('category_id')->references('id')->on('bookmark__categories');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('bookmark__sites');
-    }
-};
diff --git a/database/migrations/2024_01_31_204815_create_guestbook__bans_table.php b/database/migrations/2024_01_31_204815_create_guestbook__bans_table.php
deleted file mode 100644
index 6f0a959..0000000
--- a/database/migrations/2024_01_31_204815_create_guestbook__bans_table.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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('guestbook__bans', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('ip_address', 40);
-            $table->string('reason', 50);
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('guestbook__bans');
-    }
-};
diff --git a/database/migrations/2024_01_31_204820_create_guestbook__entries_table.php b/database/migrations/2024_01_31_204820_create_guestbook__entries_table.php
deleted file mode 100644
index baaf862..0000000
--- a/database/migrations/2024_01_31_204820_create_guestbook__entries_table.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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('guestbook__entries', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name', 255);
-            $table->bigInteger('timestamp');
-            $table->string('ip_address', 40);
-            $table->string('agent', 2048)->default('Agent unavailable');
-            $table->boolean('site_owner')->default(0);
-            $table->string('message', 512);
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('guestbook__entries');
-    }
-};
diff --git a/database/migrations/2024_01_31_210227_populate_bookmark__categories_table.php b/database/migrations/2024_01_31_210227_populate_bookmark__categories_table.php
deleted file mode 100644
index fb81e1f..0000000
--- a/database/migrations/2024_01_31_210227_populate_bookmark__categories_table.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        // Check if table exists and is empty
-        if (Schema::hasTable('bookmark__categories') && DB::table('bookmark__categories')->count() == 0) {
-            // Insert placeholder categories
-            DB::table('bookmark__categories')->insert([
-                ['name' => 'Friends\' Websites', 'priority' => 1],
-                ['name' => 'Cool Projects', 'priority' => 2],
-                ['name' => 'Other Cool Sites', 'priority' => 3],
-                ['name' => 'Miscellaneous Resources', 'priority' => 4]
-            ]);
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        //
-    }
-};
diff --git a/database/migrations/2024_02_13_230402_create_bookmark__categories_table.php b/database/migrations/2024_02_13_230402_create_bookmark__categories_table.php
new file mode 100644
index 0000000..bb1799b
--- /dev/null
+++ b/database/migrations/2024_02_13_230402_create_bookmark__categories_table.php
@@ -0,0 +1,29 @@
+<?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('bookmark__categories', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->unsignedBigInteger('priority')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('bookmark__categories');
+    }
+};
diff --git a/database/migrations/2024_02_13_230457_create_bookmark__sites_table.php b/database/migrations/2024_02_13_230457_create_bookmark__sites_table.php
new file mode 100644
index 0000000..f016f43
--- /dev/null
+++ b/database/migrations/2024_02_13_230457_create_bookmark__sites_table.php
@@ -0,0 +1,35 @@
+<?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('bookmark__sites', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->text('description')->nullable();
+            $table->string('url');
+            $table->unsignedBigInteger('category');
+            $table->foreign('category')
+                ->references('id')
+                ->on('bookmark__categories')
+                ->onDelete('cascade');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('bookmarks');
+    }
+};
diff --git a/database/migrations/2024_02_25_151527_create_guestbook__entries_table.php b/database/migrations/2024_02_25_151527_create_guestbook__entries_table.php
new file mode 100644
index 0000000..f1b2a11
--- /dev/null
+++ b/database/migrations/2024_02_25_151527_create_guestbook__entries_table.php
@@ -0,0 +1,32 @@
+<?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('guestbook__entries', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('ip');
+            $table->string('agent');
+            $table->longText('message');
+            $table->boolean('admin');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('guestbook__entries');
+    }
+};
diff --git a/database/seeders/BookmarkCategoriesTableSeeder.php b/database/seeders/BookmarkCategoriesTableSeeder.php
new file mode 100644
index 0000000..5c8ea2f
--- /dev/null
+++ b/database/seeders/BookmarkCategoriesTableSeeder.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\BookmarkCategory;
+use App\Models\BookmarkSite;
+use Illuminate\Database\Seeder;
+
+class BookmarkCategoriesTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void {
+//        BookmarkCategory::factory()->count(5)->create()->each(function ($category) {
+//            $category->sites()->saveMany(BookmarkSite::factory()->count(3)->make());
+//        });
+        $category = new BookmarkCategory([
+            'name' => 'cool people',
+        ]);
+        $category->save();
+        $site = new BookmarkSite([
+            'name' => 'campos',
+            'description' => 'Cool brazilian dude, does programming and stuff',
+            'url' => 'https://campos02.me/',
+            'category' => 1,
+        ]);
+        $site->save();
+    }
+}
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
deleted file mode 100644
index a9f4519..0000000
--- a/database/seeders/DatabaseSeeder.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Database\Seeders;
-
-// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
-use Illuminate\Database\Seeder;
-
-class DatabaseSeeder extends Seeder
-{
-    /**
-     * Seed the application's database.
-     */
-    public function run(): void
-    {
-        // \App\Models\User::factory(10)->create();
-
-        // \App\Models\User::factory()->create([
-        //     'name' => 'Test User',
-        //     'email' => 'test@example.com',
-        // ]);
-    }
-}
-- 
cgit v1.2.3-54-g00ecf