From 6243e4f6b9e5b3f091a16f32e6463c1af6352e93 Mon Sep 17 00:00:00 2001
From: tribikram <tribikram@extratechs.com.au>
Date: Wed, 15 Feb 2023 17:30:09 +0545
Subject: [PATCH 1/2] [edit] client side validation WIP

---
 public/frontend/css/style.css          |  8 ++++++-
 resources/views/enquiry-form.blade.php | 31 +++++++++++++++++++-------
 resources/views/layout/app.blade.php   |  2 +-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/public/frontend/css/style.css b/public/frontend/css/style.css
index 6478676..71a1486 100644
--- a/public/frontend/css/style.css
+++ b/public/frontend/css/style.css
@@ -248,7 +248,7 @@ Responsive Codes
 .top-links{
     display: flex;
     align-items: center;
-    gap: 0.8rem;
+    gap: 1.8rem;
     color: #000000;
     margin-right: 0;
 }
@@ -1715,6 +1715,12 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     letter-spacing: 0.005em;
     color: #326CBF;
 }
+#married{
+    display: none;
+}
+.married{
+    display: block !important;
+}
 /* enquiry page css ends */
 
 /* Footer Css */
diff --git a/resources/views/enquiry-form.blade.php b/resources/views/enquiry-form.blade.php
index d72b24e..55b9c9f 100644
--- a/resources/views/enquiry-form.blade.php
+++ b/resources/views/enquiry-form.blade.php
@@ -88,7 +88,7 @@
                     </div>
                 </div>
 
-                <h3>Addidional Information</h3>
+                <h3>Additional Information</h3>
                 <div class="col-md-4">
                     <div class="form-group mb-3">
                         <label for="name">Highest Qualification</label>
@@ -148,19 +148,19 @@
                         <label for="name">Marital Status</label>
                         <div class="d-flex gap-2 mt-2" onclick="maritalStatus()">
                             <div class="form-check">
-                                <input class="form-check-input marital-status" type="radio" name="marital-status" value="Male"/>
+                                <input class="form-check-input marital-status" id="marital-status" type="radio" name="marital-status" value="Single"/>
                                 <label class="form-check-label">
                                     Single
                                 </label>
                             </div>
                             <div class="form-check">
-                                <input class="form-check-input marital-status" type="radio" name="marital-status" value="Female"/>
+                                <input class="form-check-input marital-status" id="marital-status" type="radio" name="marital-status" value="Married"/>
                                 <label class="form-check-label">
                                     Married
                                 </label>
                             </div>
                             <div class="form-check">
-                                <input class="form-check-input marital-status" type="radio" name="marital-status" value="Other"/>
+                                <input class="form-check-input marital-status" id="marital-status" type="radio" name="marital-status" value="Widow"/>
                                 <label class="form-check-label">
                                     Widow
                                 </label>
@@ -168,25 +168,25 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4" id="married">
                     <div class="form-group mb-3">
                         <label for="name">Married date: (Only if Married if not Leave it bank)</label>
                         <input type="date" class="form-control mt-2" id="married-date" name="married-date">
                     </div>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4" id="married">
                     <div class="form-group mb-3">
                         <label for="name">Spouse Academics</label>
                         <input type="text" class="form-control mt-2" id="spouse-academics" name="spouse-academics" placeholder="Enter your Spouse Academics">
                     </div>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4" id="married">
                     <div class="form-group mb-3">
                         <label for="name">Work Experience of Spouse</label>
                         <input type="text" class="form-control mt-2" id="spouse-work-experience" name="spouse-work-experience" placeholder="Enter Work Experience of Spouse">
                     </div>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4" id="married">
                     <div class="form-group mb-3">
                         <label for="name">Spouse Salary Mode</label>
                         <input type="text" class="form-control mt-2" id="spouse-salary-mode" name="spouse-salary-mode" placeholder="Enter Spouse Salary Mode">
@@ -216,4 +216,19 @@
             </div>
         </form>
     </section>
