cm

hngi · Nov 9, 2019 · b9e679f · b9e679f
1 parent 1e70724
commit b9e679f
Show file tree

Hide file tree

Showing 9,389 changed files with 1,698 additions and 1,235 deletions.
diff --git a/Deploy.txt b/Deploy.txt
diff --git a/README.md b/README.md
@@ -1 +1 @@
-MASTER BRANCH
+NEW BACKEND BRANCH
diff --git a/app/Assignment.php b/app/Assignment.php
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Contact.php b/app/Contact.php
diff --git a/app/CourseContent.php b/app/CourseContent.php
diff --git a/app/Courses.php b/app/Courses.php
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -60,7 +60,7 @@ public function store(Request $request)
             'last_name' => ['required', 'string', 'min:4','max:255','regex:/^[a-zA-Z]+$/u'],
             'username' => ['required', 'string', 'max:255','unique:users'],
             'email' => ['required', 'email', 'max:255','unique:users'],
-            'phone' => ['required', 'numeric', 'size:11', 'max:14'],
+            'phone' => ['required', 'numeric'],
             'role' => 'required'
         ]);
 

diff --git a/app/Http/Controllers/AssignmentController.php b/app/Http/Controllers/AssignmentController.php
diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
diff --git a/app/Http/Controllers/CourseContentController.php b/app/Http/Controllers/CourseContentController.php
diff --git a/app/Http/Controllers/CourseController.php b/app/Http/Controllers/CourseController.php
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
diff --git a/app/Http/Controllers/ForgotPassController.php b/app/Http/Controllers/ForgotPassController.php
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
diff --git a/app/Http/Controllers/ReviewController.php b/app/Http/Controllers/ReviewController.php
diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php
diff --git a/app/Http/Controllers/SubmissionController.php b/app/Http/Controllers/SubmissionController.php
@@ -4,6 +4,12 @@
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Assignment;
+use App\Courses;
+use App\RegisteredCourses;
+use App\CourseContent;
+use App\Submission;
+use App\User;
 
 class SubmissionController extends Controller
 {
@@ -23,6 +29,18 @@ public function index()
             $courses = Courses::where('tutor_id', auth()->user()->id)->get();
             $contents = CourseContent::all();
             $assignments = Assignment::all();
+            $submissions = Submission::all();
+            $students = User::where('role', 0)->get();
+
+            $data = array(
+                'courses' => $courses,
+                'assignments' => $assignments,
+                'contents' => $contents,
+                'submissions' => $submissions,
+                'students' => $students
+            );
+
+            return view("$user_role.submissions")->with($data);
         }
     }
 
