NCUMT-41 個人經歷頁面

.gitignore

@@ -1,6 +1,7 @@
 /node_modules
 /public/hot
 /public/storage
+/public/uploads
 /storage/*.key
 /vendor
 .env

app/Console/Kernel.php

@@ -2,37 +2,32 @@
 
 namespace App\Console;
 
+use App\Mail\Conference\ConferenceReminder;
+use App\Mail\Course\CourseReminder;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use App\Models\CourseRecord;
-use App\Models\Course;
-use Illuminate\Support\Facades\Mail;
-use App\Mail\CourseReminder;
 
 class Kernel extends ConsoleKernel
 {
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @param Schedule $schedule
      * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         $schedule->command('queue:work --tries=3 --stop-when-empty')->withoutOverlapping()->everyMinute();
         $schedule->call(function () {
-           $course = Course::where('date', now()->addDay()->toDateString())->first();
-           if($course) {
-                foreach($course->users as $user) {
-                    Mail::to($user->email)->send(new CourseReminder($course, $user));
-                }
-           }
-        })->daily()
+            CourseReminder::sendEmail();
+        })->dailyAt('19:00');
+
+        // 登山研討會前一天晚上七點發送 email 提醒報名者
+        $schedule->call(function () {
+            ConferenceReminder::sendEmail();
+        })->dailyAt('19:00')
         ->when(function () {
-            $course = Course::where('date', '>', now()->toDateString())->first();
-            if($course) {
-                return $course->date === now()->addDay()->toDateString();
-            }
+            return now()->format('Y-m-d') === '2024-10-25';
         });
     }
 
@@ -41,9 +36,9 @@ protected function schedule(Schedule $schedule)
      *
      * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');
 
         require base_path('routes/console.php');
     }

app/Enums/Common.php

@@ -3,5 +3,8 @@
 namespace App\Enums;
 enum Common: int
 {
-    case SYSTEM = 0;
+    /**
+     * 系統寫入的使用者
+     */
+    case SYSTEM_USER = 0;
 }

app/Enums/Gender.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Enums;
+
+enum Gender: int
+{
+    /**
+     * 男
+     */
+    case MALE = 1;
+
+    /**
+     * 女
+     */
+    case FEMALE = 2;
+
+    /**
+     * 将性别转换为对应的中文描述
+     *
+     * @return string
+     */
+    public function toChinese(): string
+    {
+        return match ($this) {
+            self::MALE => '男',
+            self::FEMALE => '女',
+        };
+    }
+}

app/Enums/Identity.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Enums;
+
+/**
+ * conference 裡面的身份
+ */
+enum Identity: string {
+
+    /**
+     * 學生
+     */
+    case STUDENT = 'student';
+
+    /**
+     * 社會人士
+     */
+    case SOCIAL = 'social';
+
+    /**
+     * 將身份轉換成中文
+     *
+     * @return string
+     */
+    public function toChinese(): string
+    {
+        return match ($this) {
+            self::STUDENT => '學生',
+            self::SOCIAL => '社會人士',
+        };
+    }
+}

app/Enums/LoginMethod.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Enums;
+
+enum LoginMethod: string
+{
+    /**
+     * portal 登入
+     */
+    case PORTAL = 'portal';
+}

app/Enums/Mode.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Enums;
+
+/**
+ * 表單的模式
+ */
+enum Mode: string
+{
+    /**
+     * 建立
+     */
+    case CREATE = 'create';
+
+    case EDIT = 'edit';
+}

