1 files changed, 28 insertions, 3 deletions

diff --git a/app/Http/Controllers/AnimeController.php b/app/Http/Controllers/AnimeController.php
index 73c8842..e99f2f1 100644
--- a/app/Http/Controllers/AnimeController.php
+++ b/app/Http/Controllers/AnimeController.php
@@ -113,8 +113,12 @@ class AnimeController extends Controller {
 
 		#$anime = $anime->setTable('anime');
 		$anime = $anime->where('airing_status', env('ANIME_IS_AIRING'));
+		$anime = $anime->orWhere( function( $q ) {
+			$q->where('season_year', date("Y"));
+			$q->where('season_name', getSeason());
+			});
 		$anime = $anime->orderBy('season_year', 'desc');
-		$anime = $anime->orderByRaw('FIELD(season_name, ' . $this->_getFieldSeasonName() . ')');
+		$anime = $anime->orderByRaw('FIELD(season_name, ' . getFieldSeasonName() . ')');
 		$anime = $anime->orderBy('score_today', 'desc');
 		$anime = $anime->orderBy('members', 'desc');
 		$anime = $anime->orderBy('watching', 'desc');
@@ -179,7 +183,7 @@ class AnimeController extends Controller {
 		}
 		$count = $anime->count();
 		$anime = $anime->orderBy('season_year', 'desc');
-		$anime = $anime->orderByRaw('FIELD(season_name, "Summer", "Fall", "Winter", "Spring")');
+		$anime = $anime->orderByRaw('FIELD(season_name, ' . getFieldSeasonName() . ')');
 		$anime = $anime->orderBy('score_today', 'desc');
 		$anime = $anime->orderBy('members', 'desc');
 		$anime = $anime->orderBy('watching', 'desc');
@@ -203,8 +207,29 @@ class AnimeController extends Controller {
 		$anime = $anime->orderBy('score_today', 'desc');
 		$anime = $anime->orderBy('members', 'desc');
 		$anime = $anime->orderBy('watching', 'desc');
-		$sanime = $anime->paginate(12);
+		$sanime = $anime->get();
+		#$sanime = $anime->paginate(12);
 
 		return view('list_anime', ["all_anime" => $sanime, "title" => $season_name . " Season " . $season_year]);
 	}
+
+	public function changeSeason(Request $request) {
+		$input= explode("-", $request->input("season"));
+		$season_name = $input[0];
+		$season_year = $input[1];
+
+		switch( strtolower($season_name) ) {
+		case("winter"): $season_name = "Winter"; break;
+		case("spring"): $season_name = "Spring"; break;
+		case("summer"): $season_name = "Summer"; break;
+		case("fall"): $season_name = "Fall"; break;
+		default: $saeson_name = getSeason();
+		}
+
+		if ( ! preg_match("/\d{4}/", $season_year) ) {
+			$season_year = date("Y");
+		}
+
+		return redirect('/anime/season/' . $season_year . '/' . $season_name);
+	}
 }