Move all css and js to laravel mix and combine in one file remove pag…

…ination form blade add js pagination ordering and search
KalimeroMK · Aug 3, 2022 · 5461d5a · 5461d5a
1 parent 4d31cbf
commit 5461d5a
Show file tree

Hide file tree

Showing 42 changed files with 17,160 additions and 22,130 deletions.
diff --git a/Modules/Admin/Resources/views/layouts/footer.blade.php b/Modules/Admin/Resources/views/layouts/footer.blade.php
@@ -35,19 +35,23 @@
 </div>
 
 <!-- Bootstrap core JavaScript-->
-<script src="{{asset('backend/vendor/jquery/jquery.min.js')}}"></script>
-<script src="{{asset('backend/vendor/bootstrap/js/bootstrap.bundle.min.js')}}"></script>
-<!-- Core plugin JavaScript-->
-<script src="{{asset('backend/vendor/jquery-easing/jquery.easing.min.js')}}"></script>
+<script src="{{asset('js/all.min.js')}}"></script>
 
-<!-- Custom scripts for all pages-->
-<script src="{{asset('backend/js/sb-admin-2.min.js')}}"></script>
 <!-- Page level plugins -->
-<script src="{{asset('backend/vendor/datatables/jquery.dataTables.min.js')}}"></script>
-<script src="{{asset('backend/vendor/datatables/dataTables.bootstrap4.min.js')}}"></script>
-<!-- Page level plugins -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/2.1.2/sweetalert.min.js"></script>
-<script src="{{asset('backend/js/demo/datatables-demo.js')}}"></script>
+@push('scripts')
+ <script>
+ $('#data-table').DataTable({
+ "ordering": true,
+ "paging": true,
+ "pageLength": 25,
+ "lengthMenu": [
+ [25, 50, 75, 100, -1],
+ [25, 50, 75, 100, 'All'],
+ ],
+
+ });
+ </script>
+@endpush
 <script>
  $(document).ready(function () {
  $.ajaxSetup({

diff --git a/Modules/Admin/Resources/views/layouts/head.blade.php b/Modules/Admin/Resources/views/layouts/head.blade.php
@@ -15,8 +15,9 @@
  rel="stylesheet">
 
  <!-- Custom styles for this template-->
- <link href="{{asset('backend/css/sb-admin-2.min.css')}}" rel="stylesheet">
- <link href="{{ asset('backend/css/custom.css') }}">
+ <link href="{{asset('css/all.min.css')}}" rel="stylesheet">
+ <link href="{{asset('')}}" rel="stylesheet">
+
  @stack('styles')
 
 </head>
diff --git a/Modules/Banner/Repository/BannerRepository.php b/Modules/Banner/Repository/BannerRepository.php
@@ -14,7 +14,7 @@ class BannerRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::paginate(10);
+ return $this->model::get();
  }
 
 }
diff --git a/Modules/Banner/Resources/views/index.blade.php b/Modules/Banner/Resources/views/index.blade.php
@@ -6,7 +6,6 @@
  <div class="row">
  <div class="col-md-12">
  @include('notification::notification')
-
  </div>
  </div>
  <div class="card-header py-3">
@@ -17,7 +16,7 @@
  <div class="card-body">
  <div class="table-responsive">
  @if(count($banners)>0)
- <table class="table table-bordered" id="banner-dataTable" width="100%" cellspacing="0">
+ <table class="table table-bordered" id="data-table" width="100%" cellspacing="0">
  <thead>
  <tr>
  <th>S.N.</th>
@@ -78,7 +77,6 @@ class="fas fa-trash-alt"></i></button>
  @endforeach
  </tbody>
  </table>
- <span style="float:right">{{$banners->links('vendor.pagination.bootstrap-4')}}</span>
  @else
  <h6 class="text-center">No banners found!!! Please create banner</h6>
  @endif
@@ -87,35 +85,5 @@ class="fas fa-trash-alt"></i></button>
  </div>
 @endsection
 
-@push('styles')
- <link href="{{asset('backend/vendor/datatables/dataTables.bootstrap4.min.css')}}" rel="stylesheet">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css"/>
- <style>
- .zoom {
- transition: transform .2s; /* Animation */
- }
-
- .zoom:hover {
- transform: scale(3.2);
- }
- </style>
-@endpush
-
-@push('scripts')
- <script>
- $('#banner-dataTable').DataTable({
- "columnDefs": [
- {
- "orderable": false,
- "targets": [3, 4, 5]
- }
- ]
- });
-
- // Sweet alert
 
- function deleteData(id) {
 
- }
- </script>
-@endpush
diff --git a/Modules/Brand/Repository/BrandRepository.php b/Modules/Brand/Repository/BrandRepository.php
@@ -14,6 +14,6 @@ class BrandRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::paginate(10);
+ return $this->model::get();
  }
 }
