Llloooggg/Jarvis
1
0
Fork 0
mirror of https://github.com/Llloooggg/Jarvis.git synced 2026-03-06 03:56:23 +03:00
Code Issues 21 Packages Projects Releases Wiki Activity

Рефракторинг

Browse Source
This commit is contained in:
Denis Podshivalov
2020-03-18 22:55:04 +03:00
parent 3b678c4124
commit 7685a07339
4 changed files with 507 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
templates/error.html
View File

@@ -2,34 +2,35 @@
<html lang="ru-RU">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<meta content="ie=edge" http-equiv="X-UA-Compatible">
<title>Jarvis</title>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename = './css/main.css') }}">
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='./img/favicon.ico') }}">
<link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet" type="text/css">
<link href="{{ url_for('static', filename='./img/favicon.ico') }}" rel="icon" type="image/x-icon">
<script src="{{ url_for('static', filename = './js/main.js') }}"></script>
</head>
<body>
<div class="wrapper">
<!-- header -->
<div class="wrapper">
<!-- header -->
<header class="header">
<div class="container clearfix">
<div class="header_left clearfix">
<a href="/" class="logo-decor">
<img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
<a class="logo-decor" href="/">
<img alt=""
class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">
<p class="logo-text">J.a.r.v.i.s </p>
</a>
</div>
<div class="header_right">
<div class="contacts">
<div class="drop">
<a href="" class="contacts__schedule" onclick="activeClass();">Нужна помощь?</a>
<a class="contacts__schedule" href="" onclick="activeClass();">Нужна помощь?</a>
<div class="dropdown dropdown_mod" id="dropdown">
<div class="drop-block drop-block_mod">
<div class="triangle triangle_mod"></div>
<p>Обратитесь в службу поддержки по адресу:<b>jarvis@mail.ru</b> </p>
<p>Обратитесь в службу поддержки по адресу:<b>jarvis@mail.ru</b></p>
</div>
</div>
</div>
@@ -46,53 +47,59 @@
</div>
<div class="not_found-img">
<img src="{{ url_for('static', filename='./img/travolta.png') }}" alt="" class="img404">
<img alt="" class="img404" src="{{ url_for('static', filename='./img/travolta.png') }}">
</div>
</section>
</div>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b class="footer-text_name"></b> </p>
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b
class="footer-text_name"></b></p>
</div>
<div class="footer-q clearfix">
<a href="/" class="logo-text">j.a.r.v.i.s</a>
<a class="logo-text" href="/">j.a.r.v.i.s</a>
</div>
<div class="footer-q clearfix">
<p class="footer-messeger_text">Наши социальные сети</p>
<ul class="footer-messeger">
<li class="footer-messeger__item ">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/vk.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link ">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link " href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/fb.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/google.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/twitter.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/mail.png') }}">
</a>
</li>
</ul>
</div>
</div>
</footer>
</footer>
</body>
</html>

78
templates/index.html
View File

