diff --git a/Backend/controller/createUser.php b/Backend/controller/createUser.php index 3d16627..4a67e17 100644 --- a/Backend/controller/createUser.php +++ b/Backend/controller/createUser.php @@ -1,18 +1,16 @@ name = $_POST['name']; $hashPass = password_hash($_POST['password'], PASSWORD_DEFAULT); $user->password = $hashPass; - if(!$user->save()){ - echo "Error"; - }else{ - echo "saved"; - } -//} + if($user->save()) + echo $user->id; +} diff --git a/Backend/controller/getUser.php b/Backend/controller/getUser.php index 2eaecc2..e73bc9b 100644 --- a/Backend/controller/getUser.php +++ b/Backend/controller/getUser.php @@ -1,4 +1,5 @@ save()) { $_SESSION['token'] = $token; $_SESSION['name'] = $username; + $_SESSION['id'] = $user->id; if($user->permission === 1){ $_SESSION['permission'] = $token; } diff --git a/Backend/controller/updateUser.php b/Backend/controller/updateUser.php index 56289a3..f9eb1e7 100644 --- a/Backend/controller/updateUser.php +++ b/Backend/controller/updateUser.php @@ -1,10 +1,10 @@ find($_POST['id']); diff --git a/Backend/migrations/seedUser.php b/Backend/migrations/seedUser.php index 7ab029a..7c31eda 100644 --- a/Backend/migrations/seedUser.php +++ b/Backend/migrations/seedUser.php @@ -1,5 +1,5 @@ "admin", 'password' => password_hash('aA123456&', PASSWORD_DEFAULT), 'permission' => 0]); +$createUser = User::Create(['name' => "admin", 'password' => password_hash('aA123456&', PASSWORD_DEFAULT), 'permission' => 1]); echo "User was created"; diff --git a/Frontend/Assets/Ajax/createPost.js b/Frontend/Assets/Ajax/createPost.js index e609d6b..20c603c 100644 --- a/Frontend/Assets/Ajax/createPost.js +++ b/Frontend/Assets/Ajax/createPost.js @@ -16,7 +16,7 @@ function createPost(title, desc) { title, 'Edit', 'Delete' - ]).draw().node().id = '1234'; + ]).draw().node().id = data[0]; }, error: function (data) { console.log("error"); diff --git a/Frontend/Assets/Ajax/createUser.js b/Frontend/Assets/Ajax/createUser.js new file mode 100644 index 0000000..c410769 --- /dev/null +++ b/Frontend/Assets/Ajax/createUser.js @@ -0,0 +1,26 @@ +function createUser(name, pass) { + var data = { + name: name, + password: pass, + }; + + $.ajax({ + url: '../Backend/controller/createUser.php', + type: 'POST', + dataType: 'json', + data: data, + success: function (data) { + $('#table_id_users').DataTable().row.add([ + name, + 'Edit', + 'Delete' + ]).draw().node().id = data; + }, + error: function (data) { + console.log("error"); + console.log(data); + console.log("error"); + } + }); + +} diff --git a/Frontend/Assets/Ajax/deleteUser.js b/Frontend/Assets/Ajax/deleteUser.js new file mode 100644 index 0000000..650372e --- /dev/null +++ b/Frontend/Assets/Ajax/deleteUser.js @@ -0,0 +1,23 @@ +function deleteUser(id) { + return $.ajax({ + type: 'POST', + url: '../Backend/controller/deleteUser.php', + data: {'delete_id':id}, + success:function (data) { + Swal.fire( + 'Brugeren er slettet!', + '', + 'success' + ).then(function() { + $('#table_id_users').DataTable().row($('#'+id)[0]).remove().draw(); + }); + }, + error:function (data) { + Swal.fire( + 'Brugeren kunne ikke blive slettet', + '', + 'error' + ) + } + }); +} \ No newline at end of file diff --git a/Frontend/Assets/Ajax/editUser.js b/Frontend/Assets/Ajax/editUser.js new file mode 100644 index 0000000..ba7e72f --- /dev/null +++ b/Frontend/Assets/Ajax/editUser.js @@ -0,0 +1,59 @@ +function editUser(id) { + $.ajax({ + type: 'POST', + url: '../Backend/controller/getUser.php', + data: { id: id }, + success:function (data) { + Swal.fire({ + title: 'Rediger Bruger', + html: '
', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Rediger', + focusConfirm: false, + preConfirm: () => { + const name = Swal.getPopup().querySelector('#name').value + const pass = Swal.getPopup().querySelector('#password').value + const conpass = Swal.getPopup().querySelector('#confirmPassword').value + if (!name) { + Swal.showValidationMessage(`Brugeren skal have et navn!`) + } else if (pass != conpass) { + Swal.showValidationMessage(`Password er ikke ens!`) + } else { + data.name = name; + data.password = pass; + } + return {name: name, pass: pass, conpass: conpass} + } + }).then((result) => { + if (result.isConfirmed) + $.ajax({ + type: 'POST', + url: '../Backend/controller/updateUser.php', + data: {'id':id, 'upName': data.name, 'upPassword': data.password}, + success:function () { + Swal.fire( + 'Brugeren er redigeret!', + '', + 'success' + ).then(function() { + document.getElementById(id).children[0].innerHTML = data.name; + }) + }, + error:function (data) { + Swal.fire( + 'Brugeren kunne ikke blive redigeret', + '', + 'error' + ) + } + }); + }) + }, + error:function (data) { + console.log(data); + } + }); + /**/ +} \ No newline at end of file diff --git a/Frontend/Assets/Ajax/fetchAndDisplayData.js b/Frontend/Assets/Ajax/fetchAndDisplayData.js index cb48d78..9db7af7 100644 --- a/Frontend/Assets/Ajax/fetchAndDisplayData.js +++ b/Frontend/Assets/Ajax/fetchAndDisplayData.js @@ -12,11 +12,21 @@ $(document).ready(function() { ], }); + var tableUser = $('#table_id_users').DataTable({ + fixedHeader: true, + columnDefs: [ + { + "targets": "w-1em", + orderable: false, + "searchable": false, + } + ], + }); + $.ajax({ type: 'POST', url: '../Backend/controller/getPost.php', success:function (data) { - console.log(data); for (let i = 0; i < data.length; i++){ var d = new Date(data[i].created_at); @@ -32,4 +42,29 @@ $(document).ready(function() { console.log(data); } }); + + $.ajax({ + type: 'POST', + url: '../Backend/controller/getUser.php', + success:function (data) { + for (let i = 0; i < data[0].length; i++){ + if (data[0][i].id != data[1]) { + tableUser.row.add([ + data[0][i].name, + 'Edit', + 'Delete' + ]).draw().node().id = data[0][i].id; + } else { + tableUser.row.add([ + data[0][i].name, + 'Edit', + '' + ]).draw().node().id = data[0][i].id; + } + } + }, + error:function (data) { + console.log(data); + } + }); }); \ No newline at end of file diff --git a/Frontend/admin.php b/Frontend/admin.php index 8a4a0d9..3aa1dfb 100644 --- a/Frontend/admin.php +++ b/Frontend/admin.php @@ -82,7 +82,7 @@ use Backend\Model\Post; -
+
@@ -97,18 +97,46 @@ use Backend\Model\Post;
+ +
+
+ + + + + + + + + +
NavnEditDelete
+
+
+
+ + + +