Israat Zarin 1 rok pred
rodič
commit
40be2e1f50

+ 98 - 95
resources/views/Q_apply_form.blade.php

@@ -130,110 +130,113 @@
             </div>
         </div>
     </div>
-        <section class="cover-user">
-            <div class="container px-0">
-                <div class="row g-0 position-relative">
-                    <div class="col-lg-2"></div>
-                    <div class="col-lg-8 cover-my-30 ">
-                        <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;">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                        <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>
-                                                            <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>
+    <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>
+                                    </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>
+                            </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>
+                            </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>
+                        </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><!--end col-->
 
-                                                            </div>
+                                                    <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>
-                                                <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><!--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>
-                                                    <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><!--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>
-                                                </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>
+                                                    </div><!--end col-->
                                                 </div>
-                                                <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><!--end col-->
-
-                                                        <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 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 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>
-                                                <p class="mb-2 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                                             </div>
+                                            <p class="mb-2 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                                         </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><!--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-->
         <!-- javascript -->
         <script src="{{asset('web/js/bootstrap.bundle.min.js')}}"></script>
         <!-- tobii js -->

+ 11 - 7
resources/views/home.blade.php

@@ -3,17 +3,21 @@
         <section class="bg-half-170 d-table w-100" style="background-color: #efefef; height: 100vh;">
             <div class="container mt-5 pt-4" style="padding: 10px 20px 0px 20px;">
                 <div class="col-md-12">
-                    <div class="card p-2 rounded border-0" style="background-color: #16183f1c; color: #141639c4;">
-                        <div class="col-md-12">
-                            <div class="container">
-                                <div class="row mt-2">
+                    <div class="card p-2 rounded border-0" style="background-color: #ffffff; color: #141639c4;">
+                            <div class="col-md-12">
+                                <div class="row p-2 mb-1">
                                     <h6 style="font-weight:bold !important;">There are two methods for submitting your proposal :</h6>
-                                    <p style="font-size: 13px;"><strong>Method 1:</strong> Contact your supervisor and request their Account Reference Number (ARN). With this number, you can search for the supervisor's account and submit your proposal.</p>
-                                    <p style="font-size: 13px;"><strong>Method 2:</strong> Request your supervisor to invite you through Q apply. Once you receive the email invitation, click on the link provided in the email. This will automatically link your application with the supervisor's account, and you only need to click the Submit button</p>
+                                    <div class="col-md-5 mt-3 ms-3 method-box">
+                                        <h6 class="method"> Option 1:</h6>
+                                        <p style="font-size: 13px;"> Contact your supervisor and request their Account Reference Number (ARN). With this number, you can search for the supervisor's account and submit your proposal.</p>
+                                    </div>
+                                    <div class="col-md-5 mt-3 ms-3 method-box">
+                                        <h6 class="method"> Option 2:</h6>
+                                        <p style="font-size: 13px;">Request your supervisor to invite you through Q apply. Once you receive the email invitation, click on the link provided in the email. This will automatically link your application with the supervisor's account, and you only need to click the Submit button.</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
                     <div class="row">
                         <div class="col-md-8 mt-4">
                             <div class="card p-3 rounded border-0" style="background-color: white; height: 350px;">

+ 14 - 9
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -14,17 +14,22 @@
                         @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">
                         @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>
+                            @if(isset($teacher->department_name))
+                                <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
+                            @else
+                                <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
+                            @endif
+                            <span> . </span>
+                            <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'university.name','')}}</span>
+                        </div>
                     </div>
-                         <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
                     
-                    <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
-                    @if(isset($teacher->department_name))
-                        <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
-                    @else
-                        <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
-                    @endif
-                    <span>.</span>
-                    <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'university.name','')}}</span>
                 </div>
             </div>
         </div>

+ 3 - 3
resources/views/modal_pages/view_apply_proposal.blade.php

@@ -42,9 +42,9 @@
                                 <div class="pro_title mb-2 mt-3" style="width: 69%;">
                                     <div style="margin-top: -11px; display: block; font-size: 10px;">
                                         <span style="font-weight:400;">{{cn($std_proposal,'proposal.methology','')}}</span>
-                                        <span>.</span>
+                                        <span> . </span>
                                         <span style="font-weight:400;">{{cn($std_proposal,'proposal.department.name','')}}</span> 
-                                        <span>.</span>  
+                                        <span> . </span>  
                                         <span style="font-weight:400;">{{cn($std_proposal,'proposal.status','')}}</span> 
                                     </div>                                             
                                 </div>
@@ -61,7 +61,7 @@
                 <div class="col-md-5">
                     <div class="p-2 ms-2"> 
                         <div class="form-icon position-relative ms-1" style="font-size: 11px;">
-                            Start Date : <strong style="font-weight: bolder;">{{date("M", mktime(0, 0, 0, $std_proposal->start_month, 10))}} {{ $std_proposal->start_year}}</strong>
+                            Preferred Start Date : <strong style="font-weight: bolder;">{{date("M", mktime(0, 0, 0, $std_proposal->start_month, 10))}} {{ $std_proposal->start_year}}</strong>
                         </div>
                     </div>
                 </div>

+ 1 - 7
resources/views/teacher_profile.blade.php

@@ -36,10 +36,6 @@
         <!-- Main Css -->
         <link href="{{asset('web/css/style.css')}}" rel="stylesheet" type="text/css" id="theme-opt" />
         <link href="{{asset('web/css/colors/default.css')}}" rel="stylesheet" id="color-opt">
-        <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=Ubuntu:wght@700&display=swap" rel="stylesheet">
@@ -326,8 +322,6 @@ tbody, td, tfoot, th, thead, tr {
     color: #fff;
     padding-left: 9px;
     border-radius: 5px;
-    margin-top: -11px; 
-    font-size: 14px !important;
 }
 .method-box{
     width: 31.5%; 
@@ -372,7 +366,7 @@ tbody, td, tfoot, th, thead, tr {
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
                                     <li class="nav-item dropdown dropdown-notification">
                                         <a href="javascript:void(0)" class="open_modal_page" data-url="{{route('modal-get',['name'=>'add_wishlist'])}}" data-title="Wishlist">
-                                        <button class="btn btn2" style="padding: 6px 10px !important;">New lead</button>
+                                        <button class="btn btn2" style="padding: 6px 10px !important;">New Invite</button>
                                         </a>
                                     </li>
                                 </ul>

+ 15 - 7
resources/views/web/layouts/top.blade.php

@@ -34,13 +34,6 @@
         <!-- Main Css -->
         <link href="{{asset('web/css/style.css')}}" rel="stylesheet" type="text/css" id="theme-opt" />
         <link href="{{asset('web/css/colors/default.css')}}" rel="stylesheet" id="color-opt">
-        <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">
         <link rel="stylesheet" href="{{asset('web/css/datepicker.min.css')}}">
         <link rel="stylesheet" href="{{asset('web/css/sweetalert/sweetalert.css')}}">
         <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
@@ -674,6 +667,21 @@ element.style {
     color:white;
     border-radius: 0px !important
 }
+.method{
+    background-color: #2c2d4d;
+    margin-top: -11px;
+    width: 16%;
+    font-size: 14px !important;
+    color: #fff;
+    padding-left: 9px;
+    border-radius: 5px;
+    font-weight: bolder;
+}
+.method-box{
+    width: 47.8%;
+    background-color: #eee; 
+    border-radius: 5px;
+}
 </style>
 @stack('css')
     </head>