@@ -2,22 +2,23 @@
<html lang="ru-RU">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<meta content="ie=edge" http-equiv="X-UA-Compatible">
<title>Jarvis</title>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename = './css/main.css') }}">
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='./img/favicon.ico') }}">
<link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet" type="text/css">
<link href="{{ url_for('static', filename='./img/favicon.ico') }}" rel="icon" type="image/x-icon">
<script src="{{ url_for('static', filename = './js/main.js') }}"></script>
</head>
<body>
<div class="wrapper">
<!-- header-- -->
<div class="wrapper">
<!-- header-- -->
<header class="header">
<div class="container clearfix">
<div class="header_left clearfix">
<a class="logo-decor">
<img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
<img alt=""
class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">
<p class="logo-text">J.a.r.v.i.s </p>
</a>
</div>
@@ -25,12 +26,13 @@
<div class="contacts">
<div class="drop">
{% if current_user.is_authenticated %}
<p href="" class="contacts__schedule contacts__schedule_mod" onclick="activeClass();">{{ current_user.username }}</p>
<p class="contacts__schedule contacts__schedule_mod" href="" onclick="activeClass();">{{
current_user.username }}</p>
<div class="dropdown dropdown_mod" id="dropdown">
<div class="drop-block drop-block_out">
<div class="triangle triangle_mod"></div>
<a href="/logout" >
<button type="submit" value="Выйти" class="header_btn" name="LogOut" >Выход</button>
<a href="/logout">
<button class="header_btn" name="LogOut" type="submit" value="Выйти">Выход</button>
</a>
</div>
</div>
@@ -41,12 +43,15 @@
<form action="/login" method="POST">
<div class="triangle"></div>
<label class="form__cell-header ">
<input type="text" class="form__input-text-mod" placeholder="Логин" name= "LogUserLogin">
<input class="form__input-text-mod" name="LogUserLogin" placeholder="Логин"
type="text">
</label>
<label class="form__cell-header">
<input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserPassw">
<input class="form__input-text-mod" name="LogUserPassw" placeholder="Пароль"
type="password">
</label>
<button type="submit" value="Войти" class="header_btn" name="LogButton" >Вход</button>
<button class="header_btn" name="LogButton" type="submit" value="Войти">Вход
</button>
</form>
</div>
</div>
@@ -63,7 +68,7 @@
<div class="rotateblock_orenge">
<div class="ava_logo">
<div class="rotateblock">
<img src="{{ url_for('static', filename='./img/ava.png') }}" alt="" class="ava">
<img alt="" class="ava" src="{{ url_for('static', filename='./img/ava.png') }}">
</div>
</div>
</div>
@@ -76,12 +81,13 @@
</div>
<div class="input-button">
{% if current_user.is_authenticated %}
<a href="/workshop" class="input">
<input type="button" href="/login" name="LogButton" class="welcome__btn" value="Приступить" >
<a class="input" href="/workshop">
<input class="welcome__btn" href="/login" name="LogButton" type="button" value="Приступить">
</a>
{% else %}
<a href="/registration" class="input">
<input type="button" href="/registration" name="scriptbutton" class="welcome__btn" value="Регистрация" >
<a class="input" href="/registration">
<input class="welcome__btn" href="/registration" name="scriptbutton" type="button"
value="Регистрация">
</a>
{% endif %}
</div>
@@ -91,13 +97,14 @@
</section>
</div>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b class="footer-text_name"></b> </p>
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b
class="footer-text_name"></b></p>
</div>
<div class="footer-q clearfix">
<a class="logo-text">j.a.r.v.i.s</a>
@@ -106,33 +113,38 @@
<p class="footer-messeger_text">Наши социальные сети</p>
<ul class="footer-messeger">
<li class="footer-messeger__item ">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/vk.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link ">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link " href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/fb.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/google.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/twitter.png') }}">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon" alt="">
<a class="footer-messeger__link" href="">
<img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/mail.png') }}">
</a>
</li>
</ul>
</div>
</div>
</footer>
</footer>
</body>
</html>

53
templates/registration.html
View File

@@ -11,13 +11,14 @@
</head>
<body>
<div class="wrapper">
<!-- header-- -->
<div class="wrapper">
<!-- header-- -->
<header class="header">
<div class="container clearfix">
<div class="header_left clearfix">
<a href="/" class="logo-decor">
<img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
<img class="logo_icon"
src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
<p class="logo-text">J.a.r.v.i.s </p>
</a>
</div>
@@ -30,13 +31,15 @@
<div class="drop-block">
<div class="triangle"></div>
<label class="form__cell-header ">
<input type="text" class="form__input-text-mod" placeholder="Логин" name= "LogUserLogin">
<input type="text" class="form__input-text-mod" placeholder="Логин"
name="LogUserLogin">
</label>
<label class="form__cell-header">
<input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserPassw">
<input type="password" class="form__input-text-mod" placeholder="Пароль"
name="LogUserPassw">
</label>
<a href="" class="input">
<input type="button" name="LogButton" class="header_btn" value="Войти" >
<input type="button" name="LogButton" class="header_btn" value="Войти">
</a>
</div>
</form>
@@ -63,20 +66,24 @@
<div class="form__field-title">
Введите логин
</div>
<input type="text" class="form__input-text" placeholder="Введите логин" name = "RegUserLogin">
<input type="text" class="form__input-text" placeholder="Введите логин"
name="RegUserLogin">
</label>
<label class="form__log">
<div class="form__field-title" >
<div class="form__field-title">
Введите пароль
</div>
<input type="password" class="form__input-text" placeholder="Введите пароль" name = "RegUserPassw">
<input type="password" class="form__input-text" placeholder="Введите пароль"
name="RegUserPassw">
</label>
</div>
<div class="form__btns">
<div class="form__controls">
<div class="form__controls-btns clearfix">
<div class="form__controls-right">
<button type="submit" value="Отправить" class="form__submit" name="RegButton" >Регистрация</button>
<button type="submit" value="Отправить" class="form__submit" name="RegButton">
Регистрация
</button>
</div>
</div>
</div>
@@ -86,13 +93,14 @@
</form>
</section>
</div>
</div>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b class="footer-text_name"></b> </p>
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b
class="footer-text_name"></b></p>
</div>
<div class="footer-q clearfix">
<a href="/" class="logo-text">j.a.r.v.i.s</a>
@@ -102,32 +110,37 @@
<ul class="footer-messeger">
<li class="footer-messeger__item ">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link ">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
</ul>
</div>
</div>
</footer>
</footer>
</body>
</html>

73
templates/workshop.html
View File

