From 38f1273d2d8cf80a1cf37964e36e1d9faa419abf Mon Sep 17 00:00:00 2001 From: IceToast Date: Mon, 29 Nov 2021 09:24:18 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=9A=91=EF=B8=8F=20swapped=20no?= =?UTF-8?q?des/eggs=20column=20naming=20->=20now=20correct=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/admin/products/index.blade.php | 109 ++++++++++++------ 1 file changed, 71 insertions(+), 38 deletions(-) diff --git a/resources/views/admin/products/index.blade.php b/resources/views/admin/products/index.blade.php index 59b0156b..fdc559c2 100644 --- a/resources/views/admin/products/index.blade.php +++ b/resources/views/admin/products/index.blade.php @@ -10,9 +10,9 @@
@@ -29,7 +29,7 @@
Products
- Create new
@@ -38,22 +38,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -74,30 +74,63 @@ return confirm("Are you sure you wish to delete?") !== false; } - document.addEventListener("DOMContentLoaded", function () { + document.addEventListener("DOMContentLoaded", function() { $('#datatable').DataTable({ processing: true, serverSide: true, stateSave: true, - order: [[ 2, "asc" ]], - ajax: "{{route('admin.products.datatable')}}", - columns: [ - {data: 'disabled'}, - {data: 'name'}, - {data: 'price'}, - {data: 'memory'}, - {data: 'cpu'}, - {data: 'swap'}, - {data: 'disk'}, - {data: 'databases'}, - {data: 'backups'}, - {data: 'nodes', sortable: false}, - {data: 'eggs', sortable: false}, - {data: 'servers', sortable: false}, - {data: 'created_at'}, - {data: 'actions', sortable: false}, + order: [ + [2, "asc"] ], - fnDrawCallback: function( oSettings ) { + ajax: "{{ route('admin.products.datatable') }}", + columns: [{ + data: 'disabled' + }, + { + data: 'name' + }, + { + data: 'price' + }, + { + data: 'memory' + }, + { + data: 'cpu' + }, + { + data: 'swap' + }, + { + data: 'disk' + }, + { + data: 'databases' + }, + { + data: 'backups' + }, + { + data: 'nodes', + sortable: false + }, + { + data: 'eggs', + sortable: false + }, + { + data: 'servers', + sortable: false + }, + { + data: 'created_at' + }, + { + data: 'actions', + sortable: false + }, + ], + fnDrawCallback: function(oSettings) { $('[data-toggle="popover"]').popover(); } }); From fdd0f2131a7c9cb7ca8daa9c1d691cf44af819d5 Mon Sep 17 00:00:00 2001 From: IceToast Date: Tue, 14 Dec 2021 00:38:45 +0100 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=F0=9F=92=84=20fixed=20code=20form?= =?UTF-8?q?atting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/admin/products/index.blade.php | 112 ++++++------------ 1 file changed, 39 insertions(+), 73 deletions(-) diff --git a/resources/views/admin/products/index.blade.php b/resources/views/admin/products/index.blade.php index fdc559c2..bd2876fa 100644 --- a/resources/views/admin/products/index.blade.php +++ b/resources/views/admin/products/index.blade.php @@ -11,8 +11,7 @@ @@ -29,8 +28,7 @@
Products
- Create new + Create new
@@ -38,25 +36,24 @@
ActiveNamePriceMemoryCpuSwapDiskDatabasesBackupsEggsNodesServersCreated at
ActiveNamePriceMemoryCpuSwapDiskDatabasesBackupsNodesEggsServersCreated at
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - +
ActiveNamePriceMemoryCpuSwapDiskDatabasesBackupsNodesEggsServersCreated at
ActiveNamePriceMemoryCpuSwapDiskDatabasesBackupsNodesEggsServersCreated at
@@ -74,64 +71,33 @@ return confirm("Are you sure you wish to delete?") !== false; } - document.addEventListener("DOMContentLoaded", function() { - $('#datatable').DataTable({ + document.addEventListener("DOMContentLoaded", function () { + $("#datatable").DataTable({ processing: true, serverSide: true, stateSave: true, order: [ - [2, "asc"] + [ 2, "asc" ] ], ajax: "{{ route('admin.products.datatable') }}", - columns: [{ - data: 'disabled' - }, - { - data: 'name' - }, - { - data: 'price' - }, - { - data: 'memory' - }, - { - data: 'cpu' - }, - { - data: 'swap' - }, - { - data: 'disk' - }, - { - data: 'databases' - }, - { - data: 'backups' - }, - { - data: 'nodes', - sortable: false - }, - { - data: 'eggs', - sortable: false - }, - { - data: 'servers', - sortable: false - }, - { - data: 'created_at' - }, - { - data: 'actions', - sortable: false - }, + columns: [ + {data: "disabled"}, + {data: "name"}, + {data: "price"}, + {data: "memory"}, + {data: "cpu"}, + {data: "swap"}, + {data: "disk"}, + {data: "databases"}, + {data: "backups"}, + {data: "nodes", sortable: false}, + {data: "eggs", sortable: false}, + {data: "servers", sortable: false}, + {data: "created_at"}, + {data: "actions", sortable: false} ], - fnDrawCallback: function(oSettings) { - $('[data-toggle="popover"]').popover(); + fnDrawCallback: function (oSettings) { + $("[data-toggle=\"popover\"]").popover(); } }); });