diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index 9337068..af33a1d 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -28,14 +28,14 @@ class PublicController extends BaseController public function listGalleriesView($name) { $tenant = Tenant::query()->where("url", "=", $name)->firstOrFail(); $galleries = Gallery::query()->where("tenant", "=", $tenant->id)->get(); - return view("themes.tenant.default.list", ["galleries" => $galleries, "tenant" => $tenant]); + return view("themes.tenant.kuvia-gallery.list", ["galleries" => $galleries, "tenant" => $tenant]); } public function listGalleryImagesView($tenant, $gallery) { $tenant = Tenant::query()->where("url", "=", $tenant)->firstOrFail(); $gallery = Gallery::getByTenantAndUrl($tenant->id, $gallery); $images = Image::query()->where("gallery", "=", $gallery->id)->get(); - return view("themes.gallery.default.list", ["gallery" => $gallery, "tenant" => $tenant, "images" => $images]); + return view("themes.gallery.kuvia-gallery.list", ["gallery" => $gallery, "tenant" => $tenant, "images" => $images]); } public function returnImageFile($tenant, $gallery, $image, Request $request) { diff --git a/app/Http/Middleware/TenanMiddleware.php b/app/Http/Middleware/TenanMiddleware.php index 089c246..75fef62 100644 --- a/app/Http/Middleware/TenanMiddleware.php +++ b/app/Http/Middleware/TenanMiddleware.php @@ -5,6 +5,7 @@ namespace App\Http\Middleware; use App\Models\Tenant; use Closure; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Log; class TenanMiddleware { @@ -18,7 +19,13 @@ class TenanMiddleware public function handle($request, Closure $next) { if(Auth::check()) { + if(empty(session("current_tenant_id"))) { + Log::info("Set Tenant in Middleware"); + $tenant = Tenant::query()->where("url", "=", Auth::user()->username)->first(); + session(["current_tenant_id" => $tenant->id]); + } view()->share('user_tenants', Tenant::getTenantPerUser(Auth::id())); + view()->share('current_tenant', Tenant::query()->where("id", "=", session("current_tenant_id"))->first()); } diff --git a/resources/views/layout/template.blade.php b/resources/views/layout/template.blade.php index ac056cd..6b1e429 100644 --- a/resources/views/layout/template.blade.php +++ b/resources/views/layout/template.blade.php @@ -2,6 +2,7 @@ +
@@ -20,10 +21,22 @@
  • Gallery
    • +
  • + +
    + Pages + Statistics +
    + New Tenant +
    +
    • @endauth
    diff --git a/resources/views/themes/tenant/kuvia-gallery/list.blade.php b/resources/views/themes/tenant/kuvia-gallery/list.blade.php new file mode 100644 index 0000000..86f5cf4 --- /dev/null +++ b/resources/views/themes/tenant/kuvia-gallery/list.blade.php @@ -0,0 +1,28 @@ +@extends('layout/template') + +@section('content') +
    +
    +

    Galleries

    + +
    + @foreach($galleries as $gallery) + + {{ $gallery->name }} + + @endforeach +
    +
    +
    + +@endsection + +@section('js') + + + +@endsection