diff --git a/Modules/Brand/Resources/views/index.blade.php b/Modules/Brand/Resources/views/index.blade.php
@@ -16,7 +16,7 @@
  <div class="card-body">
  <div class="table-responsive">
  @if(count($brands)>0)
- <table class="table table-bordered" id="banner-dataTable" width="100%" cellspacing="0">
+ <table class="table table-bordered" id="data-table" width="100%" cellspacing="0">
  <thead>
  <tr>
  <th>S.N.</th>
@@ -66,7 +66,6 @@ class="fas fa-trash-alt"></i></button>
  @endforeach
  </tbody>
  </table>
- <span style="float:right">{{$brands->links('vendor.pagination.bootstrap-4')}}</span>
  @else
  <h6 class="text-center">No brands found!!! Please create brand</h6>
  @endif
@@ -75,41 +74,4 @@ class="fas fa-trash-alt"></i></button>
  </div>
 @endsection
 
-@push('styles')
- <link href="{{asset('backend/vendor/datatables/dataTables.bootstrap4.min.css')}}" rel="stylesheet">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css"/>
- <style>
- div.dataTables_wrapper div.dataTables_paginate {
- display: none;
- }
 
- .zoom {
- transition: transform .2s; /* Animation */
- }
-
- .zoom:hover {
- transform: scale(3.2);
- }
- </style>
-@endpush
-
-@push('scripts')
- <!-- Page level custom scripts -->
- <script>
-
- $('#banner-dataTable').DataTable({
- "columnDefs": [
- {
- "orderable": false,
- "targets": [3, 4]
- }
- ]
- });
-
- // Sweet alert
-
- function deleteData(id) {
-
- }
- </script>
-@endpush
diff --git a/Modules/Cart/Repository/CartRepository.php b/Modules/Cart/Repository/CartRepository.php
@@ -9,4 +9,12 @@ class CartRepository extends Repository
 {
  public $model = Cart::class;
 
+ /**
+ * @return mixed
+ */
+ public function findAll(): mixed
+ {
+ return $this->model::get();
+ }
+
 }
diff --git a/Modules/Category/Repository/CategoryRepository.php b/Modules/Category/Repository/CategoryRepository.php
@@ -14,6 +14,6 @@ class CategoryRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::paginate(10);
+ return $this->model::get();
  }
 }
diff --git a/Modules/Category/Resources/views/index.blade.php b/Modules/Category/Resources/views/index.blade.php
@@ -17,7 +17,7 @@
  <div class="card-body">
  <div class="table-responsive">
  @if(count($categories)>0)
- <table class="table table-bordered" id="banner-dataTable" width="100%" cellspacing="0">
+ <table class="table table-bordered" id="data-table" width="100%" cellspacing="0">
  <thead>
  <tr>
  <th>S.N.</th>
@@ -69,7 +69,6 @@ class="btn btn-primary btn-sm float-left mr-1"
  @endforeach
  </tbody>
  </table>
- <span style="float:right">{{$categories->links('vendor.pagination.bootstrap-4')}}</span>
  @else
  <h6 class="text-center">No Categories found!!! Please create Category</h6>
  @endif
@@ -78,37 +77,3 @@ class="btn btn-primary btn-sm float-left mr-1"
  </div>
 @endsection
 
