Refactor button display logic and add new layout file

JulianPrieber · JulianPrieber · commit 608abc73d7bb · 2024-09-19T12:53:52.000+02:00
diff --git a/resources/views/linkstack/elements/buttons.blade.php b/resources/views/linkstack/elements/buttons.blade.php
@@ -6,8 +6,14 @@
 
         @foreach($links as $link)
         @if(isset($link->custom_html) && $link->custom_html)
-            @php setBlockAssetContext($link->type); @endphp
-            @include('blocks::' . $link->type . '.display', ['link' => $link, 'initial' => $initial++])
+            @if(isset($link->ignore_container) && $link->ignore_container)
+            </div></div></div>
+            @endif
+                @php setBlockAssetContext($link->type); @endphp
+                @include('blocks::' . $link->type . '.display', ['link' => $link, 'initial' => $initial++])
+            @if(isset($link->ignore_container) && $link->ignore_container)
+            <div class="container"><div class="row"><div class="column">
+            @endif
         @else
             @switch($link->name)
                 @case('icon')
diff --git a/resources/views/linkstack/layout.blade.php b/resources/views/linkstack/layout.blade.php
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+@include('layouts.lang')
+<head>
+   @include('linkstack.modules.meta')
+   
+   @stack('linkstack-head')
+   @include('linkstack.modules.assets')
+   @foreach($information as $info)
+   @stack('linkstack-head-end')
+</head>
+<body>
+   @stack('linkstack-body-start')
+   @include('linkstack.modules.admin-bar')
+   @include('linkstack.modules.share-button')
+   @include('linkstack.modules.report-icon')
+   <div class="container">
+      <div class="row">
+         <div class="column" style="margin-top: 5%">
+            @include('linkstack.elements.avatar')
+            @include('linkstack.elements.heading')
+            @include('linkstack.elements.bio')
+            @include('linkstack.elements.icons')
+            @endforeach
+            @yield('content')
+            @include('linkstack.modules.footer')
+         </div>
+      </div>
+   </div>
+   @stack('linkstack-body-end')
+</body>
+</html>
diff --git a/resources/views/linkstack/linkstack.blade.php b/resources/views/linkstack/linkstack.blade.php
@@ -1,31 +1,7 @@
-<!DOCTYPE html>
-@include('layouts.lang')
-<head>
-   @include('linkstack.modules.meta')
-   @include('linkstack.modules.theme')
-   @stack('linkstack-head')
-   @include('linkstack.modules.assets')
-   @foreach($information as $info)
-   @stack('linkstack-head-end')
-</head>
-<body>
-   @stack('linkstack-body-start')
-   @include('linkstack.modules.admin-bar')
-   @include('linkstack.modules.share-button')
-   @include('linkstack.modules.report-icon')
-   <div class="container">
-      <div class="row">
-         <div class="column" style="margin-top: 5%">
-            @include('linkstack.elements.avatar')
-            @include('linkstack.elements.heading')
-            @include('linkstack.elements.bio')
-            @include('linkstack.elements.icons')
-            @endforeach
-            @include('linkstack.elements.buttons')
-            @include('linkstack.modules.footer')
-         </div>
-      </div>
-   </div>
-   @stack('linkstack-body-end')
-</body>
-</html>
+@extends('linkstack.layout')
+@section('content')
+    @push('linkstack-head-end')
+        @include('linkstack.modules.theme')
+    @endpush
+@include('linkstack.elements.buttons')
+@endsection