app/Enums/Role.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Enums;
+
+enum Role: int
+{
+    /**
+     * 非社員
+     */
+    case NON_MEMBER = -1;
+    /**
+     * 社員
+     */
+    case MEMBER = 0;
+
+    /**
+     * 社長
+     */
+    case CLUB_LEADER = 1;
+
+    /**
+     * 副社長
+     */
+    case VICE_CLUB_LEADER = 2;
+
+    /**
+     * 嚮導組組長
+     */
+    case GUIDE_LEADER = 3;
+
+    /**
+     * 嚮導組組員
+     */
+    case GUIDE_MEMBER = 4;
+
+    /**
+     * 技術組組長
+     */
+    case TECH_LEADER = 5;
+
+    /**
+     * 技術組組員
+     */
+    case TECH_MEMBER = 6;
+
+    /**
+     * 器材組組長
+     */
+    case EQUIPMENT_LEADER = 7;
+
+    /**
+     * 器材組組員
+     */
+    case EQUIPMENT_MEMBER = 8;
+
+    /**
+     * 醫藥組組長
+     */
+    case MEDICAL_LEADER = 9;
+
+    /**
+     * 醫藥組組員
+     */
+    case MEDICAL_MEMBER = 10;
+
+    /**
+     * 文書組組長
+     */
+    case SECRETARY_LEADER = 11;
+
+    /**
+     * 文書組組員
+     */
+    case SECRETARY_MEMBER = 12;
+
+    /**
+     * 美宣
+     */
+    case DESIGN = 13;
+
+    /**
+     * 網管
+     */
+    case WEB_ADMIN = 14;
+
+    /**
+     * 財務長
+     */
+    case TREASURER = 15;
+
+    /**
+     * 山防組組長
+     */
+    case SAFETY_LEADER = 16;
+
+    /**
+     * 山防組組員
+     */
+    case SAFETY_MEMBER = 17;
+
+    public function toChinese(): string
+    {
+        return match($this) {
+            self::NON_MEMBER => '非社員',
+            self::MEMBER => '社員',
+            self::CLUB_LEADER => '社長',
+            self::VICE_CLUB_LEADER => '副社長',
+            self::GUIDE_LEADER => '嚮導組組長',
+            self::GUIDE_MEMBER => '嚮導組組員',
+            self::TECH_LEADER => '技術組組長',
+            self::TECH_MEMBER => '技術組組員',
+            self::EQUIPMENT_LEADER => '器材組組長',
+            self::EQUIPMENT_MEMBER => '器材組組員',
+            self::MEDICAL_LEADER => '醫藥組組長',
+            self::MEDICAL_MEMBER => '醫藥組組員',
+            self::SECRETARY_LEADER => '文書組組長',
+            self::SECRETARY_MEMBER => '文書組組員',
+            self::DESIGN => '美宣',
+            self::WEB_ADMIN => '網管',
+            self::TREASURER => '財務長',
+            self::SAFETY_LEADER => '山防組組長',
+            self::SAFETY_MEMBER => '山防組組員',
+        };
+    }
+}

app/Http/Controllers/CourseController.php

@@ -2,10 +2,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Mail\Course\CourseRegister;
 use App\Models\Course;
 use App\Models\CourseRecord;
 use App\Traits\ImageTrait;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Mail;
 
@@ -19,7 +21,7 @@ class CourseController extends Controller
      */
     public function index()
     {
-        $courses = Course::whereNotNull('videoURL')->orderBy('date','desc')->get();
+        $courses = Course::whereNotNull('videoURL')->orderBy('start_date','desc')->get();
         return view('course.course', ['courses' => $courses]);
     }
 
@@ -50,7 +52,8 @@ public function store(Request $request)
         $course = new Course();
         $course->title = $request->input('title');
         $course->description = $request->input('description');
-        $course->date = $request->input('date');
+        $course->start_date = $request->input('start_date');
+        $course->end_date = $request->input('end_date');
         $course->speaker = $request->input('speaker');
         $course->location = $request->input('location');
         $course->image = $this->storeImage($file, $folder_name, $name);
@@ -60,6 +63,8 @@ public function store(Request $request)
         if($request->input('pptURL')) {
             $course->pptURL = $request->input('pptURL');
         }
+        $course->create_user = Auth::user()->id;
+        $course->modify_user = Auth::user()->id;
 
         $course->save();
 
@@ -77,8 +82,8 @@ public function showRegister()
     {
 
         $courses = Course::where('videoURL', null)
-            ->whereDate('date', '>=' , now()->toDateString())
-            ->orderBy('date','asc')
+            ->whereDate('start_date', '>=' , now()->toDateString())
+            ->orderBy('start_date','asc')
             ->get();
 
 
@@ -96,7 +101,7 @@ public function register($id) {
         $msg = auth()->user()->name . '「' . $courseRecord->course->title. '」' . '社課報名完成';
 
         Mail::to($courseRecord->user->email)
-            ->later(now()->addSeconds(5), new \App\Mail\Course($courseRecord));
+            ->later(now()->addSeconds(5), new CourseRegister($courseRecord));
 
         return redirect()->back()->with('status', $msg);
     }
@@ -145,7 +150,8 @@ public function update(Request $request, $id)
 
         $course->title = $request->input('title');
         $course->description = $request->input('description');
-        $course->date = $request->input('date');
+        $course->start_date = $request->input('start_date');
+        $course->end_date = $request->input('end_date');
         $course->speaker = $request->input('speaker');
         $course->location = $request->input('location');
 
@@ -155,6 +161,7 @@ public function update(Request $request, $id)
         if($request->input('pptURL')) {
             $course->pptURL = $request->input('pptURL');
         }
+        $course->modify_user = Auth::user()->id;
         $course->update();
 
         return redirect()->route('course.showRegister')->with('status','社課更新成功');