Merge pull request #569 from nasirkhan/dev

- Layout pages updated - Details show pages updated
nasirkhan · Apr 16, 2024 · 97571e3 · 97571e3
2 parents 9d4e228 + 3e59297
commit 97571e3
Show file tree

Hide file tree

Showing 19 changed files with 275 additions and 187 deletions.
diff --git a/Modules/Category/Http/Controllers/Backend/CategoriesController.php b/Modules/Category/Http/Controllers/Backend/CategoriesController.php
@@ -49,7 +49,7 @@ public function store(Request $request)
             'name' => 'required|max:191|unique:'.$module_model.',name',
             'slug' => 'nullable|max:191|unique:'.$module_model.',slug',
             'group_name' => 'nullable|max:191',
-            'description' => 'nullable|max:191',
+            'description' => 'nullable',
             'meta_title' => 'nullable|max:191',
             'meta_description' => 'nullable',
             'meta_keyword' => 'nullable',
@@ -122,7 +122,7 @@ public function update(Request $request, $id)
             'name' => 'required|max:191|unique:'.$module_model.',name,'.$id,
             'slug' => 'nullable|max:191|unique:'.$module_model.',slug,'.$id,
             'group_name' => 'nullable|max:191',
-            'description' => 'nullable|max:191',
+            'description' => 'nullable',
             'meta_title' => 'nullable|max:191',
             'meta_description' => 'nullable',
             'meta_keyword' => 'nullable',

diff --git a/Modules/Category/Resources/views/backend/categories/show.blade.php b/Modules/Category/Resources/views/backend/categories/show.blade.php
@@ -1,16 +1,46 @@
 @extends('backend.layouts.app')
 
-@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection
+@section('title')
+    {{ $$module_name_singular->name }} - {{ __($module_action) }} {{ __($module_title) }}
+@endsection
 
 @section('breadcrumbs')
-<x-backend.breadcrumbs>
-    <x-backend.breadcrumb-item route='{{route("backend.$module_name.index")}}' icon='{{ $module_icon }}'>
-        {{ __($module_title) }}
-    </x-backend.breadcrumb-item>
-    <x-backend.breadcrumb-item type="active">{{ __($module_action) }}</x-backend.breadcrumb-item>
-</x-backend.breadcrumbs>
+    <x-backend.breadcrumbs>
+        <x-backend.breadcrumb-item route='{{ route("backend.$module_name.index") }}' icon='{{ $module_icon }}'>
+            {{ __($module_title) }}
+        </x-backend.breadcrumb-item>
+        <x-backend.breadcrumb-item type="active">{{ __($module_action) }}</x-backend.breadcrumb-item>
+    </x-backend.breadcrumbs>
 @endsection
 
 @section('content')
-<x-backend.layouts.show :data="$$module_name_singular" :module_name="$module_name" :module_path="$module_path" :module_title="$module_title" :module_icon="$module_icon" :module_action="$module_action" />
-@endsection
+    <x-backend.layouts.show :data="$$module_name_singular" :module_name="$module_name" :module_path="$module_path" :module_title="$module_title" :module_icon="$module_icon"
+        :module_action="$module_action">
+
+        <x-backend.section-header :data="$$module_name_singular" :module_name="$module_name" :module_title="$module_title" :module_icon="$module_icon"
+            :module_action="$module_action" />
+
+        <div class="row mt-4">
+            <div class="col-12 col-sm-8">
+
+                <x-backend.section-show-table :data="$$module_name_singular" :module_name="$module_name" />
+
+            </div>
+            <div class="col-12 col-sm-4">
+                <h5>
+                    Posts <small>({{ count($posts) }})</small>
+                </h5>
+                <ul>
+                    @foreach ($posts as $post)
+                        <li>
+                            <a href="{{ route('backend.posts.show', [$post->id, $post->slug]) }}">
+                                {{ $post->name }}
+                            </a>
+                        </li>
+                    @endforeach
+                </ul>
+
+            </div>
+        </div>
+    </x-backend.layouts.show>
+@endsection
diff --git a/Modules/Post/Resources/views/backend/posts/show.blade.php b/Modules/Post/Resources/views/backend/posts/show.blade.php
@@ -33,19 +33,19 @@
                 <ul>
                     <li>
                         <a