@@ -33,7 +51,26 @@ public function index()
      */
     public function create()
     {
-        //
+        $role = auth()->user()->role;
+        if($role==0){
+            $user_role = 'user';
+            $registered_courses = RegisteredCourses::where('user_id', auth()->user()->id)->get();
+            $courses = Courses::all();
+            $contents = CourseContent::all();
+            $assignments = Assignment::where('active', 1)->get();
+
+            $data = array(
+                'registered_courses' => $registered_courses,
+                'courses' => $courses,
+                'assignments' => $assignments,
+                'contents' => $contents
+            );
+
+            return view('user.create-submission')->with($data);
+        }
+        else{
+            return back()->with('error', 'Unauthorized Permission');
+        }
     }
 
     /**
@@ -44,7 +81,23 @@ public function create()
      */
     public function store(Request $request)
     {
-        //
+        if($request->hasFile('submission')){
+            $filenameWithExt = $request->file('submission')->getClientOriginalName();
+            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
+            $extension = $request->file('submission')->getClientOriginalExtension();
+            $fileNameToStore= $filename.'_'.time().'.'.$extension;
+            $path = $request->file('submission')->storeAs('public/submisssions', $fileNameToStore);
+        } else {
+            $fileNameToStore = '';
+        }
+
+        $submission = new Submission;
+        $submission->score = 0;
+        $submission->assignment_id = $request->input('assignment');
+        $submission->user_id = auth()->user()->id;
+        $submission->file = $fileNameToStore;
+        $submission->save();
+        return back()->with('success', 'Assignment submitted');
     }
 
     /**

diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php
@@ -49,13 +49,19 @@ public function store(Request $request)
   //['first_name' => 'Povilas', 'last_name' => 'Korop']);
 
 		if (!Newsletter::isSubscribed($request->email)) {
-			Newsletter::subscribePending($request->email);
-			//$subcriber->email = $request->input('email');
-	        $subscriber->save();
-	        	return redirect('/')->with('success', 'Check your email to confirm subscription.');
+            Newsletter::subscribePending($request->email);
+            $check = Subscription::where('email', $subscriber->email)->exists();
+            if($check){
+                return back()->with('failure', 'You are already subscribed');
+            }
+            else{
+                $subscriber->save();
+	            return back()->with('success', 'Check your email to confirm subscription.');
+            }
+
         } 
         else {
-	        	return redirect('/')->with('failure', 'You are already subscribed.');
+	        return redirect('/')->with('failure', 'You are already subscribed.');
 	    }
 
     }

diff --git a/app/Http/Controllers/TutorController.php b/app/Http/Controllers/TutorController.php
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
diff --git a/app/Mail/TestEmail.php b/app/Mail/TestEmail.php
diff --git a/app/Notifications/LarashopAdminResetPassword.php b/app/Notifications/LarashopAdminResetPassword.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
diff --git a/app/RegisteredCourses.php b/app/RegisteredCourses.php
diff --git a/app/Reviews.php b/app/Reviews.php
diff --git a/app/Schedule.php b/app/Schedule.php
diff --git a/app/Submission.php b/app/Submission.php
diff --git a/app/Subscription.php b/app/Subscription.php
diff --git a/app/User.php b/app/User.php
diff --git a/artisan b/artisan
diff --git a/bootstrap/app.php b/bootstrap/app.php
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
diff --git a/config/auth.php b/config/auth.php
diff --git a/config/broadcasting.php b/config/broadcasting.php
diff --git a/config/cache.php b/config/cache.php
diff --git a/config/database.php b/config/database.php
diff --git a/config/filesystems.php b/config/filesystems.php
diff --git a/config/hashing.php b/config/hashing.php
diff --git a/config/logging.php b/config/logging.php
diff --git a/config/mail.php b/config/mail.php
diff --git a/config/queue.php b/config/queue.php
diff --git a/config/services.php b/config/services.php
diff --git a/config/session.php b/config/session.php
diff --git a/config/view.php b/config/view.php
diff --git a/database/.gitignore b/database/.gitignore
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
diff --git a/database/migrations/2019_10_29_090030_create_users_table.php b/database/migrations/2019_10_29_090030_create_users_table.php
diff --git a/database/migrations/2019_10_29_091506_create_blogs_table.php b/database/migrations/2019_10_29_091506_create_blogs_table.php
diff --git a/database/migrations/2019_10_29_091711_create_contacts_table.php b/database/migrations/2019_10_29_091711_create_contacts_table.php
diff --git a/database/migrations/2019_10_29_131051_create_registered_courses_table.php b/database/migrations/2019_10_29_131051_create_registered_courses_table.php
diff --git a/database/migrations/2019_10_29_131218_create_courses_table.php b/database/migrations/2019_10_29_131218_create_courses_table.php
diff --git a/database/migrations/2019_10_29_131630_create_reviews_table.php b/database/migrations/2019_10_29_131630_create_reviews_table.php
diff --git a/database/migrations/2019_10_29_132227_create_course_contents_table.php b/database/migrations/2019_10_29_132227_create_course_contents_table.php
diff --git a/database/migrations/2019_10_30_163624_create_subscriptions_table.php b/database/migrations/2019_10_30_163624_create_subscriptions_table.php
diff --git a/database/migrations/2019_10_31_151445_create_assignments_table.php b/database/migrations/2019_10_31_151445_create_assignments_table.php
diff --git a/database/migrations/2019_11_03_153516_create_schedules_table.php b/database/migrations/2019_11_03_153516_create_schedules_table.php
diff --git a/database/migrations/2019_11_04_120816_create_submissions_table.php b/database/migrations/2019_11_04_120816_create_submissions_table.php
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/public/.htaccess b/public/.htaccess
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
diff --git a/public/css/bootstrap.min.css.map b/public/css/bootstrap.min.css.map
diff --git a/public/css/demo.css b/public/css/demo.css
diff --git a/public/css/modifiedstyles.css b/public/css/modifiedstyles.css
diff --git a/public/css/paper-dashboard.css b/public/css/paper-dashboard.css
diff --git a/public/css/paper-dashboard.css.map b/public/css/paper-dashboard.css.map
diff --git a/public/css/paper-dashboard.min.css b/public/css/paper-dashboard.min.css
diff --git a/public/css/view-course.css b/public/css/view-course.css
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.php b/public/index.php
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/bootstrap-notify.js b/public/js/bootstrap-notify.js
diff --git a/public/js/bootstrap.min.js b/public/js/bootstrap.min.js
diff --git a/public/js/chartjs.min.js b/public/js/chartjs.min.js
diff --git a/public/js/demo.js b/public/js/demo.js
diff --git a/public/js/jquery.min.js b/public/js/jquery.min.js
diff --git a/public/js/paper-dashboard.js b/public/js/paper-dashboard.js
diff --git a/public/js/paper-dashboard.js.map b/public/js/paper-dashboard.js.map
diff --git a/public/js/paper-dashboard.min.js b/public/js/paper-dashboard.min.js
diff --git a/public/js/perfect-scrollbar.jquery.min.js b/public/js/perfect-scrollbar.jquery.min.js
diff --git a/public/js/popper.min.js b/public/js/popper.min.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/public/storage/.gitignore b/public/storage/.gitignore
diff --git a/resources/js/app.js b/resources/js/app.js
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
diff --git a/resources/js/components/ExampleComponent.vue b/resources/js/components/ExampleComponent.vue
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
diff --git a/resources/views/admin/admins.blade.php b/resources/views/admin/admins.blade.php
diff --git a/resources/views/admin/assignment.blade.php b/resources/views/admin/assignment.blade.php
diff --git a/resources/views/admin/courses.blade.php b/resources/views/admin/courses.blade.php
diff --git a/resources/views/admin/create-admin.blade.php b/resources/views/admin/create-admin.blade.php
diff --git a/resources/views/admin/create-assignment.blade.php b/resources/views/admin/create-assignment.blade.php
diff --git a/resources/views/admin/create-course-content.blade.php b/resources/views/admin/create-course-content.blade.php
diff --git a/resources/views/admin/create-course.blade.php b/resources/views/admin/create-course.blade.php
@@ -47,7 +47,7 @@
                                     <div class="row">
                                         <div class="col-md-4 pl-1">
                                             <div class="form-group">
-                                                <label>Role:</label><br>
+                                                <label> Tutor:</label><br>
                                                 @foreach($users as $user)
                                                 @if($user->role != 0)
                                                 <input type="radio" name="tutor" value="{{$user->id}}" class="form-control">{{$user->username}}<br>

diff --git a/resources/views/admin/create-schedule.blade.php b/resources/views/admin/create-schedule.blade.php
diff --git a/resources/views/admin/css/bootstrap.min.css b/resources/views/admin/css/bootstrap.min.css
diff --git a/resources/views/admin/css/bootstrap.min.css.map b/resources/views/admin/css/bootstrap.min.css.map
diff --git a/resources/views/admin/css/demo.css b/resources/views/admin/css/demo.css
diff --git a/resources/views/admin/css/paper-dashboard.css b/resources/views/admin/css/paper-dashboard.css
diff --git a/resources/views/admin/css/paper-dashboard.css.map b/resources/views/admin/css/paper-dashboard.css.map
diff --git a/resources/views/admin/css/paper-dashboard.min.css b/resources/views/admin/css/paper-dashboard.min.css
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
diff --git a/resources/views/admin/edit-admin.blade.php b/resources/views/admin/edit-admin.blade.php
diff --git a/resources/views/admin/edit-assignment.blade.php b/resources/views/admin/edit-assignment.blade.php
diff --git a/resources/views/admin/edit-course-content.blade.php b/resources/views/admin/edit-course-content.blade.php
diff --git a/resources/views/admin/edit-course.blade.php b/resources/views/admin/edit-course.blade.php
@@ -48,7 +48,7 @@
                                     <div class="row">
                                         <div class="col-md-4 pl-1">
                                             <div class="form-group">
-                                                <label>Role:</label><br>
+                                                <label>Tutor:</label><br>
                                                 @foreach($users as $user)
                                                 @if($user->role != 0)
                                                 <input type="radio" name="tutor" value="{{$user->id}}" class="form-control">

diff --git a/resources/views/admin/edit-schedule.blade.php b/resources/views/admin/edit-schedule.blade.php
diff --git a/resources/views/admin/edit-tutor.blade.php b/resources/views/admin/edit-tutor.blade.php
diff --git a/resources/views/admin/js/bootstrap-notify.js b/resources/views/admin/js/bootstrap-notify.js
diff --git a/resources/views/admin/js/bootstrap.min.js b/resources/views/admin/js/bootstrap.min.js
diff --git a/resources/views/admin/js/chartjs.min.js b/resources/views/admin/js/chartjs.min.js
diff --git a/resources/views/admin/js/demo.js b/resources/views/admin/js/demo.js
diff --git a/resources/views/admin/js/jquery.min.js b/resources/views/admin/js/jquery.min.js
diff --git a/resources/views/admin/js/paper-dashboard.js b/resources/views/admin/js/paper-dashboard.js
diff --git a/resources/views/admin/js/paper-dashboard.js.map b/resources/views/admin/js/paper-dashboard.js.map
diff --git a/resources/views/admin/js/paper-dashboard.min.js b/resources/views/admin/js/paper-dashboard.min.js
diff --git a/resources/views/admin/js/perfect-scrollbar.jquery.min.js b/resources/views/admin/js/perfect-scrollbar.jquery.min.js
diff --git a/resources/views/admin/js/popper.min.js b/resources/views/admin/js/popper.min.js
diff --git a/resources/views/admin/show-admin.blade.php b/resources/views/admin/show-admin.blade.php
diff --git a/resources/views/admin/show-assignment.blade.php b/resources/views/admin/show-assignment.blade.php
@@ -2,22 +2,22 @@
 
 @section('content')
 <div class="content">
-                <div class="card card-register">
-                    <div class="card-header">
-                        <h5 class="card-title">DETAILS</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="card-header">
-                                <h4 class="card-title">Assigment</h4>
-                            </div>
-                            <div class="card-body">
-                                {{$assignment->title}}<br>
-                                {{$assignment->description}}<br>
-                            </div>
-                        </div>
-                    </div>
+    <div class="card card-register">
+        <div class="card-header">
+            <h5 class="card-title">DETAILS</h5>
+        </div>
+        <div class="card-body">
+            <div class="card-header">
+                    <h4 class="card-title">Assigment</h4>
+                </div>
+                <div class="card-body">
+                    {{$assignment->title}}<br>
+                    {{$assignment->description}}<br>
                 </div>
             </div>
+        </div>
+    </div>
+</div>
 @endsection       
 
 
diff --git a/resources/views/admin/show-course.blade.php b/resources/views/admin/show-course.blade.php
diff --git a/resources/views/admin/show-tutor.blade.php b/resources/views/admin/show-tutor.blade.php
diff --git a/resources/views/admin/show-user.blade.php b/resources/views/admin/show-user.blade.php
diff --git a/resources/views/admin/submissions.blade.php b/resources/views/admin/submissions.blade.php
@@ -0,0 +1,45 @@
+@extends('layouts.admin-dashboard')
+
+@section('content')
+<div class="content">
+    <div class="card card-register">
+        <div class="card-header">
+            <h5 class="card-title">DETAILS</h5>
+        </div>
+        <div class="card-body">
+            <div class="card-header">
+                    <h4 class="card-title">Submissions</h4>
+                </div>
+                <div class="card-body">
+                    @foreach($courses as $course)
+                    @foreach($contents as $content)
+                    @foreach($assignments as $assignment)
+                    @foreach($submissions as $submission)
+                        @if($assignment->course_content_id==$content->id)
+                        @if($course->id==$content->course_id)
+                        @if($submission->assignment_id==$assignment->id)
+                        <li><!--<img style="width:100%" src="/storage/submissions/{{$submission->file}}">-->
+                            <a href="/storage/submissions/{{$submission->file}}" download>
+                                Download
+                            </a>
+                            @foreach($students as $student)
+                                @if($submission->user_id==$student->id)
+                                    {{$student->username}}
+                                @endif
+                            @endforeach
+                        </li>
+                        @endif
+                        @endif
+                        @endif
+                    @endforeach
+                    @endforeach
+                    @endforeach
+                    @endforeach
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection       
+
+
diff --git a/resources/views/admin/tutors.blade.php b/resources/views/admin/tutors.blade.php
diff --git a/resources/views/admin/upload-resource.blade.php b/resources/views/admin/upload-resource.blade.php
diff --git a/resources/views/admin/user-profile.blade.php b/resources/views/admin/user-profile.blade.php
diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
@@ -6,54 +6,77 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.10.0-11/css/all.min.css">
     <link href="https://fonts.googleapis.com/css?family=Nunito&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="style.css">
-    <title>StartNG</title>
+    <link href="https://fonts.googleapis.com/css?family=Poppins&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.9.0/slick-theme.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.9.0/slick.min.css">
+    <link href="/css/modifiedstyles.css" rel="stylesheet" />
+    <title>aaa |</title>
 
     <style>
         body {
-            font-family: 'Nunito', sans-serif; 
+            font-family: 'Poppins', sans-serif;
         }
-        
-        .btn-custom {
+
+            .btn-custom {
             color: #fff;
             background-color: #2DCE89;
-    
-        
+            .navbar-custom li a {
+            color: #000;
+            }
+            .btn-success {
+            background-color: #2DCE89;
+            color: #fff;
+            border: thin solid #2dce89;
+            }
+            /* .btn-success:hover {
+            background-color: rgb(2, 20, 12);
+            color: #fff;
+            border: thin solid rgb(2, 20, 12);
+
+            } */
+            .btn-secondary {
+            background-color: #3A0842;
+            border-color: #3A0842;
+            color: #fff !important;
+            cursor: pointer;
+            }
+
         .btn-custom:hover {
             color: #fff;
             background-color: #2DCE89;
         }
