Israat Zarin 2 years ago
parent
commit
deb78b8e27

BIN
public/uploads/proposal/1679318569documentfile_.docx


BIN
public/uploads/proposal/1679318947documentfile_.pdf


+ 2 - 2
resources/views/home.blade.php

@@ -16,7 +16,7 @@
                     </div>
                     <div class="row">
                         <div class="col-md-8 mt-4">
-                            <div class="card p-3 rounded border-0" style="background-color: white;">
+                            <div class="card p-3 rounded border-0" style="background-color: white; height: 329px;">
                                 <div class="col-md-12">
                                     <div class="container-fluid" style="padding:0px !important;">
                                         <div class="row">
@@ -123,7 +123,7 @@
                                                             @endif
                                                         </td>
                                                         <td style="font-size: 11px;">{{date('d M Y', strtotime($row->created_at))}}</td> 
-                                                        <td style="text-align:center; font-size: 11px;">Applied</td>
+                                                        <td style="text-align:center; font-size: 11px;"><span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">Applied</span></td>
                                                         <td style="text-align:center; font-size: 11px;">
                                                            <span class="open_modal_page hand" data-url="{{route('modal-get',['name'=>'view_apply_proposal','id'=>$row->id])}}"><i class="fa fa-eye"></i></span> 
                                                         </td>

+ 7 - 7
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -17,16 +17,16 @@
             </div>
         </div>
 
-        <div class="middle" style="background-color:white; border-radius:6px;">
-            <p class="mb-3" style="font-size: 16px; font-weight: bold;">Please select which proposal you want to send</p>
-            <div class="alert mb-3 propose" style="padding: 0px;">
+        <div class="middle p-3" style="background-color:white; border-radius:6px;">
+            <p style="font-size: 16px; font-weight: bold; margin-bottom: 0px !important;">Please select which proposal you want to send</p>
+            <div class="alert mb-3 propose" style="padding: 0px; margin-bottom: 0px">
                 <div style="width:100%;">
                     @foreach($proposal as $row)
-                    <div class="p-2" style="border-top: 2px solid #eee;">
+                    <div class="p-2" style="border-bottom: 2px solid #eee;">
                         <div class="custom-control custom-radio custom-control-inline">
                             <div class="form-check mb-0">
                                 <input class="form-check-input" type="radio" name="proposal_id" value="{{$row->id}}" id="flexRadioDefault1">
-                                <label class="form-check-label" for="flexRadioDefault1">({{ $row->proposal_ref}})-{{$row->title}}</label>
+                                <label class="form-check-label" for="flexRadioDefault1" style="font-weight: 400 !important;">({{ $row->proposal_ref}})-{{$row->title}}</label>
                             </div>
                         </div>
                     </div>
@@ -36,8 +36,8 @@
             </div> 
         </div>
     </div>
-    <div class="container">
-        <div class="col-md-12" style="background-color:white; border-radius:6px;">
+    <div class="container mt-3">
+        <div class="col-md-12 p-3" style="background-color:white; border-radius:6px;">
             <p style="margin:0px; font-size: 16px; font-weight: bold;">Select propose start date</p>
             <div class="row">
                 <div class="col-md-6">

+ 43 - 14
resources/views/modal_pages/view_apply_proposal.blade.php

@@ -2,7 +2,7 @@
 
 @section('main')
  
-    <div class="container mt-3">
+    <div class="container mt-2">
         <div class="col-md-12">
             <div class="alert p-3" style="background-color:white;"> 
                 <span style="margin: 0px;">{{cn($std_proposal,'teacher_details.first_name','')}} {{cn($std_proposal,'teacher_details.last_name','')}}</span></br>
@@ -13,30 +13,59 @@
             </div>
         </div>
 
-        <div class="middle p-3" style="background-color:white; border-radius:6px;">
-            <p class="mb-3" style="font-size:14px;">Please select which proposal you want to send</p>
-            <div class="alert mt-1 mb-3 propose" style="padding: 0px;">
+        <div class="middle" style="background-color:white; border-radius:6px;">
+            <!-- <p class="mb-3" style="font-size:14px;">Please select which proposal you want to send</p> -->
+            <div class="alert mb-3 propose" style="padding: 0px; margin-bottom: 0px !important;">
                 <div style="width:100%;">
-                    
-                    <div class="mt-2 p-2" style="border-bottom:2px solid #eee;">
+                    <div class="mt-2 p-2">
                         <div class="custom-control custom-radio custom-control-inline">
-                            <div class="form-check mb-0"> 
-                                <label class="form-check-label" for="flexRadioDefault1">({{cn($std_proposal,'proposal.proposal_ref','')}})-{{cn($std_proposal,'proposal.title','')}}</label>
+                            <div class="form-check mb-0" style="padding-left: 0 !important;"> 
+                                <label class="form-check-label" for="flexRadioDefault1" style="font-size: 13px; font-weight: 400;">({{cn($std_proposal,'proposal.proposal_ref','')}}) - {{cn($std_proposal,'proposal.title','')}}</label>
                             </div>
                         </div>
                     </div>
-                  
-                   
                 </div>
             </div> 
         </div>
     </div>
-    <div class="container mt-4">
-        <div class="col-md-12 p-3" style="background-color:white; border-radius:6px;"> 
+    <div class="container">
+        <div class="col-md-12 mt-3" style="background-color:white; border-radius:6px;"> 
             <div class="row">
                 <div class="col-md-6">