+@endsection
+@section('script')
+    <script>
+        function maritalStatus(){
+            var maritalStatus = document.getElementsByClassName('marital-status');
+            var marriedInput = document.getElementById('married');
+            for(var i=0;i<maritalStatus.length;i++){
+            if(maritalStatus[i].value == 'Married'){
+                    marriedInput.classList.add('married');
+
+            }
+            console.log(maritalStatus[i].value)
+            }
+        }
+    </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php
index 09f7e74..828a1c5 100644
--- a/resources/views/layout/app.blade.php
+++ b/resources/views/layout/app.blade.php
@@ -62,7 +62,7 @@
     </div>
     <div class="social-links d-none d-md-flex align-items-center">
         <div class="top-links">
-            <a href="/enquiry" target="_blank">Enquiry</a>
+            <a href="/enquiry">Enquiry</a>
             <h2>Find us on</h2>
         </div>
         <div class="top-socials">
-- 
2.25.1


From 310764ce277ffab6b05a4e7c604570320a6a5cf0 Mon Sep 17 00:00:00 2001
From: tribikram <tribikram@extratechs.com.au>
Date: Thu, 16 Feb 2023 11:37:47 +0545
Subject: [PATCH 2/2] [edit] enquiry form

---
 app/Models/Country.php                        | 11 +++
 ...23_02_16_164059_create_countries_table.php | 31 +++++++
 public/frontend/css/style.css                 | 31 ++++++-
 resources/views/enquiry-form.blade.php        | 91 +++++++++++++++----
 routes/web.php                                |  4 +-
 5 files changed, 143 insertions(+), 25 deletions(-)
 create mode 100644 app/Models/Country.php
 create mode 100644 database/migrations/2023_02_16_164059_create_countries_table.php

diff --git a/app/Models/Country.php b/app/Models/Country.php
new file mode 100644
index 0000000..fc698f5
--- /dev/null
+++ b/app/Models/Country.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Country extends Model
+{
+    use HasFactory;
+}
diff --git a/database/migrations/2023_02_16_164059_create_countries_table.php b/database/migrations/2023_02_16_164059_create_countries_table.php
new file mode 100644
index 0000000..e8acb86
--- /dev/null
+++ b/database/migrations/2023_02_16_164059_create_countries_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('countries', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('countries');
+    }
+};
diff --git a/public/frontend/css/style.css b/public/frontend/css/style.css
index 71a1486..4f25b76 100644
--- a/public/frontend/css/style.css
+++ b/public/frontend/css/style.css
@@ -1692,18 +1692,26 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     border-radius: 6px;
     margin-top: 35px;
 }
+.enquiry-from-btn:hover{
+    background-color: #E32394;
+    transition: background-color 1s ease-out 100ms;
+}
+.form-select .select-placeholder{
+    color: #7B8792;
+}
 .enquiry-form-row h3{
     font-weight: 600;
-    color: #E22899;
-    margin: 20px 0;
+    color: #212529;
+    margin: 10px 0;
     text-align: center;
+    font-size: 24px;
     letter-spacing: 0.001em;
     display: inline-block ;
 }
 .enquiry-form-row h3::after{
     content: '';
-    border-bottom: 5px solid #E22899;
-    margin: 1% 40%;
+    border-bottom: 2px solid #212529;
+    margin: 0.5% 45%;
     justify-content: center;
     display: block;
 }
@@ -1714,13 +1722,26 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     line-height: 48px;
     letter-spacing: 0.005em;
     color: #326CBF;
+} 
+.enquiry-form-section p{
+    text-align: center;
 }
-#married{
+#spouse-married-date,
+#spouse-academic,
+#spouse-experience,
+#spouse-salary,
+#work-exp-detail,
+#work-salary-mode{
     display: none;
 }
 .married{
     display: block !important;
 }
+.enquiry-form-section .form-control:focus,
+.enquiry-form-section .form-select:focus{
+    box-shadow: none;
+    border-color: none;
+}
 /* enquiry page css ends */
 
 /* Footer Css */
diff --git a/resources/views/enquiry-form.blade.php b/resources/views/enquiry-form.blade.php
index 55b9c9f..3328699 100644
--- a/resources/views/enquiry-form.blade.php
+++ b/resources/views/enquiry-form.blade.php
@@ -10,7 +10,8 @@
 @endsection
 @section('content')
     <section class="enquiry-form-section">
