From d63979b5e3960adb001cf3465e716d209ab253f3 Mon Sep 17 00:00:00 2001 From: Htet Phone Aung Date: Wed, 13 Sep 2023 00:08:53 +0630 Subject: [PATCH] passing firstChapter & lastChapter into PageControllerr --- app/Http/Controllers/Auth/LoginController.php | 1 + app/Http/Controllers/ChapterController.php | 2 +- app/Http/Controllers/HomeController.php | 8 +++- app/Http/Controllers/PageController.php | 20 +++++++- app/Providers/AppServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 3 +- resources/sass/app.scss | 8 ++++ .../views/components/inner-manga.blade.php | 47 +++++++++++++------ .../components/outter-manga-frame.blade.php | 8 ++-- resources/views/home.blade.php | 5 ++ resources/views/index.blade.php | 6 +-- resources/views/manga.blade.php | 2 +- .../views/partials/chapter-paginate.blade.php | 10 ++-- resources/views/partials/hot-manga.blade.php | 16 ++++--- resources/views/partials/side-bar.blade.php | 3 ++ 15 files changed, 101 insertions(+), 40 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 18a0d08..b3130d1 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -26,6 +26,7 @@ class LoginController extends Controller * * @var string */ + protected $redirectTo = RouteServiceProvider::HOME; /** diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php index 6c29d34..5c0fe80 100644 --- a/app/Http/Controllers/ChapterController.php +++ b/app/Http/Controllers/ChapterController.php @@ -49,7 +49,7 @@ class ChapterController extends Controller } else { //chapter number $manga = Manga::where('id', $request->manga_id)->first(); - $latestChap = $manga->chapters()->latest()->first()->chapter_no; + $latestChap = $manga->chapters()->orderBy('chapter_no', 'desc')->first()->chapter_no; $formData['chapter_no'] = $latestChap + 1; } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 703b14c..25ad20e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Models\Manga; +use App\Models\User; use Illuminate\Http\Request; class HomeController extends Controller @@ -23,7 +25,11 @@ class HomeController extends Controller */ public function index() { - return view('home'); + $authors = User::where('role', 'author')->get(); + $users = User::where('role', 'user')->get(); + $mangas = Manga::all(); + // dd($authors); + return view('home', ['authors' => $authors, 'users'=> $users, 'mangas' => $mangas]); } diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 0330d2b..b2cb3b2 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -26,11 +26,27 @@ class PageController extends Controller public function manga($slug) { $manga = Manga::where('slug', $slug)->first(); - return view('manga', compact('manga')); + $chapters = $manga->chapters()->orderBy('chapter_no', 'desc')->paginate(10); + $firstChapter = $manga->chapters()->orderBy('chapter_no', 'asc')->first(); + $lastChapter = $manga->chapters()->latest('chapter_no')->first(); + // dd($firstChapter); + return view('manga',[ + 'manga' => $manga, + 'chapters' => $chapters, + 'firstChapter' => $firstChapter, + 'lastChapter' => $lastChapter + ]); } public function chapter(Manga $manga, Chapter $chapter) { - return view('chapter_page', ['manga' => $manga, 'chapter' => $chapter]); + $firstChapter = $manga->chapters()->orderBy('chapter_no', 'asc')->first(); + $lastChapter = $manga->chapters()->latest('chapter_no')->first(); + return view('chapter_page', [ + 'manga' => $manga, + 'chapter' => $chapter, + 'firstChapter' => $firstChapter, + 'lastChapter' => $lastChapter + ]); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b6e0fe6..86b1719 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -20,6 +20,6 @@ class AppServiceProvider extends ServiceProvider */ public function boot(): void { - Paginator::useBootstrap(); + Paginator::useBootstrapFive(); } } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 973b544..dd2524c 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -5,6 +5,7 @@ namespace App\Providers; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\RateLimiter; use Illuminate\Support\Facades\Route; @@ -17,7 +18,7 @@ class RouteServiceProvider extends ServiceProvider * * @var string */ - public const HOME = '/'; + public const HOME = "/"; /** * Define your route model bindings, pattern filters, and other route configuration. diff --git a/resources/sass/app.scss b/resources/sass/app.scss index f2d9bd0..a919e6d 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -22,3 +22,11 @@ .alert-msg { transform: translateX(-50%) translateY(10%); } + +.cover-img { + transition: all 1s; +} +.cover-img:hover { + filter: grayscale(30%); + transform: scale(1.2); +} diff --git a/resources/views/components/inner-manga.blade.php b/resources/views/components/inner-manga.blade.php index 2a4b474..e38bdd0 100644 --- a/resources/views/components/inner-manga.blade.php +++ b/resources/views/components/inner-manga.blade.php @@ -1,26 +1,43 @@ -@props(['manga']) +@props(['manga', 'chapters', 'firstChapter', 'lastChapter'])
-
- +
{{ $manga->title }}
+
+
+
+ +
+
+
+

Author - {{ $manga->user->name }}

+

Genre -

+

+ Read First + Read Last +

+
+
+
+
Summary
+
+

{{ $manga->summary }}

-

{{ $manga->title }}

-

{{ $manga->summary }}

+ {{ $chapters->links() }}
diff --git a/resources/views/components/outter-manga-frame.blade.php b/resources/views/components/outter-manga-frame.blade.php index b8f7a5f..dfc9704 100644 --- a/resources/views/components/outter-manga-frame.blade.php +++ b/resources/views/components/outter-manga-frame.blade.php @@ -2,14 +2,16 @@
-
+
img + class="w-100 cover-img">
-
{{ $manga->title }}
+ +
{{ $manga->title }}
+ @forelse ($manga->chapters()->latest('id')->limit(2)->get() as $chapter) @empty diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index e45ce96..483db1e 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -12,6 +12,11 @@ @endif {{ __('You are logged in!') }} + +
Statistics
+

Authors : {{ $authors->count() }} {{ Str::plural('author', $authors->count())}}

+

Users : {{ $users->count() }} {{ Str::plural('user', $authors->count()) }}

+

Comics : {{ $mangas->count() }} {{ Str::plural('comic', $mangas->count()) }}

@endsection diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b493237..00d60f2 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -9,7 +9,7 @@
@endif -
+
@forelse ($mangas as $manga) @@ -23,8 +23,8 @@
- -
+
+
@include('partials.hot-manga')
diff --git a/resources/views/manga.blade.php b/resources/views/manga.blade.php index ae7a743..00d0f37 100644 --- a/resources/views/manga.blade.php +++ b/resources/views/manga.blade.php @@ -6,7 +6,7 @@
- +
diff --git a/resources/views/partials/chapter-paginate.blade.php b/resources/views/partials/chapter-paginate.blade.php index f5e1ada..b7bcaa7 100644 --- a/resources/views/partials/chapter-paginate.blade.php +++ b/resources/views/partials/chapter-paginate.blade.php @@ -1,15 +1,15 @@ diff --git a/resources/views/partials/hot-manga.blade.php b/resources/views/partials/hot-manga.blade.php index 0102031..08c945b 100644 --- a/resources/views/partials/hot-manga.blade.php +++ b/resources/views/partials/hot-manga.blade.php @@ -1,21 +1,23 @@ -

Manga Hot

+
Manga Hot
@forelse (App\Models\Manga::latest('id')->limit(3)->get() as $hotManga)
-
-
+
+
img + alt="img" class="cover-img img-fluid">
-
-

{{ $hotManga->title }}

+
+ +

{{ $hotManga->title }}

+ @foreach ($hotManga->chapters()->latest('id')->limit(2)->get() as $hotChap) @endforeach - +
diff --git a/resources/views/partials/side-bar.blade.php b/resources/views/partials/side-bar.blade.php index 88b1fb8..c0cd232 100644 --- a/resources/views/partials/side-bar.blade.php +++ b/resources/views/partials/side-bar.blade.php @@ -1,4 +1,7 @@