From 655687dd1926dd22e24b4444940076a1e6b2d55a Mon Sep 17 00:00:00 2001 From: kavience Date: Sat, 17 Mar 2018 16:05:45 +0800 Subject: [PATCH 1/5] complete admin's news manage --- app/Http/Controllers/Admin/NewsController.php | 45 +++++++++++ config/app.php | 2 + .../views/admin/layouts/default.blade.php | 20 +++-- resources/views/admin/news/index.blade.php | 81 +++++++++++++++++++ routes/web-admin.php | 8 ++ 5 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 app/Http/Controllers/Admin/NewsController.php create mode 100644 resources/views/admin/news/index.blade.php diff --git a/app/Http/Controllers/Admin/NewsController.php b/app/Http/Controllers/Admin/NewsController.php new file mode 100644 index 0000000..8e97b23 --- /dev/null +++ b/app/Http/Controllers/Admin/NewsController.php @@ -0,0 +1,45 @@ +where('title','like','%'.Input::get('q').'%')->paginate(); + }else{ + $news = News::latest()->paginate(); + } + return view('admin.news.index', compact('news')); + } + + /** + * News delete + */ + public function destroy(Request $request) + { + $this->validate($request, [ + 'id' => 'required|integer', + ]); + News::destroy($request->id); + flash('操作成功'); + return back(); + } +} \ No newline at end of file diff --git a/config/app.php b/config/app.php index e09f898..eb3b7e4 100644 --- a/config/app.php +++ b/config/app.php @@ -234,6 +234,8 @@ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, + // + 'Input' => \Illuminate\Support\Facades\Input::class, // 'Image' => Intervention\Image\Facades\Image::class, diff --git a/resources/views/admin/layouts/default.blade.php b/resources/views/admin/layouts/default.blade.php index 84ff8d8..0eb2e4d 100644 --- a/resources/views/admin/layouts/default.blade.php +++ b/resources/views/admin/layouts/default.blade.php @@ -55,12 +55,7 @@ - + @yield('search') - +
  • + + + 活动管理 + + + +
  • diff --git a/routes/web-admin.php b/routes/web-admin.php index 19060c8..929afa7 100644 --- a/routes/web-admin.php +++ b/routes/web-admin.php @@ -13,7 +13,6 @@ // News Route::group(['prefix' => 'news'], function () { Route::get('/', 'NewsController@index')->name('admin.news.index'); - Route::get('search', 'NewsController@search')->name('admin.news.search'); Route::post('destroy', 'NewsController@destroy')->name('admin.news.destroy'); }); @@ -33,6 +32,12 @@ }); }); + // + // activities + Route::group(['prefix' => 'activity'], function () { + Route::get('/', 'ActivityController@index')->name('admin.activity.index'); + Route::post('destroy', 'ActivityController@destroy')->name('admin.activity.destroy'); + }); // // System From 8cda889ff3a3fb3e33008509dcf979800e29fc1d Mon Sep 17 00:00:00 2001 From: kavience Date: Sat, 17 Mar 2018 17:04:04 +0800 Subject: [PATCH 3/5] complete admin's topic manage --- app/Http/Controllers/Admin/TopicController.php | 11 +++++++++-- resources/views/admin/topic/index.blade.php | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/TopicController.php b/app/Http/Controllers/Admin/TopicController.php index 8a4ac37..a002564 100644 --- a/app/Http/Controllers/Admin/TopicController.php +++ b/app/Http/Controllers/Admin/TopicController.php @@ -5,16 +5,23 @@ use App\Topic; use Illuminate\Http\Request; use App\Http\Controllers\Controller; +use Illuminate\Support\Facades\Input; class TopicController extends Controller { /** - * Topic list page + * Topic list and search */ public function index() { - $topics = Topic::latest()->paginate(); + if (Input::get('q')!==null){ + $TopicModel = new Topic(); + $topics = $TopicModel->where('title','like','%'.Input::get('q').'%')->paginate(); + }else{ + $topics = Topic::latest()->paginate(); + } return view('admin.topic.index', compact('topics')); } + } diff --git a/resources/views/admin/topic/index.blade.php b/resources/views/admin/topic/index.blade.php index 78a94ad..25f7baa 100644 --- a/resources/views/admin/topic/index.blade.php +++ b/resources/views/admin/topic/index.blade.php @@ -1,5 +1,14 @@ @extends('admin.layouts.default') +@section('search') + +@endsection @section('mainBody')
    @@ -24,9 +33,15 @@ 作者 TU TB F C R 发布时间 + 操作 + @if($topics->isEmpty()) + + 无数据 + + @else @foreach($topics as $topic) {{ $topic->id }} @@ -44,8 +59,11 @@ {{ $topic->read_num }} {{ $topic->created_at }} + + @endforeach + @endif From 132b0589a3cfaea5bea4888339015613ea036236 Mon Sep 17 00:00:00 2001 From: kavience Date: Sun, 18 Mar 2018 18:28:39 +0800 Subject: [PATCH 4/5] complete admin's news,acticity manage --- app/Http/Controllers/Admin/ActivityController.php | 11 +++++++---- app/Http/Controllers/Admin/NewsController.php | 11 +++++++---- app/Http/Controllers/Admin/TopicController.php | 6 +++--- resources/views/admin/activities/index.blade.php | 4 ++-- resources/views/admin/news/index.blade.php | 4 ++-- resources/views/admin/topic/index.blade.php | 4 ++-- 6 files changed, 23 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Admin/ActivityController.php b/app/Http/Controllers/Admin/ActivityController.php index 46dc94d..4918cbf 100644 --- a/app/Http/Controllers/Admin/ActivityController.php +++ b/app/Http/Controllers/Admin/ActivityController.php @@ -21,12 +21,13 @@ class ActivityController extends Controller */ public function index() { - if (Input::get('q')!==null){ + if (Input::get('q')!==null) { $activityModel = new Activity(); - $activities = $activityModel->where('title','like','%'.Input::get('q').'%')->paginate(); - }else{ + $activities = $activityModel->where('title', 'like', '%'.Input::get('q').'%')->paginate(); + } else { $activities = Activity::latest()->paginate(); } + return view('admin.activities.index', compact('activities')); } @@ -38,8 +39,10 @@ public function destroy(Request $request) $this->validate($request, [ 'id' => 'required|integer', ]); + Activity::destroy($request->id); flash('操作成功'); + return back(); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/NewsController.php b/app/Http/Controllers/Admin/NewsController.php index 8e97b23..2460dae 100644 --- a/app/Http/Controllers/Admin/NewsController.php +++ b/app/Http/Controllers/Admin/NewsController.php @@ -21,12 +21,13 @@ class NewsController extends Controller */ public function index() { - if (Input::get('q')!==null){ + if (Input::get('q')!==null) { $newsModel = new News(); - $news = $newsModel->where('title','like','%'.Input::get('q').'%')->paginate(); - }else{ + $news = $newsModel->where('title', 'like', '%'.Input::get('q').'%')->paginate(); + } else { $news = News::latest()->paginate(); } + return view('admin.news.index', compact('news')); } @@ -38,8 +39,10 @@ public function destroy(Request $request) $this->validate($request, [ 'id' => 'required|integer', ]); + News::destroy($request->id); flash('操作成功'); + return back(); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/TopicController.php b/app/Http/Controllers/Admin/TopicController.php index a002564..8f90c81 100644 --- a/app/Http/Controllers/Admin/TopicController.php +++ b/app/Http/Controllers/Admin/TopicController.php @@ -14,10 +14,10 @@ class TopicController extends Controller */ public function index() { - if (Input::get('q')!==null){ + if (Input::get('q')!==null) { $TopicModel = new Topic(); - $topics = $TopicModel->where('title','like','%'.Input::get('q').'%')->paginate(); - }else{ + $topics = $TopicModel->where('title', 'like', '%'.Input::get('q').'%')->paginate(); + } else { $topics = Topic::latest()->paginate(); } diff --git a/resources/views/admin/activities/index.blade.php b/resources/views/admin/activities/index.blade.php index d5f0da1..6eec7d6 100644 --- a/resources/views/admin/activities/index.blade.php +++ b/resources/views/admin/activities/index.blade.php @@ -38,12 +38,12 @@ - @if($activities->isEmpty()) + @if ($activities->isEmpty()) 无数据 @else - @foreach($activities as $activity) + @foreach ($activities as $activity) {{ $activity->id }} 活动缩略图 diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php index b3a94b3..1f99119 100644 --- a/resources/views/admin/news/index.blade.php +++ b/resources/views/admin/news/index.blade.php @@ -36,12 +36,12 @@ - @if($news->isEmpty()) + @if ($news->isEmpty()) 无数据 @else - @foreach($news as $new) + @foreach ($news as $new) {{ $new->id }} {{ $new->title }} diff --git a/resources/views/admin/topic/index.blade.php b/resources/views/admin/topic/index.blade.php index 25f7baa..c5e6b4c 100644 --- a/resources/views/admin/topic/index.blade.php +++ b/resources/views/admin/topic/index.blade.php @@ -37,12 +37,12 @@ - @if($topics->isEmpty()) + @if ($topics->isEmpty()) 无数据 @else - @foreach($topics as $topic) + @foreach ($topics as $topic) {{ $topic->id }} {{ $topic->title }} From 96fbfb60b67bccf33c8369d3c3421724550a95ab Mon Sep 17 00:00:00 2001 From: kavience Date: Sun, 18 Mar 2018 19:17:16 +0800 Subject: [PATCH 5/5] complete index's search function --- app/Http/Controllers/ActivityController.php | 9 +++++++-- app/Http/Controllers/NewsController.php | 10 ++++++++-- app/Http/Controllers/TopicController.php | 11 +++++++++-- resources/views/activity/index.blade.php | 6 ++++++ resources/views/layouts/default.blade.php | 4 +--- resources/views/news/index.blade.php | 6 ++++++ resources/views/topic/index.blade.php | 6 ++++++ 7 files changed, 43 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index bd00a6e..bd312ae 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -5,16 +5,21 @@ use Illuminate\Http\Request; use App\Activity; use Auth; +use Illuminate\Support\Facades\Input; class ActivityController extends Controller { /** - * Activity List Page + * Activity List Page And Search */ public function index() { $exhibits = Activity::inRandomOrder()->limit(3)->get(); - $activities = Activity::latest()->paginate(12); + if (Input::get('q') !== null) { + $activities = Activity::where('title', 'like', '%'.Input::get('q').'%')->latest()->paginate(12); + } else { + $activities = Activity::latest()->paginate(12); + } return view('activity.index', compact('activities', 'exhibits')); } diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index 875bf2c..c04e77f 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -4,15 +4,21 @@ use App\News; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Input; class NewsController extends Controller { /** - * News Index Page + * News Index Page And Search */ public function index() { - $news = News::latest()->paginate(); + if (Input::get('q')!==null) { + $newsModel = new News(); + $news = $newsModel->where('title', 'like', '%'.Input::get('q').'%')->paginate(); + } else { + $news = News::latest()->paginate(); + } return view('news.index', compact('news')); } diff --git a/app/Http/Controllers/TopicController.php b/app/Http/Controllers/TopicController.php index 78e52d6..7d49cf7 100644 --- a/app/Http/Controllers/TopicController.php +++ b/app/Http/Controllers/TopicController.php @@ -10,11 +10,12 @@ use App\TopicNode; use App\TopicThumb; use App\TopicFavorite; +use Illuminate\Support\Facades\Input; class TopicController extends Controller { /** - * Topic List Page + * Topic List Page And Search */ public function index(Request $request) { @@ -53,7 +54,13 @@ public function index(Request $request) } } - $topics = $query->latest()->paginate(10); + if (Input::get('q') !== null) { + $topics = $query->where('title', 'like', '%'.Input::get('q').'%')-> + latest()->paginate(10); + + } else { + $topics = $query->latest()->paginate(10); + } $rootNodes = TopicNode::roots()->with('childNodes')->get(); return view('topic.index', compact('topics', 'rootNodes')); diff --git a/resources/views/activity/index.blade.php b/resources/views/activity/index.blade.php index 91ba451..4af4d8b 100644 --- a/resources/views/activity/index.blade.php +++ b/resources/views/activity/index.blade.php @@ -4,6 +4,12 @@ 活动 - {{ $system->site_title }} @endsection +@section('search') +
    + +
    +@endsection + @section('mainBody')