diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 4e9eb37..3247636 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Models\Comment; use App\Models\Customer; +use App\Models\Group; use App\Models\Post; use App\Models\User; use Illuminate\Http\Request; @@ -93,4 +94,12 @@ class ClientController extends Controller { } + + public function group(Group $group){ + $area = 'group'; + $title = $group->name; + $subtitle = $group->subtitle; + $posts = $group->posts()->orderByDesc('id')->paginate($this->paginate); + return view('client.group', compact('area', 'posts', 'title', 'subtitle','group')); + } } diff --git a/app/Models/Area.php b/app/Models/Area.php index 83ae59d..8431430 100644 --- a/app/Models/Area.php +++ b/app/Models/Area.php @@ -15,7 +15,7 @@ class Area extends Model 'attachments_page', 'card', 'categories', - 'categories_page', +// 'categories_page', 'category', 'comments', 'clip', @@ -31,7 +31,7 @@ class Area extends Model 'gallery', 'group', 'groups', - 'groups_page', +// 'groups_page', 'header', 'index', 'invoice', diff --git a/app/Models/Group.php b/app/Models/Group.php index cab4777..12416b8 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -84,8 +84,7 @@ class Group extends Model public function webUrl() { - return '#';// WIP - return route(''); + return route('client.group',$this->slug); } public function published($limit = 10, $order = 'id', $dir = 'DESC') diff --git a/database/seeders/AreaSeeder.php b/database/seeders/AreaSeeder.php index 3e72b47..886bf2e 100644 --- a/database/seeders/AreaSeeder.php +++ b/database/seeders/AreaSeeder.php @@ -154,16 +154,16 @@ class AreaSeeder extends Seeder 'preview' => 'client.attachment', 'icon' => 'ri-book-3-line', ], - [ - 'name' => 'categories-list', - 'valid_segments' => json_encode( - ["top", "header", "footer", "menu", - "parallax", "other", "categories_page", "ads"] - ), - 'max' => 6, - 'preview' => 'client.categories', - 'icon' => 'ri-file-copy-2-line', - ], +// [ +// 'name' => 'categories-list', +// 'valid_segments' => json_encode( +// ["top", "header", "footer", "menu", +// "parallax", "other", "categories_page", "ads"] +// ), +// 'max' => 6, +// 'preview' => 'client.categories', +// 'icon' => 'ri-file-copy-2-line', +// ], [ 'name' => 'group', 'valid_segments' => json_encode( @@ -172,18 +172,18 @@ class AreaSeeder extends Seeder ), 'max' => 6, 'preview' => 'client.group', - 'icon' => 'ri-book-line', - ], - [ - 'name' => 'groups-list', - 'valid_segments' => json_encode( - ["top", "header", "footer", "menu", - "parallax", "other", "groups_page", "ads"] - ), - 'max' => 6, - 'preview' => 'client.groups', 'icon' => 'ri-book-shelf-line', ], +// [ +// 'name' => 'groups-list', +// 'valid_segments' => json_encode( +// ["top", "header", "footer", "menu", +// "parallax", "other", "groups_page", "ads"] +// ), +// 'max' => 6, +// 'preview' => 'client.groups', +// 'icon' => 'ri-book-shelf-line', +// ], [ 'name' => 'card', 'valid_segments' => json_encode( diff --git a/database/seeders/GroupSeeder.php b/database/seeders/GroupSeeder.php index 214e8c1..7ad64fe 100644 --- a/database/seeders/GroupSeeder.php +++ b/database/seeders/GroupSeeder.php @@ -30,5 +30,26 @@ class GroupSeeder extends Seeder $g3->name = __("About us"); $g3->slug = 'about-us'; $g3->save(); + + $g4 = new Group(); + $g4->name = __("Sport"); + $g4->subtitle = __("Sport news about sport around the world."); + $g4->slug = 'sport-news'; + $g4->parent_id = $g1->id; + $g4->save(); + + $g4 = new Group(); + $g4->name = __("Economy"); + $g4->subtitle = __("Economy news about sport around the world."); + $g4->slug = 'economy-news'; + $g4->parent_id = $g1->id; + $g4->save(); + + $g4 = new Group(); + $g4->name = __("Militarily"); + $g4->subtitle = __("Militarily news about sport around the world."); + $g4->slug = 'militarily-news'; + $g4->parent_id = $g1->id; + $g4->save(); } } diff --git a/resources/views/client/group.blade.php b/resources/views/client/group.blade.php new file mode 100644 index 0000000..a181eb5 --- /dev/null +++ b/resources/views/client/group.blade.php @@ -0,0 +1,18 @@ +@extends('website.inc.website-layout') + +@section('title') + {{$title}} - {{config('app.name')}} +@endsection +@php +if ($group->bg != null){ + $bg = $group->bgUrl(); +} +@endphp +@section('content') +
+ @foreach(getParts($area) as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach +
+@endsection diff --git a/resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.blade.php b/resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.blade.php similarity index 100% rename from resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.blade.php rename to resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.blade.php diff --git a/resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.js b/resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.js similarity index 100% rename from resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.js rename to resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.js diff --git a/resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.json b/resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.json similarity index 100% rename from resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.json rename to resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.json diff --git a/resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.php b/resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.php similarity index 100% rename from resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.php rename to resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.php diff --git a/resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.scss b/resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.scss similarity index 100% rename from resources/views/segments/category/FavProductWithMeta/FavProductWithMeta.scss rename to resources/views/segments/categories/FavProductWithMeta/FavProductWithMeta.scss diff --git a/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.blade.php b/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.blade.php new file mode 100644 index 0000000..9ebfd16 --- /dev/null +++ b/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.blade.php @@ -0,0 +1,23 @@ +
+
+ @if($group->children()->count() > 0) +
+

+ {{__("Sub groups")}} +

+
+ @foreach($group->children as $subGroup) +
+
+ {{$subGroup->name}} +

+ {{$subGroup->name}} +

+
+
+ @endforeach +
+
+ @endif +
+
diff --git a/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.js b/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.js new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.json b/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.json new file mode 100644 index 0000000..a792eba --- /dev/null +++ b/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.json @@ -0,0 +1,10 @@ +{ + "name": "SubGroupsGrid", + "version": "1.0", + "author": "xStack", + "email": "xshop@xstack.ir", + "license": "GPL-3.0-or-later", + "url": "https:\/\/xstack.ir", + "author_url": "https:\/\/4xmen.ir", + "packages": [] +} \ No newline at end of file diff --git a/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.php b/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.php new file mode 100644 index 0000000..7335ba5 --- /dev/null +++ b/resources/views/segments/group/SubGroupsGrid/SubGroupsGrid.php @@ -0,0 +1,21 @@ + +
@foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post) @@ -45,7 +45,7 @@ - {{$post->view}} + {{number_format($post->view)}}

