From c08a99aaa63a36da5587a58ad5a105320b3abbef Mon Sep 17 00:00:00 2001 From: tribikram Date: Fri, 17 Feb 2023 13:39:11 +0545 Subject: [PATCH 1/2] [edit] enquiry view table --- public/admin/css/custom-admin.css | 34 ++- resources/views/admin/enquiry/show.blade.php | 251 ++++++++++--------- resources/views/admin/index.blade.php | 2 +- resources/views/admin/layouts/app.blade.php | 49 ++-- 4 files changed, 168 insertions(+), 168 deletions(-) diff --git a/public/admin/css/custom-admin.css b/public/admin/css/custom-admin.css index 7ccad62..a13bfdf 100755 --- a/public/admin/css/custom-admin.css +++ b/public/admin/css/custom-admin.css @@ -1,5 +1,5 @@ .sb{ - background: #13a64f; + background: #326cbf; padding-bottom: 50px; } .sidebar-dark-primary .nav-sidebar>.nav-item>.nav-link.active{ @@ -28,7 +28,7 @@ margin-top: 10px; } .main-header{ - background: #13a64f; + background: #326cbf; } .nav-link i{ color:#fff; @@ -206,10 +206,7 @@ svg{ .create-button{ margin-top:10px; } -.create-button .col-md-12{ - /* display:flex; - justify-content:center; */ -} + .create-button .col-md-12 button{ padding:10px 50px; } @@ -265,11 +262,6 @@ svg{ background: none; } - - -.table-search{ - /* width: fit-content; */ -} .search-form .table-search input{ /* margin-right: 10px; */ border-radius: 5px!important; @@ -277,7 +269,6 @@ svg{ .ds-input:focus{ border-color: #1850b7; } - /* new edit */ .table td{ @@ -320,9 +311,6 @@ svg{ background: none; border:none; color:#fff; -} -.dropdown-menubar .dropdown-menu[data-bs-popper]{ - } .dropdown-menubar button:active{ background-color: none; @@ -362,13 +350,13 @@ svg{ } .btn-green{ color:#fff; - background: #13a64f; - border-color:#13a64f; + background: #326cbf; + border-color:#326cbf; } .btn-green:hover{ color:#fff; - background: #ea8937; - border-color:#ea8937; + background: #D933A2; + border-color:#D933A2; } .card-header{ padding: 1rem 1rem!important; @@ -453,7 +441,7 @@ p .font-medium{ font-weight: 700; font-size: 16px; color: #000; - width: 400px; + width: 300px; } .contact-info{ display: inline-block; @@ -485,3 +473,9 @@ p .font-medium{ font-size: 1rem; padding: 0.6rem 1rem; } +.contact-info h2{ + font-weight: bold; + font-size: 28px; + color: #326CBF; + margin-bottom: 1rem; +} diff --git a/resources/views/admin/enquiry/show.blade.php b/resources/views/admin/enquiry/show.blade.php index 01e72b9..f0c5ff8 100644 --- a/resources/views/admin/enquiry/show.blade.php +++ b/resources/views/admin/enquiry/show.blade.php @@ -24,130 +24,135 @@
@include('success.success') @include('errors.error') -

Personal Details

- -

Additional Details

- +
+ {!! Form::close() !!} diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 738c786..3745c0a 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -12,7 +12,7 @@
  1. Home
    2. -
  2. Agility Homecare Dashboard
    3. +
  3. ET Education | Visas Dashboard
diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php index 1e59817..7ccbfaa 100644 --- a/resources/views/admin/layouts/app.blade.php +++ b/resources/views/admin/layouts/app.blade.php @@ -6,32 +6,33 @@ ET-Education | Admin Dashboard + -{!! Html::style('admin/plugins/fontawesome-free/css/all.min.css') !!} - - {!! Html::style('admin/css/ionicons/2.0.1/css/ionicons.min.css') !!} - -{{-- --}} -{!! Html::style('admin/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css') !!} - - -{{-- --}} -{!! Html::style('admin/plugins/icheck-bootstrap/icheck-bootstrap.min.css') !!} - - -{{-- --}} -{!! Html::style('admin/plugins/jqvmap/jqvmap.min.css') !!} - -{{-- --}} -{!! Html::style('admin/dist/css/adminlte.min.css') !!} - -{{-- --}} -{!! Html::style('admin/plugins/overlayScrollbars/css/OverlayScrollbars.min.css') !!} - -{{-- --}} -{!! Html::style('admin/plugins/daterangepicker/daterangepicker.css') !!} - + {!! Html::style('admin/plugins/fontawesome-free/css/all.min.css') !!} + + {!! Html::style('admin/css/ionicons/2.0.1/css/ionicons.min.css') !!} + + {{-- --}} + {!! Html::style('admin/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css') !!} + + + {{-- --}} + {!! Html::style('admin/plugins/icheck-bootstrap/icheck-bootstrap.min.css') !!} + + + {{-- --}} + {!! Html::style('admin/plugins/jqvmap/jqvmap.min.css') !!} + + {{-- --}} + {!! Html::style('admin/dist/css/adminlte.min.css') !!} + + {{-- --}} + {!! Html::style('admin/plugins/overlayScrollbars/css/OverlayScrollbars.min.css') !!} + + {{-- --}} + {!! Html::style('admin/plugins/daterangepicker/daterangepicker.css') !!} + {{-- --}} {!! Html::style('admin/plugins/summernote/summernote-bs4.min.css') !!} {!! Html::style('admin/flatpickr/dist/flatpickr.min.css') !!} -- 2.25.1 From b229e57e65b8b1047a722f0688508f13298c0be0 Mon Sep 17 00:00:00 2001 From: tribikram Date: Fri, 17 Feb 2023 16:06:09 +0545 Subject: [PATCH 2/2] [add] hide btn on submit --- public/frontend/css/style.css | 111 +++++++++++++------------ resources/views/appointment.blade.php | 107 ++++++++++++++++++------ resources/views/enquiry-form.blade.php | 24 ++++-- 3 files changed, 154 insertions(+), 88 deletions(-) diff --git a/public/frontend/css/style.css b/public/frontend/css/style.css index bd020f1..3206300 100644 --- a/public/frontend/css/style.css +++ b/public/frontend/css/style.css @@ -140,7 +140,7 @@ h2{ opacity: 0; transform: translate3d(0, 30px, 0); } - + to { opacity: 1; transform: none; @@ -308,8 +308,8 @@ Responsive Codes margin-bottom: 3rem; } .slider-content p, -.slider-content h2, -.slideDown, +.slider-content h2, +.slideDown, .slideUp{ position: relative; opacity: 0; @@ -333,7 +333,7 @@ Responsive Codes font-weight: 900; font-family: "Font Awesome 5 Free"; position: absolute; - opacity: 0; + opacity: 0; top: 10px; right: -20px; transition: 0.5s; @@ -416,7 +416,7 @@ Responsive Codes font-size: 20px; line-height: 29px; text-align: center; - color: #326CBF; + color: #326CBF; margin-bottom: 0; } .high-visa, @@ -692,7 +692,7 @@ Responsive Codes .service-page-card{ background: #FFFFFF; box-shadow: 0px 4px 18px rgba(121, 121, 121, 0.05); - border-radius: 12px; + border-radius: 12px; transition: .4s; } .service-page-card{ @@ -764,7 +764,7 @@ Responsive Codes .mr-3 { margin-right: 30px; } - + .dinline { display: inline-block; } @@ -1355,7 +1355,7 @@ Responsive Codes color: #FFFFFF; text-decoration: none; background: #E22899; - border-radius: 5px; + border-radius: 5px; transition: .6s; } .featured-article a:hover, @@ -1732,7 +1732,7 @@ 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; } @@ -2000,6 +2000,9 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { .displayBtn{ display: block; } +.displayEnqBtn{ + display: inline-block; +} /* Footer Css */ /* mobile view css */ @media only screen and (min-width: 320px) and (max-width: 480px) { @@ -2008,8 +2011,8 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { line-height: 38px; } h2, - .featured-article h2, - .blog-detail-desc h2, + .featured-article h2, + .blog-detail-desc h2, .visa-content h3 { font-weight: 600; font-size: 22px; @@ -2062,7 +2065,7 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { } .services-content h1, .why-us-desc h1, - .testimonials-desc h1, + .testimonials-desc h1, .blog-header h1, .our-values-section h1, .studyabroad-banner-header h1, @@ -2077,18 +2080,18 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { .about-icons-section{ grid-template-columns: 1fr 1fr; } - .services-section, - .blog-section, - .study-australia-desc, - .study-sydney-section, - .study-melbourne-section, - .study-detail-section, - .scholarship-section, - .student-visa-section, - .about-header-section, - .why-et, - .student-visa-section, - .blogs-section, .why-et, + .services-section, + .blog-section, + .study-australia-desc, + .study-sydney-section, + .study-melbourne-section, + .study-detail-section, + .scholarship-section, + .student-visa-section, + .about-header-section, + .why-et, + .student-visa-section, + .blogs-section, .why-et, .faq-section, .why-us-section, .testimonials-section, @@ -2259,7 +2262,7 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { .why-us-img, .blog-header p, .lets-chat-section p, - .overseas-section p, + .overseas-section p, .why-et-header p, .about-banner-header p{ padding: 0; @@ -2268,19 +2271,19 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { .about-icons-section{ grid-template-columns: 1fr 1fr; } - .services-section, - .blog-section, - .study-australia-desc, - .study-sydney-section, - .study-melbourne-section, - .study-detail-section, - .scholarship-section, - .student-visa-section, - .about-header-section, - .why-et, - .student-visa-section, - .blogs-section, .why-et, - .blog-detail-section, + .services-section, + .blog-section, + .study-australia-desc, + .study-sydney-section, + .study-melbourne-section, + .study-detail-section, + .scholarship-section, + .student-visa-section, + .about-header-section, + .why-et, + .student-visa-section, + .blogs-section, .why-et, + .blog-detail-section, .faq-section, .why-us-section, .testimonials-section, @@ -2295,7 +2298,7 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { } .services-content h1, .why-us-desc h1, - .testimonials-desc h1, + .testimonials-desc h1, .blog-header h1{ font-size: 32px; line-height: 48px; @@ -2362,19 +2365,19 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { .about-icons-section{ grid-template-columns: 1fr 1fr; } - .services-section, - .blog-section, - .study-australia-desc, - .study-sydney-section, - .study-melbourne-section, - .study-detail-section, - .scholarship-section, - .student-visa-section, - .about-header-section, - .why-et, - .student-visa-section, - .blogs-section, .why-et, - .blog-detail-section, + .services-section, + .blog-section, + .study-australia-desc, + .study-sydney-section, + .study-melbourne-section, + .study-detail-section, + .scholarship-section, + .student-visa-section, + .about-header-section, + .why-et, + .student-visa-section, + .blogs-section, .why-et, + .blog-detail-section, .faq-section, .why-us-section, .testimonials-section, @@ -2418,7 +2421,7 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { .contact-form .row .col-md-8{ width: 100%; } - .overseas-section p, + .overseas-section p, .why-et-header p, .about-banner-header p, .lets-chat-section p{ @@ -2489,4 +2492,4 @@ table.lightgrey-weekends tbody td:nth-child(n+6) { .review-card{ min-height: 37pc; } -} \ No newline at end of file +} diff --git a/resources/views/appointment.blade.php b/resources/views/appointment.blade.php index c2755f7..d1023cf 100644 --- a/resources/views/appointment.blade.php +++ b/resources/views/appointment.blade.php @@ -81,15 +81,18 @@
- + +
- + +
- + +
@@ -99,7 +102,10 @@
- + +
@@ -241,28 +247,79 @@ } - function submitAppointment(event){ - event.preventDefault(); - $.ajax({ - url: "/appointment_submit", - type: "post", - data: $("form").serialize(), - success: function(response) { - $("#modal").modal("hide"); - // var isAmStart = response.appointment.start_time < '12:00:00'; - // var isAmEnd = response.appointment.end_time < '12:00:00'; - - Swal.fire({ - title: 'Booked!!', - text: 'Appointment Successfully Booked for '+response.appointment_detail['name']+' at '+response.formated_date +'('+response.appointment['start_time']+' - ' + response.appointment['end_time']+' )', - icon: 'success' - }).then(function(){ - location.reload(); - } - ) - } - }); + appNameError = document.getElementById('app-name-error'); + appEmailError = document.getElementById('app-email-error'); + appPhoneError = document.getElementById('app-phone-error'); + loaderenqBtn = document.getElementById('buttonenqload'); + appointmentBtn = document.getElementById('appointmentbtn'); + function validateAppName(){ + var appName = document.getElementById('app-name').value; + if(appName.length == 0){ + $('#name-email').focus(); + appNameError.innerHTML = "Name Field is required !"; + return false; + } + appNameError.innerHTML = ''; + return true; + } + function validateAppEmail(){ + var appEmail = document.getElementById('app-email').value; + if(appEmail.length == 0){ + $('#name-email').focus(); + appEmailError.innerHTML = "Email Field is required !"; + return false; + } + if(!appEmail.match(/^\w+([.-]?\w+)*@\w+([.-]?\w+)*(.\w{2,3})+$/)){ + appEmailError.innerHTML = "Invalid email address"; + return false; + } + appEmailError.innerHTML = ''; + return true; + } + + function validateAppPhone(){ + var appPhone = document.getElementById('app-phone').value; + if(appPhone.length == 0){ + $('#app-phone').focus(); + appPhoneError.innerHTML = "Phone Field is required !"; + return false; + } + if(!appPhone.match(/^\d{10}$/)){ + appPhoneError.innerHTML = "Invalid mobile number"; + return false; + } + appPhoneError.innerHTML = ''; + return true; + } + + function submitAppointment(){ + if(!validateAppName() || !validateAppEmail() || !validateAppPhone()){ + return false; + }else{ + loaderenqBtn.classList.add('displayBtn') + appointmentBtn.classList.add('buttonload') + $.ajax({ + url: "/appointment_submit", + type: "post", + data: $("form").serialize(), + success: function(response) { + $("#modal").modal("hide"); + // var isAmStart = response.appointment.start_time < '12:00:00'; + // var isAmEnd = response.appointment.end_time < '12:00:00'; + + loaderenqBtn.classList.remove('displayBtn'); + Swal.fire({ + title: 'Booked!!', + text: 'Appointment Successfully Booked for '+response.appointment_detail['name']+' at '+response.formated_date +'('+response.appointment['start_time']+' - ' + response.appointment['end_time']+' )', + icon: 'success' + }).then(function(){ + location.reload(); + } + ) + } + }); + } } diff --git a/resources/views/enquiry-form.blade.php b/resources/views/enquiry-form.blade.php index 003ae0f..085dde5 100644 --- a/resources/views/enquiry-form.blade.php +++ b/resources/views/enquiry-form.blade.php @@ -256,7 +256,10 @@
- + +
@@ -270,13 +273,13 @@ var status = ""; -if(php_var.length !== 0){ - Swal.fire({ - title: 'Submitted!!', - text: php_var, - icon: status ? 'success' : 'error' - }) -} + if(php_var.length !== 0){ + Swal.fire({ + title: 'Submitted!!', + text: php_var, + icon: status ? 'success' : 'error' + }) + } fnameError = document.getElementById('error-fname'); lnameError = document.getElementById('error-lname'); dobError = document.getElementById('error-dob'); @@ -533,6 +536,8 @@ if(php_var.length !== 0){ return true; } + var enqloaderBtn = document.getElementById('enquirybutnload'); + var enquirybtn = document.getElementById('enquirybtn'); function submitEnquiry(){ if(!validatefName() || !validatelName() || !validateDob() || !eCob() || !eGender() || !validateAddress() || !validateEmail() || !validatePhone() || !validateQualification() || @@ -540,7 +545,8 @@ if(php_var.length !== 0){ !wExperience() || !validateImmigrationHistory() || !validateStudyField()){ return false; }else{ - + enqloaderBtn.classList.add('displayEnqBtn'); + enquirybtn.classList.add('buttonload') } } -- 2.25.1