From 5961e52797f4e347164d5a1cae4274b0d0865a45 Mon Sep 17 00:00:00 2001
From: Annika Backstrom <annika@sixohthree.com>
Date: Sun, 26 May 2024 12:55:04 +0100
Subject: [PATCH] Revert "Switch to livewire views"

This reverts commit 1fc8f4f80249a79924fd2d51b5b82285128efa9a.
---
 app/Livewire/Bookmark.php                     | 16 ----
 app/View/Components/Bookmark.php              | 28 +++++++
 composer.json                                 |  3 +-
 composer.lock                                 | 78 +------------------
 resources/sass/app.scss                       | 13 ----
 resources/sass/components/_bookmark.scss      | 12 ---
 resources/views/bookmarks/index.blade.php     |  2 +-
 resources/views/bookmarks/show.blade.php      |  5 +-
 .../bookmark.blade.php                        |  7 +-
 routes/web.php                                |  8 +-
 10 files changed, 35 insertions(+), 137 deletions(-)
 delete mode 100644 app/Livewire/Bookmark.php
 create mode 100644 app/View/Components/Bookmark.php
 rename resources/views/{livewire => components}/bookmark.blade.php (78%)

diff --git a/app/Livewire/Bookmark.php b/app/Livewire/Bookmark.php
deleted file mode 100644
index f2e9174..0000000
--- a/app/Livewire/Bookmark.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use App\Models\Bookmark as ModelsBookmark;
-use Livewire\Component;
-
-class Bookmark extends Component
-{
-    public ModelsBookmark $bookmark;
-
-    public function save(ModelsBookmark $bookmark)
-    {
-        $this->bookmark = $bookmark;
-    }
-}
diff --git a/app/View/Components/Bookmark.php b/app/View/Components/Bookmark.php
new file mode 100644
index 0000000..271cea1
--- /dev/null
+++ b/app/View/Components/Bookmark.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\View\Components;
+
+use App\Models\Bookmark as ModelsBookmark;
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class Bookmark extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct(
+        public ModelsBookmark $bookmark
+    ) {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.bookmark');
+    }
+}
diff --git a/composer.json b/composer.json
index efea6e3..5ad959a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,7 @@
     "require": {
         "php": "^8.2",
         "laravel/framework": "^11.0",
-        "laravel/tinker": "^2.9",
-        "livewire/livewire": "^3.5"
+        "laravel/tinker": "^2.9"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",
diff --git a/composer.lock b/composer.lock
index 78845d0..a953531 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0e9662e53ae62503767a15f5dc9e9a72",
+    "content-hash": "2077c394f6aa7d63f49d97c8c4f2764c",
     "packages": [
         {
             "name": "brick/math",
@@ -1815,82 +1815,6 @@
             ],
             "time": "2024-01-28T23:22:08+00:00"
         },
-        {
-            "name": "livewire/livewire",
-            "version": "v3.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/livewire/livewire.git",
-                "reference": "72e900825c560f0e4e620185b26c5441a8914435"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/72e900825c560f0e4e620185b26c5441a8914435",
-                "reference": "72e900825c560f0e4e620185b26c5441a8914435",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/database": "^10.0|^11.0",
-                "illuminate/routing": "^10.0|^11.0",
-                "illuminate/support": "^10.0|^11.0",
-                "illuminate/validation": "^10.0|^11.0",
-                "league/mime-type-detection": "^1.9",
-                "php": "^8.1",
-                "symfony/console": "^6.0|^7.0",
-                "symfony/http-kernel": "^6.2|^7.0"
-            },
-            "require-dev": {
-                "calebporzio/sushi": "^2.1",
-                "laravel/framework": "^10.15.0|^11.0",
-                "laravel/prompts": "^0.1.6",
-                "mockery/mockery": "^1.3.1",
-                "orchestra/testbench": "^8.21.0|^9.0",
-                "orchestra/testbench-dusk": "^8.24|^9.1",
-                "phpunit/phpunit": "^10.4",
-                "psy/psysh": "^0.11.22|^0.12"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Livewire\\LivewireServiceProvider"
-                    ],
-                    "aliases": {
-                        "Livewire": "Livewire\\Livewire"
-                    }
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Livewire\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Caleb Porzio",
-                    "email": "calebporzio@gmail.com"
-                }
-            ],
-            "description": "A front-end framework for Laravel.",
-            "support": {
-                "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.5.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/livewire",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-05-21T13:39:04+00:00"
-        },
         {
             "name": "monolog/monolog",
             "version": "3.6.0",
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 6bebdc0..abf61df 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -17,19 +17,6 @@ body {
 @import 'components/bookmark';
 @import 'components/pagination';
 
-a {
-    &,
-    &:active,
-    &:visited {
-        color: #fff;
-    }
-
-    &:hover {
-        color: #88f;
-    }
-}
-
-
 h1 {
     color: #FFF3B0;
     text-align: center;
diff --git a/resources/sass/components/_bookmark.scss b/resources/sass/components/_bookmark.scss
index aa88276..4af3287 100644
--- a/resources/sass/components/_bookmark.scss
+++ b/resources/sass/components/_bookmark.scss
@@ -16,18 +16,6 @@
 
     overflow: hidden;
 
-    a {
-        &,
-        &:active,
-        &:visited {
-            color: #9E2A2B;
-        }
-
-        &:hover {
-            color: #000;
-        }
-    }
-
     &-title {
         margin: 0;
         padding: 1ex;
diff --git a/resources/views/bookmarks/index.blade.php b/resources/views/bookmarks/index.blade.php
index 0401444..cceed46 100644
--- a/resources/views/bookmarks/index.blade.php
+++ b/resources/views/bookmarks/index.blade.php
@@ -5,7 +5,7 @@
 {{ $bookmarks->links() }}
 
 @foreach ($bookmarks as $bookmark)
-    <livewire:bookmark :bookmark="$bookmark" />
+    <x-bookmark :bookmark="$bookmark" />
 @endforeach
 
 {{ $bookmarks->links() }}
diff --git a/resources/views/bookmarks/show.blade.php b/resources/views/bookmarks/show.blade.php
index 9f86dae..605ec9d 100644
--- a/resources/views/bookmarks/show.blade.php
+++ b/resources/views/bookmarks/show.blade.php
@@ -1,8 +1,5 @@
 @extends('layouts.app')
 
 @section('content')
-    <p>
-        <a href="{{ action('BookmarkController@index') }}">&larr; Back</a>
-    </p>
-    <livewire:bookmark :bookmark="$bookmark" />
+    <x-bookmark :bookmark="$bookmark" />
 @endsection
diff --git a/resources/views/livewire/bookmark.blade.php b/resources/views/components/bookmark.blade.php
similarity index 78%
rename from resources/views/livewire/bookmark.blade.php
rename to resources/views/components/bookmark.blade.php
index 4956fa4..eaa31e4 100644
--- a/resources/views/livewire/bookmark.blade.php
+++ b/resources/views/components/bookmark.blade.php
@@ -1,10 +1,5 @@
 <div class="bookmark">
-    <p class="bookmark-title">
-        {{ $bookmark->title }}
-        @action('index')
-            <a href="/bookmarks/{{ $bookmark->id }}">#</a>
-        @endaction
-    </p>
+    <p class="bookmark-title">{{ $bookmark->title }}</p>
     <p class="bookmark-href"><a href="{{ $bookmark->href }}">{{ $bookmark->href }}</a></p>
     @if (!empty($bookmark->description))
         <div class="bookmark-description">
diff --git a/routes/web.php b/routes/web.php
index 7cd0725..668451c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,9 +3,5 @@
 use App\Http\Controllers\BookmarkController;
 use Illuminate\Support\Facades\Route;
 
-Route::get(
-    '/', function () {
-        return redirect()->action([BookmarkController::class, 'index']);
-    }
-);
-Route::resource('bookmarks', BookmarkController::class);
+Route::get('/', [BookmarkController::class, 'index']);
+Route::resource('bookmarks', BookmarkController::class)->except(['index']);