Merge pull request #22 from illegalstudio/collection-public-page

Collection public page
illegalstudio · Apr 23, 2023 · 25f0cf1 · 25f0cf1
2 parents b011ff1 + c0b99a3
commit 25f0cf1
Show file tree

Hide file tree

Showing 37 changed files with 250 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@
 - Scrape of external URL for page content type
 - Check uniqueness of both the custom and the generated slug
 
+# v0.2.3
+
+**Release date**: 2023-04-23
+
+- Introduced renderer for each type of content
+- Introduced public page for collections
+- Fixed a bug that allowed to view a content also if it was not published
+
 # v0.2.2
 
 **Release date**: 2023-04-02

diff --git a/public/build/assets/app-6aff0756.css b/public/build/assets/app-6aff0756.css
diff --git a/public/build/assets/app-938b9eea.js b/public/build/assets/app-938b9eea.js
diff --git a/public/build/assets/app-955162cc.js b/public/build/assets/app-955162cc.js
diff --git a/public/build/assets/app-f0520beb.css b/public/build/assets/app-f0520beb.css
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -1,13 +1,11 @@
 {
-  "resources/js/app.css": {
-    "file": "assets/app-6aff0756.css",
-    "src": "resources/js/app.css"
+  "resources/css/app.scss": {
+    "file": "assets/app-f0520beb.css",
+    "isEntry": true,
+    "src": "resources/css/app.scss"
   },
   "resources/js/app.js": {
-    "css": [
-      "assets/app-6aff0756.css"
-    ],
-    "file": "assets/app-955162cc.js",
+    "file": "assets/app-938b9eea.js",
     "isEntry": true,
     "src": "resources/js/app.js"
   }

diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1,5 +1,3 @@
-import '../css/app.scss';
-
 /**
  * Alpine JS
  */

diff --git a/resources/views/profile/edit.blade.php → resources/views/auth/profile/edit.blade.php b/resources/views/profile/edit.blade.php → resources/views/auth/profile/edit.blade.php
@@ -9,19 +9,19 @@
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8 space-y-6">
             <div class="p-4 sm:p-8 bg-white shadow sm:rounded-lg">
                 <div class="max-w-xl">
-                    @include('linky::profile.partials.update-profile-information-form')
+                    @include('linky::auth.profile.partials.update-profile-information-form')
                 </div>
             </div>
 
             <div class="p-4 sm:p-8 bg-white shadow sm:rounded-lg">
                 <div class="max-w-xl">
-                    @include('linky::profile.partials.update-password-form')
+                    @include('linky::auth.profile.partials.update-password-form')
                 </div>
             </div>
 
             <div class="p-4 sm:p-8 bg-white shadow sm:rounded-lg">
                 <div class="max-w-xl">
-                    @include('linky::profile.partials.delete-user-form')
+                    @include('linky::auth.profile.partials.delete-user-form')
                 </div>
             </div>
         </div>

diff --git a/...ofile/partials/delete-user-form.blade.php → ...ofile/partials/delete-user-form.blade.php b/...ofile/partials/delete-user-form.blade.php → ...ofile/partials/delete-user-form.blade.php
diff --git a/...e/partials/update-password-form.blade.php → ...e/partials/update-password-form.blade.php b/...e/partials/update-password-form.blade.php → ...e/partials/update-password-form.blade.php
diff --git a/...update-profile-information-form.blade.php → ...update-profile-information-form.blade.php b/...update-profile-information-form.blade.php → ...update-profile-information-form.blade.php
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
@@ -1,10 +1,9 @@
 <html lang="en">
 <head>
     <title>Linky</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
-
-    @vite('resources/js/app.js', 'vendor/linky')
-    @livewireScripts
+    {{ Vite::useHotFile(base_path() . '/vendor/illegal/linky/public/hot')->useBuildDirectory('vendor/illegal/linky')->withEntryPoints([ 'resources/css/app.scss' ]) }}
     @livewireStyles
 </head>
 <body>
@@ -15,5 +14,7 @@
     {{ $slot }}
 </div>
 
+{{ Vite::useHotFile(base_path() . '/vendor/illegal/linky/public/hot')->useBuildDirectory('vendor/illegal/linky')->withEntryPoints([ 'resources/js/app.js' ]) }}
+@livewireScripts
 </body>
 </html>
diff --git a/resources/views/public/collection/_layout.blade.php b/resources/views/public/collection/_layout.blade.php
@@ -0,0 +1,12 @@
+<html lang="en">
+<head>
+    <title>@yield('title', 'Linky')</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{ Vite::useHotFile(base_path() . '/vendor/illegal/linky/public/hot')->useBuildDirectory('vendor/illegal/linky')->withEntryPoints([ 'resources/css/app.scss' ]) }}
+</head>
+<body>
+@yield('body')
+@vite('resources/js/app.js', 'vendor/illegal/linky')
+</body>
+</html>
diff --git a/resources/views/public/collection/default.blade.php b/resources/views/public/collection/default.blade.php
@@ -0,0 +1,14 @@
+@extends('linky::public.collection._layout')
+@section('title')
+    {{$collection->content->name}}
+@endsection
+@section('body')
+    <div class="flex flex-col w-full h-full justify-center gap-4 bg-gray-50">
+        @foreach($collection->contents as $content )
+            <a class="w-[360px] max-w-[100%] mx-auto bg-indigo-500 p-4 text-white rounded-md border-indigo-900 border-2 drop-shadow-md hover:bg-indigo-600"
+                href="/{{ $content->slug }}" target="_blank">
+                {{ $content->name ?: $content->slug }}
+            </a>
+        @endforeach
+    </div>
+@endsection
diff --git a/src/Abstracts/AbstractRepository.php → ...ntracts/AbstractContentableRepository.php b/src/Abstracts/AbstractRepository.php → ...ntracts/AbstractContentableRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Illegal\Linky\Abstracts;
+namespace Illegal\Linky\Contracts;
 
 use Illegal\InsideAuth\InsideAuth;
 use Illegal\InsideAuth\Models\User;
@@ -9,7 +9,7 @@
 use Illegal\Linky\Services\SlugGenerator;
 use Illuminate\Database\Eloquent\Model;
 
-abstract class AbstractRepository
+abstract class AbstractContentableRepository
 {
     /**
      * @param SlugGenerator $slugGenerator The slug generator service

diff --git a/src/Contracts/AbstractRenderer.php b/src/Contracts/AbstractRenderer.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Illegal\Linky\Contracts;
+
+use Illegal\Linky\Models\Content;
+use Illuminate\Http\Request;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response;
+
+/**
+ * This is the abstract renderer class.
+ * It should be extended by all renderers.
+ * A renderer is responsible for rendering a specific content type.
+ */
+abstract class AbstractRenderer
+{
+    abstract public function handle(Request $request, Content $content): RedirectResponse|Response;
+}
diff --git a/src/Traits/Contentable.php → src/Contracts/Contentable.php b/src/Traits/Contentable.php → src/Contracts/Contentable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Illegal\Linky\Traits;
+namespace Illegal\Linky\Contracts;
 
 use Illegal\Linky\Models\Content;
 use Illuminate\Database\Eloquent\Relations\MorphOne;

diff --git a/src/Traits/Livewire/Sortable.php → src/Contracts/Livewire/Sortable.php b/src/Traits/Livewire/Sortable.php → src/Contracts/Livewire/Sortable.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Illegal\Linky\Traits\Livewire;
-
-use Illegal\Linky\Models\Contentable\Link;
+namespace Illegal\Linky\Contracts\Livewire;
 
 trait Sortable
 {

diff --git a/src/Enums/ContentType.php b/src/Enums/ContentType.php
@@ -2,9 +2,33 @@
 
 namespace Illegal\Linky\Enums;
 
+use Illegal\Linky\Http\Renderers\AbortRenderer;
+use Illegal\Linky\Http\Renderers\CollectionRenderer;
+use Illegal\Linky\Http\Renderers\LinkRenderer;
+use Illegal\Linky\Http\Renderers\PageRenderer;
+use Illegal\Linky\Models\Content;
+use Illuminate\Http\Request;
+
 enum ContentType: string
 {
     case Link = "link";
     case Collection = "collection";
     case Page = "page";
+
+    /**
+     * Render the content.
+     * This function will return the rendered content, using the
+     * appropriate renderer - based on the content type - or abort with a 404 if the content type is not supported.
+     */
+    public function render(Request $request, Content $content)
+    {
+        $renderer = match ($this) {
+            self::Link       => LinkRenderer::class,
+            self::Collection => CollectionRenderer::class,
+            self::Page       => PageRenderer::class,
+            default          => AbortRenderer::class,
+        };
+
+        return (new $renderer)->handle($request, $content);
+    }
 }
diff --git a/src/Http/Controllers/ContentController.php b/src/Http/Controllers/ContentController.php
@@ -4,6 +4,7 @@
 
 use Illegal\Linky\Enums\ContentType;
 use Illegal\Linky\Models\Content;
+use Illegal\Linky\Models\Contentable\Collection;
 use Illegal\Linky\Repositories\HitRepository;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\RedirectResponse;
@@ -32,17 +33,15 @@ public function catchAll(Request $request, string $slug = null)
         /**
          * If the content is not found, abort with a 404.
          */
-        if (!$content) {
+        if (!$content || !$content->public) {
             abort(404);
         }
 
-        switch ($content->type) {
-            case ContentType::Link:
-                return Redirect::to($content->contentable->url);
-            case ContentType::Page:
-                return Response::make($content->contentable->body);
-            default:
-                abort(404);
-        }
+        /**
+         * Use the content type to render the content.
+         * If the content type is not supported, abort with a 404.
+         * The content type render function will call the correct renderer.
+         */
+        return $content->type->render($request, $content);
     }
 }
diff --git a/src/Http/Livewire/CollectionList.php b/src/Http/Livewire/CollectionList.php
@@ -3,10 +3,10 @@
 namespace Illegal\Linky\Http\Livewire;
 
 use Exception;
+use Illegal\Linky\Contracts\Livewire\Sortable;
 use Illegal\Linky\Models\Content;
 use Illegal\Linky\Models\Contentable\Collection;
 use Illegal\Linky\Repositories\CollectionRepository;
-use Illegal\Linky\Traits\Livewire\Sortable;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;

diff --git a/src/Http/Livewire/LinkList.php b/src/Http/Livewire/LinkList.php
@@ -3,10 +3,10 @@
 namespace Illegal\Linky\Http\Livewire;
 
 use Exception;
+use Illegal\Linky\Contracts\Livewire\Sortable;
 use Illegal\Linky\Models\Content;
 use Illegal\Linky\Models\Contentable\Link;
 use Illegal\Linky\Repositories\LinkRepository;
-use Illegal\Linky\Traits\Livewire\Sortable;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;

diff --git a/src/Http/Livewire/PageList.php b/src/Http/Livewire/PageList.php
@@ -3,10 +3,10 @@
 namespace Illegal\Linky\Http\Livewire;
 
 use Exception;
+use Illegal\Linky\Contracts\Livewire\Sortable;
 use Illegal\Linky\Models\Content;
 use Illegal\Linky\Models\Contentable\Page;
 use Illegal\Linky\Repositories\PageRepository;
-use Illegal\Linky\Traits\Livewire\Sortable;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;

diff --git a/src/Http/Renderers/AbortRenderer.php b/src/Http/Renderers/AbortRenderer.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Illegal\Linky\Http\Renderers;
+
+use Illegal\Linky\Contracts\AbstractRenderer;
+use Illegal\Linky\Models\Content;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+/**
+ * This is the abort renderer class.
+ * It is responsible for rendering a 404 page if the
+ * content type is not supported.
+ */
+class AbortRenderer extends AbstractRenderer
+{
+
+    public function handle(Request $request, Content $content): Response|RedirectResponse
+    {
+        abort(404);
+    }
+}
diff --git a/src/Http/Renderers/CollectionRenderer.php b/src/Http/Renderers/CollectionRenderer.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Illegal\Linky\Http\Renderers;
+
+use Illegal\Linky\Contracts\AbstractRenderer;
+use Illegal\Linky\Models\Content;
+use Illegal\Linky\Models\Contentable\Collection;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Http\Response as IlluminateResponse;
+
+class CollectionRenderer extends AbstractRenderer
+{
+
+    public function handle(Request $request, Content $content): IlluminateResponse
+    {
+        /** @var Collection $collection */
+        $collection = $content->contentable;
+        return Response::make(view('linky::public.collection.default', [
+            'collection' => $collection,
+        ]));
+    }
+}
diff --git a/src/Http/Renderers/LinkRenderer.php b/src/Http/Renderers/LinkRenderer.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Illegal\Linky\Http\Renderers;
+
+use Illegal\Linky\Contracts\AbstractRenderer;
+use Illegal\Linky\Models\Content;
+use Illegal\Linky\Models\Contentable\Link;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redirect;
+
+class LinkRenderer extends AbstractRenderer
+{
+
+    public function handle(Request $request, Content $content): RedirectResponse
+    {
+        /** @var Link $link */
+        $link = $content->contentable;
+        return Redirect::to($link->url);
+    }
+}
diff --git a/src/Http/Renderers/PageRenderer.php b/src/Http/Renderers/PageRenderer.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Illegal\Linky\Http\Renderers;
+
+use Illegal\Linky\Contracts\AbstractRenderer;
+use Illegal\Linky\Models\Content;
+use Illegal\Linky\Models\Contentable\Page;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response as IlluminateResponse;
+use Illuminate\Support\Facades\Response;
+
+class PageRenderer extends AbstractRenderer
+{
+
+    public function handle(Request $request, Content $content): IlluminateResponse
+    {
+        /** @var Page $page */
+        $page = $content->contentable;
+        return Response::make($page->body);
+    }
+}
diff --git a/src/Models/Content.php b/src/Models/Content.php
@@ -17,6 +17,14 @@ class Content extends Model
 {
     use HasPrefix;
 
+    /**
+     * This is just a placeholder, has the name will be set by
+     * the HasPrefix trait.
+     *
+     * @var string The table name.
+     */
+    protected $table = "linky_contents";
+
     /**
      * Override the db prefix for this model.
      */