From 82b2360c4f6186feaa43023dcd79fb89d91c9d4d Mon Sep 17 00:00:00 2001
From: horus
Date: Wed, 23 Sep 2020 01:30:30 +0200
Subject: show anime by year

---
 app/Http/Controllers/AnimeController.php | 11 ++++++++---
 resources/views/layouts/app.blade.php    |  2 +-
 routes/web.php                           |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/AnimeController.php b/app/Http/Controllers/AnimeController.php
index 83d36c8..1da62e1 100644
--- a/app/Http/Controllers/AnimeController.php
+++ b/app/Http/Controllers/AnimeController.php
@@ -180,13 +180,18 @@ class AnimeController extends Controller {
 		return view('list_anime', ["all_anime" => $sanime, "title" => "Search", "count" => $count]);
 	}
 
-	public function showSeason($season_name, $season_year) {
-		$season_name = ucfirst($season_name);
+	public function showSeason($season_year, $season_name = null) {
 
 		$anime = new Anime;
 		$anime = $anime->setTable('view_anime_index');
 
-		$anime = $anime->where('season_name', '=', $season_name)->where('season_year', '=', $season_year);
+		$anime = $anime->where('season_year', '=', $season_year);
+
+		if ( ! is_null($season_name) ) {
+			$season_name = ucfirst($season_name);
+			$anime = $anime->where('season_name', '=', $season_name);
+		}
+
 		$anime = $anime->orderBy('score_today', 'desc');
 		$anime = $anime->orderBy('members', 'desc');
 		$anime = $anime->orderBy('watching', 'desc');
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 734c7eb..6fc28ce 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -41,7 +41,7 @@
                             </li>
 			@endif
                             <li class="nav-item">
-				<a href="{{ route('airing_anime') }}" class="nav-link @if('airing_anime' == \Request::route()->getName()) active @endif">Currently Airing</a>
+				<a href="{{ route('airing_anime') }}" class="nav-link @if('airing_anime' == \Request::route()->getName()) active @endif">Airing</a>
                             </li>
 			
                             <li class="nav-item">
diff --git a/routes/web.php b/routes/web.php
index 13880a1..9c05426 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,9 +19,9 @@ Route::get('/anime/', function(){ return redirect()->route('airing_anime'); })->
 Route::get('/anime/airing', 'AnimeController@showCurrentAnime')->name('airing_anime');
 Route::get('/anime/surprising/', 'AnimeController@showSurprisingAnime')->name('surprising_anime');
 Route::get('/anime/top/', 'AnimeController@showTopAnime')->name('top_anime');
-Route::get('/anime/{mal_id}/{slug?}', 'AnimeController@showAnime')->name('anime');
+Route::get('/anime/season/{season_year}/{season_name?}', 'AnimeController@showSeason')->name('season');
 
-Route::get('/anime/season/{season_name}/{season_year}', 'AnimeController@showSeason')->name('season');
+Route::get('/anime/{mal_id}/{slug?}', 'AnimeController@showAnime')->name('anime');
 
 Route::get('/api/anime/{mal_id}', 'ApiController@getAnime');
 
-- 
cgit v1.2.3