web refactor
This commit is contained in:
1 parent
d70d589294
commit
7e9f7b019d
6 files changed
+135
-136
No files matched your search
+121
-121
@@ -11,136 +11,136 @@
|
|||||||
<title>admin</title>
|
<title>admin</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<button class="exitbutton headerbutton">Exit</button>
|
<button class="exitbutton headerbutton">Exit</button>
|
||||||
<button class="adduserbutton headerbutton">Adduser</button>
|
<button class="adduserbutton headerbutton">Adduser</button>
|
||||||
<h1 class="usernameheader"></h1>
|
<h1 class="usernameheader"></h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form loginform">
|
<div class="form loginform">
|
||||||
<form class="formbody loginformbody">
|
<form class="formbody loginformbody">
|
||||||
<h1 class="loginformheader">Login</h1>
|
<h1 class="loginformheader">Login</h1>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Username</div>
|
<div class="loginformlabel">Username</div>
|
||||||
<input type="text" required id="loginforminputusername" class="loginforminput">
|
<input type="text" required id="loginforminputusername" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Passsword</div>
|
<div class="loginformlabel">Passsword</div>
|
||||||
<input type="password" required id="loginforminputpassword" class="loginforminput">
|
<input type="password" required id="loginforminputpassword" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<button class="loginformbutton">login</button>
|
<button class="loginformbutton">login</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form adduserform">
|
<div class="form adduserform">
|
||||||
<form class="formbody adduserformbody">
|
<form class="formbody adduserformbody">
|
||||||
<h1 class="loginformheader">Add User</h1>
|
<h1 class="loginformheader">Add User</h1>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Username</div>
|
<div class="loginformlabel">Username</div>
|
||||||
<input type="text" required id="adduserformusername" class="loginforminput">
|
<input type="text" required id="adduserformusername" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Password</div>
|
<div class="loginformlabel">Password</div>
|
||||||
<input type="password" required id="adduserformpassword" class="loginforminput">
|
<input type="password" required id="adduserformpassword" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Group</div>
|
<div class="loginformlabel">Group</div>
|
||||||
<input type="text" required id="adduserformgroup" class="loginforminput">
|
<input type="text" required id="adduserformgroup" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Is Superuser</div>
|
<div class="loginformlabel">Is Superuser</div>
|
||||||
<input type="checkbox" id="adduserformissuperuser" class="loginforminput">
|
<input type="checkbox" id="adduserformissuperuser" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<button class="loginformbutton">Add</button>
|
<button class="loginformbutton">Add</button>
|
||||||
<button class="canceladduser loginformbutton">Cancel</button>
|
<button class="canceladduser loginformbutton">Cancel</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form changeuserform">
|
<div class="form changeuserform">
|
||||||
<form class="formbody changeuserformbody">
|
<form class="formbody changeuserformbody">
|
||||||
<h1 class="loginformheader">Change User Data</h1>
|
<h1 class="loginformheader">Change User Data</h1>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Username</div>
|
<div class="loginformlabel">Username</div>
|
||||||
<input type="text" required id="changeuserformusername" class="loginforminput">
|
<input type="text" required id="changeuserformusername" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Password</div>
|
<div class="loginformlabel">Password</div>
|
||||||
<input type="password" id="changeuserformpassword" class="loginforminput">
|
<input type="password" id="changeuserformpassword" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Group</div>
|
<div class="loginformlabel">Group</div>
|
||||||
<input type="text" required id="changeuserformgroup" class="loginforminput">
|
<input type="text" required id="changeuserformgroup" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">Is Superuser</div>
|
<div class="loginformlabel">Is Superuser</div>
|
||||||
<input type="checkbox" id="changeuserformissuperuser" class="loginforminput">
|
<input type="checkbox" id="changeuserformissuperuser" class="loginforminput">
|
||||||
</div>
|
</div>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<button class="loginformbutton">Change</button>
|
<button class="loginformbutton">Change</button>
|
||||||
<button class="cancelchangeuser loginformbutton">Cancel</button>
|
<button class="cancelchangeuser loginformbutton">Cancel</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form confirmform">
|
<div class="form confirmform">
|
||||||
<div class="formbody confirmformbody">
|
<div class="formbody confirmformbody">
|
||||||
<h1>Are you sure?</h1>
|
<h1>Are you sure?</h1>
|
||||||
<div class="loginforminputbodyflex">
|
<div class="loginforminputbodyflex">
|
||||||
<button class="no loginformbutton">Cancel</button>
|
<button class="no loginformbutton">Cancel</button>
|
||||||
<button class="yes loginformbutton">Confirm</button>
|
<button class="yes loginformbutton">Confirm</button>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form changepasswordform">
|
<div class="form changepasswordform">
|
||||||
<form class="formbody changepasswordformbody">
|
<form class="formbody changepasswordformbody">
|
||||||
<h1 class="loginformheader">Change Password</h1>
|
<h1 class="loginformheader">Change Password</h1>
|
||||||
<div class="loginforminputbody">
|
<div class="loginforminputbody">
|
||||||
<div class="loginformlabel">New password</div>
|
<div class="loginformlabel">New password</div>
|
||||||
<input type="text" required id="changepasswordnewpassword" class="loginforminput">
|
<input type="text" required id="changepasswordnewpassword" class="loginforminput">
|
||||||
</div>
|
|
||||||
<div class="loginforminputbody">
|
|
||||||
<button class="loginformbutton">Change</button>
|
|
||||||
<button class="cancelchangepassword loginformbutton">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="message">
|
|
||||||
<div class="messagetextbox">
|
|
||||||
<h3 class="messagetext"></h3>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="loginforminputbody">
|
||||||
|
<button class="loginformbutton">Change</button>
|
||||||
|
<button class="cancelchangepassword loginformbutton">Cancel</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="message">
|
||||||
|
<div class="messagetextbox">
|
||||||
|
<h3 class="messagetext"></h3>
|
||||||
</div>
|
</div>
|
||||||
<table class="headers">
|
</div>
|
||||||
<thead class="alluserstablehead">
|
<table class="headers">
|
||||||
<tr>
|
<thead class="alluserstablehead">
|
||||||
<th>id</th>
|
<tr>
|
||||||
<th>username</th>
|
<th>id</th>
|
||||||
<th>group</th>
|
<th>username</th>
|
||||||
<th>is_superuser</th>
|
<th>group</th>
|
||||||
<th>delete</th>
|
<th>is_superuser</th>
|
||||||
<th>change password</th>
|
<th>delete</th>
|
||||||
<th>change user data</th>
|
<th>change password</th>
|
||||||
</tr>
|
<th>change user data</th>
|
||||||
</thead>
|
</tr>
|
||||||
|
</thead>
|
||||||
|
</table>
|
||||||
|
<div class="table">
|
||||||
|
<table class="alluserstable">
|
||||||
|
<tbody class="alluserstablebody"></tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="table">
|
</div>
|
||||||
<table class="alluserstable">
|
<script src="js/message.js"></script>
|
||||||
<tbody class="alluserstablebody"></tbody>
|
<script src="js/routes.js"></script>
|
||||||
</table>
|
<script src="js/window.js"></script>
|
||||||
</div>
|
<script src="js/login.js"></script>
|
||||||
<script src="js/message.js"></script>
|
<script src="js/get_all_users.js"></script>
|
||||||
<script src="js/routes.js"></script>
|
<script src="js/add_user.js"></script>
|
||||||
<script src="js/window.js"></script>
|
<script src="js/del_user.js"></script>
|
||||||
<script src="js/login.js"></script>
|
<script src="js/change_password.js"></script>
|
||||||
<script src="js/get_all_users.js"></script>
|
<script src="js/change_user.js"></script>
|
||||||
<script src="js/add_user.js"></script>
|
|
||||||
<script src="js/del_user.js"></script>
|
|
||||||
<script src="js/change_password.js"></script>
|
|
||||||
<script src="js/change_user.js"></script>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -32,7 +32,7 @@ adduserformbody.addEventListener('submit', async (e) => {
|
|||||||
})
|
})
|
||||||
if (status.status === "ok") {
|
if (status.status === "ok") {
|
||||||
adduserform.classList.remove('active')
|
adduserform.classList.remove('active')
|
||||||
get_all_users()
|
await get_all_users()
|
||||||
notification("Пользователь успешно добавлен", "success")
|
notification("Пользователь успешно добавлен", "success")
|
||||||
usernameinput.value = ""
|
usernameinput.value = ""
|
||||||
passwordinput.value = ""
|
passwordinput.value = ""
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ const cancelchangepassword = document.querySelector('.cancelchangepassword')
|
|||||||
const changepasswordformbody = document.querySelector('.changepasswordformbody')
|
const changepasswordformbody = document.querySelector('.changepasswordformbody')
|
||||||
const changepasswordnewpassword = document.querySelector('#changepasswordnewpassword')
|
const changepasswordnewpassword = document.querySelector('#changepasswordnewpassword')
|
||||||
|
|
||||||
var changepassuserid = ""
|
let changepassuserid = "";
|
||||||
|
|
||||||
const change_password = (userid) => {
|
const change_password = (userid) => {
|
||||||
changepasswordform.classList.add('active')
|
changepasswordform.classList.add('active')
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ const changeuserformgroup = document.querySelector('#changeuserformgroup')
|
|||||||
const changeuserformissuperuser = document.querySelector('#changeuserformissuperuser')
|
const changeuserformissuperuser = document.querySelector('#changeuserformissuperuser')
|
||||||
const cancelchangeuser = document.querySelector(".cancelchangeuser")
|
const cancelchangeuser = document.querySelector(".cancelchangeuser")
|
||||||
|
|
||||||
var changedatauserid = ""
|
let changedatauserid = "";
|
||||||
var userdata = ""
|
let userdata = "";
|
||||||
|
|
||||||
const change_user_data = async (userid) => {
|
const change_user_data = async (userid) => {
|
||||||
changeuserform.classList.add('active')
|
changeuserform.classList.add('active')
|
||||||
@@ -24,7 +24,7 @@ const change_user_data = async (userid) => {
|
|||||||
changeuserformusername.value = userdata.username
|
changeuserformusername.value = userdata.username
|
||||||
changeuserformgroup.value = userdata.group
|
changeuserformgroup.value = userdata.group
|
||||||
console.log(changeuserformissuperuser.checked)
|
console.log(changeuserformissuperuser.checked)
|
||||||
changeuserformissuperuser.checked = userdata.is_superuser === "1"?true:false
|
changeuserformissuperuser.checked = userdata.is_superuser === "1"
|
||||||
}
|
}
|
||||||
|
|
||||||
cancelchangeuser.addEventListener('click', (e) => {
|
cancelchangeuser.addEventListener('click', (e) => {
|
||||||
@@ -34,13 +34,13 @@ cancelchangeuser.addEventListener('click', (e) => {
|
|||||||
|
|
||||||
changeuserformbody.addEventListener('submit', async (e) => {
|
changeuserformbody.addEventListener('submit', async (e) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
var request = {
|
let request = {
|
||||||
token: localStorage.getItem('token'),
|
token: localStorage.getItem('token'),
|
||||||
userid: changedatauserid,
|
userid: changedatauserid,
|
||||||
username: changeuserformusername.value,
|
username: changeuserformusername.value,
|
||||||
is_superuser: changeuserformissuperuser.checked?"1":"0",
|
is_superuser: changeuserformissuperuser.checked ? "1" : "0",
|
||||||
group: changeuserformgroup.value
|
group: changeuserformgroup.value
|
||||||
}
|
};
|
||||||
if (changeuserformpassword.value !== "") {request = {...request, "password": changeuserformpassword.value}}
|
if (changeuserformpassword.value !== "") {request = {...request, "password": changeuserformpassword.value}}
|
||||||
const status = await fetch(routes.change_user(), {
|
const status = await fetch(routes.change_user(), {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -52,6 +52,6 @@ changeuserformbody.addEventListener('submit', async (e) => {
|
|||||||
if (status.status === "ok") {
|
if (status.status === "ok") {
|
||||||
notification("Данные пользователя успешно изменены", "success")
|
notification("Данные пользователя успешно изменены", "success")
|
||||||
changeuserform.classList.remove('active')
|
changeuserform.classList.remove('active')
|
||||||
get_all_users()
|
await get_all_users()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -3,7 +3,7 @@ const confirmform = document.querySelector('.confirmform')
|
|||||||
const confirmformcancel = document.querySelector('.no')
|
const confirmformcancel = document.querySelector('.no')
|
||||||
const confirmformok = document.querySelector('.yes')
|
const confirmformok = document.querySelector('.yes')
|
||||||
|
|
||||||
var useridtodelete = ""
|
let useridtodelete = "";
|
||||||
|
|
||||||
userstablebody.addEventListener('click', e => {
|
userstablebody.addEventListener('click', e => {
|
||||||
if (e.target.classList.contains('deleteuser')) {
|
if (e.target.classList.contains('deleteuser')) {
|
||||||
@@ -32,7 +32,7 @@ confirmformok.addEventListener('click', async () => {
|
|||||||
})
|
})
|
||||||
if (status.status === "ok") {
|
if (status.status === "ok") {
|
||||||
confirmform.classList.remove('active')
|
confirmform.classList.remove('active')
|
||||||
get_all_users()
|
await get_all_users()
|
||||||
notification("Пользователь успешно удален", "success")
|
notification("Пользователь успешно удален", "success")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
+3
-4
@@ -2,7 +2,6 @@ const loginform = document.querySelector('.loginform')
|
|||||||
const loginformbody = document.querySelector('.loginformbody')
|
const loginformbody = document.querySelector('.loginformbody')
|
||||||
const loginforminputusername = document.querySelector('#loginforminputusername')
|
const loginforminputusername = document.querySelector('#loginforminputusername')
|
||||||
const loginforminputpassword = document.querySelector('#loginforminputpassword')
|
const loginforminputpassword = document.querySelector('#loginforminputpassword')
|
||||||
const loginformbutton = document.querySelector('.loginformbutton')
|
|
||||||
const exitbutton = document.querySelector('.exitbutton')
|
const exitbutton = document.querySelector('.exitbutton')
|
||||||
const usernameheader = document.querySelector('.usernameheader')
|
const usernameheader = document.querySelector('.usernameheader')
|
||||||
|
|
||||||
@@ -35,13 +34,13 @@ const login = async (username, password) => {
|
|||||||
notification("Успешно", "success")
|
notification("Успешно", "success")
|
||||||
loginform.classList.remove("active")
|
loginform.classList.remove("active")
|
||||||
localStorage.setItem("token", response.token)
|
localStorage.setItem("token", response.token)
|
||||||
get_user_data(response.token)
|
await get_user_data()
|
||||||
loginforminputusername.value = ""
|
loginforminputusername.value = ""
|
||||||
loginforminputpassword.value = ""
|
loginforminputpassword.value = ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const get_user_data = async (token) => {
|
const get_user_data = async () => {
|
||||||
const response = await fetch(routes.user(), {
|
const response = await fetch(routes.user(), {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: `{"token":"${localStorage.getItem("token")}"}`
|
body: `{"token":"${localStorage.getItem("token")}"}`
|
||||||
@@ -49,7 +48,7 @@ const get_user_data = async (token) => {
|
|||||||
notification(`Ошибка на сервере: ${error}`, "error")
|
notification(`Ошибка на сервере: ${error}`, "error")
|
||||||
})
|
})
|
||||||
if (response.is_superuser === "1") {
|
if (response.is_superuser === "1") {
|
||||||
get_all_users()
|
await get_all_users()
|
||||||
usernameheader.innerHTML = response.username
|
usernameheader.innerHTML = response.username
|
||||||
} else {
|
} else {
|
||||||
document.querySelector('.alluserstablebody').innerHTML = ""
|
document.querySelector('.alluserstablebody').innerHTML = ""
|
||||||
|
|||||||
Reference in new issue
Block a user