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/Admin/ActivityController.php b/app/Http/Controllers/Admin/ActivityController.php new file mode 100644 index 0000000..4918cbf --- /dev/null +++ b/app/Http/Controllers/Admin/ActivityController.php @@ -0,0 +1,48 @@ +where('title', 'like', '%'.Input::get('q').'%')->paginate(); + } else { + $activities = Activity::latest()->paginate(); + } + + return view('admin.activities.index', compact('activities')); + } + + /** + * Activities delete + */ + public function destroy(Request $request) + { + $this->validate($request, [ + 'id' => 'required|integer', + ]); + + Activity::destroy($request->id); + flash('操作成功'); + + return back(); + } +} diff --git a/app/Http/Controllers/Admin/NewsController.php b/app/Http/Controllers/Admin/NewsController.php new file mode 100644 index 0000000..2460dae --- /dev/null +++ b/app/Http/Controllers/Admin/NewsController.php @@ -0,0 +1,48 @@ +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(); + } +} diff --git a/app/Http/Controllers/Admin/TopicController.php b/app/Http/Controllers/Admin/TopicController.php index 8a4ac37..8f90c81 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/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/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/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')
+ +
+ + + + + + + + + + +@stop diff --git a/resources/views/admin/layouts/default.blade.php b/resources/views/admin/layouts/default.blade.php index 84ff8d8..a30e539 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/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php new file mode 100644 index 0000000..1f99119 --- /dev/null +++ b/resources/views/admin/news/index.blade.php @@ -0,0 +1,81 @@ +@extends('admin.layouts.default') + +@section('search') + +@endsection +@section('mainBody') +
    +
    +

    新闻列表

    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + @if ($news->isEmpty()) + + + + @else + @foreach ($news as $new) + + + + + + + + @endforeach + @endif + +
    #标题来源发布时间操作
    无数据
    {{ $new->id }}{{ $new->title }}{{ $new->origin }}{{ $new->created_at }}
    + + + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +@stop diff --git a/resources/views/admin/topic/index.blade.php b/resources/views/admin/topic/index.blade.php index 78a94ad..c5e6b4c 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,10 +33,16 @@ 作者 TU TB F C R 发布时间 + 操作 - @foreach($topics as $topic) + @if ($topics->isEmpty()) + + 无数据 + + @else + @foreach ($topics as $topic) {{ $topic->id }} {{ $topic->title }} @@ -44,8 +59,11 @@ {{ $topic->read_num }} {{ $topic->created_at }} + + @endforeach + @endif diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 251fcee..48c2daf 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -94,9 +94,7 @@ @endif -
    - -
    + @yield('search')