diff --git a/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php b/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php index 81ac770..90e605b 100644 --- a/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php +++ b/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php @@ -1,4 +1,4 @@ -

+
@foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post) @@ -49,7 +49,7 @@ - {{$post->view}} + {{number_format($post->view)}}

diff --git a/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.scss b/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.scss index 5f22c21..5e826ee 100644 --- a/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.scss +++ b/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.scss @@ -63,7 +63,7 @@ overflow: hidden; img{ width: 100%; - height: 300px; + height: 200px; object-fit: cover; margin-bottom: 1rem; border-radius: var(--xshop-border-radius) ; diff --git a/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php b/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php index 7e3160d..f3c4093 100644 --- a/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php +++ b/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php @@ -1,4 +1,4 @@ -

+
@foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post) diff --git a/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php b/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php index ac98614..cc2f27c 100644 --- a/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php +++ b/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php @@ -1,4 +1,4 @@ -
+
@foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post) diff --git a/routes/web.php b/routes/web.php index 66a3b41..cb4ec87 100644 --- a/routes/web.php +++ b/routes/web.php @@ -47,6 +47,7 @@ Route::prefix(config('app.panel.prefix'))->name('admin.')->group( Route::post('store', [\App\Http\Controllers\Admin\GroupController::class, 'store'])->name('store'); Route::get('edit/{item}', [\App\Http\Controllers\Admin\GroupController::class, 'edit'])->name('edit'); Route::post('update/{item}', [\App\Http\Controllers\Admin\GroupController::class, 'update'])->name('update'); + Route::get('show/{item}', [\App\Http\Controllers\Admin\GroupController::class, 'show'])->name('show'); Route::get('delete/{item}', [\App\Http\Controllers\Admin\GroupController::class, 'destroy'])->name('destroy'); Route::get('restore/{item}', [\App\Http\Controllers\Admin\GroupController::class, 'restore'])->name('restore'); Route::post('bulk', [\App\Http\Controllers\Admin\GroupController::class, "bulk"])->name('bulk'); @@ -358,7 +359,8 @@ Route::name('client.')->group(function (){ // index Route::get('/', [\App\Http\Controllers\ClientController::class,'welcome'])->name('welcome'); Route::get('/posts', [\App\Http\Controllers\ClientController::class,'posts'])->name('posts'); - Route::get('/tag/{post}', [\App\Http\Controllers\ClientController::class,'tag'])->name('tag'); + Route::get('/tag/{post}', [\App\Http\Controllers\ClientController::class,'tag'])->name('tag'); // wip + Route::get('/group/{group}', [\App\Http\Controllers\ClientController::class,'group'])->name('group'); Route::get('/search', [\App\Http\Controllers\ClientController::class,'search'])->name('search'); Route::get('/{post}', [\App\Http\Controllers\ClientController::class,'post'])->name('post');