From 75a13ba8cb052cc222df074b8ce06c301a7ee598 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Thu, 25 Jul 2024 19:55:50 +0800 Subject: [PATCH 01/11] feat: webpage for creating trip --- app/Http/Controllers/TripCreateController.php | 68 ++++++ app/Http/Controllers/UserController.php | 4 +- app/Models/Trip.php | 11 + resources/views/comingsoon.blade.php | 2 +- resources/views/record/test.blade.php | 82 ------- resources/views/trip/create.blade.php | 211 ++++++++++++++++++ resources/views/user/edit.blade.php | 24 +- routes/web.php | 4 + 8 files changed, 309 insertions(+), 97 deletions(-) create mode 100644 app/Http/Controllers/TripCreateController.php create mode 100644 app/Models/Trip.php delete mode 100644 resources/views/record/test.blade.php create mode 100644 resources/views/trip/create.blade.php diff --git a/app/Http/Controllers/TripCreateController.php b/app/Http/Controllers/TripCreateController.php new file mode 100644 index 0000000..b44bdc2 --- /dev/null +++ b/app/Http/Controllers/TripCreateController.php @@ -0,0 +1,68 @@ +role > 0){ + return view('trip.create'); + } + + return redirect()->route('portal.index')->with('status','您並無權限進行此操作，請先登入。'); + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + * @throws ValidationException + */ + + + public function update(Request $request) + { + $trip = New Trip(); + +// $-> = $request->input(''); + + $trip->leader_id = auth()->user()->id; + $trip->name = $request->input('name'); + $trip->expected_member_count = $request->input('expected_member_count'); + $trip->expected_cadre_count = $request->input('expected_cadre_count'); + $trip->description = $request->input('description'); + $trip->category = $request->input('category'); + $trip->start_date = $request->input('start_date'); + $trip->end_date = $request->input('end_date'); + $trip->image = $request->file('image'); + $trip->actual_fee = $request->input('actual_fee'); + $trip->expected_fee = $request->input('expected_fee'); + $trip->registration_open = $request->input('registration_open'); + $trip->registration_close = $request->input('registration_close'); + $trip->pre_departure_time = $request->input('pre_departure_time'); + $trip->judgements_id = $request->input('judgements_id'); + $trip->create_user = auth()->user()->id; + + $trip->save(); + + return redirect()->back()->with('status','隊伍資料更新成功'); + //return redirect()->route('trip.create'); // 預計導回所有隊伍頁面…但似乎bar上還沒有 + + } + + + +} + + + diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 264befc..d9d001c 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -8,7 +8,7 @@ class UserController extends Controller { - const POSITION = ["社員", "社長", "副社長", "嚮導組組長", "嚮導組組員", + const POSITION = ["社員", "社長", "副社長", "嚮導組組長", "嚮導組組員", '技術組組長', '技術組組員', '器材組組長', '器材組組長', '醫藥組組長', '醫藥組組員', '文書組組長', '文書組組員', '美宣', '網管', '財務長', '山防組組長', '山防組組員']; @@ -52,7 +52,7 @@ public function store(Request $request) * @param int $id * @return \Illuminate\Http\Response */ - public function show($id) + public function show($id)f { $user = User::find($id); $position = self::POSITION; diff --git a/app/Models/Trip.php b/app/Models/Trip.php new file mode 100644 index 0000000..477e007 --- /dev/null +++ b/app/Models/Trip.php @@ -0,0 +1,11 @@ +
-

Coming Soon

@@ -15,6 +14,7 @@
+
diff --git a/resources/views/record/test.blade.php b/resources/views/record/test.blade.php deleted file mode 100644 index f0679f2..0000000 --- a/resources/views/record/test.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -@extends('basic.main') - -@section('title', '創建紀錄') - -@section('content') -
-
-
- -
-
-

創建紀錄

- 請告訴我們你的精采故事吧 -
-
- -
-
-
-
- @csrf -
- - -
-
- - -
-
- - -
-
-
- - -
-
- - -
-
-
- - - 預覽封面 -
-
- - - - -
-
-
- -
-
-
-
-
-
- - -
-
-
- - - - -@endsection \ No newline at end of file diff --git a/resources/views/trip/create.blade.php b/resources/views/trip/create.blade.php new file mode 100644 index 0000000..9693545 --- /dev/null +++ b/resources/views/trip/create.blade.php @@ -0,0 +1,211 @@ +@extends('basic.main') + +@section('title', '創建紀錄') + +@section('content') +
+
+
+ +
+
+

創建隊伍

+ +
+
+ +
+
+
+ + @if (session('status')) +
+ {{ session('status') }} +
+ @endif +
+ @csrf + @method('PUT') +
+ + +
+
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + + + +
+
+ + + 預覽封面 +
+ +
+
+ + +
+
+ + +
+
+
+ + + + +
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ + +
+ + + + + + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + +
+
+ +
+ + + + +
+ +
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + + + +@endsection diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php index 62c4142..c510b72 100644 --- a/resources/views/user/edit.blade.php +++ b/resources/views/user/edit.blade.php @@ -1,6 +1,6 @@ @extends('basic.main') -@section('title', '個人資料') +@section('title', '個人資料') @section('content') @@ -27,18 +27,18 @@ @method('PUT')
- +
- +
-
- +
+
- + @if($user->nickname != null) @else @@ -46,22 +46,22 @@ @endif
- +
- +
- +
- +
@@ -72,11 +72,11 @@
- + -@endsection \ No newline at end of file +@endsection diff --git a/routes/web.php b/routes/web.php index e513d2b..c49188b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -8,6 +8,7 @@ use App\Http\Controllers\JudgementController; use App\Http\Controllers\PortalLoginController; use App\Http\Controllers\PostController; +use App\Http\Controllers\TripCreateController; use App\Http\Controllers\RecordController; use App\Http\Controllers\RentalController; use App\Http\Controllers\UserController; @@ -127,5 +128,8 @@ Route::put('/faq/edit/{id}', [FaqController::class, 'update'])->name('faq.update'); Route::delete('/faq/edit/{id}', [FaqController::class, 'destroy'])->name('faq.destroy'); + // trip + Route::get('/trip/create', [TripCreateController::class, 'create'])->name('trip.create'); + Route::put('/trip/create', [TripCreateController::class, 'update'])->name('trip.update'); }); From e3502618dc84bb74532ad59b581c116cf8791fd7 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Sun, 28 Jul 2024 16:52:07 +0800 Subject: [PATCH 02/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/TripCreateController.php | 112 ++++++++++--- resources/views/trip/create.blade.php | 77 ++------- resources/views/trip/edit.blade.php | 153 ++++++++++++++++++ routes/web.php | 8 +- 4 files changed, 262 insertions(+), 88 deletions(-) create mode 100644 resources/views/trip/edit.blade.php diff --git a/app/Http/Controllers/TripCreateController.php b/app/Http/Controllers/TripCreateController.php index b44bdc2..a3482f7 100644 --- a/app/Http/Controllers/TripCreateController.php +++ b/app/Http/Controllers/TripCreateController.php @@ -7,8 +7,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Validation\ValidationException; - - +use Carbon\Carbon; class TripCreateController extends Controller { @@ -21,20 +20,34 @@ public function create() // 會連到 web.php 的 function return redirect()->route('portal.index')->with('status','您並無權限進行此操作，請先登入。'); } - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - * @throws ValidationException - */ + public function edit($id) + { + if(Auth::check() && Auth::user()->role > 0){ + if (!is_numeric($id)) { + return redirect()->back()->with('error', '無效的隊伍 ID'); + + } + // 根據 ID 取得現有資料 + $trip = Trip::find($id); + if(!$trip){ + return redirect()->back()->with('error', '找不到該隊伍'); + }else{ + $trip->start_date = Carbon::parse($trip->start_date); + $trip->end_date = Carbon::parse($trip->end_date); + $trip->quit_date = Carbon::parse($trip->quit_date); + $trip->registration_open = Carbon::parse($trip->registration_open); + $trip->registration_close = Carbon::parse($trip->registration_close); + $trip->pre_departure_time = Carbon::parse($trip->pre_departure_time); + return view('trip.edit', compact('trip')); + } + } + return redirect()->route('portal.index')->with('status','您並無權限進行此操作，請先登入。'); + } - public function update(Request $request) - { - $trip = New Trip(); + public function handleRequest1(Request $request) { -// $-> = $request->input(''); + $trip = New Trip(); $trip->leader_id = auth()->user()->id; $trip->name = $request->input('name'); @@ -51,18 +64,77 @@ public function update(Request $request) $trip->registration_close = $request->input('registration_close'); $trip->pre_departure_time = $request->input('pre_departure_time'); $trip->judgements_id = $request->input('judgements_id'); + $trip->prepare_day = $request->input('prepare_day'); $trip->create_user = auth()->user()->id; - - $trip->save(); - - return redirect()->back()->with('status','隊伍資料更新成功'); - //return redirect()->route('trip.create'); // 預計導回所有隊伍頁面…但似乎bar上還沒有 + $trip->quit_date = $request->input('quit_date'); + $trip->quit_rule = $request->input('quit_rule'); + $trip->additional_content = $request->input('additional_content'); + + $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day)/86400; + + // 檢查按鈕的值 + $action = $request->input('action'); + + if ($action == 'update') { + $trip->isActive = false; + $trip->save(); + return redirect()->back()->with('status','隊伍資料儲存成功'); + } elseif ($action == 'publish') { + $trip->isActive = true; + $trip->save(); + return redirect()->back()->with('status','隊伍資料發布成功'); + } else { + return redirect()->back()->with('error', '未知的操作'); + } } + public function handleRequest2(Request $request, $id) { + + $trip = Trip::find($id); + if (!$trip) { + return redirect()->back()->with('error', '找不到該隊伍'); + }else { + $trip->leader_id = auth()->user()->id; + $trip->name = $request->input('name'); + $trip->expected_member_count = $request->input('expected_member_count'); + $trip->expected_cadre_count = $request->input('expected_cadre_count'); + $trip->description = $request->input('description'); + $trip->category = $request->input('category'); + $trip->start_date = $request->input('start_date'); + $trip->end_date = $request->input('end_date'); + $trip->image = $request->file('image'); + $trip->actual_fee = $request->input('actual_fee'); + $trip->expected_fee = $request->input('expected_fee'); + $trip->registration_open = $request->input('registration_open'); + $trip->registration_close = $request->input('registration_close'); + $trip->pre_departure_time = $request->input('pre_departure_time'); + $trip->judgements_id = $request->input('judgements_id'); + $trip->modify_user = auth()->user()->id; + $trip->prepare_day = $request->input('prepare_day'); + $trip->quit_date = $request->input('quit_date'); + $trip->quit_rule = $request->input('quit_rule'); + $trip->additional_content = $request->input('additional_content'); + $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day) / 86400; + + // 檢查按鈕的值 + $action = $request->input('action'); + + if ($action == 'update') { + $trip->isActive = false; + $trip->save(); + return redirect()->back()->with('status', '隊伍資料更新成功'); + } elseif ($action == 'publish') { + $trip->isActive = true; + $trip->save(); + return redirect()->back()->with('status', '隊伍資料發布成功'); + } else { + return redirect()->back()->with('error', '未知的操作'); + } + } + } -} - +} diff --git a/resources/views/trip/create.blade.php b/resources/views/trip/create.blade.php index 9693545..400d8a1 100644 --- a/resources/views/trip/create.blade.php +++ b/resources/views/trip/create.blade.php @@ -34,12 +34,6 @@ -
@@ -90,18 +84,14 @@
-
- - +
+ +
-
- - +
+ +
@@ -120,12 +110,7 @@
-
- - - -
@@ -136,58 +121,16 @@
-
-
- - -
-
- - -
-
-
- - -
- - - - - - -
-
- - -
-
- - -
-
- - -
-
- - + +
-
- -
- - - - -
- - + +
diff --git a/resources/views/trip/edit.blade.php b/resources/views/trip/edit.blade.php new file mode 100644 index 0000000..c1aaff6 --- /dev/null +++ b/resources/views/trip/edit.blade.php @@ -0,0 +1,153 @@ +@extends('basic.main') + +@section('title', '編輯紀錄') + +@section('content') +
+
+
+ +
+
+

編輯隊伍

+ +
+
+ +
+
+
+ + @if (session('status')) +
+ {{ session('status') }} +
+ @endif +
+ @csrf + @method('PUT') +
+ + name ?? '') }} required> +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + prepare_day ?? '') }} required> +
+ +
+ + +
+
+ + + 預覽封面 +
+ +
+
+ + expected_fee ?? '') }} required> +
+
+ + actual_fee ?? '') }} required> +
+
+ +
+
+ + expected_cadre_count ?? '') }} required> +
+
+ + expected_member_count ?? '') }} required> +
+
+ +
+ + +
+ +
+
+ + +
+
+ +
+
+
+
+ + +
+
+
+ + + + +@endsection diff --git a/routes/web.php b/routes/web.php index c49188b..57843c3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -130,6 +130,12 @@ // trip Route::get('/trip/create', [TripCreateController::class, 'create'])->name('trip.create'); - Route::put('/trip/create', [TripCreateController::class, 'update'])->name('trip.update'); + Route::get('/trip/edit/{id}', [TripCreateController::class, 'edit'])->name('trip.edit'); + Route::put('/trip/create', [TripCreateController::class, 'handleRequest1'])->name('trip.handleRequest1'); + Route::put('/trip/edit/{id}', [TripCreateController::class, 'handleRequest2'])->name('trip.handleRequest2'); + + // Route::put('/trip/create', [TripCreateController::class, 'update'])->name('trip.update'); + // Route::put('/trip/create', [TripCreateController::class, 'publish'])->name('trip.publish'); + }); From a85ae774ffda059d64dba6e50b139973e4ef367f Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Sun, 28 Jul 2024 17:51:39 +0800 Subject: [PATCH 03/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/TripCreateController.php | 4 ++-- resources/views/trip/edit.blade.php | 2 +- routes/web.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/TripCreateController.php b/app/Http/Controllers/TripCreateController.php index a3482f7..836df88 100644 --- a/app/Http/Controllers/TripCreateController.php +++ b/app/Http/Controllers/TripCreateController.php @@ -45,7 +45,7 @@ public function edit($id) } - public function handleRequest1(Request $request) { + public function store(Request $request) { $trip = New Trip(); @@ -88,7 +88,7 @@ public function handleRequest1(Request $request) { } } - public function handleRequest2(Request $request, $id) { + public function update(Request $request, $id) { $trip = Trip::find($id); if (!$trip) { diff --git a/resources/views/trip/edit.blade.php b/resources/views/trip/edit.blade.php index c1aaff6..ff22dd7 100644 --- a/resources/views/trip/edit.blade.php +++ b/resources/views/trip/edit.blade.php @@ -23,7 +23,7 @@ {{ session('status') }}
@endif -
+ @csrf @method('PUT')
diff --git a/routes/web.php b/routes/web.php index 57843c3..cb62ac6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -131,8 +131,8 @@ // trip Route::get('/trip/create', [TripCreateController::class, 'create'])->name('trip.create'); Route::get('/trip/edit/{id}', [TripCreateController::class, 'edit'])->name('trip.edit'); - Route::put('/trip/create', [TripCreateController::class, 'handleRequest1'])->name('trip.handleRequest1'); - Route::put('/trip/edit/{id}', [TripCreateController::class, 'handleRequest2'])->name('trip.handleRequest2'); + Route::put('/trip/create', [TripCreateController::class, 'store'])->name('trip.store'); + Route::put('/trip/edit/{id}', [TripCreateController::class, 'update'])->name('trip.update'); // Route::put('/trip/create', [TripCreateController::class, 'update'])->name('trip.update'); // Route::put('/trip/create', [TripCreateController::class, 'publish'])->name('trip.publish'); From dabb6255634ea8684aa508967f7e80242292393f Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Sun, 4 Aug 2024 12:56:49 +0800 Subject: [PATCH 04/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/TripController.php | 190 ++++++++++ app/Http/Controllers/TripCreateController.php | 140 -------- resources/views/trip/create.blade.php | 330 ++++++++++-------- resources/views/trip/edit.blade.php | 130 +++++-- routes/web.php | 17 +- 5 files changed, 482 insertions(+), 325 deletions(-) create mode 100644 app/Http/Controllers/TripController.php delete mode 100644 app/Http/Controllers/TripCreateController.php diff --git a/app/Http/Controllers/TripController.php b/app/Http/Controllers/TripController.php new file mode 100644 index 0000000..68a5512 --- /dev/null +++ b/app/Http/Controllers/TripController.php @@ -0,0 +1,190 @@ +role > 0) { + if (Auth::user()->guard != 0) { + return view('trip.create'); + } + // 等隊伍畫面完成後，想導回隊伍頁面，加入以下內容 + /* + * @if (session('status')) + *
+ *
{{ session('status') }}
+ *
+ */ + return redirect()->route('index')->with('status', '您不具有嚮導資格，無法進行操作。'); + } + return redirect()->route('portal.index')->with('status', '您並無權限進行此操作，請先登入。'); + } + + public function edit($id) + { + if (Auth::check() && Auth::user()->role > 0) { + if (Auth::user()->guard != 0) { + if (!is_numeric($id)) { + return redirect()->back()->with('error', '無效的隊伍 ID'); + } + // 根據 ID 取得現有資料 + $trip = Trip::find($id); + if (!$trip) { + return redirect()->back()->with('error', '找不到該隊伍'); + } else { + $trip->registration_open = Carbon::parse($trip->registration_open); + $trip->registration_close = Carbon::parse($trip->registration_close); + $trip->quit_date = Carbon::parse($trip->quit_date); + $trip->pre_departure_time = Carbon::parse($trip->pre_departure_time); + $trip->start_date = Carbon::parse($trip->pre_departure_time); + $trip->end_date = Carbon::parse($trip->end_date); + + return view('trip.edit', compact('trip')); + } + } else { + return redirect()->route('index')->with('status', '您不具有嚮導資格，無法進行操作。'); + } + } + return redirect()->route('portal.index')->with('status', '您並無權限進行此操作，請先登入。'); + + } + + // 創建新隊伍資料 + public function store(Request $request) + { + // validate date + $validator = Validator::make($request->all(), [ + 'registration_close' => 'after_or_equal:registration_open', + 'quit_date' => 'after_or_equal:registration_close', + 'pre_departure_time' => 'after_or_equal:quit_date', + 'start_date' => 'after_or_equal:pre_departure_time', + 'end_date' => 'after_or_equal:start_date', + + ], [ + 'registration_close.after_or_equal' => '報名截止日期需在報名開始日期之後。', + 'quit_date.after_or_equal' => '鳥隊日期需在報名截止日期之後。', + 'pre_departure_time.after_or_equal' => '行前會日期需在鳥隊日期之後。', + 'start_date.after_or_equal' => '隊伍開始日期需在行前會日期之後。', + 'end_date.after_or_equal' => '結束日期需在開始日期之後。', + 'image.required' => '請上傳封面照。', + ]); + + if ($validator->fails()) { + return redirect()->back()->withErrors($validator)->withInput($request->all()); + } + $trip = new Trip(); + + $trip->leader_id = auth()->user()->id; + $trip->name = $request->input('name'); + $trip->expected_member_count = $request->input('expected_member_count'); + $trip->expected_cadre_count = $request->input('expected_cadre_count'); + $trip->description = $request->input('description'); + $trip->category = $request->input('category'); + $trip->start_date = $request->input('start_date'); + $trip->end_date = $request->input('end_date'); + $trip->image = $request->file('image'); + $trip->actual_fee = $request->input('actual_fee'); + $trip->expected_fee = $request->input('expected_fee'); + $trip->registration_open = $request->input('registration_open'); + $trip->registration_close = $request->input('registration_close'); + $trip->pre_departure_time = $request->input('pre_departure_time'); + $trip->judgements_id = $request->input('judgements_id'); + $trip->prepare_day = $request->input('prepare_day'); + $trip->create_user = auth()->user()->id; + $trip->quit_date = $request->input('quit_date'); + $trip->quit_rule = $request->input('quit_rule'); + $trip->additional_content = $request->input('additional_content'); + + $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day) / 86400; + + // 檢查按鈕的值 + $action = $request->input('action'); + + if ($action == 'update') { + $trip->isActive = false; + $trip->save(); + return redirect()->back()->with('status', '隊伍資料儲存成功'); + } elseif ($action == 'publish') { + $trip->isActive = true; + $trip->save(); + return redirect()->back()->with('status', '隊伍資料發布成功'); + } + + } + + // 修改新隊伍資料 + public function update(Request $request, $id) + { + + $trip = Trip::find($id); + if (!$trip) { + return redirect()->back()->with('error', '找不到該隊伍'); + } else { + // validate date + $validator = Validator::make($request->all(), [ + 'registration_close' => 'after_or_equal:registration_open', + 'quit_date' => 'after_or_equal:registration_close', + 'pre_departure_time' => 'after_or_equal:quit_date', + 'start_date' => 'after_or_equal:pre_departure_time', + 'end_date' => 'after_or_equal:start_date', + + ], [ + 'registration_close.after_or_equal' => '報名截止日期需在報名開始日期之後。', + 'quit_date.after_or_equal' => '鳥隊日期需在報名截止日期之後。', + 'pre_departure_time.after_or_equal' => '行前會日期需在鳥隊日期之後。', + 'start_date.after_or_equal' => '隊伍開始日期需在行前會日期之後。', + 'end_date.after_or_equal' => '結束日期需在開始日期之後。', + 'image.required' => '請上傳封面照。', + ]); + + if ($validator->fails()) { + return redirect()->back()->withErrors($validator)->withInput($request->all()); + } + + $trip->leader_id = auth()->user()->id; + $trip->name = $request->input('name'); + $trip->expected_member_count = $request->input('expected_member_count'); + $trip->expected_cadre_count = $request->input('expected_cadre_count'); + $trip->description = $request->input('description'); + $trip->category = $request->input('category'); + $trip->start_date = $request->input('start_date'); + $trip->end_date = $request->input('end_date'); + $trip->image = $request->file('image'); + $trip->actual_fee = $request->input('actual_fee'); + $trip->expected_fee = $request->input('expected_fee'); + $trip->registration_open = $request->input('registration_open'); + $trip->registration_close = $request->input('registration_close'); + $trip->pre_departure_time = $request->input('pre_departure_time'); + $trip->judgements_id = $request->input('judgements_id'); + $trip->modify_user = auth()->user()->id; + $trip->prepare_day = $request->input('prepare_day'); + $trip->quit_date = $request->input('quit_date'); + $trip->quit_rule = $request->input('quit_rule'); + $trip->additional_content = $request->input('additional_content'); + $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day) / 86400; + + // 檢查按鈕的值 + $action = $request->input('action'); + + if ($action == 'update') { + $trip->isActive = false; + $trip->save(); + return redirect()->back()->with('status', '隊伍資料更新成功'); + } elseif ($action == 'publish') { + $trip->isActive = true; + $trip->save(); + return redirect()->back()->with('status', '隊伍資料發布成功'); + } + } + } +} diff --git a/app/Http/Controllers/TripCreateController.php b/app/Http/Controllers/TripCreateController.php deleted file mode 100644 index 836df88..0000000 --- a/app/Http/Controllers/TripCreateController.php +++ /dev/null @@ -1,140 +0,0 @@ -role > 0){ - return view('trip.create'); - } - - return redirect()->route('portal.index')->with('status','您並無權限進行此操作，請先登入。'); - } - - public function edit($id) - { - if(Auth::check() && Auth::user()->role > 0){ - if (!is_numeric($id)) { - return redirect()->back()->with('error', '無效的隊伍 ID'); - - } - // 根據 ID 取得現有資料 - $trip = Trip::find($id); - if(!$trip){ - return redirect()->back()->with('error', '找不到該隊伍'); - }else{ - $trip->start_date = Carbon::parse($trip->start_date); - $trip->end_date = Carbon::parse($trip->end_date); - $trip->quit_date = Carbon::parse($trip->quit_date); - $trip->registration_open = Carbon::parse($trip->registration_open); - $trip->registration_close = Carbon::parse($trip->registration_close); - $trip->pre_departure_time = Carbon::parse($trip->pre_departure_time); - return view('trip.edit', compact('trip')); - } - } - return redirect()->route('portal.index')->with('status','您並無權限進行此操作，請先登入。'); - - } - - public function store(Request $request) { - - $trip = New Trip(); - - $trip->leader_id = auth()->user()->id; - $trip->name = $request->input('name'); - $trip->expected_member_count = $request->input('expected_member_count'); - $trip->expected_cadre_count = $request->input('expected_cadre_count'); - $trip->description = $request->input('description'); - $trip->category = $request->input('category'); - $trip->start_date = $request->input('start_date'); - $trip->end_date = $request->input('end_date'); - $trip->image = $request->file('image'); - $trip->actual_fee = $request->input('actual_fee'); - $trip->expected_fee = $request->input('expected_fee'); - $trip->registration_open = $request->input('registration_open'); - $trip->registration_close = $request->input('registration_close'); - $trip->pre_departure_time = $request->input('pre_departure_time'); - $trip->judgements_id = $request->input('judgements_id'); - $trip->prepare_day = $request->input('prepare_day'); - $trip->create_user = auth()->user()->id; - $trip->quit_date = $request->input('quit_date'); - $trip->quit_rule = $request->input('quit_rule'); - $trip->additional_content = $request->input('additional_content'); - - $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day)/86400; - - // 檢查按鈕的值 - $action = $request->input('action'); - - if ($action == 'update') { - $trip->isActive = false; - $trip->save(); - return redirect()->back()->with('status','隊伍資料儲存成功'); - } elseif ($action == 'publish') { - $trip->isActive = true; - $trip->save(); - return redirect()->back()->with('status','隊伍資料發布成功'); - } else { - return redirect()->back()->with('error', '未知的操作'); - } - - } - public function update(Request $request, $id) { - - $trip = Trip::find($id); - if (!$trip) { - return redirect()->back()->with('error', '找不到該隊伍'); - }else { - $trip->leader_id = auth()->user()->id; - $trip->name = $request->input('name'); - $trip->expected_member_count = $request->input('expected_member_count'); - $trip->expected_cadre_count = $request->input('expected_cadre_count'); - $trip->description = $request->input('description'); - $trip->category = $request->input('category'); - $trip->start_date = $request->input('start_date'); - $trip->end_date = $request->input('end_date'); - $trip->image = $request->file('image'); - $trip->actual_fee = $request->input('actual_fee'); - $trip->expected_fee = $request->input('expected_fee'); - $trip->registration_open = $request->input('registration_open'); - $trip->registration_close = $request->input('registration_close'); - $trip->pre_departure_time = $request->input('pre_departure_time'); - $trip->judgements_id = $request->input('judgements_id'); - $trip->modify_user = auth()->user()->id; - $trip->prepare_day = $request->input('prepare_day'); - $trip->quit_date = $request->input('quit_date'); - $trip->quit_rule = $request->input('quit_rule'); - $trip->additional_content = $request->input('additional_content'); - $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day) / 86400; - - // 檢查按鈕的值 - $action = $request->input('action'); - - if ($action == 'update') { - $trip->isActive = false; - $trip->save(); - return redirect()->back()->with('status', '隊伍資料更新成功'); - } elseif ($action == 'publish') { - $trip->isActive = true; - $trip->save(); - return redirect()->back()->with('status', '隊伍資料發布成功'); - } else { - return redirect()->back()->with('error', '未知的操作'); - } - } - } - - - - - -} diff --git a/resources/views/trip/create.blade.php b/resources/views/trip/create.blade.php index 400d8a1..947a08d 100644 --- a/resources/views/trip/create.blade.php +++ b/resources/views/trip/create.blade.php @@ -3,152 +3,196 @@ @section('title', '創建紀錄') @section('content') -
-
-
- -
-
-

創建隊伍

- -
-
- -
-
-
- - @if (session('status')) -
- {{ session('status') }} +
+
+
+ +
+
+

創建隊伍

+
- @endif - - @csrf - @method('PUT') -
- - -
-
- - -
- -
- - -
- -
- - -
- -
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
-
- - -
- -
- - - -
-
- - - 預覽封面 -
- -
-
- - -
-
- - -
-
- -
-
- - -
-
- - -
-
- -
- - -
- -
-
- - -
-
- - -
-
-
+
+ +
+
+
+ + @if (session('status')) +
+ {{ session('status') }} +
+ @endif + +
+ @error('end_date') +
{{ $message }}
+ @enderror +
+
+ @error('quit_date') +
{{ $message }}
+ @enderror +
+
+ @error('start_date') +
{{ $message }}
+ @enderror +
+
+ @error('registration_close') +
{{ $message }}
+ @enderror +
+
+ @error('pre_departure_time') +
{{ $message }}
+ @enderror +
+
+ @csrf + @method('PUT') +
+ + +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ + +
+ +
+ + + +
+
+ + + 預覽封面 +
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+
+ + +
+
+ +
+
+
+
-
-
-
+
+ + - + - + @endsection diff --git a/resources/views/trip/edit.blade.php b/resources/views/trip/edit.blade.php index ff22dd7..29d141c 100644 --- a/resources/views/trip/edit.blade.php +++ b/resources/views/trip/edit.blade.php @@ -15,7 +15,7 @@
-
+
@if (session('status')) @@ -23,25 +23,60 @@ {{ session('status') }}
@endif -
+ +
+ @error('end_date') +
{{ $message }}
+ @enderror +
+
+ @error('quit_date') +
{{ $message }}
+ @enderror +
+
+ @error('start_date') +
{{ $message }}
+ @enderror +
+
+ @error('registration_close') +
{{ $message }}
+ @enderror +
+
+ @error('pre_departure_time') +
{{ $message }}
+ @enderror +
+ @csrf @method('PUT')
- name ?? '') }} required> + name ?? '') }} required>
- +
@@ -49,81 +84,116 @@
+
- +
- +
- - + +
+
- - + +
- - + +
- - + +
+
- prepare_day ?? '') }} required> + prepare_day ?? '') }} required>
- - + +
- + 預覽封面
- expected_fee ?? '') }} required> + expected_fee ?? '') }} required>
- actual_fee ?? '') }} required> + actual_fee ?? '') }} required>
- expected_cadre_count ?? '') }} required> + expected_cadre_count ?? '') }} required>
- expected_member_count ?? '') }} required> + expected_member_count ?? '') }} required>
- +
diff --git a/routes/web.php b/routes/web.php index cb62ac6..8d624c7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -8,7 +8,7 @@ use App\Http\Controllers\JudgementController; use App\Http\Controllers\PortalLoginController; use App\Http\Controllers\PostController; -use App\Http\Controllers\TripCreateController; +use App\Http\Controllers\TripController; use App\Http\Controllers\RecordController; use App\Http\Controllers\RentalController; use App\Http\Controllers\UserController; @@ -51,8 +51,6 @@ Route::get('/record/show/{id}', [RecordController::class, 'show'])->name('record.show'); - - Route::prefix('portal')->name('portal.')->group(function () { Route::get('/', [PortalLoginController::class, 'index'])->name('index'); @@ -129,13 +127,8 @@ Route::delete('/faq/edit/{id}', [FaqController::class, 'destroy'])->name('faq.destroy'); // trip - Route::get('/trip/create', [TripCreateController::class, 'create'])->name('trip.create'); - Route::get('/trip/edit/{id}', [TripCreateController::class, 'edit'])->name('trip.edit'); - Route::put('/trip/create', [TripCreateController::class, 'store'])->name('trip.store'); - Route::put('/trip/edit/{id}', [TripCreateController::class, 'update'])->name('trip.update'); - - // Route::put('/trip/create', [TripCreateController::class, 'update'])->name('trip.update'); - // Route::put('/trip/create', [TripCreateController::class, 'publish'])->name('trip.publish'); - - + Route::get('/trip/create', [TripController::class, 'create'])->name('trip.create'); + Route::get('/trip/edit/{id}', [TripController::class, 'edit'])->name('trip.edit'); + Route::put('/trip/create', [TripController::class, 'store'])->name('trip.store'); + Route::put('/trip/edit/{id}', [TripController::class, 'update'])->name('trip.update'); }); From 5a8e25e8daab560b54528e664246258b688a24df Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Tue, 6 Aug 2024 21:15:48 +0800 Subject: [PATCH 05/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index d9d001c..4a29dc0 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -52,7 +52,7 @@ public function store(Request $request) * @param int $id * @return \Illuminate\Http\Response */ - public function show($id)f + public function show($id) { $user = User::find($id); $position = self::POSITION; From 858c36541d7bc91bf2649b29974dd4bb119a7089 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Wed, 7 Aug 2024 22:14:20 +0800 Subject: [PATCH 06/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/TripController.php | 25 +++++++++++++++++++------ resources/views/trip/edit.blade.php | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/TripController.php b/app/Http/Controllers/TripController.php index 68a5512..6ed6756 100644 --- a/app/Http/Controllers/TripController.php +++ b/app/Http/Controllers/TripController.php @@ -9,13 +9,16 @@ use Illuminate\Support\Facades\Validator; use Illuminate\Validation\ValidationException; use Carbon\Carbon; +use App\Traits\ImageTrait; +use Illuminate\Support\Facades\File; class TripController extends Controller { + use ImageTrait; public function create() // 會連到 web.php 的 function { if (Auth::check() && Auth::user()->role > 0) { - if (Auth::user()->guard != 0) { + if(Auth::user()->guard != 0) { return view('trip.create'); } // 等隊伍畫面完成後，想導回隊伍頁面，加入以下內容 @@ -56,7 +59,6 @@ public function edit($id) } } return redirect()->route('portal.index')->with('status', '您並無權限進行此操作，請先登入。'); - } // 創建新隊伍資料 @@ -78,6 +80,10 @@ public function store(Request $request) 'end_date.after_or_equal' => '結束日期需在開始日期之後。', 'image.required' => '請上傳封面照。', ]); + $file = $request->image; + $folder_name = "uploads/images/trips"; + $name = $request->input('name'); + if ($validator->fails()) { return redirect()->back()->withErrors($validator)->withInput($request->all()); @@ -92,7 +98,7 @@ public function store(Request $request) $trip->category = $request->input('category'); $trip->start_date = $request->input('start_date'); $trip->end_date = $request->input('end_date'); - $trip->image = $request->file('image'); + $trip->image = $this->storeImage($file, $folder_name, $name); $trip->actual_fee = $request->input('actual_fee'); $trip->expected_fee = $request->input('expected_fee'); $trip->registration_open = $request->input('registration_open'); @@ -105,7 +111,7 @@ public function store(Request $request) $trip->quit_rule = $request->input('quit_rule'); $trip->additional_content = $request->input('additional_content'); - $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day) / 86400; + $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) ) / 86400 + $trip->prepare_day; // 檢查按鈕的值 $action = $request->input('action'); @@ -147,6 +153,14 @@ public function update(Request $request, $id) 'image.required' => '請上傳封面照。', ]); + if($request->image) { + File::delete(public_path($trip->image)); + $file = $request->image; + $folder_name = "uploads/images/records"; + $name = $request->input('name'); + $trip->image = $this->storeImage($file, $folder_name, $name); + } + if ($validator->fails()) { return redirect()->back()->withErrors($validator)->withInput($request->all()); } @@ -159,7 +173,6 @@ public function update(Request $request, $id) $trip->category = $request->input('category'); $trip->start_date = $request->input('start_date'); $trip->end_date = $request->input('end_date'); - $trip->image = $request->file('image'); $trip->actual_fee = $request->input('actual_fee'); $trip->expected_fee = $request->input('expected_fee'); $trip->registration_open = $request->input('registration_open'); @@ -171,7 +184,7 @@ public function update(Request $request, $id) $trip->quit_date = $request->input('quit_date'); $trip->quit_rule = $request->input('quit_rule'); $trip->additional_content = $request->input('additional_content'); - $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) + $trip->prepare_day) / 86400; + $trip->total_day = (strtotime($trip->end_date) - strtotime($trip->start_date) ) / 86400 + $trip->prepare_day; // 檢查按鈕的值 $action = $request->input('action'); diff --git a/resources/views/trip/edit.blade.php b/resources/views/trip/edit.blade.php index 29d141c..0fc73b7 100644 --- a/resources/views/trip/edit.blade.php +++ b/resources/views/trip/edit.blade.php @@ -162,6 +162,7 @@ 預覽封面
+
From 3dc5b93f49363f5db34c89dafb442ea78788dbf9 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Mon, 9 Sep 2024 21:10:33 +0800 Subject: [PATCH 07/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/trip/create.blade.php | 64 ++++----------------------- resources/views/trip/edit.blade.php | 40 +++++------------ routes/web.php | 10 +++-- 3 files changed, 25 insertions(+), 89 deletions(-) diff --git a/resources/views/trip/create.blade.php b/resources/views/trip/create.blade.php index d1c0ec7..af030ea 100644 --- a/resources/views/trip/create.blade.php +++ b/resources/views/trip/create.blade.php @@ -24,61 +24,15 @@
@endif -
- @error('expected_cadre_count') -
{{ $message }}
- @enderror -
-
- @error('actual_fee') -
{{ $message }}
- @enderror -
-
- @error('expected_member_count') -
{{ $message }}
- @enderror -
-
- @error('expected_fee') -
{{ $message }}
- @enderror -
-
- @error('prepare_day') -
{{ $message }}
- @enderror -
-
- @error('end_date') -
{{ $message }}
- @enderror -
-
- @error('quit_date') -
{{ $message }}
- @enderror -
-
- @error('start_date') -
{{ $message }}
- @enderror -
-
- @error('registration_close') -
{{ $message }}
- @enderror -
-
- @error('registration_open') -
{{ $message }}
- @enderror -
-
- @error('pre_departure_time') -
{{ $message }}
- @enderror -
+ @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif @csrf diff --git a/resources/views/trip/edit.blade.php b/resources/views/trip/edit.blade.php index 0c9cba9..e8c1694 100644 --- a/resources/views/trip/edit.blade.php +++ b/resources/views/trip/edit.blade.php @@ -24,36 +24,16 @@
@endif -
- @error('expected_cadre_count') -
{{ $message }}
- @enderror -
-
- @error('actual_fee') -
{{ $message }}
- @enderror -
-
- @error('expected_member_count') -
{{ $message }}
- @enderror -
-
- @error('expected_fee') -
{{ $message }}
- @enderror -
-
- @error('prepare_day') -
{{ $message }}
- @enderror -
-
- @error('pre_departure_time') -
{{ $message }}
- @enderror -
+ @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + @csrf diff --git a/routes/web.php b/routes/web.php index 0dbf506..ac45a1f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -139,11 +139,13 @@ Route::put('/trip/create', [TripController::class, 'store'])->name('trip.store'); Route::put('/trip/edit/{id}', [TripController::class, 'update'])->name('trip.update'); + Route::get('/trip/create', [TripController::class, 'create'])->name('trip.create'); + Route::get('/trip/edit/{id}', [TripController::class, 'edit'])->name('trip.edit'); - Route::get('/trip/create', [TripController::class, 'create']) - ->middleware('TripAuthenticate'); - Route::get('/trip/edit/{id}', [TripController::class, 'edit']) - ->middleware('TripAuthenticate'); +// Route::get('/trip/create', [TripController::class, 'create']) +// ->middleware('TripAuthenticate'); +// Route::get('/trip/edit/{id}', [TripController::class, 'edit']) +// ->middleware('TripAuthenticate'); // user Route::get('/user/list', [UserController::class, 'index'])->name('user.list'); From 832a01678bc77c484ed7774f59e8db0e8a7bd512 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Mon, 9 Sep 2024 22:33:05 +0800 Subject: [PATCH 08/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Enums/{JudgementID.php => JudgementRank.php} | 2 +- app/Http/Controllers/TripController.php | 14 +++++++------- app/Http/Kernel.php | 3 --- resources/views/comingsoon.blade.php | 2 -- 4 files changed, 8 insertions(+), 13 deletions(-) rename app/Enums/{JudgementID.php => JudgementRank.php} (97%) diff --git a/app/Enums/JudgementID.php b/app/Enums/JudgementRank.php similarity index 97% rename from app/Enums/JudgementID.php rename to app/Enums/JudgementRank.php index 122836c..c6da5a8 100644 --- a/app/Enums/JudgementID.php +++ b/app/Enums/JudgementRank.php @@ -2,7 +2,7 @@ namespace App\Enums; -enum JudgementID: int +enum JudgementRank: int { case SSS = 13; case S_PLUS = 12; diff --git a/app/Http/Controllers/TripController.php b/app/Http/Controllers/TripController.php index f1e4c85..298c9b4 100644 --- a/app/Http/Controllers/TripController.php +++ b/app/Http/Controllers/TripController.php @@ -7,20 +7,20 @@ use Carbon\Carbon; use App\Traits\ImageTrait; use Illuminate\Support\Facades\File; -use App\Enums\JudgementID; +use App\Enums\JudgementRank; use App\Enums\RouteCategory; class TripController extends Controller { use ImageTrait; -// public function __construct() -// { -// $this->middleware('TripAuthenticate'); -// } + public function __construct() + { + $this->middleware('TripAuthenticate'); + } public function create() // 會連到 web.php 的 function { - $judgement_ids = JudgementID::cases(); // Get all enum instances + $judgement_ids = JudgementRank::cases(); // Get all enum instances $categories = RouteCategory::cases(); return view('trip.create', compact('judgement_ids', 'categories')); @@ -41,7 +41,7 @@ public function edit($id) $trip->pre_departure_time = Carbon::parse($trip->pre_departure_time); $trip->start_date = Carbon::parse($trip->pre_departure_time); $trip->end_date = Carbon::parse($trip->end_date); - $judgement_ids = JudgementID::cases(); + $judgement_ids = JudgementRank::cases(); $categories = RouteCategory::cases(); return view('trip.edit', compact('trip', 'judgement_ids', 'categories')); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 4e16f91..f8e2463 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -70,7 +70,4 @@ class Kernel extends HttpKernel 'user' => \App\Http\Middleware\UserMiddleware::class, 'TripAuthenticate' => \App\Http\Middleware\TripAuthenticate::class ]; - - } - diff --git a/resources/views/comingsoon.blade.php b/resources/views/comingsoon.blade.php index 9d2d19f..711d1bb 100644 --- a/resources/views/comingsoon.blade.php +++ b/resources/views/comingsoon.blade.php @@ -12,9 +12,7 @@ 努力製作中，先放隻狗狗在這邊等。
-
-
From 1357e2ff10bd9c46d9a2c48fd6fedbf83a1b46e5 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Mon, 9 Sep 2024 22:38:56 +0800 Subject: [PATCH 09/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/uploads/images/trips/1231724161516.jpg | Bin 4235 -> 0 bytes public/uploads/images/trips/1231724161667.jpg | Bin 4235 -> 0 bytes public/uploads/images/trips/1231724161716.jpg | Bin 4235 -> 0 bytes public/uploads/images/trips/eefsfe1725811634.jpg | Bin 4235 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/uploads/images/trips/1231724161516.jpg delete mode 100644 public/uploads/images/trips/1231724161667.jpg delete mode 100644 public/uploads/images/trips/1231724161716.jpg delete mode 100644 public/uploads/images/trips/eefsfe1725811634.jpg diff --git a/public/uploads/images/trips/1231724161516.jpg b/public/uploads/images/trips/1231724161516.jpg deleted file mode 100644 index e5ea28d3fcd08d1376c44d6a4e306d9e4e672469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4235 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 KpVMai=l=jZDK5qU diff --git a/public/uploads/images/trips/1231724161667.jpg b/public/uploads/images/trips/1231724161667.jpg deleted file mode 100644 index e5ea28d3fcd08d1376c44d6a4e306d9e4e672469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4235 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 KpVMai=l=jZDK5qU diff --git a/public/uploads/images/trips/1231724161716.jpg b/public/uploads/images/trips/1231724161716.jpg deleted file mode 100644 index e5ea28d3fcd08d1376c44d6a4e306d9e4e672469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4235 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 KpVMai=l=jZDK5qU diff --git a/public/uploads/images/trips/eefsfe1725811634.jpg b/public/uploads/images/trips/eefsfe1725811634.jpg deleted file mode 100644 index e5ea28d3fcd08d1376c44d6a4e306d9e4e672469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4235 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 KpVMai=l=jZDK5qU From 2d2d71edfc2950596899ed64e77cbea55d2c7427 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Mon, 9 Sep 2024 22:42:09 +0800 Subject: [PATCH 10/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uploads/images/records/eefsfe1725808917.jpg | Bin 4235 -> 0 bytes public/uploads/images/records/test1725811016.jpg | Bin 4235 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/uploads/images/records/eefsfe1725808917.jpg delete mode 100644 public/uploads/images/records/test1725811016.jpg diff --git a/public/uploads/images/records/eefsfe1725808917.jpg b/public/uploads/images/records/eefsfe1725808917.jpg deleted file mode 100644 index e5ea28d3fcd08d1376c44d6a4e306d9e4e672469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4235 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 KpVMai=l=jZDK5qU diff --git a/public/uploads/images/records/test1725811016.jpg b/public/uploads/images/records/test1725811016.jpg deleted file mode 100644 index e5ea28d3fcd08d1376c44d6a4e306d9e4e672469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4235 zcmb7FXH-*bv)&24C-fScAe{t|LsNPXFh~HA4l0NgQHm(NNUs6uMw;{{2#QGWT|}yY zp-58!kq!d+0-m$Z{eIka*PXq8%scO_XV2O*^E~)T{2Tz$L24rb5C{N3ga^P+1L^<= zJtGSvl!Jwt1;)w2BcvuOBp@J!R=5mTv$Yn{CBfzCi6Se zmXkj+tG-THd`j>h1pvhYd-i;nvbCpvUVlZG6B{g~qEIfP2$DMa+~v_^HJ*$qa)4_* z@G7BqRa`8%G`IncKeewpMeTI8JH3oh+9BkWGiHzoAlZlOX?f_%=GUl z{~@3huiICRP`TC;r~`t7R`onTl$9|jbqe;y>__xBM~&gSHNI}w%aw(60>m9H0N|;i zcYjnOX3aq}GA$7;xSitAiJdUGZFBZ}Xp5vD=)W@u%a9XqNA_Jh3juV5ZeN4|AR;1S zFrm3b=Rv|?fT2VX9(rClLPeFBPfD6W&4$o^a>7u6NWgfY2#nG(<5)WOR4G3`1}@-% zNcqqPYL`L}5j>y_j;Ildi3v`VTY};WlW?sat*)HJ9$OFqe2#H!-i}U*koS*{DTp zW=IMtjM-GV6b4IBI#q>|+n79`@(Sw_fnry9Hh3EA=8J!hH(%YZ{7R)0$}CAk=b1~* zLQKiWxFow9h?0I`uddtoJhqMON;#WMw!O$k2S3jBNuN#4cNYIa{}pc2efI>TIHnkx z0}|9=Y*6ro^&+GEZ|PexI-#GK%WSu!y=$gi480#;m;UhN_PU!-!q2R!{RejkTXAHB zez8LdUHGr{1VMS=D*As~L|AEM&@3%HI&vBh{GZw2^K1#o^XNa>{AaU343PZ`4}$W- z0SJ!@m>!|3Z*vR%_Z*NagZDxhX;%<0^T(xgQKxs`-z6)kUrh*RWzg`Z8!$1wXn|dj zbGA3+k@?`D*tdBpX`xLkzQA@Pxnf#8nk`eSx+-s>pfH)=Jm=~Dpi;M;Qk2W97aYoe z=8*^hg9rl&5Z-em6oF8M@StzOT~&e-a;j`LfBiF$%Di|WN#2x0nq(j#eTmc_5BLX= zV9YOV$x^}mDabLpo6ScFH0)c3#YS9aL8qF+PC4pLth;lr3rTnp>Y9iOaqcRh7Az zt)H)V65pbD+iK_P>xtmB%J5pj@LFU2q0OsDSK`DOqg8fO6PKM2?BtuD>G0M0Wzdng zp(&=>L9X(pOmX*cC>>99;b+<59c z=TsuszV+S@bDM#+@2`8hDM$f5)tc>%B&?K3t%x`BlA_ZR%^flALfNp!XSwp~7MNi= zG~zB5()7L)YuDn3U%i676)^7L;HG{&5c2DDY*Z9(^k_BX>7J^GHmoa${DMT9C|hbm z^=Iz@T7`#*pQ07qg<~B%f|;rNxmwk0xF-U?We^C_HH_L1OJw-u*1-=e*3otJjs$X= z!O(3rlUCAb(v&2T>g5faliU%QQ~A1MKD}-bDywzXseN_Cm#U>WHPv*;5+#oegze@7ZfPannyP9^u?FfP z;xGw~39Z~aWJHYPUCoNglkPif%K6Hbf2K*z==L}BJ=l{iC0|4nCDFvof$T>PO zJZFip*f?4hl`{{Z726n+u{n2Lo(>I#Oehij(|Y@A{@SN&1l)(FCv%4lrl#)#fs4zL zy?)mOUxhOQAP2*?jP5`n`v-v(M1D+d6>k<1-H+pM3&k z)1JFTgl*@764ZvEJ^zDo04M~`gHYjBJ>T&&LWArGVw!llE}|uQS-%~@k3QBNKJSGc zgtoYrN$oSCzqp;mO|{qIz7gZ(jG;L&lO!qSFHXjIEx1DDjOrV;FeC3#eb5Gdc13t6!?Rt~I+(*t zcO$@yDL8TA-BCy^|J!#7S%nhNp!p4n6Egi*PKhBAm8-jw zBUT-|+yUcnJpD*HZVo4?b?&4DfaxpjsB1}$;UwWyW^?5cu^+Sd7G3&YT2sHZP*pu1 z5LLekLVdFm_{dtA?m=k~zsVI(-k+0Q|Jp+-C*wJ)OPqHj`+)QnO)W^F=(*Q4&S_ad2!K#ZZTV);6|bd;26Zj$0| zePqg8qnorMJ;9$i;D%8P{AO*0hqVgy)FiW0d(QL)(p7^WjxtuC@im27`C*;gHS)V^KU@IbT=`#o}YU{AS zU!)=3!IK}GP;%iw5VTfA3h8Xly#SPs7Qv$4s}iqDMXZi=wiI=SjkVO~eZ(mmCRJU8 z8G2-htQjCmC1=w3K$=EUL#7(UBF6nmAhkhq;Tb_Mvit!#$uaEl)EnOyJ~}keg_kVX z%a|BpSG9d#$3vO8FGx~v0LtX~l39qCHj-&K=roCW9h&ZRAj!x2fMlexacIH|28{S` zi&3p%<%p={>-sEU`7BAB`U-*fKjk7w+_p(GX?-;vZsvWl5ACiQhHT{Wr&e*8?PQ|% z16$D_ty>~JJl7FC#f*zKU<*f~Hx~Entpnt4oZR0DEpHOQ16fma4%hi@4H-}T@AlWQ z)LnJN^>ihL+vXGXn^QreN>Vlu+L<=hm}P-f(k*tj849M$vk^|(O?=+qziOunW@qwL z+LGeSx3XGv<|3YOG_*Vb?=H)<{b;9;{#wibB)|)qK3YinnEsax%4bkHi4?ml-DFaqk|$P3 zgt>F10E!QjkPvp)q`UaAjDwP_*W{!bV%7cy4_w_<@DgOK*<2%$@u}dW-|_VHP4P@< zveU8ulKmp34`+8sBkU6`dMOOqxzl>x_aN%akO_0zdWutF#MFbx;@_?MyzeTlxzvEA zp-)TTXkyRm%FxPu?BR$-K#^L~l{lTv7)ED@i&ej&(89U&3A+vV0(Whr zj{MYjZ>KPxHC{m)HzML#X?jQeHq6Kxi;)a0jE$^+&C{+xoIy3w-6v?XgN8%-IAp8# zb~6!YxK+Ys^)_EE;ZOGI-mM=`7iMnIbW<8NN?1sQYm|yc15q@StQMth8SkSXjjh3y ztb*i>zJ!RFSs}%3A1*u!bXVdlG2IEsO5IcLW#Wnn_}Sc1;C5MOZKS&=G_<*7Nh1C3Vh-7YdnX^?upmRqw1gi6j+xMN$J zwDs$N7$pbbI=p8=LqF*vpHqy1kv-tK1jW;S3B8F3j&%6ed#-e@*4>F%b9R3LZe@`d!Bg zS)kq}v2Ghm4OTWc20d9-EBnO`uGuE(jw2rfOPQK2RAe{OCeFRv;VO30 zF+wa&?9$N%ls=RzE#jXvXeVyhwhw+}>vHFT8%9>V5a-!2263h1N?;8YH>VO8z&d*{ z-J%h1lF--BWHT2Z(?Cw-o>KX4uj~de22hNw!>ooeKPTh4y$1HO!Vj?VUgK^baNAfn KpVMai=l=jZDK5qU From 22a073c2ec5608280f15d7be9533b580bc9addb5 Mon Sep 17 00:00:00 2001 From: ki225 <271yeye@gmail.com> Date: Mon, 9 Sep 2024 22:49:49 +0800 Subject: [PATCH 11/11] =?UTF-8?q?NCUMT-40=20=E5=89=B5=E5=BB=BA=E9=9A=8A?= =?UTF-8?q?=E4=BC=8D=E8=A1=A8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routes/web.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/routes/web.php b/routes/web.php index b13ea94..d906440 100644 --- a/routes/web.php +++ b/routes/web.php @@ -152,7 +152,8 @@ Route::middleware(['TripAuthenticate'])->group(function () { //trip Route::get('/trip/create', [TripController::class, 'create'])->name('trip.create'); - Route::put('/trip/create', [TripController::class, 'update'])->name('trip.update'); + Route::put('/trip/create', [TripController::class, 'store'])->name('trip.store'); Route::get('/trip/edit/{id}', [TripController::class, 'edit'])->name('trip.edit'); - Route::put('/trip/edit/{id}', [TripController::class, 'store'])->name('trip.store'); + Route::put('/trip/edit/{id}', [TripController::class, 'update'])->name('trip.update'); + });