@@ -11,25 +11,27 @@
</head>
<body>
<div class="wrapper">
<!-- header-- -->
<div class="wrapper">
<!-- header-- -->
<header class="header">
<div class="container clearfix">
<div class="header_left clearfix">
<a href="/" class="logo-decor">
<img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
<img class="logo_icon"
src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
<p class="logo-text">J.a.r.v.i.s </p>
</a>
</div>
<div class="header_right">
<div class="contacts">
<div class="drop">
<p href="" class="contacts__schedule contacts__schedule_mod" onclick="activeClass();">{{ current_user.username }}</p>
<p href="" class="contacts__schedule contacts__schedule_mod" onclick="activeClass();">{{
current_user.username }}</p>
<div class="dropdown dropdown_mod" id="dropdown">
<div class="drop-block drop-block_out">
<div class="triangle triangle_mod"></div>
<a href="/logout" class="input">
<button type="submit" value="Выйти" class="header_btn" name="LogOut" >Выход</button>
<button type="submit" value="Выйти" class="header_btn" name="LogOut">Выход</button>
</a>
</div>
</div>
@@ -48,46 +50,49 @@
<form action="/workshop" name="NewSceanrio" method="POST">
<div class="form_condition">
<label class="form__log">
<div class="form__field-title" >
<div class="form__field-title">
Название
</div>
<input type="text" class="form__input-text" placeholder="Название нового сценария" name = "NewScenarioName">
<input type="text" class="form__input-text" placeholder="Название нового сценария"
name="NewScenarioName">
</label>
<label class="form__log">
<div class="form__field-title" >
<div class="form__field-title">
Условие:
</div>
<select class="form__input-text" name = "TriggerName">
<select class="form__input-text" name="TriggerName">
{% for trigger in triggers_list %}
<option value="{{ trigger.id }}" >{{ trigger.name }}</option>
<option value="{{ trigger.id }}">{{ trigger.name }}</option>
{% endfor %}
</select>
</label>
<div class="form__row">
<label class="form__textaria-label">
<textarea class="form__texterea" placeholder="Параметры" name = "TriggerArgs"></textarea>
<textarea class="form__texterea" placeholder="Параметры" name="TriggerArgs"></textarea>
</label>
</div>
<label class="form__log">
<div class="form__field-title" >
<div class="form__field-title">
Действие:
</div>
<select class="form__input-text" name = "ActionName">
<select class="form__input-text" name="ActionName">
{% for action in actions_list %}
<option value="{{ action.id }}" >{{ action.name }}</option>
<option value="{{ action.id }}">{{ action.name }}</option>
{% endfor %}
</select>
</label>
<div class="form__row">
<label class="form__textaria-label">
<textarea class="form__texterea" placeholder="Параметры" name = "ActionArgs"></textarea>
<textarea class="form__texterea" placeholder="Параметры" name="ActionArgs"></textarea>
</label>
</div>
<div class="form__btns">
<div class="form__controls">
<div class="form__controls-btns clearfix">
<div class="form__controls-right">
<button type="submit" value="Добавить" class="form__submit" name="SendScenario" >Добавить</button>
<button type="submit" value="Добавить" class="form__submit" name="SendScenario">
Добавить
</button>
</div>
</div>
</div>
@@ -108,7 +113,7 @@
{% for user_script in user_scripts_list%}
<li class="events_item">
<p>{{ user_script.scenario_name }}</p>
<div class="cl-btn-7" ></div>
<div class="cl-btn-7"></div>
</li>
{% endfor %}
{% else %}
@@ -127,16 +132,18 @@
<form action="/workshop" name="Telegram" method="POST">
<label class="form__log">
{% if tg_username %}
<input type="text" class="form__input-text" placeholder={{tg_username}} name = "TGUsername">
<input type="text" class="form__input-text" placeholder={{tg_username}} name="TGUsername">
{% else %}
<input type="text" class="form__input-text" placeholder="Логин" name = "TGUsername">
<input type="text" class="form__input-text" placeholder="Логин" name="TGUsername">
{% endif %}
</label>
<div class="form__btns">
<div class="form__controls">
<div class="form__controls-btns clearfix">
<div class="form__controls-right">
<button type="submit" value="Отправить" class="form__submit" name="TelegButton" >Изменить</button>
<button type="submit" value="Отправить" class="form__submit" name="TelegButton">
Изменить
</button>
</div>
</div>
</div>
@@ -145,13 +152,14 @@
</div>
</section>
</section>
</div>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b class="footer-text_name"></b> </p>
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b
class="footer-text_name"></b></p>
</div>
<div class="footer-q clearfix">
<a href="/" class="logo-text">j.a.r.v.i.s</a>
@@ -161,32 +169,37 @@
<ul class="footer-messeger">
<li class="footer-messeger__item ">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link ">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
<li class="footer-messeger__item">
<a href="" class="footer-messeger__link">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon" alt="">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon"
alt="">
</a>
</li>
</ul>
</div>
</div>
</footer>
</footer>
</body>
</html>