auth, first setup, error handling, small fixes

This commit is contained in:
Ivan
2023-09-11 12:57:10 +03:00
parent 97554fc6bb
commit 3262ae0230
19 changed files with 727 additions and 653 deletions

25
static/templates/404.html Normal file
View File

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Здесь ничего нет</title>
<link rel="stylesheet" href="../styles/main.css" />
</head>
<body>
<section class="form right">
<form>
<h1 style="margin-bottom: 40px;">Здесь ничего нет...</h1>
<button onclick="location.href = '/';" type="button">Вернуться</button>
</form>
</section>
<video class="animation left" autoplay muted loop>
<source src="../img/traffic.mp4" type="video/mp4">
</video>
<span class="copyright left"><a href="https://dribbble.com/shots/15608015-Traffic">Видеоматериал создан Igor Kozak для 10Clouds</a></span>
</body>
</html>

View File

@ -21,7 +21,7 @@
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>

View File

@ -21,7 +21,7 @@
<img id="down" src="../../img/down.svg">
<img id="up" src="../../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>

View File

@ -11,17 +11,17 @@
<header>
<h1>Аргус</h1>
<h2><span>/</span> Название организации</h2>
<h2><span>/</span> {{Organisation}}</h2>
</header>
<section class="account-info">
<div id="account-main">
<img id="person" src="../img/person.svg">
<span>Тестовое Имя</span>
<span>{{User}}</span>
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -43,6 +43,11 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -11,17 +11,17 @@
<header>
<h1>Аргус</h1>
<h2><span>/</span> Название организации</h2>
<h2><span>/</span> {{Organisation}}</h2>
</header>
<section class="account-info">
<div id="account-main">
<img id="person" src="../img/person.svg">
<span>Тестовое Имя</span>
<span>{{User}}</span>
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -43,6 +43,11 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -11,17 +11,17 @@
<header>
<h1>Аргус</h1>
<h2><span>/</span> Название организации</h2>
<h2><span>/</span> {{Organisation}}</h2>
</header>
<section class="account-info">
<div id="account-main">
<img id="person" src="../img/person.svg">
<span>Тестовое Имя</span>
<span>{{User}}</span>
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -43,6 +43,11 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -23,7 +23,7 @@
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -45,9 +45,11 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -25,7 +25,7 @@
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -47,9 +47,11 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
</a>
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -1,32 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Авторизация</title>
<link rel="stylesheet" href="../styles/main.css" />
</head>
<body>
<section class="form right">
<form enctype="multipart/form-data" method="post" action="/postsignin">
<h1 style="margin-bottom: 40px;">Добро пожаловать в Аргус</h1>
<label for="login">Логин<span>*</span></label>
<input title="Введите логин" placeholder="Введите логин" name="login" type="text" required>
<label for="password">Пароль<span>*</span></label>
<input title="Введите пароль" placeholder="Введите пароль" name="password" type="password" required>
<button onclick="window.location.href='/'" type="button">Войти</button>
</form>
</section>
<video class="animation left" autoplay muted loop>
<source src="../img/traffic.mp4" type="video/mp4">
</video>
<span class="copyright left"><a href="https://dribbble.com/shots/15608015-Traffic">Видеоматериал создан Igor Kozak на Dribbble</a></span>
</body>
</html>

View File

@ -10,7 +10,7 @@
<body>
<section class="form left">
<form enctype="multipart/form-data" method="post" action="/postsignin">
<form enctype="multipart/form-data" method="post" action="/setup" id="setupForm">
<h1>Добро пожаловать в Аргус</h1>
<h2>Приступим к созданию организации</h2>
@ -26,7 +26,7 @@
<label for="repassword">Подтверждение<span>*</span></label>
<input title="Повторите пароль" placeholder="Повторите пароль" name="repassword" type="password" required>
<button onclick="window.location.href='/'" type="button">Установить</button>
<button type="submit">Установить</button>
</form>
</section>
@ -34,7 +34,55 @@
<video class="animation right" autoplay muted loop>
<source src="../img/traffic.mp4" type="video/mp4">
</video>
<span class="copyright right"><a href="https://dribbble.com/shots/15608015-Traffic">Видеоматериал создан Igor Kozak на Dribbble</a></span>
<span class="copyright right"><a href="https://dribbble.com/shots/15608015-Traffic">Видеоматериал создан Igor Kozak для 10Clouds</a></span>
<script>
document.addEventListener("DOMContentLoaded", function() {
const passwordInput = document.querySelector('input[name="password"]');
const repasswordInput = document.querySelector('input[name="repassword"]');
// Обработка отправки формы в формате JSON
const setupForm = document.getElementById('setupForm');
setupForm.addEventListener('submit', function(event) {
const password = passwordInput.value;
const repassword = repasswordInput.value;
if (password !== repassword) {
alert('Пароли не совпадают');
event.preventDefault();
return;
}
event.preventDefault();
const formData = new FormData(setupForm);
const jsonData = {};
formData.forEach((value, key) => {
jsonData[key] = value;
});
const xhr = new XMLHttpRequest();
xhr.open('POST', '/setup');
xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
xhr.onload = function() {
if (xhr.status === 200) {
location.href = '/';
} else {
alert('Произошла ошибка при отправке данных');
window.location.reload();
}
};
xhr.onerror = function() {
// Ошибка сети
alert('Произошла ошибка сети');
};
xhr.send(JSON.stringify(jsonData));
});
});
</script>

