Home Explore Help
Sign In
revinr
/
student-admission
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Login modified

Md.Mostafijur Rahman 2 years ago
parent
1e5e7853ac
commit
47336fe923
8 changed files with 157 additions and 148 deletions
Unified View Show Diff Stats
  1. 3 1
      app/Http/Controllers/Auth/LoginController.php
  2. 29 22
      app/Http/Controllers/StudentHomeController.php
  3. 5 4
      app/Http/Controllers/TeacherAuth/LoginController.php
  4. 13 16
      app/Http/Controllers/TeacherAuth/RegisterController.php
  5. 30 29
      resources/views/login-v2.blade.php
  6. 59 60
      resources/views/teacher_profile.blade.php
  7. 7 7
      resources/views/web/layouts/header.blade.php
  8. 11 9
      routes/web.php

+ 3 - 1
app/Http/Controllers/Auth/LoginController.php
View File 

@@ -39,5 +39,7 @@ class LoginController extends Controller
 
         $this->middleware('guest')->except('logout');
 
         $this->middleware('guest')->except('logout');
 
     }
 
     }
 
 
 
-    
+
 
+
 
+
 
 }
 
 }

+ 29 - 22
app/Http/Controllers/StudentHomeController.php
View File 

@@ -8,10 +8,10 @@ use App\Workexperience;
 
 use App\Score;
 
 use App\Score;
 
 use App\User;
 
 use App\User;
 
 use App\Proposal;
 
 use App\Proposal;
 
-use App\ StudentProposalUpload;
 
+use App\StudentProposalUpload;
 
 use Auth;
 
 use Auth;
 
 use Carbon\Carbon;
 
 use Carbon\Carbon;
 
