Update Tabler Html Template Version 1.0.0-beta21

takielias · Sep 19, 2024 · bd67d20 · bd67d20
2 parents 611562f + 29e507a
commit bd67d20
Show file tree

Hide file tree

Showing 25 changed files with 378 additions and 167 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[Bug]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Dev Environment**
+PHP version:
+Laravel Version:
+Nodejs version:
+NPM version:
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,10 @@
+---
+name: Issue
+about: Describe any issue regarding this package
+title: "[Issue]"
+labels: ''
+assignees: ''
+
+---
+
+Describe your issue here.
diff --git a/README.md b/README.md
@@ -29,6 +29,13 @@
 
 Get it [here](https://laravel-news.com/tablar-laravel-dashboard-preset)
 
+Please check the corresponding branch for the documentation.
+
+|Version|Branch|
+|:-:|:-:|
+|Laravel 11|[11.x branch](../../tree/11.x/README.md)|
+|Laravel 10|[10.x branch](../../tree/10.x/README.md)|
+
 ### Tablar Installation: Setting Up Laravel Tablar in Minutes
 
 [![Tablar](https://img.youtube.com/vi/ka26mSdmvIQ/0.jpg)](https://www.youtube.com/watch?v=ka26mSdmvIQ)
@@ -38,10 +45,10 @@ Get it [here](https://laravel-news.com/tablar-laravel-dashboard-preset)
 ### Installation
 
 ```shell
-composer require takielias/tablar:"^11"
+composer require takielias/tablar
 ```
-### Demo
-
+  
+### Live Demo
 https://tablar.ebuz.xyz
 
 ```shell

diff --git a/config/tablar.php b/config/tablar.php
@@ -228,4 +228,18 @@
     */
 
     'vite' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Livewire
+    |--------------------------------------------------------------------------
+    |
+    | Here we can enable the Livewire support.
+    |
+    | For detailed instructions you can look the livewire here:
+    | https://livewire.laravel.com
+    |
+    */
+
+    'livewire' => false,
 ];
diff --git a/resources/views/auth/layout.blade.php b/resources/views/auth/layout.blade.php
@@ -6,12 +6,20 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>@yield('title')</title>
-    <!-- CSS files -->
-    @vite('resources/js/app.js')
+
+    <!-- CSS/JS files -->
+    @if(config('tablar','vite'))
+        @vite('resources/js/app.js')
+    @endif
+    {{-- Custom Stylesheets (post Tablar) --}}
+    @yield('tablar_css')
+
 </head>
 <body class=" border-top-wide border-primary d-flex flex-column">
 <div class="page page-center">
     @yield('content')
 </div>
-</body>
+
+@yield('tablar_js')
+
 </html>
diff --git a/resources/views/common/alert.blade.php b/resources/views/common/alert.blade.php
@@ -11,3 +11,10 @@
         <div class="text-muted">{{Session('error')}}</div>
     </div>
 @endif
+@if ($errors->any())
+    @foreach ($errors->all() as $error)
+        <div class="alert alert-danger" role="alert">
+            <div class="text-muted">{{$error}}</div>
+        </div>
+    @endforeach
+@endif
diff --git a/resources/views/error.blade.php b/resources/views/error.blade.php
@@ -0,0 +1,25 @@
+@hasSection('code')
+    <div class="container-tight py-4">
+        <div class="empty">
+            <div class="empty-header">@yield('code')</div>
+            <p class="empty-title">Oops… You just found an error page</p>
+            <p class="empty-subtitle text-secondary">
+                @yield('message')
+            </p>
+            <div class="empty-action">
+                <a href="./." class="btn btn-primary">
+                    <!-- Download SVG icon from http://tabler-icons.io/i/arrow-left -->
+                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24"
+                         viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
+                         stroke-linecap="round" stroke-linejoin="round">
+                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                        <path d="M5 12l14 0"></path>
+                        <path d="M5 12l6 6"></path>
+                        <path d="M5 12l6 -6"></path>
+                    </svg>
+                    Take me home
+                </a>
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/resources/views/layouts/boxed.blade.php b/resources/views/layouts/boxed.blade.php
@@ -5,7 +5,11 @@
         @include('tablar::partials.navbar.topbar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/combo.blade.php b/resources/views/layouts/combo.blade.php
@@ -9,7 +9,11 @@
         @include('tablar::partials.header.sidebar-top')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/condensed.blade.php b/resources/views/layouts/condensed.blade.php
@@ -9,7 +9,11 @@
         @include('tablar::partials.navbar.condensed-top')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/fluid-vertical.blade.php b/resources/views/layouts/fluid-vertical.blade.php
@@ -9,7 +9,11 @@
         @include('tablar::partials.navbar.sidebar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/fluid.blade.php b/resources/views/layouts/fluid.blade.php
@@ -9,7 +9,11 @@
         @include('tablar::partials.navbar.topbar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/horizontal.blade.php b/resources/views/layouts/horizontal.blade.php
@@ -9,7 +9,11 @@
         @include('tablar::partials.navbar.topbar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/navbar-overlap.blade.php b/resources/views/layouts/navbar-overlap.blade.php
@@ -8,7 +8,11 @@
         @include('tablar::partials.navbar.overlap-topbar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/navbar-sticky.blade.php b/resources/views/layouts/navbar-sticky.blade.php
@@ -10,7 +10,11 @@
         </div>
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/rtl.blade.php b/resources/views/layouts/rtl.blade.php
@@ -9,7 +9,11 @@
         @include('tablar::partials.navbar.topbar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/vertical-right.blade.php b/resources/views/layouts/vertical-right.blade.php
@@ -8,7 +8,11 @@
         @include('tablar::partials.navbar.sidebar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/vertical-transparent.blade.php b/resources/views/layouts/vertical-transparent.blade.php
@@ -8,7 +8,11 @@
         @include('tablar::partials.navbar.sidebar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/layouts/vertical.blade.php b/resources/views/layouts/vertical.blade.php
@@ -8,7 +8,11 @@
         @include('tablar::partials.navbar.sidebar')
         <div class="page-wrapper">
             <!-- Page Content -->
-            @yield('content')
+            @hasSection('content')
+                @yield('content')
+            @endif
+            <!-- Page Error -->
+            @include('tablar::error')
             @include('tablar::partials.footer.bottom')
         </div>
     </div>

diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
@@ -14,14 +14,28 @@
         @yield('title', config('tablar.title', 'Tablar'))
         @yield('title_postfix', config('tablar.title_postfix', ''))
     </title>
-    <!-- CSS files -->
+
+    <!-- CSS/JS files -->
     @if(config('tablar','vite'))
         @vite('resources/js/app.js')
     @endif
+
+    {{-- Livewire Styles --}}
+    @if(config('tablar.livewire'))
+        @livewireStyles
+    @endif
+
     {{-- Custom Stylesheets (post Tablar) --}}
     @yield('tablar_css')
+
 </head>
 @yield('body')
 @include('tablar::extra.modal')
+
+{{-- Livewire Script --}}
+@if(config('tablar.livewire'))
+    @livewireScripts
+@endif
+
 @yield('tablar_js')
 </html>
diff --git a/resources/views/page.blade.php b/resources/views/page.blade.php
@@ -9,7 +9,13 @@
 
 @section('classes_body', $layoutHelper->makeBodyClasses())
 
-@includeIf('tablar::layouts.'. config('tablar.layout'))
+@section('layout')
+    @if(isset($layout))
+        @includeIf('tablar::layouts.' . $layout)
+    @else
+        @includeIf('tablar::layouts.'. config('tablar.layout'))
+    @endif
+@show
 
 @section('tablar_js')
     @stack('js')