Merge branch 'master' of https://revinr.site/mostafij-revinr/student-admission

resources/views/Q_apply_form.blade.php

@@ -39,6 +39,9 @@
             <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 rel="preconnect" href="https://fonts.googleapis.com">
+            <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+            <link href="https://fonts.googleapis.com/css2?family=Oswald:wght@200&family=Quicksand:wght@400;500;600;700&display=swap" rel="stylesheet">
             <link rel="preconnect" href="https://fonts.googleapis.com">
             <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
             <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@700&display=swap" rel="stylesheet">
@@ -55,14 +58,10 @@
        <style>
 
             body {
-                font-family: "Montserrat",Arial,sans-serif;
-                font-family: "Montserrat",Arial,sans-serif;
-            }
-            h1, h2, h3, h4, h6 {
-                font-family:Ubuntu !important;
+                font-family: 'Quicksand', sans-serif !important; 
             }
-            h5{
-                font-family: "Montserrat",Arial,sans-serif !important;
+            h1, h2, h3, h4, h5, h6 {
+                font-family: 'Quicksand', sans-serif !important; 
             }
             .bg-half-170 {
             padding:0px;
@@ -103,7 +102,6 @@
             }
             .tmail{
                 color: #a7a7a7;
-                text-align: center;
                 margin: 0px;
             }
             .form-control {
@@ -117,126 +115,203 @@
                 position: relative;
             }
             .text-muted{
-                color: #3c3d5b !important;
+                color: #ffffff !important;
+            }
+            .bg-left{
+                background-color: #191e38;
+                border:none;
+                padding:7.53rem;
+                height: 100vh;
+            }
+            .bg-left .head-line{
+                font-size: 39px !important;
+                font-weight: bold;
+                line-height: 1.2;
+                color:#ffff;
+            }
+            .sub-line1{
+                font-size: 18px !important;
+                font-weight: 400;
+                font-family: poppins !important;
+                color:#ffff !important;
+            }
+            .sub-line2{
+                font-size: 17px !important;
+                font-weight: bold;
+                font-family: poppins !important;
+                color:#ffff !important;
+            }
+            .bg-white{
+                background-color: #72809f33 !important;
+                height: 160px;
+                border: 1px solid #ffff;
+            }
+            .box-head{
+                font-size:15px !important;
+                color:#ffff;
+            }
+            .box-sub{
+                font-size:14px;
+                color:#ffff;
+            }
+            .d-flex{
+                display: grid !important;
+            }
+            .master-link.secondary {
+                padding: 12px;
+                color: #fff;
+                background-color: rgba(235,232,227,.1);
+                clip-path: polygon(0 0, 100% 0, 100% calc(100% - 1.1em), calc(100% - 1.1em) 100%, 0 100%);
+            }
+            .master-link.secondary:hover {
+                color: #191e38 !important;
+                background-color: #ffffff;
+                clip-path: polygon(0 0, 100% 0, 100% calc(100% - 1.1em), calc(100% - 1.1em) 100%, 0 100%);
+            }
+
+            /* new */
+            .bg-gray-900 {
+                --tw-bg-opacity: 1;
+                background-color: rgb(15 23 42/var(--tw-bg-opacity));
+            }
+            .xl\:h-full {
+                height: 100%;
+            }
+            .w-full {
+                width: 100%;
+            }
+            .absolute {
+                position: absolute;
+            }
+            .xl\:grid-cols-2 {
+                grid-template-columns: repeat(2,minmax(0,1fr));
+            }
+            .xl\:grid {
+                display: grid;
+            }
+            .xl\:col-start-2 {
+                grid-column-start: 2;
+            }
+            .xl\:relative {
+                position: relative;
             }
        </style>
-    <div class="container-fluid">
-        <div class="col-md-12">
-            <div class="row">
-                <div class="col-md-12" style="text-align: center; background-color:#3c3d5b;">
-                        <h2 class="mt-2" style="font-family:Ubuntu !important; font-size: 37px !important; color: #ffbd59;">Research Admission</h2>
-                        <div style="border-bottom: 1px solid #eee;"></div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <section class="cover-user">
-        <div class="container px-0">
-            <div class="row g-0 position-relative">
-                <div class="col-md-5">
-                    <div class="row">
-                        <div class="col-md-12 mt-4">
-                            <h3 class="mb-3" style="font-size: 22px !important; line-height: 43px; font-weight: 700; text-align: left; color: #3c3d5b;">You're going to submit your doctoral application proposal to - </h3>
-                            <div class="uni_details" style="background-color: #16183f40; display:flex; border-radius: 10px; padding: 10px 21px;">
-                                <div class="mt-2" style="text-align: center;">
-                                    <div class="inner_left mt-1" style="background-color: #141639c4; padding: 18px 0px 0px 0px; height: 63px; width: 63px;">
-                                        <p style="color:white; font-weight:600 !important; letter-spacing: 2px;">{{ strtoupper(mb_substr($user->first_name, 0, 1) . mb_substr($user->last_name, 0, 1)) }}</p>
+         <section class="cover-user">
+            <div class="container-fluid px-0">
+                <div class="row g-0 position-relative">
+                    <div class="col-lg-7 padding-less ">
+                        <div class="bg-left">
+                            <h5 class="text-muted mt-5">Guideline to submit your proposal :</h5>
+                                <div class="row">
+                                    <div class="col-12">
+                                        <div class="align-items-center">
+                                            <p class="text-muted mb-1" style="font-size: 17px;">1. You should get an invitation to the email address given above.</p>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="alert" style="margin-bottom: 0px; color: #3c3d5b;">
-                                    <strong class="mb-2" style="font-size:19px; font-weight: 700;"> {{ $user->first_name }} {{ $user->last_name }}</strong></br>
-                                    <span style="font-size:14px; font-weight:400;">{{ $user->email }} </span><br>
-                                    <span style="font-size:14px; font-weight:400;">{{ cn($user,'university.name','')}}</span>
-                                    <span> . </span>
-                                    <span style="font-size:14px; font-weight:400;">{{ cn($user,'department_name.name','')}}</span>
 
+                                    <div class="col-12">
+                                        <div class="align-items-center">
+                                            <p class="text-muted mb-1" style="font-size: 17px;">2. Click on the apply now button.</p>
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <div class="align-items-center">
+                                            <p class="text-muted mb-1" style="font-size: 17px;">3. Complete your registration (one time).</p>
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <div class="align-items-center">
+                                            <p class="text-muted mb-1" style="font-size: 17px;">4. Complete your profile and upload your proposal.</p>
+                                        </div>
+                                    </div>
+                                    <div class="col-12 mb-3">
+                                        <div class="align-items-center">
+                                            <p class="text-muted mb-3" style="font-size: 17px;">5. Submit the application</p>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-12 mt-4">
-                            <div class="mb-3">
-                                <input type="hidden" name="teacher_id" value="{{ $hash_teacher_ids[0] }}" id="teacher_id">
-                                <label class="form-label" style="font-size: 19px; font-weight: 700; color: #3c3d5b;">Your name</label>
-                                <div class="form-icon position-relative">
-                                    <input type="text" class="form-control" id="name" placeholder="Write your full name here" name="name" required="">
-                                </div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="form-label" style="font-size: 19px; font-weight: 700; color: #3c3d5b;">e-mail address</label>
-                                <div class="form-icon position-relative">
-                                    <input type="email" class="form-control" id="email" placeholder="Write your e-mail address here" name="email" required="">
+                                <div style="border-bottom: 1px solid #eee;"></div>
+                                    <h5 class="text-muted mb-2 mt-4" style="font-weight:600;">Already an account ?</h5>
+                                    <p class="text-muted mb-1" style="font-size: 17px;">1. Sign in to your account.</p>
+                                    <p class="text-muted mb-1" style="font-size: 17px;">2. Navigate to the application tab, where you will find a draft application tagged with this supervisor.</p>
+                                    <p class="text-muted mb-3" style="font-size: 17px;">3. Proceed to submit the application.</p>
+                                <div class="col-md-12">
+                                    <div class="mt-5 pt-3 mb-4 text-left">
+                                        <a href="{{ url('/login') }}" class="master-link secondary" style="font-size: 21px;">
+                                            {{ __('Log in') }}
+                                        </a>
+                                    </div>
                                 </div>
-                            </div>
-                        </div><!--end col-->
-                        <h5 class="text-center mb-4" style="color: #3c3d5b; font-weight: 500; font-size: 18px;">We will send you a link to this email address, so you can complete your registration and submit your proposal.</h5>
-                        <div class="col-md-12">
-                            <div class="mt-2 mb-4 text-center">
-                                <button type="submit" class="btn btn1 q_form_submit" style="font-size: 21px; border-radius: 25px;">
-                                    {{ __('Submit') }}
-                                </button>
-                            </div>
+                                <p class="tmail mt-5" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                         </div>
-                    </div>
-                </div>
-                <div class="col-md-6 ms-5 ps-5 cover-my-30 mt-5">
-                    <div class="d-flex align-items-center p-5">
-                        <div class="row">
-                            <div class="col-12">
-                                <div class="card login-page border-0">
-                                    <div class="card-body" style="padding: 0px;">
-                                        
-                                            <h5 class="text-muted">Guideline to submit your proposal :</h5>
-                                                <div class="row">
-                                                    <div class="col-12">
-                                                        <div class="align-items-center">
-                                                            <p class="text-muted mb-1" style="font-size: 17px;">1. You should get an invitation to the email address given above.</p>
+                    </div>   
+                    <div class="col-lg-5 cover-my-30 ">
+                        <div class="cover-user-img d-flex align-items-center p-5">
+                            <div class="row">
+                                <div class="col-12">
+                                    <div class="card login-page border-0" style="z-index: 1;">
+                                        <div class="card-body" style="padding: 0px;">
+                                             <h3 class="mb-3" style="font-size: 22px !important; line-height: 43px; font-weight: 700; text-align: left; color: #3c3d5b;">You're going to submit your doctoral application proposal to - </h3>
+                                                <div class="uni_details" style="background-color: #16183f40; display:flex; border-radius: 10px; padding: 10px 21px;">
+                                                    <div class="mt-2" style="text-align: center;">
+                                                        <div class="inner_left mt-1" style="background-color: #141639c4; padding: 18px 0px 0px 0px; height: 63px; width: 63px;">
+                                                            <p style="color:white; font-weight:600 !important; letter-spacing: 2px;">{{ strtoupper(mb_substr($user->first_name, 0, 1) . mb_substr($user->last_name, 0, 1)) }}</p>
                                                         </div>
-                                                    </div><!--end col-->
+                                                    </div>
+                                                    <div class="alert" style="margin-bottom: 0px; color: #3c3d5b;">
+                                                        <strong class="mb-2" style="font-size:19px; font-weight: 700;"> {{ $user->first_name }} {{ $user->last_name }}</strong></br>
+                                                        <span style="font-size:14px; font-weight:400;">{{ $user->email }} </span><br>
+                                                        <span style="font-size:14px; font-weight:400;">{{ cn($user,'university.name','')}}</span>
+                                                        <span> . </span>
+                                                        <span style="font-size:14px; font-weight:400;">{{ cn($user,'department_name.name','')}}</span>
 
-                                                    <div class="col-12">
-                                                        <div class="align-items-center">
-                                                            <p class="text-muted mb-1" style="font-size: 17px;">2. Click on the apply now button.</p>
-                                                        </div>
-                                                    </div><!--end col-->
-                                                    <div class="col-12">
-                                                        <div class="align-items-center">
-                                                            <p class="text-muted mb-1" style="font-size: 17px;">3. Complete your registration (one time).</p>
-                                                        </div>
-                                                    </div><!--end col-->
-                                                    <div class="col-12">
-                                                        <div class="align-items-center">
-                                                            <p class="text-muted mb-1" style="font-size: 17px;">4. Complete your profile and upload your proposal.</p>
-                                                        </div>
-                                                    </div><!--end col-->
-                                                    <div class="col-12">
-                                                        <div class="align-items-center">
-                                                            <p class="text-muted mb-3" style="font-size: 17px;">5. Submit the application</p>
-                                                        </div>
-                                                    </div><!--end col-->
+                                                    </div>
                                                 </div>
-                                            <div style="border-bottom: 1px solid #eee;"></div>
-                                            <h5 class="text-muted mb-2 mt-4" style="font-weight:600;">Already an account ?</h5>
-                                            <p class="text-muted mb-1" style="font-size: 17px;">1. Sign in to your account.</p>
-                                            <p class="text-muted mb-1" style="font-size: 17px;">2. Navigate to the application tab, where you will find a draft application tagged with this supervisor.</p>
-                                            <p class="text-muted mb-3" style="font-size: 17px;">3. Proceed to submit the application.</p>
-                                            <div class="col-md-12">
-                                                <div class="mt-2 mb-4 text-center">
-                                                    <a href="{{ url('/login') }}" class="btn btn1" style="font-size: 21px; border-radius: 25px;">
-                                                        {{ __('Log in') }}
-                                                    </a>
+                                            </div>
+                                            <div class="col-lg-12 mt-4">
+                                                <div class="mb-3">
+                                                    <input type="hidden" name="teacher_id" value="{{ $hash_teacher_ids[0] }}" id="teacher_id">
+                                                    <label class="form-label" style="font-size: 19px; font-weight: 700; color: #3c3d5b;">Your name</label>
+                                                    <div class="form-icon position-relative">
+                                                        <input type="text" class="form-control" id="name" placeholder="Write your full name here" name="name" required="">
+                                                    </div>
+                                                </div>
+                                                <div class="mb-3">
+                                                    <label class="form-label" style="font-size: 19px; font-weight: 700; color: #3c3d5b;">e-mail address</label>
+                                                    <div class="form-icon position-relative">
+                                                        <input type="email" class="form-control" id="email" placeholder="Write your e-mail address here" name="email" required="">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                                <h5 class="text-center mb-4" style="color: #3c3d5b; font-weight: 500; font-size: 18px !important;">We will send you a link to this email address, so you can complete your registration and submit your proposal.</h5>
+                                                <div class="col-md-12">
+                                                    <div class="mt-2 mb-4 text-center">
+                                                        <button type="submit" class="btn btn1 q_form_submit" style="font-size: 21px;">
+                                                            {{ __('Submit') }}
+                                                        </button>
+                                                    </div>
                                                 </div>
                                             </div>
-                                            <p class="mb-2 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                                         </div>
                                     </div>
                                 </div>
-                            </div><!--end col-->
-                        </div><!--end row-->
-                    </div> <!-- end about detail -->
-                    <div class="col-lg-2"></div>
-            </div><!--end row-->
-        </div><!--end container fluid-->
-    </section><!--end section-->
+                            </div>
+                        </div> 
+                    </div>
+                </div>
+            </div>
+        </section> 
+
+        <!-- <div class="relative bg-gray-900">
+            <div class="h-80 w-full absolute bottom-0 xl:inset-0 xl:h-full">
+                <div class="h-full w-full xl:grid xl:grid-cols-2">
+                    <div class="h-full xl:relative xl:col-start-2">
+                        <img src="web/images/01.jpg" alt="">
+                    </div>
+                </div>
+            </div>
+        </div> -->
+
         <!-- javascript -->
         <script src="{{asset('web/js/bootstrap.bundle.min.js')}}"></script>
         <!-- tobii js -->

resources/views/application.blade.php

@@ -50,19 +50,19 @@
                                     </div>
                                     <div class="text-end" style="width:50%;">
                                         <span style="font-size:11px;">Apply Reference</span><br>
-                                        <span class="label_badge_radius" style="background-color: #141639c4; color: white; border-radius: 4px; font-size:11px !important; font-weight:800;">{{$row->student_apply_ref ?? ''}}</span>
+                                        <span class="label_badge_radius" style="background-color: #463993; color: white; border-radius: 4px; font-size:11px !important; font-weight:800;">{{$row->student_apply_ref ?? ''}}</span>
                                     </div>
                                 </div>
                                 <div class="p-2" style="display:flex; border-top: 1px solid #eee;">
                                     <div class="left" style="width:50%;">
                                         <div class="uni_details" style="display:flex;">
                                             <div class="inner_right ms-5">
-                                                <strong style="font-size:13px; font-weight: 400;">{{cn($row,'proposal.title','')}}</strong></br>
+                                                <strong style="font-size:14px; font-weight: 600;">{{cn($row,'proposal.title','')}}</strong></br>
                                                     <div style="margin-top: -2px;">
-                                                        <span style="font-size:10px;">{{cn($row,'proposal.proposal_ref','')}}</span>
-                                                        <span>.</span>
-                                                        <span style="font-size:10px;">{{cn($row,'proposal.methology','')}}</span>
-                                                        <span>.</span>
+                                                        <span style="font-size:12px;">{{cn($row,'proposal.proposal_ref','')}}</span>
+                                                        <span> • </span>
+                                                        <span style="font-size:12px;">{{cn($row,'proposal.methology','')}}</span>
+                                                        <span> • </span>
                                                         @php
                                                                $proposal =\DB::table('proposal')->where('id',$row->proposal_id)->first();
                                                                if($proposal->department){
@@ -72,9 +72,9 @@
                                                                 
                                                             @endphp
                                                             @if($department)
-                                                                <span style="font-size:10px;">{{$department->name ?? ''}}</span>
+                                                                <span style="font-size:12px;">{{$department->name ?? ''}}</span>
                                                             @endif
-                                                        <span>.</span>
+                                                        <span> • </span>
                                                         <span style="font-size:10px;">{{cn($row,'proposal.status','')}}</span>
                                                     </div>
                                             </div>
@@ -85,7 +85,7 @@
                                     <div class="left" style="width:50%;">
                                         <div class="uni_details" style="display:flex;">
                                             <div class="inner_right ms-5">
-                                                <span style="font-size:11px;">Preferred Start Date : <br><strong>{{ date('M Y', strtotime($row->created_at))}}</strong></span><br>
+                                                <span style="font-size:11px;">Preferred Start Date : <br><strong style="font-size:13px;">{{ date('M Y', strtotime($row->created_at))}}</strong></span><br>
                                             </div>
                                         </div>
                                     </div>

resources/views/home.blade.php

@@ -5,7 +5,7 @@
                 <div class="col-md-12">
                     
                     @if(\Auth::user()->email_verification==0)
-                        <div class="col md-4 mt-1" style="margin-left: 10px;">
+                        <div class="col md-4 mt-1">
                             <div class="col-md-12">
                                 <span class="alert mt-3" role="alert" style="font-size: 12px !important; border-radius: .55rem; padding: 8px 12px; margin-top: 6px; background: #fff0d6; color: #fdad2a; border-color: #ffebca; border-width: 3px; border-style: double;"> <i class="fa fa-warning" style="font-size: 11px; margin-right: 5px; color: #fdad2a !important; top: 0px; position: relative;"></i> Your email is not verified. Pleace check your email .</span>
                             </div>

resources/views/landing.blade.php

@@ -230,8 +230,9 @@
                                 <div class="card-body">
                                     <div class="grid_wrap">
                                         <div class="w-layout-grid grid_customize ">
-                                            <div class="flex-1 content p-3 rounded position-relative">
-                                                <h6 class="text-muted mt-2" style="text-align: left; line-height: 1.1; color: #191e38 !important; font-size: 39px !important; font-weight: 700 !important; font-family: 'Quicksand', sans-serif !important;">3 Ways you can receive proposals from doctoral candidates</h6>
+                                            <div class="flex-1 content p-3 rounded box-white position-relative">
+                                                <h6 style="color: #ffbd59; font-weight: bolder !important;">Through Research Admission Platform </h6>
+                                                <p class="text-muted1 mt-2">3 Ways you can receive proposals from doctoral candidates</p>
                                             </div>
                                             <div class="flex-1 content p-3 rounded box-white position-relative">
                                                 <h6 style="color: #ffbd59; font-weight: bolder !important;">OPTION 1 </h6>

resources/views/modal_pages/apply_student_proposal.blade.php

@@ -12,11 +12,8 @@
                     <input type="hidden" name="student_id" value="{{$student->id}}">
                     <div class="d-flex">
                         @if($teacher->university) 
-                            <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                            <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 45px; width: 44px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                         @endif
-                        <div class="inner_left mt-1" style="background-color: #141639c4; padding: 18px 0px 0px 0px; height: 47px; width: 70px; margin-top: 9px !important;">
-                            <p style="color:white; font-weight:600 !important; letter-spacing: 2px; text-align: center; margin-top: -8px; font-size: 17px;">DD</p>
-                        </div>
                         <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                             <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
                             <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>

resources/views/modal_pages/view_apply_proposal.blade.php

@@ -7,11 +7,8 @@
             <div class="alert p-3" style="background-color:white;"> 
                 <div class="d-flex">
                     @if(cn($std_proposal,'teacher_details.university','')) 
-                        <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($std_proposal,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                        <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 45px; width: 45px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($std_proposal,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                     @endif
-                    <div class="inner_left mt-1" style="background-color: #141639c4; padding: 18px 0px 0px 0px; height: 47px; width: 70px; margin-top: 9px !important;">
-                        <p style="color:white; font-weight:600 !important; letter-spacing: 2px; text-align: center; margin-top: -8px; font-size: 17px;">DD</p>
-                    </div>
                     
                     <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                         <span style="margin: 0px;">{{cn($std_proposal,'teacher_details.first_name','')}} {{cn($std_proposal,'teacher_details.last_name','')}}</span></br>

resources/views/profile.blade.php

@@ -28,7 +28,7 @@
                                                                             <div class="mb-2">
                                                                                 <label class="form-label">Title</label>
                                                                                 <div class="form-icon position-relative">
-                                                                                    <input type="text" class="form-control" placeholder="Title" name="title" required="">
+                                                                                    <input type="text" class="form-control" placeholder="Write your project title here" name="title" required="">
                                                                                 </div>
                                                                             </div>
                                                                         </div>
@@ -37,7 +37,7 @@
                                                                                 <div class="mb-2">
                                                                                     <label class="form-label">Methology</label>
                                                                                     <select class="form-control" id="" name="methology">
-                                                                                        <option>Methology</option>
+                                                                                        <option>Select Methodology</option>
                                                                                         <option>Quantitative </option>
                                                                                         <option>Qualitative </option>
                                                                                         <option>Mixed Method </option>
@@ -49,7 +49,7 @@
                                                                                     <label class="form-label">Department</label>
                                                                                     <div class="form-icon position-relative"> 
                                                                                         <select class="form-control" name="department" required="">
-                                                                                            <option selected disabled>Select one</option>
+                                                                                            <option selected disabled>Select Department</option>
                                                                                             @foreach($departments as $row)
                                                                                                 <option value="{{$row->id}}">{{$row->name}}</option>
                                                                                             @endforeach
@@ -77,6 +77,7 @@
                                                                             <div class="col-md-2">
                                                                                 <div class="mt-4 pt-3">
                                                                                     <div class="text-end">
+                                                                                        <a href="" class="btn btncl"><i class="fa fa-refresh"></i></a> 
                                                                                         <button class="btn btn2">Save</button>                                                                                                                
                                                                                     </div>
                                                                                 </div>
@@ -162,9 +163,174 @@
                                                     </div>
                                                 </div>      
                                             </div>
+
+
+                                             <!-- Publication edit -->
+                                             <div class="col-md-12" style="background: #ffffff; border-radius: 0.25rem;"> 
+                                                <div class="p-3">
+                                                    <div class="container-fluid" style="padding:0px !important;">
+                                                        <div class="row">
+                                                            <div style="margin:0px !important; font-size:13px; font-weight: 600;">
+                                                                <div class="row">
+                                                                    <div class="col-md-6">
+                                                                        Have you ever attended any conferences to present your papers?
+                                                                    </div>
+                                                                    <div class="col-md-6" style="text-align: end;">
+                                                                        <div class="form-check-inline ps-3">
+                                                                            <label class="form-check-label" for="radio1">
+                                                                                <input type="radio" class="form-check-input" name="" value="yes"  style="font-size: 12px;"> Yes
+                                                                            </label>
+                                                                            </div>
+                                                                        <div class="form-check-inline">
+                                                                            <label class="form-check-label" for="radio2">
+                                                                                <input type="radio" class="form-check-input" name="" value="no"  style="font-size: 12px;"> No
+                                                                            </label>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                                
+                                                            </div>                   
+                                                        </div>
+                                                    </div>                                              
+                                                </div>
+                                            </div>
+
+                                             <div class="col-md-12 mt-4" style="background: rgb(255, 255, 255);border-radius: 0.25rem;"> 
+                                                <div class="mt-3 mb-2">
+                                                    <div class="container-fluid" style="padding:0px !important;">
+                                                        <div class="row">
+                                                            <div class="col-md-12">
+                                                                <div class="row">
+                                                                    <div class="col-md-6">
+                                                                        <div class="education">
+                                                                             <i class="fa fa-graduation-cap" style="padding: 7px;"></i> PUBLICATION
+                                                                        </div>
+                                                                    </div>
+                                                                                                
+                                                                    <div class="col-md-6 mt-2" id="add_div" style="display:none;">
+                                                                        <div class="text-end" style="margin:0px !important;">
+                                                                            <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse11" aria-expanded="true" aria-controls="collapse11">
+                                                                                <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo17">Add</button>
+                                                                            </a>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div> <!--box-end-->
+                                                            <div class="col-md-12 mt-1">
+                                                                <div id="demo17" class="collapse">
+                                                                    <div class="panel-body" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
+                                                                        <form method="" action="">
+                                                                           <div class="row">
+                                                                                <div class="col-md-5">
+                                                                                    <div class="mb-1">
+                                                                                            <label class="form-label" for="publication">Publication <span class="text-danger">*</span></label>
+                                                                                        <div class="form-icon position-relative">
+                                                                                            <input type="text" for="publication" name="publication" class="form-control ps-2" required="">
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col-md-5">
+                                                                                    <div class="mb-1">
+                                                                                            <label class="form-label">Status<span class="text-danger">*</span></label>
+                                                                                        <div class="form-icon position-relative">
+                                                                                            <select name="status" id="status" class="form-control frm" required="">
+                                                                                                    <option disabled="" selected="" value="">Choose one....</option>
+                                                                                                    <option value="">Published</option>                                                                                    
+                                                                                                    <option value="">Under Review</option>                                                                                    
+                                                                                                    <option value="">Draft stage</option>                                                                                    
+                                                                                            </select>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col-md-2">
+                                                                                    <div class="mt-4 pt-3">
+                                                                                        <div class="text-end">
+                                                                                            <a href="" class="btn btncl"><i class="fa fa-refresh"></i></a> 
+                                                                                            <button class="btn btn2">Save</button>                                                                                                                
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>                                                                                                                                           
+                                                                            </div>
+                                                                        </form>
+                                                                    </div>
+                                                                </div>
+                                                            </div><!--end col-->                               
+                                                        </div>
+                                                    </div>
+                                                    <div class="table-responsive mt-2">
+                                                        <table class="table table-bordered list_table" style="margin-bottom:10px;">
+                                                            <thead>
+                                                                <tr>
+                                                                    <th style="width: 8%">Sl</th>
+                                                                    <th style="width: 70%">Title</th>
+                                                                    <th style="width: 12%">Status</th>
+                                                                    <th style="width: 10%; text-align: center;">Action</th>
+                                                                </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                                    <tr>
+                                                                        <td style="font-size: 11px;">1</td>
+                                                                        <td style="font-size: 11px;">sub</td>
+                                                                        <td style="font-size: 11px;">Published</td>
+                                                                            <div class="top_part_status" style="position: relative; width: fit-content;">
+                                                                        <td class="text-center" style="width: 75px;">
+                                                                            <div class="icon_bar" style="border: none;"> 
+                                                                                <a role="" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse11" aria-expanded="true" aria-controls="collapse11">
+                                                                                    <i class="fa fa-edit" data-toggle="collapse" data-target="#demo16"></i>
+                                                                                </a>
+                                                                                <i class="fa fa-trash" data-id=""></i>
+                                                                            </div>
+                                                                        </td>   
+                                                                    </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </div>
+                                                    <div class="col-md-12">
+                                                        <div id="demo16" class="collapse">
+                                                            <div class="panel-body mb-2" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
+                                                                <form method="" action="" id="">
+                                                                    <div class="row">
+                                                                        <div class="col-md-5">
+                                                                            <div class="mb-1">
+                                                                                    <label class="form-label">Publication  <span class="text-danger">*</span></label>
+                                                                                <div class="form-icon position-relative">
+                                                                                    <input type="text" class="form-control ps-2" name="publication " placeholder="" required="">
+                                                                                </div>
+                                                                            </div>
+                                                                        </div> 
+                                                                        <div class="col-md-5">
+                                                                            <div class="mb-1">
+                                                                                    <label class="form-label">Status<span class="text-danger">*</span></label>
+                                                                                <div class="form-icon position-relative">
+                                                                                    <select name="status" id="status" class="form-control frm" required="">
+                                                                                            <option disabled="" selected="" value="">Choose one....</option>
+                                                                                            <option value="">Published</option>                                                                                    
+                                                                                            <option value="">Under Review</option>                                                                                    
+                                                                                            <option value="">Draft stage</option>                                                                                    
+                                                                                    </select>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                        <div class="col-md-2">
+                                                                            <div class="mt-4 pt-3">
+                                                                                <div class="text-end">
+                                                                                    <a href="" class="btn btncl"><i class="fa fa-refresh"></i></a> 
+                                                                                    <button class="btn btn2">Update</button>                                                                                                                
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>                                                                                                                                           
+                                                                    </div>
+                                                                </form>
+                                                            </div>
+                                                        </div>
+                                                    </div><!--end col-->                                                               
+                                                </div>
+                                            </div>
+                                        </div>
+                                        </div>
+
                                             <!-- Education edit -->
-                                            <div class="col-md-12" style="background: rgb(255, 255, 255);border-radius: 0.25rem;">
-                                               
+                                            <div class="col-md-12 mt-4" style="background: rgb(255, 255, 255);border-radius: 0.25rem;"> 
                                                 <div class="mt-3 mb-2">
                                                     <div class="container-fluid" style="padding:0px !important;">
                                                         <div class="row">
@@ -190,7 +356,7 @@
                                                                         <form method="POST" action="{{ route('institution-save') }}">
                                                                         @csrf
                                                                            <div class="row">
-                                                                                <div class="col-md-3">
+                                                                                <div class="col-md-4">
                                                                                     <div class="mb-1">
                                                                                             <label class="form-label">Academic level <span class="text-danger">*</span></label>
                                                                                         <div class="form-icon position-relative">
@@ -204,7 +370,7 @@
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>
-                                                                                <div class="col-md-3">
+                                                                                <div class="col-md-4">
                                                                                     <div class="mb-1">
                                                                                             <label class="form-label" for="subject">Subject <span class="text-danger">*</span></label>
                                                                                         <div class="form-icon position-relative">
@@ -212,7 +378,7 @@
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>
-                                                                                <div class="col-md-3">
+                                                                                <div class="col-md-4">
                                                                                         <div class="mb-1">
                                                                                             <label class="form-label" for="">Institution<span class="text-danger">*</span></label>
                                                                                         <div class="form-icon position-relative">
@@ -220,7 +386,9 @@
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>
-                                                                                <div class="col-md-3">
+                                                                            </div>
+                                                                            <div class="row">
+                                                                                <div class="col-md-4">
                                                                                     <div class="mb-1">
                                                                                             <label class="form-label">Passing Year <span class="text-danger">*</span></label>
                                                                                         <div class="form-icon position-relative">
@@ -239,7 +407,7 @@
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>
-                                                                                <div class="col-md-3">
+                                                                                <div class="col-md-4">
                                                                                     <div class="mb-1">
                                                                                             <label class="form-label">Result <span class="text-danger">*</span></label>
                                                                                         <div class="form-icon position-relative">
@@ -247,7 +415,7 @@
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>
-                                                                                <div class="col-md-3">
+                                                                                <!-- <div class="col-md-3">
                                                                                     <div class="row">
                                                                                         <div class="col-md-6">
                                                                                             <div class="mb-1">
@@ -338,8 +506,8 @@
                                                                                             </div>
                                                                                         </div>
                                                                                     </div>
-                                                                                </div>
-                                                                                <div class="col-md-3">
+                                                                                </div> -->
+                                                                                <div class="col-md-4">
                                                                                     <div class="mt-4 pt-3">
                                                                                         <div class="text-end">
                                                                                             <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a> 
@@ -359,10 +527,11 @@
                                                         <table class="table table-bordered list_table" style="margin-bottom:10px;">
                                                             <thead>
                                                                 <tr>
-                                                                    <th>Institution</th>
-                                                                    <th>Subject</th>
+                                                                    <th style="width: 30%;">Institution</th>
+                                                                    <th style="width: 20%;">Academic level</th>
+                                                                    <th style="width: 30%;">Subject</th>
                                                                     <th>Result</th>
-                                                                    <th>During</th>
+                                                                    <th style="width: 10%;">Passing Year</th>
                                                                     @if(profile_permission($institution[0]->student_id))
                                                                     <th>Action</th>
                                                                     @endif
@@ -372,17 +541,15 @@
                                                                 @foreach($institution as $row)  
                                                                     <tr>
                                                                         <td style="font-size: 11px;">{{$row->institution}}</td>
-                                                                        <td style="font-size: 11px;">{{$row->subject}}
-                                                                            <div class="right">
-                                                                                <span class="label_badge_radius" style="background-image: linear-gradient(90deg,rgba(46,17,83,.19),#f5f4fd) !important;">{{$row->academic_level_info->name}}</span>
-                                                                            </div>
-                                                                       </td> 
-                                                                        <td style="font-size: 11px;">{{$row->result}}
-                                                                            <div class="right">
-                                                                                <span style="font-weight: 400; font-size: 12px;">Passing Year : {{$row->passing_year}}</span>
-                                                                            </div>
+                                                                        <td style="font-size: 11px;">
+                                                                            <span class="label_badge_radius" style="background-image: linear-gradient(90deg,rgba(46,17,83,.19),#f5f4fd) !important;">{{$row->academic_level_info->name}}</span>
                                                                         </td>
-                                                                        <td style="font-size: 11px;">{{date("d M, Y", strtotime($row->start_date)).' - '.date("d M, Y", strtotime($row->end_date))}}</td>
+                                                                        <td style="font-size: 11px;">{{$row->subject}}</td> 
+                                                                        <td style="font-size: 11px;">{{$row->result}}</td>
+                                                                        <td style="font-size: 11px;">
+                                                                            <span style="font-weight: 400; font-size: 12px;">{{$row->passing_year}}</span>
+                                                                        </td>
+                                                                        <!-- <td style="font-size: 11px;">{{date("d M, Y", strtotime($row->start_date)).' - '.date("d M, Y", strtotime($row->end_date))}}</td> -->
                                                                         @if(profile_permission($row->student_id))
                                                                         <td class="text-center" style="width: 75px;">
                                                                                 <div class="icon_bar" style="border: none;"> 
@@ -469,7 +636,7 @@
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>
-                                                                                <div class="col-md-3">
+                                                                                <!-- <div class="col-md-3">
                                                                                     <div class="row">
                                                                                         <div class="col-md-6">
                                                                                             <div class="mb-1">
@@ -560,7 +727,7 @@
                                                                                             </div>
                                                                                         </div>
                                                                                     </div>
-                                                                                </div>
+                                                                                </div> -->
                                                                                 <div class="col-md-3">
                                                                                     <div class="mt-4 pt-3">
                                                                                         <div class="text-end">

resources/views/web/layouts/footer.blade.php

@@ -1,32 +1,12 @@
-<footer class="footer footer-bar" style="background-color:#16183f69; display: block;">
+<footer class="footer footer-bar" style="background-color: #46399347; display: block;">
     <div class="container text-center">
         <div class="row align-items-center">
             <div class="col-sm-12">
                 <div class="text-sm-center">
-                <p class="mb-0" style="color:white; margin-left: -2px; padding: 14px;">Copyright © <script>document.write(new Date().getFullYear())</script>
+                <p class="mb-0" style="color:#463993; margin-left: -2px; padding: 14px;">Copyright © <script>document.write(new Date().getFullYear())</script>
                     Research Admission</p>
                 </div>
             </div><!--end col-->
         </div><!--end row-->
     </div><!--end container-->
-</footer>
-<!-- <footer class="footer footer-bar mt-4" style="background-color:#16183f69; display: block; bottom: 65px !important;">
-    <div class="wrapper" id="sidebar" style="height: 100%; width: 100%; position: fixed; overflow-y: hidden; top: 65px;">
-        <div class="content" style="height: calc(100vh - 75px);">
-            <div class="sidebar-menu" style="padding-bottom: 110px; height: 100vh; overflow: auto;">
-            </div>
-            <div class="sidebar-footer" style="display: block;bottom: 45px !important;">
-                <div style="background-color: #16183f69; border-radius: 0px !important;">
-                    <div class="row align-items-center">
-                        <div class="col-md-12">
-                            <div class="text-sm-center">
-                                <p class="mb-0" style="color:white; margin-left: -2px; padding: 14px;">Copyright © <script>document.write(new Date().getFullYear())</script>
-                                Research Admission</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</footer> -->
+</footer>

resources/views/web/layouts/header.blade.php

@@ -30,7 +30,7 @@
             </div>
         </div>
     </div>
-    <div style="border-top: 1px solid #d2d2d2; border-bottom: 1px solid #d2d2d2; background-color: #141639c4;">
+    <div style="border-top: 1px solid #d2d2d2; border-bottom: 1px solid #d2d2d2; background-color: #463993;">
     <div class="container">
         <div id="navigation" >
             <!-- Navigation Menu-->   

resources/views/web/layouts/top.blade.php

@@ -44,6 +44,12 @@
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
         <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@200;300&display=swap" rel="stylesheet">
+        <link rel="preconnect" href="https://fonts.googleapis.com">
+        <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 rel="preconnect" href="https://fonts.googleapis.com">
+        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+        <link href="https://fonts.googleapis.com/css2?family=Oswald:wght@200&family=Quicksand:wght@400;500;600;700&display=swap" rel="stylesheet">
         {{-- Ajax Form Submit --}}
         <link href="{{ asset('css/noty/lib/noty.css') }}" rel="stylesheet" type="text/css">
         <link href="{{ asset('css/noty/lib/themes/sunset.css') }}" rel="stylesheet" type="text/css">
@@ -96,16 +102,16 @@ p{
     width: 100%;
 }
 .btn1{
-    background-color: #141639c4 !important; 
+    background-color: #463993 !important; 
     color:white !important; 
     border-radius: 20px; 
     box-shadow:none !important;
 }
 .btn1:hover{
     background: #ffff !important;
-    color: #141639c4 !important;
+    color: #463993 !important;
     border-radius: 20px;
-    border: 1px solid #141639c4;
+    border: 1px solid #463993;
 }
 .title{
     font-size:12px;
@@ -396,7 +402,7 @@ tbody, td, tfoot, th, thead, tr {
     color:#141639c4 !important;
 }
 .btn2{
-    background-color: #141639c4 !important; 
+    background-color: #463993 !important; 
     color:white !important; 
     border-radius: 20px; 
     box-shadow:none !important;
@@ -405,9 +411,9 @@ tbody, td, tfoot, th, thead, tr {
 }
 .btn2:hover{
     background: #fff !important;
-    color:  #141639c4  !important;
+    color:  #463993  !important;
     border-radius: 20px;
-    border-color: #141639c4!important;
+    border-color: #463993 !important;
 }
 .btncl{
     padding: 2px 6px;
@@ -586,10 +592,10 @@ element.style {
     font-weight: 600;
 }
 .search-btn{
-    border: 2px solid #ccc; 
+    border: 2px solid #463993; 
     width: 11%; 
     border-radius: 18px 18px 18px 18px; 
-    background-color: #141639c4 !important; 
+    background-color: #463993 !important; 
     color: white; 
     font-weight: 700;
     height: 34px;
@@ -668,7 +674,7 @@ element.style {
     border-radius: 0px !important
 }
 .method{
-    background-color: #2c2d4d;
+    background-color: #463993;
     margin-top: -11px;
     width: 16%;
     font-size: 14px !important;
@@ -682,6 +688,53 @@ element.style {
     background-color: #eee; 
     border-radius: 5px;
 }
+.dropdown-menu {
+    display: none;
+    float: left;
+    min-width: 7rem;
+    padding: 0.5rem 0;
+    margin: 0.125rem 0 0;
+    color: #212529;
+    text-align: left;
+    list-style: none;
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid rgba(0,0,0,.15);
+    border-radius: 0.25rem;
+    font-size: 11px;
+    background-color: #dedbf1;
+}
+.dropdown-item {
+    display: block;
+    width: 100%;
+    clear: both;
+    font-weight: 400;
+    text-align: inherit;
+    white-space: nowrap;
+    background: 0 0;
+    border: 0;
+    padding: 4px 12px;
+}
+.top_part_status_name {
+    border-radius: 20px;
+    padding: 1px 22px 1px 10px;
+    font-size: 10px;
+    font-weight: 400;
+    line-height: 1.3;
+    letter-spacing: .2px;
+    top: 0;
+    position: relative;
+    width: fit-content;
+    display: flex;
+}
+.top_part_status .dropdown .dropdown-menu.show .dropdown-item:first-child {
+    border-top-left-radius: 0.25rem;
+    border-top-right-radius: 0.25rem;
+}
+.top_part_status .dropdown .dropdown-menu.show .dropdown-item:hover {
+    background: #2e1153;
+    color: #fff !important;
+}
 </style>
 @stack('css')
     </head>