Merge pull request #81 from sigi-ro/feature/new-requests

Changes for logo and small impro

app/Http/Controllers/Website/PageController.php

@@ -5,9 +5,11 @@
 use App\Actions\CMS\Page\PageQueryAction;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Web\CMS\FullPageResource;
+use App\Models\Settings\ThemeSettings;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Inertia\Response;
+use Spatie\LaravelSettings\Settings;
 
 class PageController extends Controller
 {
@@ -39,6 +41,8 @@ public function show(Request $request): Response
             abort(404);
         }
 
+        $page->logo_url = app(ThemeSettings::class)->getLogoUrl();
+
         return Inertia::render('website/page/Show', [
             'page' => function () use ($page) {
                 return FullPageResource::make($page);

app/Http/Resources/Admin/CMS/MetadataResource.php

@@ -18,6 +18,7 @@ public function toArray($request)
             'og_type'           => $this->og_type,
             'og_url'            => $this->og_url,
             'title'             => $this->title,
+            'logo'             => $this->title,
         ];
     }
 }

app/Http/Resources/Web/CMS/FullPageResource.php

@@ -18,6 +18,7 @@ public function toArray($request)
             'slug'          => $this->slug,
             'template'      => TemplateResource::make($this->whenLoaded('template')),
             'url'           => UrlResource::make($this->whenLoaded('url')),
+            'logo_url'      => $this->logo_url ?? null,
         ];
 
         // Add content

app/Models/Settings/ThemeSettings.php

@@ -23,6 +23,30 @@ public static function group(): string
         return 'theme';
     }
 
+    public function getLogoUrl(): ?string
+    {
+        return $this->logo_url;
+    }
+
+    public function getFaviconUrl(): ?string
+    {
+        return $this->favicon_url;
+    }
+
+    public function getSiteName(): ?string
+    {
+        return $this->site_name;
+    }
+
+    public function getGeneralThemeSettingsArray(): array
+    {
+        return [
+            $this->favicon_url,
+            $this->logo_url,
+            $this->site_name,
+        ];
+    }
+
     public function getColorsAsCssArray(): array
     {
         $cssVars = ThemeInterface::ALL_COLORS_CSS_VARS;