View File

@ -21,7 +21,7 @@
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -43,9 +43,11 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -23,7 +23,7 @@
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -45,9 +45,11 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -11,17 +11,17 @@
<header>
<h1>Аргус</h1>
<h2><span>/</span> Название организации</h2>
<h2><span>/</span> {{Organisation}}</h2>
</header>
<section class="account-info">
<div id="account-main">
<img id="person" src="../img/person.svg">
<span>Тестовое Имя</span>
<span>{{User}}</span>
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -43,16 +43,18 @@
<a href="/videos">
<div><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div class="selected"><img src="../img/gear.svg">Настройки</div>
</a>
</section>
<section class="main">
<!-- {{#if ifDBError}}
{{#if ifDBError}}
<section class="dberror">
<div class="erorr-container">
<img src="../img/warning.svg"> <br>
@ -61,7 +63,7 @@
<button type="button" onclick="location.reload();">Повторить попытку</button>
</div>
</section>
{{/if}} -->
{{/if}}
<section style="display: none;" class="dberror" id="deleteConfirmation" >
<div class="erorr-container">
<div id="loader" class="loader">

View File

@ -0,0 +1,72 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Авторизация</title>
<link rel="stylesheet" href="../styles/main.css" />
</head>
<body>
<section class="form right">
<form enctype="multipart/form-data" method="post" action="/login" id="loginForm">
<h1 style="margin-bottom: 40px;">Добро пожаловать в Аргус</h1>
<label for="login">Логин или Email<span>*</span></label>
<input placeholder="Введите логин или Email" name="email" type="text" required>
<label for="password">Пароль<span>*</span></label>
<input placeholder="Введите пароль" name="password" type="password" required>
<button type="submit">Войти</button>
</form>
</section>
<video class="animation left" autoplay muted loop>
<source src="../img/traffic.mp4" type="video/mp4">
</video>
<span class="copyright left"><a href="https://dribbble.com/shots/15608015-Traffic">Видеоматериал создан Igor Kozak для 10Clouds</a></span>
<script>
document.addEventListener("DOMContentLoaded", function() {
// Обработка отправки формы в формате JSON
const loginForm = document.getElementById('loginForm');
loginForm.addEventListener('submit', function(event) {
event.preventDefault();
const formData = new FormData(loginForm);
const jsonData = {};
formData.forEach((value, key) => {
jsonData[key] = value;
});
const xhr = new XMLHttpRequest();
xhr.open('POST', '/login');
xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
xhr.onload = function() {
if (xhr.status === 200) {
location.href = '/';
} else if (xhr.status === 401) {
alert('Неверный логин или пароль');
} else {
alert('Произошла ошибка при отправке данных');
window.location.reload();
}
};
xhr.onerror = function() {
// Ошибка сети
alert('Произошла ошибка сети');
};
xhr.send(JSON.stringify(jsonData));
});
});
</script>
</body>
</html>

View File

@ -25,7 +25,7 @@
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -47,9 +47,11 @@
<a href="/videos">
<div class="selected"><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>

View File

@ -25,7 +25,7 @@
<img id="down" src="../img/down.svg">
<img id="up" src="../img/up.svg">
</div>
<a href="/login"><div id="account-additional" class="additional">Выйти</div></a>
<a href="/logout"><div id="account-additional" class="additional">Выйти</div></a>
</section>
@ -47,9 +47,11 @@
<a href="/videos">
<div class="selected"><img src="../img/play.svg">Записи</div>
</a>
{{#if isAdmin}}
<a class="admin-panel" href="/admin">
<div><img src="../img/keyboard.svg">Админка</div>
<div><img src="../img/keyboard.svg">Админка</div>
</a>
{{/if}}
<a class="settings" href="/settings">
<div><img src="../img/gear.svg">Настройки</div>
</a>