diff --git a/src/web/index.html b/src/web/index.html index 749bb21..f7bc63d 100644 --- a/src/web/index.html +++ b/src/web/index.html @@ -11,136 +11,136 @@ admin -
- - -

-
+
+ + +

+
-
-
-

Login

-
-
Username
- -
-
-
Passsword
- -
-
- -
-
-
+
+
+

Login

+
+
Username
+ +
+
+
Passsword
+ +
+
+ +
+
+
-
-
-

Add User

-
-
Username
- -
-
-
Password
- -
-
-
Group
- -
-
-
Is Superuser
- -
-
- - -
-
-
+
+
+

Add User

+
+
Username
+ +
+
+
Password
+ +
+
+
Group
+ +
+
+
Is Superuser
+ +
+
+ + +
+
+
-
-
-

Change User Data

-
-
Username
- -
-
-
Password
- -
-
-
Group
- -
-
-
Is Superuser
- -
-
- - -
-
-
+
+
+

Change User Data

+
+
Username
+ +
+
+
Password
+ +
+
+
Group
+ +
+
+
Is Superuser
+ +
+
+ + +
+
+
-
-
-

Are you sure?

-
- - -
+
+
+

Are you sure?

+
+ +
+
-
-
-

Change Password

-
-
New password
- -
-
- - -
-
-
- -
-
-

+
+
+

Change Password

+
+
New password
+
+
+ + +
+
+
+ +
+
+

- - - - - - - - - - - - + +
idusernamegroupis_superuserdeletechange passwordchange user data
+ + + + + + + + + + + +
idusernamegroupis_superuserdeletechange passwordchange user data
+
+ +
-
- - -
-
- - - - - - - - - +
+ + + + + + + + + \ No newline at end of file diff --git a/src/web/js/add_user.js b/src/web/js/add_user.js index 13c321e..cd083dd 100644 --- a/src/web/js/add_user.js +++ b/src/web/js/add_user.js @@ -32,7 +32,7 @@ adduserformbody.addEventListener('submit', async (e) => { }) if (status.status === "ok") { adduserform.classList.remove('active') - get_all_users() + await get_all_users() notification("Пользователь успешно добавлен", "success") usernameinput.value = "" passwordinput.value = "" diff --git a/src/web/js/change_password.js b/src/web/js/change_password.js index c3ebd53..6b81037 100644 --- a/src/web/js/change_password.js +++ b/src/web/js/change_password.js @@ -3,7 +3,7 @@ const cancelchangepassword = document.querySelector('.cancelchangepassword') const changepasswordformbody = document.querySelector('.changepasswordformbody') const changepasswordnewpassword = document.querySelector('#changepasswordnewpassword') -var changepassuserid = "" +let changepassuserid = ""; const change_password = (userid) => { changepasswordform.classList.add('active') diff --git a/src/web/js/change_user.js b/src/web/js/change_user.js index 63a0b7e..5e7b77a 100644 --- a/src/web/js/change_user.js +++ b/src/web/js/change_user.js @@ -6,8 +6,8 @@ const changeuserformgroup = document.querySelector('#changeuserformgroup') const changeuserformissuperuser = document.querySelector('#changeuserformissuperuser') const cancelchangeuser = document.querySelector(".cancelchangeuser") -var changedatauserid = "" -var userdata = "" +let changedatauserid = ""; +let userdata = ""; const change_user_data = async (userid) => { changeuserform.classList.add('active') @@ -24,7 +24,7 @@ const change_user_data = async (userid) => { changeuserformusername.value = userdata.username changeuserformgroup.value = userdata.group console.log(changeuserformissuperuser.checked) - changeuserformissuperuser.checked = userdata.is_superuser === "1"?true:false + changeuserformissuperuser.checked = userdata.is_superuser === "1" } cancelchangeuser.addEventListener('click', (e) => { @@ -34,13 +34,13 @@ cancelchangeuser.addEventListener('click', (e) => { changeuserformbody.addEventListener('submit', async (e) => { e.preventDefault() - var request = { + let request = { token: localStorage.getItem('token'), userid: changedatauserid, username: changeuserformusername.value, - is_superuser: changeuserformissuperuser.checked?"1":"0", + is_superuser: changeuserformissuperuser.checked ? "1" : "0", group: changeuserformgroup.value - } + }; if (changeuserformpassword.value !== "") {request = {...request, "password": changeuserformpassword.value}} const status = await fetch(routes.change_user(), { method: 'POST', @@ -52,6 +52,6 @@ changeuserformbody.addEventListener('submit', async (e) => { if (status.status === "ok") { notification("Данные пользователя успешно изменены", "success") changeuserform.classList.remove('active') - get_all_users() + await get_all_users() } }) diff --git a/src/web/js/del_user.js b/src/web/js/del_user.js index 50a880b..2ab7573 100644 --- a/src/web/js/del_user.js +++ b/src/web/js/del_user.js @@ -3,7 +3,7 @@ const confirmform = document.querySelector('.confirmform') const confirmformcancel = document.querySelector('.no') const confirmformok = document.querySelector('.yes') -var useridtodelete = "" +let useridtodelete = ""; userstablebody.addEventListener('click', e => { if (e.target.classList.contains('deleteuser')) { @@ -32,7 +32,7 @@ confirmformok.addEventListener('click', async () => { }) if (status.status === "ok") { confirmform.classList.remove('active') - get_all_users() + await get_all_users() notification("Пользователь успешно удален", "success") } }) diff --git a/src/web/js/login.js b/src/web/js/login.js index e5bb295..c762a0a 100644 --- a/src/web/js/login.js +++ b/src/web/js/login.js @@ -2,7 +2,6 @@ const loginform = document.querySelector('.loginform') const loginformbody = document.querySelector('.loginformbody') const loginforminputusername = document.querySelector('#loginforminputusername') const loginforminputpassword = document.querySelector('#loginforminputpassword') -const loginformbutton = document.querySelector('.loginformbutton') const exitbutton = document.querySelector('.exitbutton') const usernameheader = document.querySelector('.usernameheader') @@ -35,13 +34,13 @@ const login = async (username, password) => { notification("Успешно", "success") loginform.classList.remove("active") localStorage.setItem("token", response.token) - get_user_data(response.token) + await get_user_data() loginforminputusername.value = "" loginforminputpassword.value = "" } } -const get_user_data = async (token) => { +const get_user_data = async () => { const response = await fetch(routes.user(), { method: "POST", body: `{"token":"${localStorage.getItem("token")}"}` @@ -49,7 +48,7 @@ const get_user_data = async (token) => { notification(`Ошибка на сервере: ${error}`, "error") }) if (response.is_superuser === "1") { - get_all_users() + await get_all_users() usernameheader.innerHTML = response.username } else { document.querySelector('.alluserstablebody').innerHTML = ""