Design Refresh

app/Models/BookmarkCategory.php

@@ -4,18 +4,29 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 
 class BookmarkCategory extends Model
 {
     use HasFactory;
     protected $table = "bookmark__categories";
-    protected $fillable = ['name'];
+    protected $fillable = ['name', 'shuffled'];
+    protected $casts = ['shuffled' => 'boolean'];
 
     public function sites() {
         return $this->hasMany(BookmarkSite::class, 'category');
     }
 
-    public static function insertBookmarkCategory(string $name) {
+    public static function create(Request $request): BookmarkCategory {
+        $newCategory = new BookmarkCategory();
+        $newCategory->name = $request->get('name');
+        $newCategory->shuffled = $request->has('shuffled');
+        $newCategory->save();
+        return $newCategory;
+    }
+
+
+    public static function insertBookmarkCategory(string $name): void {
         $newBookmarkCategory = new BookmarkCategory;
         $newBookmarkCategory->name = $name;
         $newBookmarkCategory->save();
@@ -24,13 +35,4 @@ public static function selectBookmarks(int $id) {
         $bookmarks = BookmarkSite::where('category', '=', $id)->firstOrFail();
         return $bookmarks;
     }
-
-    public static function importBookmarkCategory(array $data) {
-        foreach ($data as $category) {
-            $newBookmarkCategory = new BookmarkCategory;
-            $newBookmarkCategory->name = $category['name'];
-            $newBookmarkCategory->priority = intval($category['priority']);
-            $newBookmarkCategory->save();
-        }
-    }
 }

app/Models/BookmarkSite.php

@@ -4,16 +4,31 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 
 class BookmarkSite extends Model {
     use HasFactory;
     protected $table = "bookmark__sites";
     protected $fillable = ['name', 'description', 'url', 'category'];
 
-    public function category() {
+    public function category(): BelongsTo {
         return $this->belongsTo(BookmarkCategory::class, 'category');
     }
-    public static function insertBookmark(string $name, string $url, int $category) {
+
+    public static function create(Request $request): BookmarkSite {
+        $category = BookmarkCategory::where('id', $request->get('category'))->firstOrFail();
+        $newSite = new BookmarkSite;
+        $newSite->name = $request->get('name');
+        $newSite->url = $request->get('url');
+        $newSite->description = $request->get('description');
+        $newSite->category = $category->id;
+        $newSite->save();
+        return $newSite;
+    }
+
+    public static function insertBookmark(string $name, string $url, int $category): void {
         $category = BookmarkCategory::where('id', $category)->firstOrFail();
         $newBookmark = new BookmarkSite;
         $newBookmark->name = $name;
@@ -21,15 +36,4 @@ public static function insertBookmark(string $name, string $url, int $category)
         $newBookmark->category = $category->id;
         $newBookmark->save();
     }
-
-    public static function importBookmark(array $data) {
-        foreach ($data as $site) {
-            $newBookmark = new BookmarkSite;
-            $newBookmark->name = $site['name'];
-            $newBookmark->description = $site['description'];
-            $newBookmark->url = $site['url'];
-            $newBookmark->category = $site['category_id'];
-            $newBookmark->save();
-        }
-    }
 }

app/Models/GuestbookEntry.php

@@ -5,46 +5,37 @@
 use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class GuestbookEntry extends Model
 {
     use HasFactory;
     protected $table = "guestbook__entries";
-    protected $fillable = ['name', 'message'];
+    protected $fillable = ['name', 'message',
+        'flagged'
+    ];
 
     /**
      * Creates a new guestbook entry.
      *
      * @param Request $request The HTTP POST request
-     * @return void
+     * @return GuestbookEntry
      */
-    public static function insertGuestbookEntry(Request $request) {
+    public static function create(Request $request): GuestbookEntry {
         $newEntry = new GuestbookEntry;
         $newEntry->name = $request->get('name');
         $newEntry->message = $request->get('message');
         $newEntry->ip = $request->ip();
         $newEntry->agent = $request->userAgent();
-        $newEntry->legacy_flagged = isLegacy();
+        $newEntry->flagged = true;
         $newEntry->save();
+        return $newEntry;
     }
 
-    public static function selectEntries() {
-        $entries = GuestbookEntry::where("legacy_flagged", false)->orderBy('created_at', 'desc')->get();
-        return $entries;
-    }
-
-    public static function importGuestbookEntry(array $data) {
-        foreach ($data as $entry) {
-            $dt = new \DateTime('@' . $entry['timestamp']);
-            $newEntry = new GuestbookEntry;
-            $newEntry->name = $entry['name'];
-            $newEntry->ip = $entry['ip_address'];
-            $newEntry->agent = $entry['agent'];
-            $newEntry->admin = $entry['site_owner'];
-            $newEntry->message = $entry['message'];
-            $newEntry->created_at = $dt;
-            $newEntry->updated_at = $dt;
-            $newEntry->save();
+    public static function get() {
+        if (Auth::check()) {
+            return GuestbookEntry::select()->orderBy('created_at', 'desc')->get();
         }
+        return GuestbookEntry::where("flagged", false)->orderBy('created_at', 'desc')->get();
     }
 }

app/Models/User.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+
+class User extends Authenticatable {
+    use HasFactory, Notifiable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'username',
+        'email',
+        'password',
+    ];
+
+    /**
+     * The attributes that should be hidden for serialization.
+     *
+     * @var array<int, string>
+     */
+    protected $hidden = [
+        'password',
+        'remember_token',
+    ];
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array<string, string>
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+        'password' => 'hashed',
+    ];
+}