-@push('styles')
- <link href="{{asset('backend/vendor/datatables/dataTables.bootstrap4.min.css')}}" rel="stylesheet">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css"/>
- <style>
- div.dataTables_wrapper div.dataTables_paginate {
- display: none;
- }
- </style>
-@endpush
-
-@push('scripts')
-
- <!-- Page level plugins -->
-
-
- <!-- Page level custom scripts -->
- <script>
-
- $('#banner-dataTable').DataTable({
- "columnDefs": [
- {
- "orderable": false,
- "targets": [3, 4, 5]
- }
- ]
- });
-
- // Sweet alert
-
- function deleteData(id) {
-
- }
- </script>
-@endpush
diff --git a/Modules/Coupon/Repository/CouponRepository.php b/Modules/Coupon/Repository/CouponRepository.php
@@ -14,6 +14,6 @@ class CouponRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::paginate(10);
+ return $this->model::get();
  }
 }
diff --git a/Modules/Coupon/Resources/views/index.blade.php b/Modules/Coupon/Resources/views/index.blade.php
@@ -17,7 +17,7 @@
  <div class="card-body">
  <div class="table-responsive">
  @if(count($coupons)>0)
- <table class="table table-bordered" id="banner-dataTable" width="100%" cellspacing="0">
+ <table class="table table-bordered" id="data-table" width="100%" cellspacing="0">
  <thead>
  <tr>
  <th>S.N.</th>
@@ -90,74 +90,3 @@ class="fas fa-trash-alt"></i></button>
  </div>
 @endsection
 
-@push('styles')
- <link href="{{asset('backend/vendor/datatables/dataTables.bootstrap4.min.css')}}" rel="stylesheet">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css"/>
- <style>
- div.dataTables_wrapper div.dataTables_paginate {
- display: none;
- }
-
- .zoom {
- transition: transform .2s; /* Animation */
- }
-
- .zoom:hover {
- transform: scale(3.2);
- }
- </style>
-@endpush
-
-@push('scripts')
-
- <!-- Page level plugins -->
-
-
- <!-- Page level custom scripts -->
- <script>
-
- $('#banner-dataTable').DataTable({
- "columnDefs": [
- {
- "orderable": false,
- "targets": [4, 5]
- }
- ]
- });
-
- // Sweet alert
-
- function deleteData(id) {
-
- }
- </script>
- <script>
- $(document).ready(function () {
- $.ajaxSetup({
- headers: {
- 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
- }
- });
- $('.dltBtn').click(function (e) {
- const form = $(this).closest('form');
- const dataID = $(this).data('id');
- // alert(dataID);
- e.preventDefault();
- swal({
- title: "Are you sure?",
- text: "Once deleted, you will not be able to recover this data!",
- icon: "warning",
- buttons: true,
- dangerMode: true,
- })
- .then((willDelete) => {
- if (willDelete) {
- form.submit();
- } else {
- swal("Your data is safe!");
- }
- });
- })
- })
- </script>
-@endpush
diff --git a/Modules/Message/Repository/MessageRepository.php b/Modules/Message/Repository/MessageRepository.php
@@ -2,8 +2,8 @@
 
 namespace Modules\Message\Repository;
 
-use Modules\Admin\Models\Message;
 use Modules\Core\Repositories\Repository;
+use Modules\Message\Models\Message;
 
 class MessageRepository extends Repository
 {
@@ -14,6 +14,6 @@ class MessageRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::paginate(10);
+ return $this->model::get();
  }
 }
diff --git a/Modules/Newsletter/Repository/NewsletterRepository.php b/Modules/Newsletter/Repository/NewsletterRepository.php
@@ -14,6 +14,6 @@ class NewsletterRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::paginate(10);
+ return $this->model::get();
  }
 }
diff --git a/Modules/Notification/Repository/NotificationRepository.php b/Modules/Notification/Repository/NotificationRepository.php
@@ -14,6 +14,6 @@ class NotificationRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::paginate(10);
+ return $this->model::get();
  }
 }
diff --git a/Modules/Order/Repository/OrderRepository.php b/Modules/Order/Repository/OrderRepository.php
@@ -15,7 +15,7 @@ class OrderRepository extends Repository
  */
  public function findAll(): mixed
  {
- return $this->model::with('shipping', 'user', 'carts')->paginate(10);
+ return $this->model::with('shipping', 'user', 'carts')->get();
  }
 
  /**