-        <h2>Can you please send me fill up this information sheet and we will get back to you soon, Thanks !</h2>
+        <h2>Enquiry Form</h2>
+        <p>Please fill up the form and we will get back to you soon, Thanks !</p>
         <form action="">
             <div class="row enquiry-form-row">
                 <h3>Personal Details</h3>
@@ -23,7 +24,7 @@
                 <div class="col-md-4">
                     <div class="form-group mb-3">
                         <label for="name">Middle Name</label>
-                        <input type="text" class="form-control mt-2" id="mname" name="mname" placeholder="Enter your Middle name" required>
+                        <input type="text" class="form-control mt-2" id="mname" name="mname" placeholder="Enter your Middle name">
                     </div>
                 </div>
                 <div class="col-md-4">
@@ -41,7 +42,12 @@
                 <div class="col-md-4">
                     <div class="form-group mb-3">
                         <label for="name">Country</label>
-                        <input type="text" class="form-control mt-2" id="country" name="country" placeholder="Enter your Country Name" required>
+                        <select class="form-select mt-2" name="cob" id="e-cob" onchange="eCob()">
+                            <option value="" hidden>Select you country of birth</option>
+                            @foreach($countries as $country)
+                                <option value="{{$country->id}}" @if(old('country_id') === $country->id) selected @endif>{{$country->name}}</option>
+                            @endforeach
+                        </select>
                     </div>
                 </div>
                 <div class="col-md-4">
@@ -78,7 +84,7 @@
                 <div class="col-md-4">
                     <div class="form-group mb-3">
                         <label for="name">Email</label>
-                        <input type="text" class="form-control mt-2" id="email" name="email" placeholder="Enter your Email Address" required>
+                        <input type="email" class="form-control mt-2" id="email" name="email" placeholder="Enter your Email Address" required>
                     </div>
                 </div>
                 <div class="col-md-4">
@@ -88,7 +94,7 @@
                     </div>
                 </div>
 
-                <h3>Additional Information</h3>
+                <h3 class="mt-5">Additional Information</h3>
                 <div class="col-md-4">
                     <div class="form-group mb-3">
                         <label for="name">Highest Qualification</label>
@@ -127,11 +133,21 @@
                 </div>
                 <div class="col-md-4">
                     <div class="form-group mb-3">
-                        <label for="name">Work experience Details ( If any )</label>
+                        <label for="name">Do you have work experience?</label>
+                        <select class="form-select mt-2" name="work-experience" id="work-experience" onchange="wExperience()">
+                            <option value="" hidden>Work experence status</option>
+                            <option value="yes">Yes</option>
+                            <option value="no">No</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-md-4" id="work-exp-detail">
+                    <div class="form-group mb-3">
+                        <label for="name">Work experience Details</label>
                         <input type="text" class="form-control mt-2" id="work-experience" name="work-experience" placeholder="Enter your Work experience Details">
                     </div>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4" id="work-salary-mode">
                     <div class="form-group mb-3">
                         <label for="name">Salary mode</label>
                         <input type="text" class="form-control mt-2" id="salary-mode" name="salary-mode" placeholder="Enter your Salary Mode">
@@ -166,27 +182,28 @@
                                 </label>
                             </div>
                         </div>
+                        <span class='error' id="error-gender"></span>
                     </div>
                 </div>
-                <div class="col-md-4" id="married">
+                <div class="col-md-4" id="spouse-married-date">
                     <div class="form-group mb-3">
-                        <label for="name">Married date: (Only if Married if not Leave it bank)</label>
+                        <label for="name">Married date</label>
                         <input type="date" class="form-control mt-2" id="married-date" name="married-date">
                     </div>
                 </div>
-                <div class="col-md-4" id="married">
+                <div class="col-md-4" id="spouse-academic">
                     <div class="form-group mb-3">
                         <label for="name">Spouse Academics</label>
                         <input type="text" class="form-control mt-2" id="spouse-academics" name="spouse-academics" placeholder="Enter your Spouse Academics">
                     </div>
                 </div>