-                            href="{{ route('backend.categories.show', [encode_id($$module_name_singular->category_id), $$module_name_singular->category->slug]) }}">{{ $$module_name_singular->category->name }}</a>
+                            href="{{ route('backend.categories.show', [$$module_name_singular->category_id, $$module_name_singular->category->slug]) }}">{{ $$module_name_singular->category->name }}</a>
                     </li>
                 </ul>
 
                 <h5>
-                    Tags
+                    Tags <small>({{ count($$module_name_singular->tags) }})</small>
                 </h5>
 
                 <ul>
                     @foreach ($$module_name_singular->tags as $tag)
                         <li>
                             <a
-                                href="{{ route('backend.tags.show', [encode_id($tag->id), $tag->slug]) }}">{{ $tag->name }}</a>
+                                href="{{ route('backend.tags.show', [$tag->id, $tag->slug]) }}">{{ $tag->name }}</a>
                         </li>
                     @endforeach
                 </ul>

diff --git a/Modules/Tag/Models/Tag.php b/Modules/Tag/Models/Tag.php
@@ -18,7 +18,7 @@ class Tag extends BaseModel
      */
     public function posts()
     {
-        return $this->morphedByMany('Modules\Article\Models\Post', 'taggable');
+        return $this->morphedByMany('Modules\Post\Models\Post', 'taggable');
     }
 
     /**

diff --git a/Modules/Tag/Resources/views/backend/tags/show.blade.php b/Modules/Tag/Resources/views/backend/tags/show.blade.php
@@ -1,16 +1,46 @@
 @extends('backend.layouts.app')
 
-@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection
+@section('title')
+    {{ $$module_name_singular->name }} - {{ __($module_action) }} {{ __($module_title) }}
+@endsection
 
 @section('breadcrumbs')
-<x-backend.breadcrumbs>
-    <x-backend.breadcrumb-item route='{{route("backend.$module_name.index")}}' icon='{{ $module_icon }}'>
-        {{ __($module_title) }}
-    </x-backend.breadcrumb-item>
-    <x-backend.breadcrumb-item type="active">{{ __($module_action) }}</x-backend.breadcrumb-item>
-</x-backend.breadcrumbs>
+    <x-backend.breadcrumbs>
+        <x-backend.breadcrumb-item route='{{ route("backend.$module_name.index") }}' icon='{{ $module_icon }}'>
+            {{ __($module_title) }}
+        </x-backend.breadcrumb-item>
+        <x-backend.breadcrumb-item type="active">{{ __($module_action) }}</x-backend.breadcrumb-item>
+    </x-backend.breadcrumbs>
 @endsection
 
 @section('content')
-<x-backend.layouts.show :data="$$module_name_singular" :module_name="$module_name" :module_path="$module_path" :module_title="$module_title" :module_icon="$module_icon" :module_action="$module_action" />
-@endsection
+    <x-backend.layouts.show :data="$$module_name_singular" :module_name="$module_name" :module_path="$module_path" :module_title="$module_title" :module_icon="$module_icon"
+        :module_action="$module_action">
+
+        <x-backend.section-header :data="$$module_name_singular" :module_name="$module_name" :module_title="$module_title" :module_icon="$module_icon"
+            :module_action="$module_action" />
+
+        <div class="row mt-4">
+            <div class="col-12 col-sm-8">
+
+                <x-backend.section-show-table :data="$$module_name_singular" :module_name="$module_name" />
+
+            </div>
+            <div class="col-12 col-sm-4">
+                <h5>
+                    Posts <small>({{ count($posts) }})</small>
+                </h5>
+                <ul>
+                    @foreach ($posts as $post)
+                        <li>
+                            <a href="{{ route('backend.posts.show', [$post->id, $post->slug]) }}">
+                                {{ $post->name }}
+                            </a>
+                        </li>
+                    @endforeach
+                </ul>
+
+            </div>
+        </div>
+    </x-backend.layouts.show>
+@endsection
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ If you want to test the application on your local machine with additional demo d
 
 ```php
 
-php artisan starter:insert-demo-data --fresh
+php artisan starter:insert-demo-data
 
 ```
 

diff --git a/app/Http/Controllers/Backend/RolesController.php b/app/Http/Controllers/Backend/RolesController.php
@@ -88,7 +88,7 @@ public function create()
         $module_action = 'Create';
 
         $roles = Role::get();
-        $permissions = Permission::select('name', 'id')->get();
+        $permissions = Permission::select('name', 'id')->orderBy('id')->get();
 
         Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')');
 
@@ -179,7 +179,7 @@ public function edit($id)
 
         $module_action = 'Edit';
 
-        $permissions = Permission::select('name', 'id')->get();
+        $permissions = Permission::select('name', 'id')->orderBy('id')->get();
 
         $$module_name_singular = $module_model::findOrFail($id);
 

diff --git a/app/Http/Controllers/Backend/UserController.php b/app/Http/Controllers/Backend/UserController.php
@@ -190,7 +190,7 @@ public function create()
         $module_action = 'Create';
 
         $roles = Role::get();
-        $permissions = Permission::select('name', 'id')->get();
+        $permissions = Permission::select('name', 'id')->orderBy('id')->get();
 
         return view(
             "backend.{$module_name}.create",
@@ -397,7 +397,7 @@ public function edit($id)
         $userPermissions = $$module_name_singular->permissions->pluck('name')->all();
 
         $roles = Role::get();
-        $permissions = Permission::select('name', 'id')->get();
+        $permissions = Permission::select('name', 'id')->orderBy('id')->get();
 
         Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')');
 

diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
@@ -54,7 +54,34 @@ public function getTableColumns()
     {
         $table_name = DB::getTablePrefix().$this->getTable();
 
-        return DB::select('SHOW COLUMNS FROM '.$table_name);
+        switch (config('database.default')) {
+            case 'sqlite':
+                $columns = DB::select("PRAGMA table_info({$table_name});");
+                break;
+            case 'mysql':
+            case 'mariadb':
+                $columns = DB::select('SHOW COLUMNS FROM '.$table_name);
+                $columns = array_map(function ($column) {
+                    return [
+                        'name' => $column->Field,
+                        'type' => $column->Type,
+                        'notnull' => $column->Null,
+                        'key' => $column->Key,
+                        'default' => $column->Default,
+                        'extra' => $column->Extra,
+                    ];
+                }, $columns);
+                break;
+            case 'pgsql':
+                $columns = DB::select("SELECT column_name as `Field`, data_type as `Type` FROM information_schema.columns WHERE table_name = '{$table_name}';");
+                break;
+
+            default:
+                // code...
+                break;
+        }
+
+        return $columns;
     }
 
     /**

diff --git a/app/helpers.php b/app/helpers.php
@@ -94,8 +94,8 @@ function label_case($text)
      */
     function show_column_value($valueObject, $column, $return_format = '')
     {
-        $column_name = $column->Field;
-        $column_type = $column->Type;
+        $column_name = $column->name;
+        $column_type = $column->type;
 
         $value = $valueObject->$column_name;
 

diff --git a/resources/views/backend/includes/show.blade.php b/resources/views/backend/includes/show.blade.php
@@ -24,7 +24,7 @@
         <tr>
             <td>
                 <strong>
-                    {{ __(label_case($column->Field)) }}
+                    {{ __(label_case($column->name)) }}
                 </strong>
             </td>
             <td>

diff --git a/resources/views/backend/roles/create.blade.php b/resources/views/backend/roles/create.blade.php
@@ -1,22 +1,25 @@
 @extends ('backend.layouts.app')
 
-@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection
+@section('title')
+    {{ __($module_action) }} {{ __($module_title) }}
+@endsection
 
 @section('breadcrumbs')
-<x-backend.breadcrumbs>
-    <x-backend.breadcrumb-item route='{{route("backend.$module_name.index")}}' icon='{{ $module_icon }}'>
-        {{ __($module_title) }}
-    </x-backend.breadcrumb-item>
-    <x-backend.breadcrumb-item type="active">{{ __($module_action) }}</x-backend.breadcrumb-item>
-</x-backend.breadcrumbs>
+    <x-backend.breadcrumbs>
+        <x-backend.breadcrumb-item route='{{ route("backend.$module_name.index") }}' icon='{{ $module_icon }}'>
+            {{ __($module_title) }}
+        </x-backend.breadcrumb-item>
+        <x-backend.breadcrumb-item type="active">{{ __($module_action) }}</x-backend.breadcrumb-item>
+    </x-backend.breadcrumbs>
 @endsection
 
 @section('content')
 
-<div class="card">
-    <div class="card-body">
+    <x-backend.layouts.create>
+
         <x-backend.section-header>
-            <i class="{{ $module_icon }}"></i> {{ __($module_title) }} <small class="text-muted">{{ __($module_action) }}</small>
+            <i class="{{ $module_icon }}"></i> {{ __($module_title) }} <small
+                class="text-muted">{{ __($module_action) }}</small>
 
             <x-slot name="toolbar">
                 <x-backend.buttons.return-back />
@@ -33,7 +36,7 @@
                     $field_name = 'name';
                     $field_lable = __('labels.backend.roles.fields.name');
                     $field_placeholder = $field_lable;
-                    $required = "required";
+                    $required = 'required';
                     ?>
                     <div class="col-12 col-sm-2">
                         <div class="form-group">
@@ -50,9 +53,9 @@
                 <div class="row mb-3">
                     <?php
                     $field_name = 'name';
-                    $field_lable = __("Abilities");
+                    $field_lable = __('Abilities');
                     $field_placeholder = $field_lable;
-                    $required = "";
+                    $required = '';
                     ?>
                     <div class="col-12 col-sm-2">
                         <div class="form-group">
@@ -61,14 +64,15 @@
                     </div>
                     <div class="col-12 col-sm-10">
                         <div class="form-group">
-                            {{ __("Select permissions from the list:") }}
-                            {{-- <hr> --}}
+                            {{ __('Select permissions from the list:') }}
+
                             @if ($permissions->count())
-                            @foreach($permissions as $permission)
-                            <div class="checkbox">
-                                {{ html()->label(html()->checkbox('permissions[]', old('permissions') && in_array($permission->name, old('permissions')) ? true : false, $permission->name)->id('permission-'.$permission->id) . ' ' . $permission->name)->for('permission-'.$permission->id) }}
-                            </div>
-                            @endforeach
+                                @foreach ($permissions as $permission)
+                                    <div class="form-check">
+                                        {{ html()->label($permission->name)->for('permission-' . $permission->id)->class('form-check-label') }}
+                                        {{ html()->checkbox('permissions[]', old('permissions') && in_array($permission->name, old('permissions')) ? true : false, $permission->name)->id('permission-' . $permission->id)->class('form-check-input') }}
+                                    </div>
+                                @endforeach
                             @endif
                         </div>
                     </div>
@@ -77,8 +81,8 @@
                 <div class="row">
                     <div class="col-6">
                         <div class="form-group">
-                            <x-buttons.create title="{{__('Create')}} {{ ucwords(Str::singular($module_name)) }}">
-                                {{__('Create')}}
+                            <x-buttons.create title="{{ __('Create') }} {{ ucwords(Str::singular($module_name)) }}">
+                                {{ __('Create') }}
                             </x-buttons.create>
                         </div>
                     </div>
@@ -93,17 +97,7 @@
                 {{ html()->form()->close() }}
             </div>
         </div>
-    </div>
-
-    <div class="card-footer">
-        <div class="row">
-            <div class="col">
-                <small class="float-end text-muted">
 
-                </small>
-            </div>
-        </div>
-    </div>
-</div>
+    </x-backend.layouts.create>
 
-@endsection
+@endsection