From 08385f48a34f82328b9dfa266af69f528f3e4e73 Mon Sep 17 00:00:00 2001 From: horus Date: Mon, 13 May 2019 15:58:58 +0200 Subject: Renames Controller. --- app/Http/Controllers/ListOfferController.php | 95 ++++++++++++++++++++++++++++ app/Http/Controllers/OfferController.php | 95 ---------------------------- routes/web.php | 12 ++-- 3 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 app/Http/Controllers/ListOfferController.php delete mode 100644 app/Http/Controllers/OfferController.php diff --git a/app/Http/Controllers/ListOfferController.php b/app/Http/Controllers/ListOfferController.php new file mode 100644 index 0000000..1fb846e --- /dev/null +++ b/app/Http/Controllers/ListOfferController.php @@ -0,0 +1,95 @@ +input("order"); + if ( "asc" != $order_by ) { + $order_by = "desc"; + } + + /* + * Database query + */ + $view_name = \Request::route()->getName(); + #$data = DB::table($view_name . '_view')->whereNotNull('url')->orderBy($sort_by, $order_by)->simplePaginate(10); + $data = DB::table($view_name . '_view')->whereNotNull('url')->orderBy($sort_by, $order_by)->paginate(10); + $count = DB::table($view_name . '_view')->whereNotNull('url')->count(); + + $rss_feed = "/angebote/" . $view_name . "/feed/"; + $query_string = ""; + $query_params = Input::except('page'); + foreach( $query_params as $key => $value) { + $query_string .= "&" . $key . "=" . $value; + } + if ( "search" == $view_name && "" != $query_string ) { + $query_string = ltrim($query_string, "&"); + $rss_feed .= "?" . $query_string; + } + + if ( "misc" == $view_name ) { + $view_name = "Andere Angebote"; + if ( $data->count() ) { + $title = "andere Angebote"; + } else { + $title = "anderen Angebote"; + } + } else if ( "all" == $view_name ) { + $view_name = "Alle Angebote"; + if ( $data->count() ) { + $title = "alle Angebote"; + } else { + $title = "Angebote"; + } + } else { + $title = ucfirst($view_name) . "-Angebote"; + } + + return view('offer', ['data' => $data, 'count' => $count, 'spirit_type' => $view_name, 'rss_feed' => $rss_feed, 'title' => $title ]); + } +} diff --git a/app/Http/Controllers/OfferController.php b/app/Http/Controllers/OfferController.php deleted file mode 100644 index fd5765f..0000000 --- a/app/Http/Controllers/OfferController.php +++ /dev/null @@ -1,95 +0,0 @@ -input("order"); - if ( "asc" != $order_by ) { - $order_by = "desc"; - } - - /* - * Database query - */ - $view_name = \Request::route()->getName(); - #$data = DB::table($view_name . '_view')->whereNotNull('url')->orderBy($sort_by, $order_by)->simplePaginate(10); - $data = DB::table($view_name . '_view')->whereNotNull('url')->orderBy($sort_by, $order_by)->paginate(10); - $count = DB::table($view_name . '_view')->whereNotNull('url')->count(); - - $rss_feed = "/angebote/" . $view_name . "/feed/"; - $query_string = ""; - $query_params = Input::except('page'); - foreach( $query_params as $key => $value) { - $query_string .= "&" . $key . "=" . $value; - } - if ( "search" == $view_name && "" != $query_string ) { - $query_string = ltrim($query_string, "&"); - $rss_feed .= "?" . $query_string; - } - - if ( "misc" == $view_name ) { - $view_name = "Andere Angebote"; - if ( $data->count() ) { - $title = "andere Angebote"; - } else { - $title = "anderen Angebote"; - } - } else if ( "all" == $view_name ) { - $view_name = "Alle Angebote"; - if ( $data->count() ) { - $title = "alle Angebote"; - } else { - $title = "Angebote"; - } - } else { - $title = ucfirst($view_name) . "-Angebote"; - } - - return view('offer', ['data' => $data, 'count' => $count, 'spirit_type' => $view_name, 'rss_feed' => $rss_feed, 'title' => $title ]); - } -} diff --git a/routes/web.php b/routes/web.php index 8011a5d..185ab9d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,12 +13,12 @@ Route::get('/angebote/', 'IndexController@showPage')->name('whisky'); -Route::get('/angebote/whisky', 'OfferController@showPage')->name('whisky'); -Route::get('/angebote/wodka', 'OfferController@showPage')->name('wodka'); -Route::get('/angebote/gin', 'OfferController@showPage')->name('gin'); -Route::get('/angebote/rum', 'OfferController@showPage')->name('rum'); -Route::get('/angebote/misc', 'OfferController@showPage')->name('misc'); -Route::get('/angebote/all', 'OfferController@showPage')->name('all'); +Route::get('/angebote/whisky', 'ListOfferController@showPage')->name('whisky'); +Route::get('/angebote/wodka', 'ListOfferController@showPage')->name('wodka'); +Route::get('/angebote/gin', 'ListOfferController@showPage')->name('gin'); +Route::get('/angebote/rum', 'ListOfferController@showPage')->name('rum'); +Route::get('/angebote/misc', 'ListOfferController@showPage')->name('misc'); +Route::get('/angebote/all', 'ListOfferController@showPage')->name('all'); Route::get('/angebote/search', 'SearchController@showPage')->name('searchp'); -- cgit v1.2.3