Layout updates

nova/database/migrations/2019_05_00_000000_create_theme_tables.php

@@ -18,9 +18,6 @@ public function up()
             $table->text('credits')->nullable();
             $table->text('preview')->nullable();
             $table->string('status')->default(ThemeStatus::active->value);
-            $table->string('layout_auth')->default('auth-simple');
-            $table->string('layout_public')->default('app-hero');
-            $table->string('layout_admin')->default('app-sidebar');
             $table->json('settings');
             $table->timestamps();
 

nova/foundation/Concerns/SetSEOValues.php

@@ -9,6 +9,8 @@
 
 trait SetSEOValues
 {
+    protected array $seoData = [];
+
     protected function setSEOValues(): void
     {
         $this->setSEOTitle();

nova/foundation/Http/Middleware/CheckVersion.php

@@ -21,27 +21,27 @@ class CheckVersion
     public function handle(Request $request, Closure $next): Response
     {
         if (Nova::isInstalled()) {
-            // if (Cache::missing('nova-latest-version')) {
-            // $upstream = Http::get('https://anodyne-productions.com/api/nova/latest-version')->json();
-            // $upstream = Http::get(url('api/version'))->json();
-
-            // if ($upstream) {
-            //     if ($upstream['severity'] === 'critical') {
-            //         Cache::rememberForever('nova-critical-update-available', function () {
-            //             return true;
-            //         });
-            //     }
-
-            //     if (version_compare($upstream['version'], nova()->version, '>')) {
-            //         Cache::rememberForever('nova-update-available', function () {
-            //             return true;
-            //         });
-            //     }
-
-            //     Cache::put('nova-latest-version', $upstream, now()->addDay());
-            // }
-
-            // }
+            if (Cache::missing('nova-latest-version')) {
+                $upstream = Http::get('https://anodyne-productions.com/api/nova/latest-version')->json();
+                $upstream = Http::get(url('api/version'))->json();
+
+                if ($upstream) {
+                    if ($upstream['severity'] === 'critical') {
+                        Cache::rememberForever('nova-critical-update-available', function () {
+                            return true;
+                        });
+                    }
+
+                    if (version_compare($upstream['version'], nova()->version, '>')) {
+                        Cache::rememberForever('nova-update-available', function () {
+                            return true;
+                        });
+                    }
+
+                    Cache::put('nova-latest-version', $upstream, now()->addDay());
+                }
+
+            }
         }
 
         return $next($request);

nova/foundation/Providers/AppServiceProvider.php

@@ -57,8 +57,11 @@
 use Nova\Foundation\NovaManager;
 use Nova\Foundation\Responses\FiltersManager;
 use Nova\Foundation\View\Compilers\BladeCompiler;
-use Nova\Foundation\View\Components\EmailLayout;
 use Nova\Foundation\View\Components\Tips;
+use Nova\Foundation\View\Layouts\AdminLayout;
+use Nova\Foundation\View\Layouts\AuthLayout;
+use Nova\Foundation\View\Layouts\EmailLayout;
+use Nova\Foundation\View\Layouts\PublicLayout;
 use Nova\Navigation\Models\Navigation;
 use Nova\Pages\Blocks;
 use Nova\Pages\Models\Page;
@@ -191,8 +194,12 @@ protected function setupBlade(): void
     {
         Blade::anonymousComponentPath(resource_path('views/public-components'), 'public');
 
-        Blade::component('tips', Tips::class);
+        Blade::component('admin-layout', AdminLayout::class);
+        Blade::component('auth-layout', AuthLayout::class);
         Blade::component('email-layout', EmailLayout::class);
+        Blade::component('public-layout', PublicLayout::class);
+
+        Blade::component('tips', Tips::class);
 
         Blade::directive('icon', [NovaBladeDirectives::class, 'icon']);
         Blade::directive('novaAdminScripts', [NovaBladeDirectives::class, 'novaAdminScripts']);

nova/foundation/Responses/Responsable.php

@@ -6,8 +6,10 @@
 
 use BadMethodCallException;
 use Illuminate\Contracts\Support\Responsable as LaravelResponsable;
+use Illuminate\Contracts\View\View as ViewContract;
 use Illuminate\Http\Response;
 use Illuminate\Pipeline\Pipeline;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\Str;
 use Nova\Foundation\Concerns\SetSEOValues;
 use Nova\Menus\Models\Menu;
@@ -29,8 +31,6 @@ abstract class Responsable implements LaravelResponsable
 
     protected array $data = [];
 
-    protected array $seoData = [];
-
     protected $output;
 
     protected $page;
@@ -62,9 +62,6 @@ public function __construct(?Page $page)
         $this->theme = app('nova.theme');
     }
 
-    /**
-     * Handle preparing the data to be used by the view.
-     */
     public function prepareData(): array
     {
         return app(Pipeline::class)
@@ -73,18 +70,16 @@ public function prepareData(): array
             ->then(fn ($data) => $data->all());
     }
 
-    public function layout(): string
+    public function layout(): ?string
     {
         if ($this->page->layout === 'public') {
-            return 'layouts.public';
+            return 'layouts.theme';
         }
 
-        $layout = $this->layout ?? $this->theme->getPageLayout($this->page);
-
-        return "layouts.{$layout}";
+        return null;
     }
 
-    public function subnav(): mixed
+    public function subnav(): ?string
     {
         if ($this->subnav) {
             return "subnavs.{$this->subnav}";
@@ -93,19 +88,7 @@ public function subnav(): mixed
         return null;
     }
 
-    public function template(): string
-    {
-        $template = $this->template ?? 'simple';
-
-        return "templates.{$template}";
-    }
-
-    /**
-     * Render the response.
-     *
-     * @return string
-     */
-    public function render()
+    public function render(): ViewContract
     {
         $data = array_merge_recursive(
             $this->prepareData(),
@@ -114,10 +97,8 @@ public function render()
 
         $meta = new ResponseMeta(
             layout: $this->layout(),
-            structure: $this->page->layout === 'public' ? 'public' : 'app',
             subnav: $this->subnav(),
             subnavSection: $this->subnav,
-            template: $this->template(),
             menu: $this->page->layout === 'public' ? Menu::with('items.page', 'items.items')->public()->first() : null,
             pageHeading: $this->page->heading,
             pageSubheading: $this->page->subheading,
@@ -126,15 +107,18 @@ public function render()
 
         app()->instance('nova.meta', $meta);
 
+        View::share('meta', $meta);
+        View::share('settings', settings());
+
         $this->setSEOValues();
 
-        return view(
-            "pages.{$this->view}",
-            array_merge(['meta' => $meta], $data)
-        );
+        return view("pages.{$this->view}", array_merge($data, [
+            'subnav' => $this->subnav,
+            'meta' => $meta,
+        ]));
     }
 
-    public function toResponse($request)
+    public function toResponse($request): Response
     {
         if ($request->expectsJson()) {
             return response()->json($this->data, Response::HTTP_OK);
@@ -143,13 +127,6 @@ public function toResponse($request)
         return response($this->render(), Response::HTTP_OK);
     }
 
-    /**
-     * Any data that should be sent with the response.
-     *
-     * @param  array  $data
-     * @param  mixed  $key
-     * @param  null|mixed  $value
-     */
     public function with($key, $value = null): self
     {
         if (is_array($key)) {
@@ -161,14 +138,6 @@ public function with($key, $value = null): self
         return $this;
     }
 
-    /**
-     * Dynamically bind parameters to the response.
-     *
-     * @param  string  $method
-     * @param  array  $parameters
-     *
-     * @throws \BadMethodCallException
-     */
     public function __call($method, $parameters): self
     {
         if (! Str::startsWith($method, 'with')) {

nova/foundation/Responses/ResponseMeta.php

@@ -10,10 +10,8 @@ class ResponseMeta
 {
     public function __construct(
         public ?string $layout,
-        public ?string $structure,
         public ?string $subnav,
         public ?string $subnavSection,
-        public ?string $template,
         public ?Menu $menu,
         public ?string $pageHeading = null,
         public ?string $pageSubheading = null,

nova/foundation/View/Layouts/AdminLayout.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nova\Foundation\View\Layouts;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\Component;
+use Nova\Applications\Models\Application;
+use Nova\Pages\Models\Page;
+
+class AdminLayout extends Component
+{
+    protected ?Page $page;
+
+    protected ?string $subnav;
+
+    public function __construct()
+    {
+        $this->page = request()->route()?->findPageFromRoute();
+        $this->subnav = app('nova.meta')->subnavSection;
+    }
+
+    public function pendingApplicationsCount(): int
+    {
+        return once(fn () => Application::pending()->count());
+    }
+
+    public function unreadAnnouncementsCount(): int
+    {
+        return once(fn () => Auth::user()->unread_announcements_count);
+    }
+
+    public function unreadMessagesCount(): int
+    {
+        return once(fn () => Auth::user()->unread_messages_count);
+    }
+
+    public function render()
+    {
+        return view('layouts.admin');
+    }
+}

nova/foundation/View/Layouts/AuthLayout.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nova\Foundation\View\Layouts;
+
+use Illuminate\View\Component;
+
+class AuthLayout extends Component
+{
+    public function __construct(
+        public string $pageHeader
+    ) {}
+
+    public function render()
+    {
+        return view('layouts.auth');
+    }
+}

nova/foundation/View/Components/EmailLayout.php → nova/foundation/View/Layouts/EmailLayout.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Nova\Foundation\View\Components;
+namespace Nova\Foundation\View\Layouts;
 
 use Illuminate\View\Component;