-                    <div class="mb-1"> 
-                        <div class="form-icon position-relative">
+                    <div class="p-2"> 
+                        <div class="form-icon position-relative ms-1" style="font-size: 14px;">
+                            <div class="left mb-2">
+                                <div>
+                                    <div class="single_glance_row mt-1">
+                                        <span class="title" style="font-size:11px; font-weight: 600;">Methology :</span>
+                                        <span class="tbl2 ms-2">
+                                            Quantitative
+                                        </span>
+                                    </div>
+                                    <div class="single_glance_row">
+                                        <span class="title" style="font-size:11px; font-weight: 600;">Department :</span>
+                                        <span class="ms-2" style="font-size: 11px; color: #868e96;">math</span>
+                                    </div>
+                                    <div class="single_glance_row mt-1" style="display: flex;">
+                                        <span class="title" style="font-size:11px; font-weight: 600;">Application Status :</span>
+                                        <span class="ms-2" style="font-size: 11px; color: #868e96;">
+                                           21 Mar 2023
+                                        </span>
+                                    </div>                                       
+                                </div>
+                            </div> 
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div> 
+    </div>
+    <div class="container mb-2">
+        <div class="col-md-12 mt-3" style="background-color:white; border-radius:6px;"> 
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="p-2"> 
+                        <div class="form-icon position-relative ms-1" style="font-size: 13px;">
                             Start Year : {{date("M", mktime(0, 0, 0, $std_proposal->start_month, 10))}} {{ $std_proposal->start_year}}
                         </div>
                     </div>

+ 25 - 25
resources/views/teacher_profile.blade.php

@@ -552,17 +552,17 @@ tbody, td, tfoot, th, thead, tr {
                                             </td>
                                             <td style="font-size: 11px; text-align:center;">
                                                 <div style="font-size: 11px; display:block;">
-                                                    @php
+                                                    {{-- @php
                                                         $to = \Carbon\Carbon::parse($row->work_experience->end_date); 
                                                         $from = \Carbon\Carbon::parse($row->work_experience->start_date); 
                                                         $years = $to->diffInYears($from);
-                                                    @endphp
-                                                    <span class="label_badge_work">@if($years) {{$years}} years @endif</span>
+                                                    @endphp --}}
+                                                    {{-- <span class="label_badge_work">@if($years) {{$years}} years @endif</span> --}}
                                                 </div>
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    @if(empty($row->work_experience->end_date))
+                                                    {{-- @if(empty($row->work_experience->end_date))
                                                     <span>{{date('M Y', strtotime($row->work_experience->start_date))}} - continue</span>
-                                                    @endif
+                                                    @endif --}}
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px;">
@@ -826,28 +826,28 @@ tbody, td, tfoot, th, thead, tr {
                             <div class="col-md-3 bg-white rounded p-2 ms-4">
                                 <div class="row">
                                     <div class="col-md-10">
-                                                <h6 style="padding: 13px 10px 0px;">Subscription</h6>
+                                            <h6 style="padding: 13px 10px 0px;">Subscription</h6>
                                         <div class="left mb-2">
-                                                <div>
-                                                    <div class="single_glance_row mt-5">
-                                                        <span class="title" style="font-size:11px; font-weight: 600;">Joined :</span>
-                                                        <span class="tbl2 mb-2 ms-2">
-                                                            16 Mar 2023
-                                                        </span>
-                                                    </div>
-                                                    <div class="single_glance_row mt-1">
-                                                        <span class="title" style="font-size:11px; font-weight: 600;">Referred :</span>
-                                                        <span class="ms-2" style="font-size: 11px; color: #868e96;">10</span>
-                                                    </div>
-                                                    <div class="single_glance_row mt-1" style="display: flex;">
-                                                        <span class="title" style="font-size:11px; font-weight: 600;">Account Type :</span>
-                                                        <span class="label_badge_radius mb-1 ms-2" style="background: #d8fdd8; color: green;">
-                                                            Premium
-                                                        </span>
-                                                    </div>                                       
+                                            <div>
+                                                <div class="single_glance_row mt-5">
+                                                    <span class="title" style="font-size:11px; font-weight: 600;">Joined :</span>
+                                                    <span class="tbl2 mb-2 ms-2">
+                                                        16 Mar 2023
+                                                    </span>
                                                 </div>
-                                            </div> 
-                                        </div>
+                                                <div class="single_glance_row mt-1">
+                                                    <span class="title" style="font-size:11px; font-weight: 600;">Referred :</span>
+                                                    <span class="ms-2" style="font-size: 11px; color: #868e96;">10</span>
+                                                </div>
+                                                <div class="single_glance_row mt-1" style="display: flex;">
+                                                    <span class="title" style="font-size:11px; font-weight: 600;">Account Type :</span>
+                                                    <span class="label_badge_radius mb-1 ms-2" style="background: #d8fdd8; color: green;">
+                                                        Premium
+                                                    </span>
+                                                </div>                                       
+                                            </div>
+                                        </div> 
+                                    </div>
                                  </div>
                             </div><!--end col-->
                         </div>

+ 1 - 1
resources/views/web/layouts/modal.blade.php

@@ -6,7 +6,7 @@
               <h6 class="modal-title" id="exampleModalLabel" style="font-weight: bold !important; margin-left: 10px;"></h6>
               <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
           </div>
-          <div class="modal-body"></div>
+          <div class="modal-body" style="background-color: #8492a33d !important;"></div>
           
       </div>
   </div>

+ 0 - 1
resources/views/web/layouts/top.blade.php

@@ -604,7 +604,6 @@ element.style {
     margin-top: 5.5px;
 }
 .alert{
-    border: 2px solid #e9f0f3 !important; 
     width: 100%; 
     display: -webkit-inline-box;  
     font-size: 12px !important;