- 
+
 
 
 
 class StudentHomeController extends Controller
 
 class StudentHomeController extends Controller
 
 {
 
 {
 
@@ -30,7 +30,7 @@ class StudentHomeController extends Controller
 
 
 
 
 
     public function institution_save(Request $request)
 
     public function institution_save(Request $request)
 
-    {   
+    {
 
         $institution= New  Institution;
 
         $institution= New  Institution;
 
         $institution->student_id= Auth::user()->id;
 
         $institution->student_id= Auth::user()->id;
 
         $institution->academic_level= $request->academiclevel;
 
         $institution->academic_level= $request->academiclevel;
 
@@ -44,22 +44,22 @@ class StudentHomeController extends Controller
 
         $institution->save();
 
         $institution->save();
 
         return redirect()->back()->with('Added successfully.');
 
         return redirect()->back()->with('Added successfully.');
 
     }
 
     }
 
-    
+
 
     public function work_save(Request $request)
 
     public function work_save(Request $request)
 
-    {        
-        $work_experience= New  Workexperience; 
+    {
 
+        $work_experience= New  Workexperience;
 
         $work_experience->student_id= Auth::user()->id;
 
         $work_experience->student_id= Auth::user()->id;
 
         $work_experience->company_name= $request->companyname;
 
         $work_experience->company_name= $request->companyname;
 
         $work_experience->designation= $request->designation;
 
         $work_experience->designation= $request->designation;
 
         $work_experience->currently_working= $request->currentlyworking ? 0 : 1;
 
         $work_experience->currently_working= $request->currentlyworking ? 0 : 1;
 
-        $work_experience->start_date= date($request->startdate.'-'.$request->startmonth.'-01');  
-        if($request->enddate && $request->endmonth){           
+        $work_experience->start_date= date($request->startdate.'-'.$request->startmonth.'-01');
 
+        if($request->enddate && $request->endmonth){
 
         $work_experience->end_date= date($request->enddate.'-'.$request->endmonth.'-01');
 
         $work_experience->end_date= date($request->enddate.'-'.$request->endmonth.'-01');
 
-        }        
+        }
 
         $work_experience->save();
 
         $work_experience->save();
 
         return redirect()->back()->with('Added successfully.');
 
         return redirect()->back()->with('Added successfully.');
 
     }
 
     }
 
-    
+
 
      public function score_save(Request $request)
 
      public function score_save(Request $request)
 
      {
 
      {
 
          $score= New Score;
 
          $score= New Score;
 
@@ -77,7 +77,7 @@ class StudentHomeController extends Controller
 
      }
 
      }
 
 
 
      public function proposal_save(Request $request)
 
      public function proposal_save(Request $request)
 
-     {   
+     {
 
          $proposal= New  Proposal;
 
          $proposal= New  Proposal;
 
          $proposal->student_id= Auth::user()->id;
 
          $proposal->student_id= Auth::user()->id;
 
          $proposal->title= $request->title;
 
          $proposal->title= $request->title;
 
@@ -101,7 +101,7 @@ class StudentHomeController extends Controller
 
          $proposal->save();
 
          $proposal->save();
 
          return redirect()->back()->with('Added successfully.');
 
          return redirect()->back()->with('Added successfully.');
 
      }
 
      }
 
-     
+
 
      public function save_as_complete()
 
      public function save_as_complete()
 
      {
 
      {
 
          $user= User::find(Auth::user()->id);
 
          $user= User::find(Auth::user()->id);
 
@@ -126,8 +126,8 @@ class StudentHomeController extends Controller
 
      {
 
      {
 
         $score=  Score::find($id);
 
         $score=  Score::find($id);
 
         $score->delete();
 
         $score->delete();
 
-     } 
-     
+     }
 
+
 
      public function proposal_remove($id)
 
      public function proposal_remove($id)
 
      {
 
      {
 
         $proposal=  Proposal::find($id);
 
         $proposal=  Proposal::find($id);
 
@@ -152,12 +152,12 @@ class StudentHomeController extends Controller
 
 
 
      public function work_update($id,Request $request)
 
      public function work_update($id,Request $request)
 
      {
 
      {
 
-      $work_experience= Workexperience::find($id); 
+      $work_experience= Workexperience::find($id);
 
       $work_experience->student_id= Auth::user()->id;
 
       $work_experience->student_id= Auth::user()->id;
 
       $work_experience->company_name= $request->companyname;
 
       $work_experience->company_name= $request->companyname;
 
       $work_experience->designation= $request->designation;
 
       $work_experience->designation= $request->designation;
 
       $work_experience->currently_working= $request->checkbox;
 
       $work_experience->currently_working= $request->checkbox;
 
-      $work_experience->start_date= date($request->startdate.'-'.$request->startmonth.'-01');  
+      $work_experience->start_date= date($request->startdate.'-'.$request->startmonth.'-01');
 
       $work_experience->end_date= date($request->enddate.'-'.$request->endmonth.'-01');
 
       $work_experience->end_date= date($request->enddate.'-'.$request->endmonth.'-01');
 
       $work_experience->update();
 
       $work_experience->update();
 
       return redirect()->back()->with('Updated successfully.');
 
       return redirect()->back()->with('Updated successfully.');
 
@@ -180,20 +180,20 @@ class StudentHomeController extends Controller
 
      }
 
      }
 
 
 
      public function proposal_update($id,Request $request)
 
      public function proposal_update($id,Request $request)
 
-     {   
+     {
 
         $proposal=Proposal::find($id);
 
         $proposal=Proposal::find($id);
 
         $proposal->student_id= Auth::user()->id;
 
         $proposal->student_id= Auth::user()->id;
 
         $proposal->title= $request->title;
 
         $proposal->title= $request->title;
 
         $proposal->methology= $request->methology;
 
         $proposal->methology= $request->methology;
 
         $proposal->department= $request->department;
 
         $proposal->department= $request->department;
 
         $proposal->status= $request->status;
 
         $proposal->status= $request->status;
 
-        
+
 
         $proposal->update();
 
         $proposal->update();
 
         return redirect()->back()->with('Added successfully.');
 
         return redirect()->back()->with('Added successfully.');
 
      }
 
      }
 
 
 
    //   public function proposal_media_upload(Request $request)
 
    //   public function proposal_media_upload(Request $request)
 
-   //   {   
+   //   {
 
    //          $student_doc=new StudentProposalUpload;
 
    //          $student_doc=new StudentProposalUpload;
 
    //          $student_doc->student_id=Auth::user()->id;
 
    //          $student_doc->student_id=Auth::user()->id;
 
    //          $student_doc->created_by=Auth::user()->id;
 
    //          $student_doc->created_by=Auth::user()->id;
 
@@ -232,9 +232,16 @@ class StudentHomeController extends Controller
 
          $data['teacher'] =[];
 
          $data['teacher'] =[];
 
          if($req->teacher_ref_no){
 
          if($req->teacher_ref_no){
 
             $data['teacher'] =User::where('ref_no','like','%'. trim($req->teacher_ref_no) .'%')->get();
 
             $data['teacher'] =User::where('ref_no','like','%'. trim($req->teacher_ref_no) .'%')->get();
 
-         } 
-        
+         }
 
+
 
         return view('ref_search_load',$data);
 
         return view('ref_search_load',$data);
 
      }
 
      }
 
- 
+
 
+     public function logout(){
 
+        \Auth::guard()->logout();
 
+        request()->session()->invalidate();
 
+        return redirect('/login');
 
+
 
+    }
 
+
 
 }
 
 }

+ 5 - 4
app/Http/Controllers/TeacherAuth/LoginController.php
View File 

@@ -5,8 +5,8 @@ namespace App\Http\Controllers\TeacherAuth;
 
 use App\Http\Controllers\Controller;
 
 use App\Http\Controllers\Controller;
 
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 use Illuminate\Support\Facades\Auth;
 
 use Illuminate\Support\Facades\Auth;
 
- 
-use Illuminate\Http\Request; 
+
 
+use Illuminate\Http\Request;
 
 use App\User;
 
 use App\User;
 
 
 
 class LoginController extends Controller
 
 class LoginController extends Controller
 
@@ -22,7 +22,7 @@ class LoginController extends Controller
 
     |
 
     |
 
     */
 
     */
 
 
 
-     
+
 
 
 
     /**
 
     /**
 
      * Where to redirect users after login / registration.
 
      * Where to redirect users after login / registration.
 
@@ -55,6 +55,7 @@ class LoginController extends Controller
 
     public function login(Request $request)
 
     public function login(Request $request)
 
     {
 
     {
 
         $teacher = User::where('user_type',2)->where('email',$request->email)->first();
 
         $teacher = User::where('user_type',2)->where('email',$request->email)->first();
 
+
 
         if(!$teacher){
 
         if(!$teacher){
 
             return redirect('/')->with('error','Unknown Email address!');
 
             return redirect('/')->with('error','Unknown Email address!');
 
         }else{
 
         }else{
 
@@ -68,7 +69,7 @@ class LoginController extends Controller
 
                     'status' => '1'
 
                     'status' => '1'
 
                 ];
 
                 ];
 
 
 
-                if (Auth::guard('teacher')->attempt($credentials)) {   
+                if (Auth::guard('teacher')->attempt($credentials)) {
 
 
 
                     return redirect('teacher_profile');
 
                     return redirect('teacher_profile');
 
                   }
 
                   }

+ 13 - 16
app/Http/Controllers/TeacherAuth/RegisterController.php
View File 

@@ -1,14 +1,16 @@
 
 <?php
 
 <?php
 
 
 
 namespace App\Http\Controllers\TeacherAuth;
 
 namespace App\Http\Controllers\TeacherAuth;
 
- 
+
 
 use Validator;
 
 use Validator;
 
 use App\Http\Controllers\Controller;
 
 use App\Http\Controllers\Controller;
 
 use Illuminate\Http\Request;
 
 use Illuminate\Http\Request;
 
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 use Illuminate\Support\Facades\Auth;
 
 use Illuminate\Support\Facades\Auth;
 
+use App\Mail\SignUp;
 
 use App\User;
 
 use App\User;
 
 use Hash;
 
 use Hash;
 
+use Mail;
 
 
 
 class RegisterController extends Controller
 
 class RegisterController extends Controller
 
 {
 
 {
 
@@ -23,7 +25,7 @@ class RegisterController extends Controller
 
     |
 
     |
 
     */
 
     */
 
 
 
-    use RegistersUsers;
 
+    //use RegistersUsers;
 
 
 
     /**
 
     /**
 
      * Where to redirect users after login / registration.
 
      * Where to redirect users after login / registration.
 
@@ -42,15 +44,10 @@ class RegisterController extends Controller
 
         $this->middleware('teacher.guest');
 
         $this->middleware('teacher.guest');
 
     }
 
     }
 
 
 
-    /**
 
-     * Get a validator for an incoming registration request.
 
-     *
 
-     * @param  array  $data
 
-     * @return \Illuminate\Contracts\Validation\Validator
 
-     */
 
+
 
     protected function validator(array $data)
 
     protected function validator(array $data)
 
     {
 
     {
 
-        return Validator::make($data, [ 
+        return Validator::make($data, [
 
             'firstname' => ['required', 'string', 'max:255'],
 
             'firstname' => ['required', 'string', 'max:255'],
 
             'lastname' => ['required', 'string', 'max:255'],
 
             'lastname' => ['required', 'string', 'max:255'],
 
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
 
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
 
@@ -70,8 +67,8 @@ class RegisterController extends Controller
 
      * @return User
 
      * @return User
 
      */
 
      */
 
     protected function create(Request $req)
 
     protected function create(Request $req)
 
-    { 
-         
+    {
 
+
 
         $data = User::create([
 
         $data = User::create([
 
             'first_name' => $req->firstname,
 
             'first_name' => $req->firstname,
 
             'last_name' => $req->lastname,
 
             'last_name' => $req->lastname,
 
@@ -85,9 +82,9 @@ class RegisterController extends Controller
 
             'user_type' => $req->user_type,
 
             'user_type' => $req->user_type,
 
             'ref_no' => name_initials($req->firstname,$req->lastname).''.teacherRefNoGenerate(),
 
             'ref_no' => name_initials($req->firstname,$req->lastname).''.teacherRefNoGenerate(),
 
         ]);
 
         ]);
 
-        Mail::to('test@mail.com')->send(new SignUp($data->id));
 
-        return redirect("/teacher_profile");
 
-        
+       Mail::to('test@mail.com')->send(new SignUp($data->id));
 
+        return redirect()->to("/login-v2");
 
+
 
     }
 
     }
 
 
 
     /**
 
     /**
 
@@ -96,8 +93,8 @@ class RegisterController extends Controller
 
      * @return \Illuminate\Http\Response
 
      * @return \Illuminate\Http\Response
 
      */
 
      */
 
     public function showRegistrationForm()
 
     public function showRegistrationForm()
 
-    { 
-        
+    {
 
+
 
         return view('register-v2');
 
         return view('register-v2');
 
     }
 
     }

+ 30 - 29
resources/views/login-v2.blade.php
View File 

@@ -6,7 +6,7 @@
 
             <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
             <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
             <meta name="description" content="Information & Guidance on the PhD Process, Connect with Supervisor and Many" />
 
             <meta name="description" content="Information & Guidance on the PhD Process, Connect with Supervisor and Many" />
 
             <meta name="keywords" content="" />
 
             <meta name="keywords" content="" />
 
-            
+
 
             <!-- facebook tags -->
 
             <!-- facebook tags -->
 
             <meta property="og:url" content="http://www.facebook.com/researchadmission"/>
 
             <meta property="og:url" content="http://www.facebook.com/researchadmission"/>
 
             <meta property="og:type" content="website"/>
 
             <meta property="og:type" content="website"/>
 
@@ -29,8 +29,8 @@
 
             <link rel="stylesheet" type="text/css" href="{{ asset('web/stylesheets/font-awesome.min.css') }}" />
 
             <link rel="stylesheet" type="text/css" href="{{ asset('web/stylesheets/font-awesome.min.css') }}" />
 
             <link rel="stylesheet" href="https://unicons.iconscout.com/release/v3.0.6/css/line.css">
 
             <link rel="stylesheet" href="https://unicons.iconscout.com/release/v3.0.6/css/line.css">
 
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
 
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
 
-            
-            <!-- Slider -->               
+
 
+            <!-- Slider -->
 
             <link rel="stylesheet" href="{{asset('web/css/tiny-slider.css')}}"/>
 
             <link rel="stylesheet" href="{{asset('web/css/tiny-slider.css')}}"/>
 
             <!-- Main Css -->
 
             <!-- Main Css -->
 
             <link href="{{asset('web/css/style.css')}}" rel="stylesheet" type="text/css" id="theme-opt" />
 
             <link href="{{asset('web/css/style.css')}}" rel="stylesheet" type="text/css" id="theme-opt" />
 
@@ -38,7 +38,7 @@
 
             <link rel="preconnect" href="https://fonts.googleapis.com">
 
             <link rel="preconnect" href="https://fonts.googleapis.com">
 
             <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
             <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
             <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;900&display=swap" rel="stylesheet">
 
             <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;900&display=swap" rel="stylesheet">
 
-            
+
 
             <link rel="preconnect" href="https://fonts.googleapis.com">
 
             <link rel="preconnect" href="https://fonts.googleapis.com">
 
             <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
             <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
             <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@700&display=swap" rel="stylesheet">
 
             <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@700&display=swap" rel="stylesheet">
 
@@ -50,7 +50,7 @@
 
             <link href="https://fonts.googleapis.com/css2?family=Montserrat+Alternates&display=swap" rel="stylesheet">
 
             <link href="https://fonts.googleapis.com/css2?family=Montserrat+Alternates&display=swap" rel="stylesheet">
 
        </head>
 
        </head>
 
        <style>
 
        <style>
 
-            
+
 
             body {
 
             body {
 
                 font-family: 'Oswald', sans-serif;
 
                 font-family: 'Oswald', sans-serif;
 
                 font-family: 'Quicksand', sans-serif;
 
                 font-family: 'Quicksand', sans-serif;
 
@@ -69,9 +69,9 @@
 
                 border-color: #8492a61f !important;
 
                 border-color: #8492a61f !important;
 
             }
 
             }
 
             .btn1{
 
             .btn1{
 
-                background-color: #141639c4 !important; 
-                color:white !important; 
-                border-radius: 20px; 
+                background-color: #141639c4 !important;
 
+                color:white !important;
 
+                border-radius: 20px;
 
                 box-shadow:none !important;
 
                 box-shadow:none !important;
 
             }
 
             }
 
             .btn1:hover{
 
             .btn1:hover{
 
@@ -84,34 +84,34 @@
 
                 background: #141639c4 !important;
 
                 background: #141639c4 !important;
 
             }
 
             }
 
             .tns-nav button.tns-nav-active{
 
             .tns-nav button.tns-nav-active{
 
-                background-color: #ffff !important; 
+                background-color: #ffff !important;
 
             }
 
             }
 
             .bg-left{
 
             .bg-left{
 
                 background-color:#141639c4;
 
                 background-color:#141639c4;
 
-                border:none; 
+                border:none;
 
                 padding:7.53rem;
 
                 padding:7.53rem;
 
             }
 
             }
 
             .bg-left .head-line{
 
             .bg-left .head-line{
 
-                font-size: 39px !important; 
-                font-weight: bold; 
+                font-size: 39px !important;
 
+                font-weight: bold;
 
                 line-height: 1.2;
 
                 line-height: 1.2;
 
                 color:#ffff;
 
                 color:#ffff;
 
             }
 
             }
 
             .sub-line1{
 
             .sub-line1{
 
-                font-size: 18px !important; 
-                font-weight: 400; 
-                font-family: poppins !important; 
+                font-size: 18px !important;
 
+                font-weight: 400;
 
+                font-family: poppins !important;
 
                 color:#ffff !important;
 
                 color:#ffff !important;
 
             }
 
             }
 
             .sub-line2{
 
             .sub-line2{
 
-                font-size: 17px !important; 
-                font-weight: bold; 
-                font-family: poppins !important; 
+                font-size: 17px !important;
 
+                font-weight: bold;
 
+                font-family: poppins !important;
 
                 color:#ffff !important;
 
                 color:#ffff !important;
 
             }
 
             }
 
             .bg-white{
 
             .bg-white{
 
-                background-color: #72809f33 !important; 
-                height: 160px; 
+                background-color: #72809f33 !important;
 
+                height: 160px;
 
                 border: 1px solid #ffff;
 
                 border: 1px solid #ffff;
 
             }
 
             }
 
             .box-head{
 
             .box-head{
 
@@ -119,7 +119,7 @@
 
                 color:#ffff;
 
                 color:#ffff;
 
             }
 
             }
 
             .box-sub{
 
             .box-sub{
 
-                font-size:14px; 
+                font-size:14px;
 
                 color:#ffff;
 
                 color:#ffff;
 
             }
 
             }
 
        </style>
 
        </style>
 
@@ -134,7 +134,7 @@
 
                                 <h3 class="ps-4 mt-5 sub-line2">Why this platform is advantageous for you</h3>
 
                                 <h3 class="ps-4 mt-5 sub-line2">Why this platform is advantageous for you</h3>
 
                                 <div class="row justify-content-center">
 
                                 <div class="row justify-content-center">
 
                                     <div class="col-lg-12">
 
                                     <div class="col-lg-12">
 
-                                        <div class="tiny-two-item"> 
+                                        <div class="tiny-two-item">
 
                                             <div class="tiny-slide">
 
                                             <div class="tiny-slide">
 
                                                 <div class="d-flex client-testi m-2">
 
                                                 <div class="d-flex client-testi m-2">
 
                                                     <div class="flex-1 p-3 rounded bg-white position-relative">
 
                                                     <div class="flex-1 p-3 rounded bg-white position-relative">
 
@@ -143,7 +143,7 @@
 
                                                     </div>
 
                                                     </div>
 
                                                 </div>
 
                                                 </div>
 
                                             </div>
 
                                             </div>
 
-                                            
+
 
                                             <div class="tiny-slide">
 
                                             <div class="tiny-slide">
 
                                                 <div class="d-flex client-testi m-2">
 
                                                 <div class="d-flex client-testi m-2">
 
                                                     <div class="flex-1 p-3 rounded bg-white position-relative" style="background-color: #72809f33 !important; height: 160px; border: 1px solid #eee;">
 
                                                     <div class="flex-1 p-3 rounded bg-white position-relative" style="background-color: #72809f33 !important; height: 160px; border: 1px solid #eee;">
 
@@ -197,8 +197,9 @@
 
                         <div class="col-md-4 mt-4 mt-sm-0 pt-sm-0" style="padding:0px;">
 
                         <div class="col-md-4 mt-4 mt-sm-0 pt-sm-0" style="padding:0px;">
 
                             <div class="card shadow border-0" >
 
                             <div class="card shadow border-0" >
 
                                 <div class="card-body" style="height:648px;">
 
                                 <div class="card-body" style="height:648px;">
 
-                                <h6 class="mt-5 pt-5" style="color: white; margin-top:7.5rem !important;">Please log-in to your account</h6> 
-                                    <form class="login-form">
 
+                                <h6 class="mt-5 pt-5" style="color: white; margin-top:7.5rem !important;">Please log-in to your account</h6>
 
+                                    <form method="POST" action="{{ route('teacher-login') }}">
 
+                                        @csrf
 
                                         <div class="row">
 
                                         <div class="row">
 
                                             <div class="col-md-12 back">
 
                                             <div class="col-md-12 back">
 
                                                 <div class="mb-3">
 
                                                 <div class="mb-3">
 
@@ -207,12 +208,12 @@
 
                                                         <input type="email" class="form-control" placeholder="Email" name="email" required="">
 
                                                         <input type="email" class="form-control" placeholder="Email" name="email" required="">
 
                                                     </div>
 
                                                     </div>
 
                                                 </div>
 
                                                 </div>
 
-                                            </div>    
+                                            </div>
 
                                             <div class="col-lg-12 back" style="margin-top:-18px;">
 
                                             <div class="col-lg-12 back" style="margin-top:-18px;">
 
                                                         <div class="mb-3">
 
                                                         <div class="mb-3">
 
                                                             <label class="form-label"></label>
 
                                                             <label class="form-label"></label>
 
                                                             <div class="form-icon position-relative">
 
                                                             <div class="form-icon position-relative">
 
-                                                                <input type="password" class="form-control" placeholder="Password" required="">
 
+                                                                <input type="password" name="password" class="form-control" placeholder="Password" required="">
 
                                                             </div>
 
                                                             </div>
 
                                                         </div>
 
                                                         </div>
 
                                                     </div><!--end col-->
 
                                                     </div><!--end col-->
 
@@ -234,7 +235,7 @@
 
             </div> <!--end container-->
 
             </div> <!--end container-->
 
         </section><!--end section-->
 
         </section><!--end section-->
 
         <!-- Hero End -->
 
         <!-- Hero End -->
 
-        
+
 
         <!-- javascript -->
 
         <!-- javascript -->
 
         <script src="{{asset('web/js/bootstrap.bundle.min.js')}}"></script>
 
         <script src="{{asset('web/js/bootstrap.bundle.min.js')}}"></script>
 
         <!-- tobii js -->
 
         <!-- tobii js -->
 
@@ -247,4 +248,4 @@
 
         <script src="{{asset('web/js/plugins.init.js')}}"></script>
 
         <script src="{{asset('web/js/plugins.init.js')}}"></script>
 
         <script src="{{asset('web/js/app.js')}}"></script>
 
         <script src="{{asset('web/js/app.js')}}"></script>
 
         </body>
 
         </body>
 
-  </html>
 
+  </html>

+ 59 - 60
resources/views/teacher_profile.blade.php
View File 

@@ -6,7 +6,7 @@
 
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
         <meta name="description" content="Information & Guidance on the PhD Process, Connect with Supervisor and Many" />
 
         <meta name="description" content="Information & Guidance on the PhD Process, Connect with Supervisor and Many" />
 
         <meta name="keywords" content="" />
 
         <meta name="keywords" content="" />
 
-        
+
 
          <!-- facebook tags -->
 
          <!-- facebook tags -->
 
          <meta property="og:url" content="http://www.facebook.com/researchadmission"/>
 
          <meta property="og:url" content="http://www.facebook.com/researchadmission"/>
 
          <meta property="og:type" content="website"/>
 
          <meta property="og:type" content="website"/>
 
@@ -30,8 +30,8 @@
 
         <link rel="stylesheet" href="https://unicons.iconscout.com/release/v3.0.6/css/line.css">
 
         <link rel="stylesheet" href="https://unicons.iconscout.com/release/v3.0.6/css/line.css">
 
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
 
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
 
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/11.6.15/sweetalert2.min.css">
 
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/11.6.15/sweetalert2.min.css">
 
-        
-        <!-- Slider -->               
+
 
+        <!-- Slider -->
 
         <link rel="stylesheet" href="{{asset('web/css/tiny-slider.css')}}"/>
 
         <link rel="stylesheet" href="{{asset('web/css/tiny-slider.css')}}"/>
 
         <!-- Main Css -->
 
         <!-- Main Css -->
 
         <link href="{{asset('web/css/style.css')}}" rel="stylesheet" type="text/css" id="theme-opt" />
 
         <link href="{{asset('web/css/style.css')}}" rel="stylesheet" type="text/css" id="theme-opt" />
 
@@ -39,7 +39,7 @@
 
         <link rel="preconnect" href="https://fonts.googleapis.com">
 
         <link rel="preconnect" href="https://fonts.googleapis.com">
 
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
         <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;900&display=swap" rel="stylesheet">
 
         <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;900&display=swap" rel="stylesheet">
 
-        
+
 
         <link rel="preconnect" href="https://fonts.googleapis.com">
 
         <link rel="preconnect" href="https://fonts.googleapis.com">
 
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
         <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@700&display=swap" rel="stylesheet">
 
         <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@700&display=swap" rel="stylesheet">
 
@@ -50,7 +50,7 @@
 
         <link rel="stylesheet" href="{{asset('web/css/sweetalert/sweetalert.css')}}">
 
         <link rel="stylesheet" href="{{asset('web/css/sweetalert/sweetalert.css')}}">
 
     </head>
 
     </head>
 
     <style>
 
     <style>
 
-    
+
 
 body {
 
 body {
 
     font-family: 'Oswald', sans-serif;
 
     font-family: 'Oswald', sans-serif;
 
     font-family: 'Quicksand', sans-serif;
 
     font-family: 'Quicksand', sans-serif;
 
@@ -63,7 +63,7 @@ h1, h2, h3, h4, h5, h6 {
 
     padding:0px;
 
     padding:0px;
 
 }
 
 }
 
 .bg-primary, .btn-primary, .btn-soft-primary:hover, .btn-soft-primary:focus, .btn-soft-primary:active, .btn-soft-primary.active, .btn-soft-primary.focus, .btn-outline-primary:hover, .btn-outline-primary:focus, .btn-outline-primary:active, .btn-outline-primary.active, .btn-outline-primary.focus, .btn-outline-primary:not(:disabled):not(.disabled):active, .pagination .page-item.active .page-link, .nav-pills .nav-link.active, #preloader #status .spinner .double-bounce1, #preloader #status .spinner .double-bounce2, .social-icon li a:hover, #topnav .navbar-toggle.open span:hover, .bg-animation-left.crypto-home:after, .bg-animation-left.task-management-home:after, .classic-app-image .bg-app-shape:after, .classic-saas-image .bg-saas-shape:after, .swiper-slider-hero .swiper-container .swiper-button-prev:hover, .features.fea-primary:hover, .tns-nav button.tns-nav-active, .ribbon.ribbon-primary span, .sidebar .widget .tagcloud > a:hover, .work-container.work-modern .icons .work-icon:hover, .timeline-page .timeline-item .date-label-left:after, .timeline-page .timeline-item .duration-right:after, #navmenu-nav li.account-menu.active .navbar-link, #navmenu-nav li.account-menu:hover .navbar-link, .form-check-input.form-check-input:checked, .qs-datepicker-container .qs-squares .qs-square:not(.qs-empty):not(.qs-disabled):not(.qs-day):not(.qs-active):hover, .qs-datepicker-container .qs-squares .qs-square.qs-current, .carousel-indicators [data-bs-target], .carousel-indicators .active, .tns-controls button[data-controls="prev"]:hover, .tns-controls button[data-controls="next"]:hover, .back-to-top {
 
 .bg-primary, .btn-primary, .btn-soft-primary:hover, .btn-soft-primary:focus, .btn-soft-primary:active, .btn-soft-primary.active, .btn-soft-primary.focus, .btn-outline-primary:hover, .btn-outline-primary:focus, .btn-outline-primary:active, .btn-outline-primary.active, .btn-outline-primary.focus, .btn-outline-primary:not(:disabled):not(.disabled):active, .pagination .page-item.active .page-link, .nav-pills .nav-link.active, #preloader #status .spinner .double-bounce1, #preloader #status .spinner .double-bounce2, .social-icon li a:hover, #topnav .navbar-toggle.open span:hover, .bg-animation-left.crypto-home:after, .bg-animation-left.task-management-home:after, .classic-app-image .bg-app-shape:after, .classic-saas-image .bg-saas-shape:after, .swiper-slider-hero .swiper-container .swiper-button-prev:hover, .features.fea-primary:hover, .tns-nav button.tns-nav-active, .ribbon.ribbon-primary span, .sidebar .widget .tagcloud > a:hover, .work-container.work-modern .icons .work-icon:hover, .timeline-page .timeline-item .date-label-left:after, .timeline-page .timeline-item .duration-right:after, #navmenu-nav li.account-menu.active .navbar-link, #navmenu-nav li.account-menu:hover .navbar-link, .form-check-input.form-check-input:checked, .qs-datepicker-container .qs-squares .qs-square:not(.qs-empty):not(.qs-disabled):not(.qs-day):not(.qs-active):hover, .qs-datepicker-container .qs-squares .qs-square.qs-current, .carousel-indicators [data-bs-target], .carousel-indicators .active, .tns-controls button[data-controls="prev"]:hover, .tns-controls button[data-controls="next"]:hover, .back-to-top {
 
-    background-color: #141639c4 !important; 
+    background-color: #141639c4 !important;
 
     color: white!important;
 
     color: white!important;
 
     border-radius:0px !important;
 
     border-radius:0px !important;
 
 }
 
 }
 
@@ -204,9 +204,9 @@ tbody, td, tfoot, th, thead, tr {
 
     color: #ffc107 !important;
 
     color: #ffc107 !important;
 
 }
 
 }
 
 .btn2{
 
 .btn2{
 
-    background-color: #141639c4 !important; 
-    color:white !important; 
-    border-radius: 20px; 
+    background-color: #141639c4 !important;
 
+    color:white !important;
 
+    border-radius: 20px;
 
     box-shadow:none !important;
 
     box-shadow:none !important;
 
     padding:3px 13px !important;
 
     padding:3px 13px !important;
 
     font-size:13px;
 
     font-size:13px;
 
@@ -292,7 +292,7 @@ tbody, td, tfoot, th, thead, tr {
 
                                             <i class="fa fa-bell change_pass_btn"></i>
 
                                             <i class="fa fa-bell change_pass_btn"></i>
 
                                         </a>
 
                                         </a>
 
                                     </li>
 
                                     </li>
 
-                                </ul>                                    
+                                </ul>
 
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
 
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
 
                                     <li class="nav-item dropdown dropdown-notification">
 
                                     <li class="nav-item dropdown dropdown-notification">
 
                                         <a href="">
 
                                         <a href="">
 
@@ -303,7 +303,7 @@ tbody, td, tfoot, th, thead, tr {
 
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
 
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
 
                                     <li class="nav-item dropdown dropdown-notification">
 
                                     <li class="nav-item dropdown dropdown-notification">
 
                                         <a href="">
 
                                         <a href="">
 
-                                           
+
 
                                         </a>
 
                                         </a>
 
                                     </li>
 
                                     </li>
 
                                 </ul>
 
                                 </ul>
 
@@ -313,28 +313,28 @@ tbody, td, tfoot, th, thead, tr {
 
                                             <h5 class="change_pass_btn" style="height: 33px; margin-top: 7px; padding: 5px 8px;">IZ</h5>
 
                                             <h5 class="change_pass_btn" style="height: 33px; margin-top: 7px; padding: 5px 8px;">IZ</h5>
 
                                         </a>
 
                                         </a>
 
                                     </li>
 
                                     </li>
 
-                                </ul> 
+                                </ul>
 
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
 
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
 
                                     <li class="nav-item dropdown dropdown-notification">
 
                                     <li class="nav-item dropdown dropdown-notification">
 
-                                        <a href="{{ route('logout') }}"
 
+                                        <a href="{{ route('teacher-logout') }}"
 
                                             onclick="event.preventDefault();
 
                                             onclick="event.preventDefault();
 
                                                             document.getElementById('logout-form').submit();">
 
                                                             document.getElementById('logout-form').submit();">
 
                                              <i class="fa fa-sign-out change_pass_btn"></i>
 
                                              <i class="fa fa-sign-out change_pass_btn"></i>
 
                                         </a>
 
                                         </a>
 
-                                        <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
 
+                                        <form id="logout-form" action="{{ route('teacher-logout') }}" method="POST" class="d-none">
 
                                             @csrf
 
                                             @csrf
 
                                         </form>
 
                                         </form>
 
                                     </li>
 
                                     </li>
 
-                                </ul>  
+                                </ul>
 
                             </div>
 
                             </div>
 
                         </div>
 
                         </div>
 
                     </nav>
 
                     </nav>
 
-                </div> 
-            </div>   
-        </div>                    
+                </div>
 
+            </div>
 
+        </div>
 
 </header>
 
 </header>
 
-<section class="bg-half-170 d-table w-100 it-home" style="background-color: #efefef;">   
-    <div class="container-fluid">                       
+<section class="bg-half-170 d-table w-100 it-home" style="background-color: #efefef;">
 
+    <div class="container-fluid">
 
         <div class="row">
 
         <div class="row">
 
             <div class="col-md-2" style="padding:0px;">
 
             <div class="col-md-2" style="padding:0px;">
 
                 <div class="full">
 
                 <div class="full">
 
@@ -347,7 +347,7 @@ tbody, td, tfoot, th, thead, tr {
 
                                 </div>
 
                                 </div>
 
                             </a><!--end nav link-->
 
                             </a><!--end nav link-->
 
                         </li><!--end nav item-->
 
                         </li><!--end nav item-->
 
-                        
+
 
                         <li class="nav-item">
 
                         <li class="nav-item">
 
                             <a class="nav-link rounded" id="cardeography" data-bs-toggle="pill" href="#cardeo" role="tab" aria-controls="cardeo" aria-selected="false">
 
                             <a class="nav-link rounded" id="cardeography" data-bs-toggle="pill" href="#cardeo" role="tab" aria-controls="cardeo" aria-selected="false">
 
                                 <div class="text-start py-1 px-2" style="display:flex;">
 
                                 <div class="text-start py-1 px-2" style="display:flex;">
 
@@ -356,7 +356,7 @@ tbody, td, tfoot, th, thead, tr {
 
                                 </div>
 
                                 </div>
 
                             </a><!--end nav link-->
 
                             </a><!--end nav link-->
 
                         </li><!--end nav item-->
 
                         </li><!--end nav item-->
 
-                        
+
 
                         <li class="nav-item">
 
                         <li class="nav-item">
 
                             <a class="nav-link rounded" id="eyecare" data-bs-toggle="pill" href="#eye" role="tab" aria-controls="eye" aria-selected="false">
 
                             <a class="nav-link rounded" id="eyecare" data-bs-toggle="pill" href="#eye" role="tab" aria-controls="eye" aria-selected="false">
 
                                 <div class="text-start py-1 px-2" style="display:flex;">
 
                                 <div class="text-start py-1 px-2" style="display:flex;">
 
@@ -377,7 +377,7 @@ tbody, td, tfoot, th, thead, tr {
 
                 </div>
 
                 </div>
 
             </div><!--end col-->
 
             </div><!--end col-->
 
 
 
-            <div class="col-md-10 col-12 mt-2" style="padding:1rem;"> 
+            <div class="col-md-10 col-12 mt-2" style="padding:1rem;">
 
                 <div class="tab-content" id="pills-tabContent">
 
                 <div class="tab-content" id="pills-tabContent">
 
                     <div class="tab-pane fade show active p-2 rounded" id="dental" role="tabpanel" aria-labelledby="dentalcare">
 
                     <div class="tab-pane fade show active p-2 rounded" id="dental" role="tabpanel" aria-labelledby="dentalcare">
 
                         <form method="POST" action="" style="padding: 10px; background-color: #16183f69; border-radius: 5px 5px 0px 0px;">
 
                         <form method="POST" action="" style="padding: 10px; background-color: #16183f69; border-radius: 5px 5px 0px 0px;">
 
@@ -417,19 +417,19 @@ tbody, td, tfoot, th, thead, tr {
 
                                             <input name="startdate" type="text" class="form-control start" placeholder="start Date" autocomplete="off">
 
                                             <input name="startdate" type="text" class="form-control start" placeholder="start Date" autocomplete="off">
 
                                         </div>
 
                                         </div>
 
                                     </div>
 
                                     </div>
 
-                                </div>                                                                                                                                               
-                            </div>       
+                                </div>
 
+                            </div>
 
                         </form>
 
                         </form>
 
                         <div class="col-md-12" style="background-color:white; border-radius: 0px 0px 5px 5px;">
 
                         <div class="col-md-12" style="background-color:white; border-radius: 0px 0px 5px 5px;">
 
                             <div class="mb-4" style="padding:15px;">
 
                             <div class="mb-4" style="padding:15px;">
 
                                 <div class="text-end">
 
                                 <div class="text-end">
 
-                                    <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
-                                    <button class="btn btn2">Save</button>                                                                                                                
+                                    <button class="btn btncl"><i class="fa fa-refresh"></i></button>
 
+                                    <button class="btn btn2">Save</button>
 
                                 </div>
 
                                 </div>
 
                             </div>
 
                             </div>
 
-                        </div> 
+                        </div>
 
                         <div class="col-md-12 bg-white" style="padding:10px; height:500px;">
 
                         <div class="col-md-12 bg-white" style="padding:10px; height:500px;">
 
-                            {{-- <h4 class="text-info">Ref :{{ auth_user('teacher')->ref_no }}</h4> --}}
 
+                            <h4 class="text-info">Ref :{{ auth_user()->ref_no }}</h4>
 
                             <div class="table-responsive">
 
                             <div class="table-responsive">
 
                                 <table class="table table-bordered list_table">
 
                                 <table class="table table-bordered list_table">
 
                                     <thead>
 
                                     <thead>
 
@@ -456,31 +456,31 @@ tbody, td, tfoot, th, thead, tr {
 
                                                 </div>
 
                                                 </div>
 
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
 
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
 
                                                     <span>{{date("d M, Y", strtotime($row->dob))}}</span>
 
                                                     <span>{{date("d M, Y", strtotime($row->dob))}}</span>
 
-                                                </div>     
+                                                </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">
 
                                             <td style="font-size: 11px;">
 
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
 
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
 
                                                     <span>Civil Technology</span>
 
                                                     <span>Civil Technology</span>
 
-                                                </div>   
-                                                <div style="font-size: 11px; font-weight: 600; display:block;">  
+                                                </div>
 
+                                                <div style="font-size: 11px; font-weight: 600; display:block;">
 
                                                     <span>Sep 2023 - aug 2023</span>
 
                                                     <span>Sep 2023 - aug 2023</span>
 
-                                                </div>  
-                                                <div class="mt-1" style="font-size: 11px; display:block;">  
+                                                </div>
 
+                                                <div class="mt-1" style="font-size: 11px; display:block;">
 
                                                     <span class="label_badge_gpa">2.88 (GPA)</span>
 
                                                     <span class="label_badge_gpa">2.88 (GPA)</span>
 
                                                 </div>
 
                                                 </div>
 
-                                            </td> 
-                                            <td style="font-size: 11px; font-weight: 600; text-align:center;">IELTS 
-                                                <div style="font-size: 11px;">  
+                                            </td>
 
+                                            <td style="font-size: 11px; font-weight: 600; text-align:center;">IELTS
 
+                                                <div style="font-size: 11px;">
 
                                                     <span>6</span>
 
                                                     <span>6</span>
 
                                                 </div>
 
                                                 </div>
 
-                                            </td> 
+                                            </td>
 
                                             <td style="font-size: 11px; text-align:center;">
 
                                             <td style="font-size: 11px; text-align:center;">
 
-                                                <div style="font-size: 11px; display:block;">  
+                                                <div style="font-size: 11px; display:block;">
 
                                                     <span class="label_badge_work">3 years</span>
 
                                                     <span class="label_badge_work">3 years</span>
 
-                                                </div> 
-                                                <div style="font-size: 11px; font-weight: 600; display:block;">  
+                                                </div>
 
+                                                <div style="font-size: 11px; font-weight: 600; display:block;">
 
                                                     <span>Sep 2019 - continue</span>
 
                                                     <span>Sep 2019 - continue</span>
 
-                                                </div>  
+                                                </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">
 
                                             <td style="font-size: 11px;">
 
                                                 <div class="inner_right">
 
                                                 <div class="inner_right">
 
@@ -513,10 +513,10 @@ tbody, td, tfoot, th, thead, tr {
 
                                     @endforeach
 
                                     @endforeach
 
                                     </tbody>
 
                                     </tbody>
 
                                 </table>
 
                                 </table>
 
-                            </div>                                    
+                            </div>
 
                         </div><!--end col-->
 
                         </div><!--end col-->
 
                     </div><!--end teb pane-->
 
                     </div><!--end teb pane-->
 
-                    
+
 
                     <div class="tab-pane fade bg-white p-2 rounded shadow" id="cardeo" role="tabpanel" aria-labelledby="cardeography"  style="height:530px;">
 
                     <div class="tab-pane fade bg-white p-2 rounded shadow" id="cardeo" role="tabpanel" aria-labelledby="cardeography"  style="height:530px;">
 
                         <div class="col-md-12">
 
                         <div class="col-md-12">
 
                             <div class="table-responsive">
 
                             <div class="table-responsive">
 
@@ -544,8 +544,8 @@ tbody, td, tfoot, th, thead, tr {
 
                                                 </div>
 
                                                 </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
-                                            <td style="font-size: 11px;">test</td> 
-                                            <td style="font-size: 11px;">test</td> 
+                                            <td style="font-size: 11px;">test</td>
 
+                                            <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                         </tr>
 
                                         </tr>
 
@@ -563,14 +563,14 @@ tbody, td, tfoot, th, thead, tr {
 
                                                 </div>
 
                                                 </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
-                                            <td style="font-size: 11px;">test</td> 
-                                            <td style="font-size: 11px;">test</td> 
+                                            <td style="font-size: 11px;">test</td>
 
+                                            <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                         </tr>
 
                                         </tr>
 
                                     </tbody>
 
                                     </tbody>
 
                                 </table>
 
                                 </table>
 
-                            </div>                                    
+                            </div>
 
                         </div><!--end col-->
 
                         </div><!--end col-->
 
                     </div><!--end teb pane-->
 
                     </div><!--end teb pane-->
 
 
 
@@ -601,8 +601,8 @@ tbody, td, tfoot, th, thead, tr {
 
                                                 </div>
 
                                                 </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
-                                            <td style="font-size: 11px;">test</td> 
-                                            <td style="font-size: 11px;">test</td> 
+                                            <td style="font-size: 11px;">test</td>
 
+                                            <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                         </tr>
 
                                         </tr>
 
@@ -620,14 +620,14 @@ tbody, td, tfoot, th, thead, tr {
 
                                                 </div>
 
                                                 </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
-                                            <td style="font-size: 11px;">test</td> 
-                                            <td style="font-size: 11px;">test</td> 
+                                            <td style="font-size: 11px;">test</td>
 
+                                            <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                         </tr>
 
                                         </tr>
 
                                     </tbody>
 
                                     </tbody>
 
                                 </table>
 
                                 </table>
 
-                            </div>                                    
+                            </div>
 
                         </div><!--end col-->
 
                         </div><!--end col-->
 
                     </div><!--end teb pane-->
 
                     </div><!--end teb pane-->
 
                     <div class="tab-pane fade bg-white p-2 rounded shadow" id="head" role="tabpanel" aria-labelledby="headcare"  style="height:530px;">
 
                     <div class="tab-pane fade bg-white p-2 rounded shadow" id="head" role="tabpanel" aria-labelledby="headcare"  style="height:530px;">
 
@@ -657,8 +657,8 @@ tbody, td, tfoot, th, thead, tr {
 
                                                 </div>
 
                                                 </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
-                                            <td style="font-size: 11px;">test</td> 
-                                            <td style="font-size: 11px;">test</td> 
+                                            <td style="font-size: 11px;">test</td>
 
+                                            <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                         </tr>
 
                                         </tr>
 
@@ -676,14 +676,14 @@ tbody, td, tfoot, th, thead, tr {
 
                                                 </div>
 
                                                 </div>
 
                                             </td>
 
                                             </td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
-                                            <td style="font-size: 11px;">test</td> 
-                                            <td style="font-size: 11px;">test</td> 
+                                            <td style="font-size: 11px;">test</td>
 
+                                            <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                             <td style="font-size: 11px;">test</td>
 
                                         </tr>
 
                                         </tr>
 
                                     </tbody>
 
                                     </tbody>
 
                                 </table>
 
                                 </table>
 
-                            </div>                                    
+                            </div>
 
                         </div><!--end col-->
 
                         </div><!--end col-->
 
                     </div><!--end teb pane-->
 
                     </div><!--end teb pane-->
 
                 </div><!--end tab content-->
 
                 </div><!--end tab content-->
 
@@ -714,4 +714,3 @@ tbody, td, tfoot, th, thead, tr {
 
       <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 
       <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>
 
-

+ 7 - 7
resources/views/web/layouts/header.blade.php
View File 

@@ -11,15 +11,15 @@
 
                 <div class="col md-6">
 
                 <div class="col md-6">
 
                     <div class="mt-3" style="display:flex; justify-content: end;">
 
                     <div class="mt-3" style="display:flex; justify-content: end;">
 
                             <!-- <i class="fa fa-user me-2" style="color:black !important; font-size: 13px; height: 25px; padding: 3.5px 5.9px; border: 2px solid black; border-radius: 100%;"></i> -->
 
                             <!-- <i class="fa fa-user me-2" style="color:black !important; font-size: 13px; height: 25px; padding: 3.5px 5.9px; border: 2px solid black; border-radius: 100%;"></i> -->
 
-                            <p style="color:black; font-weight:600 !important;">{{ auth_user()->first_name }} , {{ Auth::user()->last_name }}</p>
 
+                            <p style="color:black; font-weight:600 !important;">{{ Auth::user()->first_name }} , {{ Auth::user()->last_name }}</p>
 
                         <ul class="nav navbar-nav align-items-center ml-auto header_right ps-3">
 
                         <ul class="nav navbar-nav align-items-center ml-auto header_right ps-3">
 
                             <li class="nav-item dropdown dropdown-notification">
 
                             <li class="nav-item dropdown dropdown-notification">
 
-                                <a href="{{ route('logout') }}"
 
+                                <a href="{{ url('std-logout') }}"
 
                                     onclick="event.preventDefault();
 
                                     onclick="event.preventDefault();
 
                                                     document.getElementById('logout-form').submit();">
 
                                                     document.getElementById('logout-form').submit();">
 
-                                    <button class="btn btn2">Log Out</button>   
+                                    <button class="btn btn2">Log Out</button>
 
                                 </a>
 
                                 </a>
 
-                                <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
 
+                                <form id="logout-form" action="{{ url('std-logout') }}" method="POST" class="d-none">
 
                                     @csrf
 
                                     @csrf
 
                                 </form>
 
                                 </form>
 
                             </li>
 
                             </li>
 
@@ -27,12 +27,12 @@
 
                     </div>
 
                     </div>
 
                     <!-- End Logo container-->
 
                     <!-- End Logo container-->
 
                 </div>
 
                 </div>
 
-            </div>    
+            </div>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="container-fluid" style="padding: 0px;">
 
     <div class="container-fluid" style="padding: 0px;">
 
         <div id="navigation" style="border-top: 1px solid #d2d2d2; border-bottom: 1px solid #d2d2d2; background-color: #141639c4;">
 
         <div id="navigation" style="border-top: 1px solid #d2d2d2; border-bottom: 1px solid #d2d2d2; background-color: #141639c4;">
 
-            <!-- Navigation Menu-->   
+            <!-- Navigation Menu-->
 
             <ul class="navigation-menu" style="margin-top: 15px; margin-bottom: -14px; margin-left: 13.2rem;">
 
             <ul class="navigation-menu" style="margin-top: 15px; margin-bottom: -14px; margin-left: 13.2rem;">
 
                 <li><a href="{{ url('/home') }}" class="sub-menu-item active" style="margin-top: -2rem; margin-left: -1.4rem;">Home</a></li>
 
                 <li><a href="{{ url('/home') }}" class="sub-menu-item active" style="margin-top: -2rem; margin-left: -1.4rem;">Home</a></li>
 
                 <li class="has-submenu parent-parent-menu-item">
 
                 <li class="has-submenu parent-parent-menu-item">
 
@@ -49,4 +49,4 @@
 
             </ul><!--end navigation menu-->
 
             </ul><!--end navigation menu-->
 
         </div><!--end navigation-->
 
         </div><!--end navigation-->
 
     </div><!--end container-->
 
     </div><!--end container-->
 
-</header>
 
+</header>

+ 11 - 9
routes/web.php
View File 

@@ -45,19 +45,20 @@ Route::get('/title', function () {
 
     return view('title');
 
     return view('title');
 
 });
 
 });
 
 
 
-// Route::get('/home', function () {
 
-//     return view('home');
 
-// });
 
+
 
 
 
 Auth::routes();
 
 Auth::routes();
 
 
 
 Route::get('/profile', 'HomeController@index')->name('profile');
 
 Route::get('/profile', 'HomeController@index')->name('profile');
 
 Route::get('/email-verification/{id}', [App\Http\Controllers\RegisterController::class,'email_verification'])->name('/email-verification');
 
 Route::get('/email-verification/{id}', [App\Http\Controllers\RegisterController::class,'email_verification'])->name('/email-verification');
 
 
 
-// Student 
+// Student
 
+// Route::get('/home', function () {
 
+//     return view('home');
 
+// });
 
 Route::group(['middleware' => ['auth']], function() {
 
 Route::group(['middleware' => ['auth']], function() {
 
-
 
-Route::get('/home', [App\Http\Controllers\StudentHomeController::class,'index']);
 
+    Route::get('/home', [App\Http\Controllers\StudentHomeController::class,'index']);
 
+    Route::post('std-logout', [App\Http\Controllers\StudentHomeController::class,'logout'])->name('std-logout');
 
 Route::get('/save-as-complete', [App\Http\Controllers\StudentHomeController::class,'save_as_complete'])->name('save-as-complete');
 
 Route::get('/save-as-complete', [App\Http\Controllers\StudentHomeController::class,'save_as_complete'])->name('save-as-complete');
 
 Route::post('/institution_save', [App\Http\Controllers\StudentHomeController::class,'institution_save'])->name('institution-save');
 
 Route::post('/institution_save', [App\Http\Controllers\StudentHomeController::class,'institution_save'])->name('institution-save');
 
 Route::post('/work_save', [App\Http\Controllers\StudentHomeController::class,'work_save'])->name('work-save');
 
 Route::post('/work_save', [App\Http\Controllers\StudentHomeController::class,'work_save'])->name('work-save');
 
@@ -81,10 +82,11 @@ Route::get('/home/search', [App\Http\Controllers\StudentHomeController::class,'r
 
 Route::get('register-v2', [App\Http\Controllers\TeacherAuth\RegisterController::class,'showRegistrationForm']);
 
 Route::get('register-v2', [App\Http\Controllers\TeacherAuth\RegisterController::class,'showRegistrationForm']);
 
 Route::post('register-v2/teacher-register-v2', [App\Http\Controllers\TeacherAuth\RegisterController::class,'create'])->name('teacher-register-v2');
 
 Route::post('register-v2/teacher-register-v2', [App\Http\Controllers\TeacherAuth\RegisterController::class,'create'])->name('teacher-register-v2');
 
 Route::get('/login-v2', [App\Http\Controllers\TeacherAuth\LoginController::class,'showLoginForm']);
 
 Route::get('/login-v2', [App\Http\Controllers\TeacherAuth\LoginController::class,'showLoginForm']);
 
+Route::post('/teacher-login', [App\Http\Controllers\TeacherAuth\LoginController::class,'login'])->name('teacher-login');
 
 
 
-Route::group(['middleware' => ['teacher']], function() { 
+Route::group(['middleware' => ['teacher']], function() {
 
     Route::get('/teacher_profile', [App\Http\Controllers\TeacherHomeController::class,'teacher_profile'])->name('teacher_profile');
 
     Route::get('/teacher_profile', [App\Http\Controllers\TeacherHomeController::class,'teacher_profile'])->name('teacher_profile');
 
-    Route::post('logout', [App\Http\Controllers\TeacherAuth\LoginController::class,'logout'])->name('logout');
 
+    Route::post('logout', [App\Http\Controllers\TeacherAuth\LoginController::class,'logout'])->name('teacher-logout');
 
 });
 
 });
 
 
 
 
 
@@ -97,4 +99,4 @@ Route::get(
 
 Route::post(
 
 Route::post(
 
 	'ajax/{name}',
 
 	'ajax/{name}',
 
 	'AjaxController@post'
 
 	'AjaxController@post'
 
-)->name('ajax-post');
 
+)->name('ajax-post');