diff --git a/app/Http/Controllers/Admin/AboutUsController.php b/app/Http/Controllers/Admin/AboutUsController.php index 7e23404..ccfbd2a 100644 --- a/app/Http/Controllers/Admin/AboutUsController.php +++ b/app/Http/Controllers/Admin/AboutUsController.php @@ -39,8 +39,10 @@ class AboutUsController extends Controller public function edit($id) { - $edit_privacy_policy = Aboutus::find($id)->toArray(); - return view('Admin.pages.manage_cms.manage_aboutus.manage_about_us_cust', compact('edit_privacy_policy')); + $edit_aboutUs_cust = Aboutus::find($id)->toArray(); + // dd($edit_privacy_policy); + return view('Admin.pages.manage_cms.manage_aboutus.manage_about_us_cust', compact('edit_aboutUs_cust')); + } @@ -165,6 +167,7 @@ class AboutUsController extends Controller DB::beginTransaction(); if (isset($request->about_image)) { + $image = $request->about_image; $image_db = null; } else { @@ -191,4 +194,40 @@ class AboutUsController extends Controller return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); } } + + + //new update customer aboutUs + /** + * Created By : sayali parab + * Created at : 11 May 2024 + * Use : To update customer about us page. + */ + public function update_aboutUS_Cust(Request $request) + { + $update = Aboutus::find($request->about_custom_id); + $update->description = $request->input('about_us'); + // dd( $update); + $update->save(); + return response()->json(['success' => true, 'status' => 200]); + } + + + //new update restatuant aboutUs + + + /** + * Created By : sayali parab + * Created at : 11 May 2024 + * Use : To update resturant about us page. + */ + public function update_aboutUS_Rest(Request $request) + { + $update_rest = Aboutus::find($request->about_rest_id); + $update_rest->description = $request->input('about_rest'); + // dd($update_rest); + $update_rest->save(); + return response()->json(['success' => true, 'status' => 200]); + } + + } diff --git a/app/Http/Controllers/Admin/ManageNewsAndArticlesController.php b/app/Http/Controllers/Admin/ManageNewsAndArticlesController.php index 5c3b1b7..86b174c 100644 --- a/app/Http/Controllers/Admin/ManageNewsAndArticlesController.php +++ b/app/Http/Controllers/Admin/ManageNewsAndArticlesController.php @@ -191,40 +191,7 @@ class ManageNewsAndArticlesController extends Controller return view('Admin.pages.manage_cms.manage_new.manage_news_add', compact('news_categories')); } - // public function insert(Request $request) - // { - - // try { - // $blog = new NewsArticle; - // $blog->name = $request->input('article_name'); - // $blog->description = $request->input('article_des'); - // $blog->news_articles_category_xid = $request->input('category'); - - // // if ($request->hasFile('article_image')) { - // // $uploadedFile = $request->file('article_image'); - // // $extension = $uploadedFile->getClientOriginalExtension(); - // // $filename = date('YmdHi') . '_' . str_replace(' ', '', $uploadedFile->getClientOriginalName()); - // // // Move the uploaded file to the storage folder - // // $path = $uploadedFile->storeAs('uploads/news_article', $filename, 'public'); - // // // Store the file path in the database - // // $blog->image = $path; - // // } - // // upload blog single image - // if ($request->hasFile('article_thmb')) { - // $uploadedFile = $request->file('article_thmb'); - // $extension = $uploadedFile->getClientOriginalExtension(); - // $filename = date('YmdHi') . '_' . str_replace(' ', '', $uploadedFile->getClientOriginalName()); - // $path = $uploadedFile->storeAs('uploads/news_article_thumb', $filename, 'public'); - // $blog->thumbnail_image = $path; - // } - // $blog->save(); - // return response()->json(['success' => true,'status'=>200]); - // } catch (\Exception $e) { - // // Handle the exception, you can log it or return an error response - // return response()->json(['success' => false, 'error' => $e->getMessage(), 'status' => 500]); - // } - // } - + /** * Created By : sayali parab * Created at : 28 May 2024 @@ -283,57 +250,37 @@ class ManageNewsAndArticlesController extends Controller // } // } - public function insert(Request $request) - { - try { - // Validate the incoming request - $request->validate([ - 'article_thmb' => 'required|image|mimes:jpeg,png,jpg,gif|max:2048', - 'article_image' => 'required|image|mimes:jpeg,png,jpg,gif|max:2048', - ]); +public function insert(Request $request) +{ + + try { + $blog = new NewsArticle; + $blog->name = $request->input('article_name'); + $blog->description = $request->input('article_des'); + $blog->news_articles_category_xid = $request->input('category'); - DB::beginTransaction(); - - $path = null; - $image_path = null; - - if ($request->hasFile('article_thmb')) { - $uploadedFile = $request->file('article_thmb'); - $filename = date('YmdHi') . '_' . str_replace(' ', '', $uploadedFile->getClientOriginalName()); - $path = $uploadedFile->storeAs('uploads/news_article_thumb', $filename, 'public'); - } - - if ($request->hasFile('article_image')) { - $image = $request->file('article_image'); - $imageName = date('YmdHi') . '_' . str_replace(' ', '', $image->getClientOriginalName()); - $image_path = $image->storeAs('uploads/news_article_image', $imageName, 'public'); - } - - $blog = NewsArticle::create([ - 'name' => $request->input('article_name'), - 'description' => $request->input('article_des'), - 'news_articles_category_xid' => $request->input('category'), - 'thumbnail_image' => $path, - 'image' => $image_path - ]); - // dd( $blog); - - DB::commit(); - - return response()->json([ - 'success' => true, - 'status' => 200, - 'message' => 'News article added successfully', - ]); - } catch (\Exception $exception) { - DB::rollBack(); - // Log the exception for further analysis - Log::error('Error in insert method: ' . $exception->getMessage() . ' at ' . $exception->getFile() . ':' . $exception->getLine()); - - // Return an error response - return response()->json(['error' => 'Failed to add news article'], 500); + if ($request->hasFile('article_image')) { + $uploadedFile = $request->file('article_image'); + $extension = $uploadedFile->getClientOriginalExtension(); + $filename = date('YmdHi') . '_' . str_replace(' ', '', $uploadedFile->getClientOriginalName()); + $path = $uploadedFile->storeAs('uploads/news_article', $filename, 'public'); + $blog->image = $path; } + if ($request->hasFile('article_thmb')) { + $uploadedFile = $request->file('article_thmb'); + $extension = $uploadedFile->getClientOriginalExtension(); + $filename = date('YmdHi') . '_' . str_replace(' ', '', $uploadedFile->getClientOriginalName()); + $path = $uploadedFile->storeAs('uploads/news_article_thumb', $filename, 'public'); + $blog->thumbnail_image = $path; + } + $blog->save(); + return response()->json(['success' => true,'status'=>200]); + } catch (\Exception $e) { + // Handle the exception, you can log it or return an error response + return response()->json(['success' => false, 'error' => $e->getMessage(), 'status' => 500]); } } + +} diff --git a/public/assets/css/light/main.css b/public/assets/css/light/main.css index 0a32411..1deb9db 100644 --- a/public/assets/css/light/main.css +++ b/public/assets/css/light/main.css @@ -536,7 +536,7 @@ input[type=search]::-ms-reveal { /* Form Group Label */ .form-group label, label { font-size: 15px; - color: #0e1726; + color: #090101; letter-spacing: 1px; display: inline-block; margin-bottom: 0.5rem; diff --git a/public/assets/js/admin/auth/login.js b/public/assets/js/admin/auth/login.js index 31cbbc2..c54903c 100644 --- a/public/assets/js/admin/auth/login.js +++ b/public/assets/js/admin/auth/login.js @@ -1,13 +1,13 @@ // Login js $(document).on("click", "#admin_login_btn", function (e) { - $('#admin_login_form').validate({ + $("#admin_login_form").validate({ rules: { email: { required: true, }, password: { required: true, - } + }, }, messages: { email: { @@ -15,7 +15,7 @@ $(document).on("click", "#admin_login_btn", function (e) { }, password: { required: "Please enter the password.", - } + }, }, submitHandler: function (form) { e.preventDefault(); @@ -23,64 +23,68 @@ $(document).on("click", "#admin_login_btn", function (e) { var formData = new FormData(form); $.ajaxSetup({ headers: { - "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), + "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr( + "content" + ), }, }); $.ajax({ - url: base_url + '/check_login', - type: 'POST', + url: base_url + "/check_login", + type: "POST", data: formData, - beforeSend:function(){ - $('#admin_login_btn').text('Please wait...'); - $('#admin_login_btn').attr('disabled', true); + beforeSend: function () { + $("#admin_login_btn").text("Please wait..."); + $("#admin_login_btn").attr("disabled", true); }, processData: false, contentType: false, success: function (response) { if (response.status == 200) { - $('#admin_login_btn').prop('disabled', false); - $('#admin_login_btn').text('Login'); + $("#admin_login_btn").prop("disabled", false); + $("#admin_login_btn").text("Login"); window.location.href = base_url + "/dashboard"; - } + } if (response.status == 401) { toastr.error(response.message); form.reset(); - $('#admin_login_btn').prop('disabled', false); - $('#admin_login_btn').text('Sign In'); + $("#admin_login_btn").prop("disabled", false); + $("#admin_login_btn").text("Sign In"); } }, }); - } + }, }); }); // forgot password js $(document).on("click", "#forgot_password_btn", function (e) { let base_url = url_path; - $('#forgot_pass_form').validate({ + $("#forgot_pass_form").validate({ ignore: [], debug: false, rules: { email: { - required: true - } + required: true, + }, }, messages: { email: { - required: "Please Enter email" - } + required: "Please Enter email", + }, }, submitHandler: function (form) { var formData = new FormData(form); e.preventDefault(), - $.ajaxSetup({ - headers: { - "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), - }, - }); + $.ajaxSetup({ + headers: { + "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr( + "content" + ), + }, + }); $.ajax({ - url: base_url + '/send_otp', - type: 'POST', + url: base_url + "/send_otp", + type: "POST", data: formData, processData: false, contentType: false, @@ -88,51 +92,53 @@ $(document).on("click", "#forgot_password_btn", function (e) { console.log(response); if (response.status == 200) { form.reset(); - toastr.success('Otp send it your mail id please check'); + toastr.success("Otp send it your mail id please check"); setTimeout(function () { -// toastr.info('Please check your email to reset your password. The link is valid for 5 minutes.'); + // toastr.info('Please check your email to reset your password. The link is valid for 5 minutes.'); window.location.href = base_url + "/otp"; }, 1000); - }else if (response.status == 404) { - toastr.error('This email id is not exits'); - } - else { + } else if (response.status == 404) { + toastr.error("This email id is not exits"); + } else { toastr.error("Something went wrong"); } }, }); - } + }, }); }); // otp varification -$(document).on('click', '#otp_verify_button', function(e) { +$(document).on("click", "#otp_verify_button", function (e) { e.preventDefault(); // Get base URL let base_url = url_path; // Get admin ID - var id = $('#admin_otp_id').val(); + var id = $("#admin_otp_id").val(); // Get OTP by concatenating values of all OTP input fields - var otp = $('.otp').map(function() { - return this.value; - }).get().join(''); + var otp = $(".otp") + .map(function () { + return this.value; + }) + .get() + .join(""); // Send AJAX request for OTP verification $.ajax({ - url: base_url + '/otp_verify', - type: 'POST', + url: base_url + "/otp_verify", + type: "POST", data: { id: id, otp: otp, - '_token': $('meta[name="csrf-token"]').attr('content') + _token: $('meta[name="csrf-token"]').attr("content"), }, success: function (response) { if (response.status == 200) { // Display success message - toastr.success('Otp Verify Successfully'); + toastr.success("Otp Verify Successfully"); // Redirect to the dashboard after a delay setTimeout(function () { window.location.href = base_url + "/password_reset"; @@ -148,34 +154,35 @@ $(document).on('click', '#otp_verify_button', function(e) { }); }); - -$(document).on('input', '.otp', function() { - this.value = this.value.replace(/[^0-9]/g, ''); +$(document).on("input", ".otp", function () { + this.value = this.value.replace(/[^0-9]/g, ""); if (this.value.length >= this.maxLength) { - $(this).next('.otp').focus(); + $(this).next(".otp").focus(); } }); // Reset Password $(document).on("click", "#password_reset", function (e) { - $('#password_reset_form').validate({ + $("#password_reset_form").validate({ rules: { password: { required: true, + minlength: 8, }, confirm_password: { required: true, - equalTo: "#password" + equalTo: "#password", }, }, messages: { password: { required: "Please enter a password.", + minlength: "The password field must be at least 8 characters.", }, confirm_password: { required: "Please Confirm Your Password", - equalTo: "Your Password Do Not Match" + equalTo: "Your Password Do Not Match", }, }, submitHandler: function (form) { @@ -185,43 +192,44 @@ $(document).on("click", "#password_reset", function (e) { $.ajaxSetup({ headers: { - "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), + "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr( + "content" + ), }, }); $.ajax({ - url: base_url + '/password_update', - type: 'POST', + url: base_url + "/password_update", + type: "POST", data: formData, processData: false, contentType: false, success: function (response) { if (response.status == 200) { - $('#password_reset').prop('disabled', false); - $('#password_reset').text('Login'); + $("#password_reset").prop("disabled", false); + $("#password_reset").text("Login"); window.location.href = base_url + "/"; - } + } if (response.status == 401) { toastr.error(response.message); form.reset(); - $('#password_reset').prop('disabled', false); - $('#password_reset').text('Sign In'); + $("#password_reset").prop("disabled", false); + $("#password_reset").text("Sign In"); } }, }); - } + }, }); }); -$('#passwordToggle').click(function () { - var passwordInput = $('#password'); - var eyeIcon = $('#passwordToggle'); +$("#passwordToggle").click(function () { + var passwordInput = $("#password"); + var eyeIcon = $("#passwordToggle"); - if (passwordInput.attr('type') === 'password') { - passwordInput.attr('type', 'text'); - eyeIcon.removeClass('fa-eye-slash').addClass('fa-eye'); + if (passwordInput.attr("type") === "password") { + passwordInput.attr("type", "text"); + eyeIcon.removeClass("fa-eye-slash").addClass("fa-eye"); } else { - passwordInput.attr('type', 'password'); - eyeIcon.removeClass('fa-eye').addClass('fa-eye-slash'); + passwordInput.attr("type", "password"); + eyeIcon.removeClass("fa-eye").addClass("fa-eye-slash"); } }); - diff --git a/public/assets/js/admin/manage_cms/manage_news/add_news.js b/public/assets/js/admin/manage_cms/manage_news/add_news.js index 804e1bd..3cbf8db 100644 --- a/public/assets/js/admin/manage_cms/manage_news/add_news.js +++ b/public/assets/js/admin/manage_cms/manage_news/add_news.js @@ -1,95 +1,97 @@ -// $('#add_newsletter').on("click", function (e) { - -// $.validator.addMethod("quillNotEmpty", function(value, element) { -// var quill = new Quill('#news-quill-add'); -// return quill.getText().trim().length > 0; -// }, "Please enter description "); +$('#add_newsletter').on("click", function (e) { +// alert('jh'); + // $.validator.addMethod("quillNotEmpty", function(value, element) { + // var quill = new Quill('#news-quill-add'); + // return quill.getText().trim().length > 0; + // }, "Please enter description "); -// $('#add_blog_form').validate({ -// ignore: [], -// debug: false, -// rules: { -// article_name: { -// required: true -// }, -// article_dis: { -// required: true, -// quillNotEmpty: true -// }, -// article_image: { -// required: true -// }, -// article_thmb: { -// required: true -// }, -// category: { -// required: true -// }, -// }, -// messages: { -// article_name: { -// required: "Please Enter Article name" -// }, -// article_dis: { -// required: "Please Enter Description" -// }, -// article_image: { -// required: "Please Select Image" -// }, -// category: { -// required: "Please Select Article Category" -// }, -// }, -// errorClass: 'error-message', -// submitHandler: function (form) { -// let base_url = url_path; -// var formData = new FormData(form); -// $('#add_newsletter').text('Please wait...').attr('disabled', true); + $('#add_blog_form').validate({ + // ignore: [], + // debug: false, + rules: { + article_name: { + required: true + }, + article_dis: { + required: true, + quillNotEmpty: true + }, + article_image: { + required: true + }, + article_thmb: { + required: true + }, + category: { + required: true + }, + }, + messages: { + article_name: { + required: "Please Enter Article name" + }, + article_dis: { + required: "Please Enter Description" + }, + article_image: { + required: "Please Select Image" + }, + category: { + required: "Please Select Article Category" + }, + }, + errorClass: 'error-message', + submitHandler: function (form) { -// $.ajaxSetup({ -// headers: { -// "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), -// }, -// }); + var quillContent = quill.root.innerHTML; + $('#article_des').val(quillContent);base_url = url_path; + var formData = new FormData(form); + $('#add_newsletter').text('Please wait...').attr('disabled', true); + + $.ajaxSetup({ + headers: { + "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), + }, + }); -// $.ajax({ -// url: base_url + '/manage_insert_news', -// type: 'POST', -// data: formData, -// processData: false, -// contentType: false, -// success: function (response) { -// if (response.status == 200) { -// toastr.success('News and Article Added Successfully'); -// setTimeout(function () { -// window.location.href = base_url + "/manage_news"; -// }, 1000); -// } else { -// toastr.error("Something went wrong"); -// } -// $('#add_newsletter').attr('disabled', false).text('Submit'); -// }, -// }); -// } -// }); -// }); + $.ajax({ + url: base_url + '/manage_insert_news', + type: 'POST', + data: formData, + processData: false, + contentType: false, + success: function (response) { + if (response.status == 200) { + toastr.success('News and Article Added Successfully'); + setTimeout(function () { + window.location.href = base_url + "/manage-new-articles"; + }, 1000); + } else { + toastr.error("Something went wrong"); + } + $('#add_newsletter').attr('disabled', false).text('Submit'); + }, + }); + } + }); +}); -// selectThumbnailImage.onchange = evt => { -// preview = document.getElementById('previewthumbnailimage'); -// preview.style.display = 'block'; -// const [file] = selectThumbnailImage.files -// if (file) { -// preview.src = URL.createObjectURL(file) -// } -// } +selectThumbnailImage.onchange = evt => { + preview = document.getElementById('previewthumbnailimage'); + preview.style.display = 'block'; + const [file] = selectThumbnailImage.files + if (file) { + preview.src = URL.createObjectURL(file) + } +} -// selectImage.onchange = evt => { -// preview = document.getElementById('preview'); -// preview.style.display = 'block'; -// const [file] = selectImage.files -// if (file) { -// preview.src = URL.createObjectURL(file) -// } -// } \ No newline at end of file +selectImage.onchange = evt => { + preview = document.getElementById('preview'); + preview.style.display = 'block'; + const [file] = selectImage.files + if (file) { + preview.src = URL.createObjectURL(file) + } +} \ No newline at end of file diff --git a/resources/views/Admin/pages/auth/password_reset.blade.php b/resources/views/Admin/pages/auth/password_reset.blade.php index 0db192b..de8d6c3 100644 --- a/resources/views/Admin/pages/auth/password_reset.blade.php +++ b/resources/views/Admin/pages/auth/password_reset.blade.php @@ -2,41 +2,53 @@ @section('title', 'Cheers To Season - Password Reset') @section('content') -
-
-
- +
+
+
+ +
-
-
-
@endsection @section('scripts') - - + + + + - - -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us.blade.php b/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us.blade.php index 1ce88b8..df633b5 100644 --- a/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us.blade.php +++ b/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us.blade.php @@ -16,7 +16,7 @@
Customer About Us
- + Edit Details
diff --git a/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_cust.blade.php b/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_cust.blade.php index e827d6c..0d2c6bf 100644 --- a/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_cust.blade.php +++ b/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_cust.blade.php @@ -26,15 +26,15 @@
-
+
- -
{!! $edit_privacy_policy['description'] !!}
- + +
{!! $edit_aboutUs_cust['description'] !!}
+
-
@@ -69,5 +69,57 @@ - + @endsection \ No newline at end of file diff --git a/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_rest.blade.php b/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_rest.blade.php index 842290c..5f75936 100644 --- a/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_rest.blade.php +++ b/resources/views/Admin/pages/manage_cms/manage_aboutus/manage_about_us_rest.blade.php @@ -24,7 +24,7 @@
- +
Edit Details of Resturant
 @@ -38,15 +38,15 @@
- +
- -
{!! $edit_about_rest['description'] !!}
- + +
{!! $edit_about_rest['description'] !!}
+
-
@@ -65,7 +65,7 @@ @endsection @section('section_script') + @endsection diff --git a/resources/views/Admin/pages/manage_cms/manage_new/manage_news_add.blade.php b/resources/views/Admin/pages/manage_cms/manage_new/manage_news_add.blade.php index 22cd6c2..f29f80f 100644 --- a/resources/views/Admin/pages/manage_cms/manage_new/manage_news_add.blade.php +++ b/resources/views/Admin/pages/manage_cms/manage_new/manage_news_add.blade.php @@ -51,17 +51,24 @@ $currentPage = 'manage_cms';
-
+ +
+
+ + + +
+
@@ -141,11 +148,11 @@ $currentPage = 'manage_cms'; $('').insertBefore("#zero-config_filter label"); }); - // var quill = new Quill('#news-quill-add', { - // theme: 'snow' - // }); + var quill = new Quill('#news-quill-add', { + theme: 'snow' + }); - --> + @endsection \ No newline at end of file diff --git a/resources/views/Admin/pages/manage_cms/manage_new/manage_news_edit.blade.php b/resources/views/Admin/pages/manage_cms/manage_new/manage_news_edit.blade.php index 7447db9..c344aeb 100644 --- a/resources/views/Admin/pages/manage_cms/manage_new/manage_news_edit.blade.php +++ b/resources/views/Admin/pages/manage_cms/manage_new/manage_news_edit.blade.php @@ -52,15 +52,7 @@ $currentPage = 'manage_cms';
- - - + - + + +
+
+ + +
+ Image Preview +
+
- -
diff --git a/routes/web.php b/routes/web.php index 8f10511..0ad90ce 100644 --- a/routes/web.php +++ b/routes/web.php @@ -112,8 +112,12 @@ Route::group(['middleware' => ['checkStatus']], function () { Route::get('/manage-about-us', [AboutUsController::class, 'index'])->name('manage.aboutUs'); Route::get('/about_us_edit/{id}', [AboutUsController::class, 'edit'])->name('about_us_edit'); - Route::get('/about_us_rest/{id}', [PrivacyPolicyController::class, 'edit_rest'])->name('aboutusRestEdit'); + Route::get('/about_us_rest/{id}', [AboutUsController::class, 'edit_rest'])->name('aboutusRestEdit'); + Route::post('/aboutus_cust_update', [AboutUsController::class, 'update_aboutUS_Cust']); + Route::post('/aboutus_rest_update', [AboutUsController::class, 'update_aboutUS_Rest']); + + Route::post('/about_us_update', [AboutUsController::class, 'update']); Route::delete('/delete_about/{id}', [AboutUsController::class, 'delete_about']); Route::get('/change_Status', [AboutUsController::class, 'change_about_Status']);