diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php deleted file mode 100644 index 25ad20e..0000000 --- a/app/Http/Controllers/HomeController.php +++ /dev/null @@ -1,36 +0,0 @@ -middleware(['auth', 'admin.access']); - } - - /** - * Show the application dashboard. - * - * @return \Illuminate\Contracts\Support\Renderable - */ - public function index() - { - $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/MangaChapterController.php b/app/Http/Controllers/MangaChapterController.php index ff13bfc..54d2153 100644 --- a/app/Http/Controllers/MangaChapterController.php +++ b/app/Http/Controllers/MangaChapterController.php @@ -26,8 +26,7 @@ class MangaChapterController extends Controller public function manga(Manga $manga) { $chapters = $manga->chapters() - ->latest('chapter_no') - ->paginate(10); + ->paginate(40); $hotMangas = Manga::with(['chapters']) ->latest('id')->limit('3')->get(); return view('manga',[ diff --git a/app/Http/Controllers/MangaController.php b/app/Http/Controllers/MangaController.php index 0124ff6..89aaf6f 100644 --- a/app/Http/Controllers/MangaController.php +++ b/app/Http/Controllers/MangaController.php @@ -18,13 +18,10 @@ class MangaController extends Controller */ public function index() { - $mangas = Manga::when(auth()->user()->role != 'admin', function ($q) { - $user_id = auth()->id(); - $q->where('author_id', $user_id); - }) - ->latest('id') - ->paginate(10) - ->withQueryString(); + $mangas = Manga::latest('id') + ->paginate(20) + ->withQueryString(); + // dd($mangas); return view('manga.index', compact('mangas')); } diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 420f7bf..fb93189 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Models\User; +use App\Models\Manga; use Illuminate\Http\Request; class PageController extends Controller @@ -9,7 +11,7 @@ class PageController extends Controller public function redirect() { $role = auth()->user()->role; if($role != 'user') { - return redirect()->route('home')->with(['message' => 'Welcome to Admin Dashboard!']); + return redirect()->route('dashboard')->with(['message' => 'Welcome to Admin Dashboard!']); }else { return redirect()->route('page.index')->with(['message' => 'Welcome to MangaDex!']); } @@ -18,4 +20,19 @@ class PageController extends Controller { return view('contact'); } + + public function dashboard() + { + $authors = User::where('role', 'author')->get(); + $users = User::where('role', 'user')->get(); + $mangas = Manga::all(); + return view('dashboard', + [ + 'authors' => $authors, + 'users'=> $users, + 'mangas' => $mangas, + ]); + } + + } diff --git a/app/Models/Chapter.php b/app/Models/Chapter.php index ba95afe..947be88 100644 --- a/app/Models/Chapter.php +++ b/app/Models/Chapter.php @@ -22,4 +22,8 @@ class Chapter extends Model public function comments() { return $this->hasMany(Comment::class, 'chapter_id'); } + + public function user() { + return $this->belongsTo(User::class, 'user_id'); + } } diff --git a/app/Models/Manga.php b/app/Models/Manga.php index a1b4a5c..cc1d8ac 100644 --- a/app/Models/Manga.php +++ b/app/Models/Manga.php @@ -26,6 +26,7 @@ class Manga extends Model // { // return $this->chapters()->one()->latestOfMany(); // } + public function lastChap() { return $this->chapters()->one()->ofMany('chapter_no', 'max'); diff --git a/app/Policies/ChapterPolicy.php b/app/Policies/ChapterPolicy.php index fe65607..f81d074 100644 --- a/app/Policies/ChapterPolicy.php +++ b/app/Policies/ChapterPolicy.php @@ -45,7 +45,7 @@ class ChapterPolicy */ public function update(User $user, Chapter $chapter): bool { - // + return $chapter->user()->is($user); } /** @@ -53,7 +53,7 @@ class ChapterPolicy */ public function delete(User $user, Chapter $chapter): bool { - return $user->id == $chapter->user_id; + return $this->update($user, $chapter); } /** diff --git a/app/Policies/CommentPolicy.php b/app/Policies/CommentPolicy.php index 7b4c7a6..2b5c3cb 100644 --- a/app/Policies/CommentPolicy.php +++ b/app/Policies/CommentPolicy.php @@ -47,7 +47,7 @@ class CommentPolicy */ public function update(User $user, Comment $comment): bool { - return $comment->user_id === $user->id; + return $comment->user()->is($user); } /** @@ -55,7 +55,7 @@ class CommentPolicy */ public function delete(User $user, Comment $comment): bool { - return $comment->user_id === $user->id || $user->role === 'admin'; + return $this->update($user, $comment) || $user->role === 'admin'; } /** diff --git a/app/Policies/MangaPolicy.php b/app/Policies/MangaPolicy.php index 4a1b078..acc5f4f 100644 --- a/app/Policies/MangaPolicy.php +++ b/app/Policies/MangaPolicy.php @@ -23,7 +23,7 @@ class MangaPolicy public function viewAny(User $user, Manga $manga): bool { - // return $user->id == $manga->author_id; + // } /** @@ -31,7 +31,7 @@ class MangaPolicy */ public function view(User $user, Manga $manga): bool { - return $user->id == $manga->author_id; + return true; } /** @@ -47,7 +47,7 @@ class MangaPolicy */ public function update(User $user, Manga $manga): bool { - return $user->id == $manga->author_id; + return $manga->user()->is($user); } /** @@ -55,7 +55,7 @@ class MangaPolicy */ public function delete(User $user, Manga $manga): bool { - return $user->id == $manga->author_id; + return $this->update($user, $manga); } /** diff --git a/resources/js/app.js b/resources/js/app.js index 82c3b17..139d084 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,10 +1,6 @@ import './bootstrap'; -// let selectChapter = document.querySelector('#selectChapter'); -// selectChapter.addEventListener('change', function() { -// this.submit(); -// }); - - import "./edit-box"; import "./reply-box"; + + diff --git a/resources/js/side-bar.js b/resources/js/side-bar.js new file mode 100644 index 0000000..0a51cbc --- /dev/null +++ b/resources/js/side-bar.js @@ -0,0 +1,11 @@ +const sideBar = document.getElementById('sideBar') +const sideBarBtn = document.getElementById('sideBarBtn') + +sideBarBtn.addEventListener('click', () => { + sideBar.classList.toggle('d-none') + if(sideBar.classList.contains('d-none')) { + sideBarBtn.innerHTML = `` + }else { + sideBarBtn.innerHTML = `` + } +}) \ No newline at end of file diff --git a/resources/views/chapter/manageChapter.blade.php b/resources/views/chapter/manageChapter.blade.php index d6eb49b..a865d47 100644 --- a/resources/views/chapter/manageChapter.blade.php +++ b/resources/views/chapter/manageChapter.blade.php @@ -8,21 +8,21 @@
Chapter {{ $chapter->chapter_no }}
-Chapter {{ $chapter->chapter_no }}
+Copyright All Served @MangaDex
Genre - @foreach ($manga->genres as $genre) - {{$genre->name}} / + {{ $genre->name }} / @endforeach
- Read First - Read Last + Read + First + Read Last
Chapter {{ $chapter->chapter_no }} - {{ $chapter->title ?? '' }}
-- {{ $chapter->updated_at->diffForHumans() }} -
- - @empty -No Chapter Yet!
- @endforelse +No Chapter Yet!
+ @endforelse +{{ $manga->title }}
{{ $manga->excerpt }} diff --git a/resources/views/home.blade.php b/resources/views/dashboard.blade.php similarity index 100% rename from resources/views/home.blade.php rename to resources/views/dashboard.blade.php diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index ad6ff68..7c8c135 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -15,10 +15,10 @@ - @vite(['resources/sass/app.scss', 'resources/js/app.js']) + @vite(['resources/sass/app.scss', 'resources/js/app.js', 'resources/js/side-bar.js']) - +