-        
+
         .navbar-custom .nav-link {
             color: #000;
         }
-        
+
         .custom-toggler .navbar-toggler-icon {
             background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0,0,0, 0.7)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
         }
-        
+
         .footer-top {
             background-color: #3A0842;
             color: #fff;
         }
-        
+
         .footer-top li {
             list-style-type: none;
         }
-        
+
         .footer-link {
             color: #fff;
             text-decoration: none;
             font-size: 1em;
         }
-        
+
         .footer-link:hover {
             color: #fff;
             text-decoration: none;
         }
-        
+
         .footer-social {
             background-color: #2E0435;
             color: #fff;
@@ -63,7 +86,7 @@
 
 <body>
 @include('../inc.navbar')
-    <div class="container pt-4 pb-5">
+
         @if(session('success'))
     <div class="alert alert-success">
         {{session('success')}}
@@ -75,6 +98,7 @@
         {{session('error')}}
     </div>
 @endif
+<div class="container pt-4 pb-5 mb-5">
        <form method="post" action="{{route('forgot.pass')}}">
            @csrf
            <div class="row">
@@ -184,4 +208,4 @@ class="fab fa-facebook"></i></a>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js"></script>
 </body>
 
-</html>
+</html>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -8,14 +8,15 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.10.0-11/css/all.min.css">
     <link href="https://fonts.googleapis.com/css?family=Nunito&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Poppins&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.9.0/slick-theme.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.9.0/slick.min.css">
     <link href="/css/modifiedstyles.css" rel="stylesheet" />
     <title>Start NG | Login</title>
     <style>
         body {
-        font-family: Nunito;
+        font-family: 'Poppins';
         }
         /* Style for Navbar Starts */
         .navbar-custom li a {
@@ -51,7 +52,7 @@
         margin: 0;
         padding: 0;
         box-sizing: border-box;
-        font-family: 'Nunito', sans-serif;
+        font-family: 'Poppins', sans-serif;
         }
         a {
         text-decoration: none;

diff --git a/resources/views/auth/passwords/confirm.blade.php b/resources/views/auth/passwords/confirm.blade.php