-                <div class="col-md-4" id="married">
+                <div class="col-md-4" id="spouse-experience">
                     <div class="form-group mb-3">
                         <label for="name">Work Experience of Spouse</label>
                         <input type="text" class="form-control mt-2" id="spouse-work-experience" name="spouse-work-experience" placeholder="Enter Work Experience of Spouse">
                     </div>
                 </div>
-                <div class="col-md-4" id="married">
+                <div class="col-md-4" id="spouse-salary">
                     <div class="form-group mb-3">
                         <label for="name">Spouse Salary Mode</label>
                         <input type="text" class="form-control mt-2" id="spouse-salary-mode" name="spouse-salary-mode" placeholder="Enter Spouse Salary Mode">
@@ -207,7 +224,13 @@
                 <div class="col-md-4">
                     <div class="form-group mb-3">
                         <label for="name">Desired location (If Any)</label>
-                        <input type="text" class="form-control mt-2" id="desired-location" name="desired-location" placeholder="Enter your Desired location">
+                        <select class="form-select mt-2" name="desired-location" id="desired-location">
+                            <option value="" hidden class="select-placeholder">Select your desired location</option>
+                            <option value="au">Australia</option>
+                            <option value="nz">New Zeland</option>
+                            <option value="ca">Canada</option>
+                            <option value="us">USA</option>
+                        </select>
                     </div>
                 </div>
                 <div class="col-md-12 text-center">
@@ -220,14 +243,44 @@
 @section('script')
     <script>
         function maritalStatus(){
-            var maritalStatus = document.getElementsByClassName('marital-status');
-            var marriedInput = document.getElementById('married');
-            for(var i=0;i<maritalStatus.length;i++){
-            if(maritalStatus[i].value == 'Married'){
-                    marriedInput.classList.add('married');
+            var marriedDate = document.getElementById('spouse-married-date');
+            var spouseAcademic = document.getElementById('spouse-academic');
+            var spouseExperience = document.getElementById('spouse-experience');
+            var spouseSalary = document.getElementById('spouse-salary');
+            var maritalStatus = document.getElementsByClassName("marital-status");
 
+            for(var i=0;i<maritalStatus.length;i++){
+                if(maritalStatus[i].checked){
+                    valid = true;
+                    break;
+                }
+            }
+            if(maritalStatus[i].value == "Married"){
+                marriedDate.classList.add('married');
+                spouseAcademic.classList.add('married');
+                spouseExperience.classList.add('married');
+                spouseSalary.classList.add('married');
+            }else{
+                marriedDate.classList.remove('married');
+                spouseAcademic.classList.remove('married');
+                spouseExperience.classList.remove('married');
+                spouseSalary.classList.remove('married');
             }
-            console.log(maritalStatus[i].value)
+        }
+
+        function wExperience(){
+            workExperience = document.getElementById('work-experience').value;
+            workDetail = document.getElementById('work-exp-detail');
+            salaryMode = document.getElementById('work-salary-mode');
+            if(workExperience.length == 0){
+                $('#work-experience').focus();
+                return false;
+            }if(workExperience == "yes"){
+                workDetail.classList.add('married');
+                salaryMode.classList.add('married');
+            }else{
+                workDetail.classList.remove('married');
+                salaryMode.classList.remove('married');
             }
         }
     </script>
diff --git a/routes/web.php b/routes/web.php
index 7c39686..3ca0dd0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -39,6 +39,7 @@ use App\Http\Controllers\Admin\SeoTitleController;
 use App\Http\Controllers\Admin\VisaServiceController;
 use App\Http\Controllers\Admin\FaqController;
 use App\Http\Controllers\Admin\VisaServiceSectionController;
+use App\Models\Country;
 
 use App\Http\Controllers\Admin\TeamController;
 use App\Http\Controllers\Admin\AppointmentController;
@@ -302,7 +303,8 @@ Route::get('/insurance', function () {
     return view('insurance');
 });
 Route::get('/enquiry', function () {
-    return view('enquiry-form');
+    $countries = Country::all();
+    return view('enquiry-form', compact('countries'));
 });
 // Route::get('/visa', function () {
 //     return view('visa');
-- 
2.25.1