From 80cc7d7e03732dee5334fa041b52a3fd0c5305c0 Mon Sep 17 00:00:00 2001 From: imadhigp Date: Thu, 16 Jul 2026 17:03:22 +0530 Subject: [PATCH] fix0716 --- app/Http/Controllers/AuthController.php | 66 +++------ app/Http/Controllers/FeedbackController.php | 65 ++++----- .../Controllers/StudentPortalController.php | 35 +++-- .../studentportalnavController.php | 4 - app/Http/Controllers/studentsController.php | 5 + app/Models/Feedback.php | 12 +- ...ack_table_change_user_id_to_student_id.php | 31 +++++ resources/views/Feedback&Complain.blade.php | 127 +++++++----------- resources/views/StudentPortal.blade.php | 9 +- resources/views/courses.blade.php | 2 +- resources/views/layouts/app.blade.php | 4 +- .../views/layouts/studentportalnav.blade.php | 2 +- resources/views/welcome.blade.php | 21 +-- 13 files changed, 188 insertions(+), 195 deletions(-) create mode 100644 database/migrations/2026_07_16_040809_update_feedback_table_change_user_id_to_student_id.php diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 4c8011a..f09aed9 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -11,22 +11,13 @@ use Illuminate\Support\Facades\Log; class AuthController extends Controller { - - -public function profilview(Request $request) -{ - // Auth wi inna userge data gannawa - $user = Auth::user(); - - // profile.blade.php file ekata data pass karanawa - return view('profile', compact('user')); -} + public function profilview(Request $request) + { + $user = Auth::user(); + return view('profile', compact('user')); + } - - /** - * Handle Student Registration (POST) - */ public function register(Request $request) { $request->validate([ @@ -47,8 +38,6 @@ public function profilview(Request $request) Auth::login($user); - - return redirect('/')->with('success', 'Registration successful! Welcome to your dashboard.'); } @@ -65,30 +54,24 @@ public function profilview(Request $request) return redirect()->intended('/')->with('success', 'Welcome back!'); } - return back()->withErrors([ 'email' => 'The provided credentials do not match our records.', ])->onlyInput('email'); } - /** - * Handle Async Logout (POST Fetch) - */ - public function logout(Request $request) // FIX: Restored Request injection + + public function logout(Request $request) { try { if (Auth::check()) { Auth::logout(); } - - // Flush old fallback explicit keys $request->session()->forget(['user_id', 'user_name']); if ($request->session()->isStarted()) { $request->session()->invalidate(); $request->session()->regenerateToken(); } - return response()->json(['success' => true]); } catch (\Exception $e) { @@ -102,26 +85,19 @@ public function profilview(Request $request) } public function update(Request $request) -{ - - $request->validate([ - 'first_name' => 'required|string|max:255', - 'last_name' => 'required|string|max:255', - 'phone' => 'nullable|string|max:20', - ]); - - - $user = Auth::user(); - - - $user->update([ - 'first_name' => $request->first_name, - 'last_name' => $request->last_name, - 'phone' => $request->phone, - ]); - - - return redirect()->back()->with('success', 'Profile updated successfully!'); -} + { + $request->validate([ + 'first_name' => 'required|string|max:255', + 'last_name' => 'required|string|max:255', + 'phone' => 'nullable|string|max:20', + ]); + $user = Auth::user(); + $user->update([ + 'first_name' => $request->first_name, + 'last_name' => $request->last_name, + 'phone' => $request->phone, + ]); + return redirect()->back()->with('success', 'Profile updated successfully!'); + } } \ No newline at end of file diff --git a/app/Http/Controllers/FeedbackController.php b/app/Http/Controllers/FeedbackController.php index a799d48..80a517d 100644 --- a/app/Http/Controllers/FeedbackController.php +++ b/app/Http/Controllers/FeedbackController.php @@ -4,46 +4,39 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\Feedback; -use App\Models\user; +use Illuminate\Support\Facades\DB; class FeedbackController extends Controller { -// public function feedback(Request $request) -// { -// // 1. Validate incoming data -// $validatedData = $request->validate([ -// 'feedback_type' => 'required', -// 'subject' => 'required|string|max:255', -// 'feedback_text' => 'required|string', -// ]); - -// // 2. Automatically inject the logged-in user's ID -// $validatedData['user_id'] = auth()->id(); + // public function feedback(Request $request) + // { + + // $request->validate([ + // 'feedback_type' => 'required', + // 'subject' => 'required|string|max:255', + // 'feedback_text' => 'required|string', + // ]); -// // 3. Save to database -// Feedback::create($validatedData); + + // $studentLogId = session('student_portal_log_id'); -// return redirect()->back()->with('success', 'Feedback submitted successfully!'); -// } + + // if (!$studentLogId) { + // return redirect('/')->with('error', 'Please login first to submit feedback!'); + // } -public function feedback(Request $request) -{ - - $request->validate([ - 'feedback_type' => 'required', - 'subject' => 'required|string|max:255', - 'feedback_text' => 'required|string', - ]); - - - Feedback::create([ - 'user_id' => auth()->id(), - 'feedback_type' => $request->feedback_type, - 'subject' => $request->subject, - 'feedback_text' => $request->feedback_text, - 'status' => 'Pending', - ]); + + // DB::table('feedbacks')->insert([ + // 'student_id' => $studentLogId, + // 'feedback_type' => $request->feedback_type, + // 'subject' => $request->subject, + // 'feedback_text' => $request->feedback_text, + // 'status' => 'Pending', + // 'created_at' => now(), + // 'updated_at' => now(), + // ]); - return redirect()->back()->with('success', 'Feedback submitted successfully!'); -} -} + + // return redirect()->back()->with('success', 'Feedback submitted successfully!'); + // } +} \ No newline at end of file diff --git a/app/Http/Controllers/StudentPortalController.php b/app/Http/Controllers/StudentPortalController.php index a1bf9ed..c179710 100644 --- a/app/Http/Controllers/StudentPortalController.php +++ b/app/Http/Controllers/StudentPortalController.php @@ -23,22 +23,39 @@ public function studentlogin(Request $request) ->where('email', $request->username) ->first(); - if ($student && Hash::check($request->password, $student->password) && $student->pin == $request->pin) { - - if ($student->status !== 'active' && $student->status !== '') { return redirect('/')->with('error', 'Your account is inactive!'); } - - $request->session()->put('student_id', $student->studentid); - - return redirect()->route('student.portal')->with('success', 'Logged in successfully!'); } - - return redirect('/')->with('error', 'Invalid Email, Password, or PIN!'); } + + +// public function showProfile(Request $request) +// { + +// $log_id = $request->session()->get('student_id'); + + +// if (!$log_id) { +// return redirect('/')->with('error', 'Please login first!'); +// } + + +// $student = DB::table('student_details') +// ->where('student_portal_log_id', $log_id) +// ->first(); + + +// if (!$student) { +// return redirect()->back()->with('error', 'Student details not found!'); +// } + + +// return view('StudentProfile', compact('student')); +// } + } diff --git a/app/Http/Controllers/studentportalnavController.php b/app/Http/Controllers/studentportalnavController.php index c74fdea..cc7b46b 100644 --- a/app/Http/Controllers/studentportalnavController.php +++ b/app/Http/Controllers/studentportalnavController.php @@ -9,12 +9,8 @@ class studentportalnavController extends Controller public function logout(Request $request) { Auth::logout(); - - $request->session()->invalidate(); $request->session()->regenerateToken(); - - return response()->json([ 'success' => true, 'message' => 'Logged out successfully' diff --git a/app/Http/Controllers/studentsController.php b/app/Http/Controllers/studentsController.php index eebb13f..b990bac 100644 --- a/app/Http/Controllers/studentsController.php +++ b/app/Http/Controllers/studentsController.php @@ -2,8 +2,13 @@ namespace App\Http\Controllers; + use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use App\Models\StudentPortalLog; +use Illuminate\Support\Facades\Hash; +use App\Models\studentDetails; + class studentsController extends Controller { diff --git a/app/Models/Feedback.php b/app/Models/Feedback.php index 6da4fa3..014110a 100644 --- a/app/Models/Feedback.php +++ b/app/Models/Feedback.php @@ -7,13 +7,13 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Feedback extends Model { - use HasFactory; - protected $table = 'feedbacks'; + protected $table = 'feedback'; + protected $fillable = [ - 'user_id', - 'feedback_type', - 'subject', - 'feedback_text', + 'student_id', + 'feedback_type', + 'subject', + 'feedback_text', 'status' ]; } diff --git a/database/migrations/2026_07_16_040809_update_feedback_table_change_user_id_to_student_id.php b/database/migrations/2026_07_16_040809_update_feedback_table_change_user_id_to_student_id.php new file mode 100644 index 0000000..4221203 --- /dev/null +++ b/database/migrations/2026_07_16_040809_update_feedback_table_change_user_id_to_student_id.php @@ -0,0 +1,31 @@ +dropForeign(['user_id']); + $table->dropColumn('user_id'); + $table->foreignId('student_id')->after('id')->constrained('student_portal_logs')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('student_id', function (Blueprint $table) { + // + }); + } +}; diff --git a/resources/views/Feedback&Complain.blade.php b/resources/views/Feedback&Complain.blade.php index 1ad695e..08ae2e5 100644 --- a/resources/views/Feedback&Complain.blade.php +++ b/resources/views/Feedback&Complain.blade.php @@ -150,35 +150,11 @@ body{ Submit Feedback - -
+ +
+ @csrf + + + @if(session('success')) + + @endif + + @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + +
+ +
+
+ + +
+ +
+ + +
+ + +
+
@@ -245,62 +266,6 @@ body{
- - @endsection \ No newline at end of file diff --git a/resources/views/StudentPortal.blade.php b/resources/views/StudentPortal.blade.php index bc93015..1e307f9 100644 --- a/resources/views/StudentPortal.blade.php +++ b/resources/views/StudentPortal.blade.php @@ -284,12 +284,17 @@ Student Services
- + +
- + +
Student Profile

Update your personal information.

diff --git a/resources/views/courses.blade.php b/resources/views/courses.blade.php index 66ffb0c..16081d5 100644 --- a/resources/views/courses.blade.php +++ b/resources/views/courses.blade.php @@ -98,7 +98,7 @@ body { height: 200px; width: 100%; object-fit: cover; - border-radius: 14px; + /* border-radius: 14px; */ } .course-card .card-body { diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index d8e135f..9eb751d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -245,11 +245,13 @@
+ +
@yield('content')
-