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

This commit is contained in:
2020-03-18 22:55:04 +03:00
parent 3b678c4124
commit 7685a07339
4 changed files with 507 additions and 462 deletions

View File

@@ -2,11 +2,11 @@
<html lang="ru-RU"> <html lang="ru-RU">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta content="width=device-width, initial-scale=1.0" name="viewport">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta content="ie=edge" http-equiv="X-UA-Compatible">
<title>Jarvis</title> <title>Jarvis</title>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename = './css/main.css') }}"> <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet" type="text/css">
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='./img/favicon.ico') }}"> <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> <script src="{{ url_for('static', filename = './js/main.js') }}"></script>
</head> </head>
@@ -16,15 +16,16 @@
<header class="header"> <header class="header">
<div class="container clearfix"> <div class="container clearfix">
<div class="header_left clearfix"> <div class="header_left clearfix">
<a href="/" class="logo-decor"> <a class="logo-decor" href="/">
<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> <p class="logo-text">J.a.r.v.i.s </p>
</a> </a>
</div> </div>
<div class="header_right"> <div class="header_right">
<div class="contacts"> <div class="contacts">
<div class="drop"> <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="dropdown dropdown_mod" id="dropdown">
<div class="drop-block drop-block_mod"> <div class="drop-block drop-block_mod">
@@ -46,7 +47,7 @@
</div> </div>
<div class="not_found-img"> <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> </div>
</section> </section>
@@ -57,37 +58,43 @@
<footer class="footer clearfix"> <footer class="footer clearfix">
<div class="container"> <div class="container">
<div class="footer-q clearfix"> <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>
<div class="footer-q clearfix"> <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>
<div class="footer-q clearfix"> <div class="footer-q clearfix">
<p class="footer-messeger_text">Наши социальные сети</p> <p class="footer-messeger_text">Наши социальные сети</p>
<ul class="footer-messeger"> <ul class="footer-messeger">
<li class="footer-messeger__item "> <li class="footer-messeger__item ">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/vk.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link "> <a class="footer-messeger__link " href="">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/fb.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/google.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/twitter.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/mail.png') }}">
</a> </a>
</li> </li>
</ul> </ul>

View File

@@ -2,11 +2,11 @@
<html lang="ru-RU"> <html lang="ru-RU">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta content="width=device-width, initial-scale=1.0" name="viewport">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta content="ie=edge" http-equiv="X-UA-Compatible">
<title>Jarvis</title> <title>Jarvis</title>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename = './css/main.css') }}"> <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet" type="text/css">
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='./img/favicon.ico') }}"> <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> <script src="{{ url_for('static', filename = './js/main.js') }}"></script>
</head> </head>
@@ -17,7 +17,8 @@
<div class="container clearfix"> <div class="container clearfix">
<div class="header_left clearfix"> <div class="header_left clearfix">
<a class="logo-decor"> <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> <p class="logo-text">J.a.r.v.i.s </p>
</a> </a>
</div> </div>
@@ -25,12 +26,13 @@
<div class="contacts"> <div class="contacts">
<div class="drop"> <div class="drop">
{% if current_user.is_authenticated %} {% 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="dropdown dropdown_mod" id="dropdown">
<div class="drop-block drop-block_out"> <div class="drop-block drop-block_out">
<div class="triangle triangle_mod"></div> <div class="triangle triangle_mod"></div>
<a href="/logout"> <a href="/logout">
<button type="submit" value="Выйти" class="header_btn" name="LogOut" >Выход</button> <button class="header_btn" name="LogOut" type="submit" value="Выйти">Выход</button>
</a> </a>
</div> </div>
</div> </div>
@@ -41,12 +43,15 @@
<form action="/login" method="POST"> <form action="/login" method="POST">
<div class="triangle"></div> <div class="triangle"></div>
<label class="form__cell-header "> <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>
<label class="form__cell-header"> <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> </label>
<button type="submit" value="Войти" class="header_btn" name="LogButton" >Вход</button> <button class="header_btn" name="LogButton" type="submit" value="Войти">Вход
</button>
</form> </form>
</div> </div>
</div> </div>
@@ -63,7 +68,7 @@
<div class="rotateblock_orenge"> <div class="rotateblock_orenge">
<div class="ava_logo"> <div class="ava_logo">
<div class="rotateblock"> <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> </div>
</div> </div>
@@ -76,12 +81,13 @@
</div> </div>
<div class="input-button"> <div class="input-button">
{% if current_user.is_authenticated %} {% if current_user.is_authenticated %}
<a href="/workshop" class="input"> <a class="input" href="/workshop">
<input type="button" href="/login" name="LogButton" class="welcome__btn" value="Приступить" > <input class="welcome__btn" href="/login" name="LogButton" type="button" value="Приступить">
</a> </a>
{% else %} {% else %}
<a href="/registration" class="input"> <a class="input" href="/registration">
<input type="button" href="/registration" name="scriptbutton" class="welcome__btn" value="Регистрация" > <input class="welcome__btn" href="/registration" name="scriptbutton" type="button"
value="Регистрация">
</a> </a>
{% endif %} {% endif %}
</div> </div>
@@ -97,7 +103,8 @@
<footer class="footer clearfix"> <footer class="footer clearfix">
<div class="container"> <div class="container">
<div class="footer-q clearfix"> <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>
<div class="footer-q clearfix"> <div class="footer-q clearfix">
<a class="logo-text">j.a.r.v.i.s</a> <a class="logo-text">j.a.r.v.i.s</a>
@@ -106,28 +113,33 @@
<p class="footer-messeger_text">Наши социальные сети</p> <p class="footer-messeger_text">Наши социальные сети</p>
<ul class="footer-messeger"> <ul class="footer-messeger">
<li class="footer-messeger__item "> <li class="footer-messeger__item ">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/vk.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/vk.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link "> <a class="footer-messeger__link " href="">
<img src="{{ url_for('static', filename='./img/fb.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/fb.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/google.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/google.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/twitter.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/twitter.png') }}">
</a> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <a class="footer-messeger__link" href="">
<img src="{{ url_for('static', filename='./img/mail.png') }}" class="footer-messeger__icon" alt=""> <img alt="" class="footer-messeger__icon"
src="{{ url_for('static', filename='./img/mail.png') }}">
</a> </a>
</li> </li>
</ul> </ul>

View File

@@ -17,7 +17,8 @@
<div class="container clearfix"> <div class="container clearfix">
<div class="header_left clearfix"> <div class="header_left clearfix">
<a href="/" class="logo-decor"> <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> <p class="logo-text">J.a.r.v.i.s </p>
</a> </a>
</div> </div>
@@ -30,10 +31,12 @@
<div class="drop-block"> <div class="drop-block">
<div class="triangle"></div> <div class="triangle"></div>
<label class="form__cell-header "> <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>
<label class="form__cell-header"> <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> </label>
<a href="" class="input"> <a href="" class="input">
<input type="button" name="LogButton" class="header_btn" value="Войти"> <input type="button" name="LogButton" class="header_btn" value="Войти">
@@ -63,20 +66,24 @@
<div class="form__field-title"> <div class="form__field-title">
Введите логин Введите логин
</div> </div>
<input type="text" class="form__input-text" placeholder="Введите логин" name = "RegUserLogin"> <input type="text" class="form__input-text" placeholder="Введите логин"
name="RegUserLogin">
</label> </label>
<label class="form__log"> <label class="form__log">
<div class="form__field-title"> <div class="form__field-title">
Введите пароль Введите пароль
</div> </div>
<input type="password" class="form__input-text" placeholder="Введите пароль" name = "RegUserPassw"> <input type="password" class="form__input-text" placeholder="Введите пароль"
name="RegUserPassw">
</label> </label>
</div> </div>
<div class="form__btns"> <div class="form__btns">
<div class="form__controls"> <div class="form__controls">
<div class="form__controls-btns clearfix"> <div class="form__controls-btns clearfix">
<div class="form__controls-right"> <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> </div>
</div> </div>
@@ -92,7 +99,8 @@
<footer class="footer clearfix"> <footer class="footer clearfix">
<div class="container"> <div class="container">
<div class="footer-q clearfix"> <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>
<div class="footer-q clearfix"> <div class="footer-q clearfix">
<a href="/" class="logo-text">j.a.r.v.i.s</a> <a href="/" class="logo-text">j.a.r.v.i.s</a>
@@ -102,27 +110,32 @@
<ul class="footer-messeger"> <ul class="footer-messeger">
<li class="footer-messeger__item "> <li class="footer-messeger__item ">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link "> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
</ul> </ul>

View File

@@ -17,14 +17,16 @@
<div class="container clearfix"> <div class="container clearfix">
<div class="header_left clearfix"> <div class="header_left clearfix">
<a href="/" class="logo-decor"> <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> <p class="logo-text">J.a.r.v.i.s </p>
</a> </a>
</div> </div>
<div class="header_right"> <div class="header_right">
<div class="contacts"> <div class="contacts">
<div class="drop"> <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="dropdown dropdown_mod" id="dropdown">
<div class="drop-block drop-block_out"> <div class="drop-block drop-block_out">
<div class="triangle triangle_mod"></div> <div class="triangle triangle_mod"></div>
@@ -51,7 +53,8 @@
<div class="form__field-title"> <div class="form__field-title">
Название Название
</div> </div>
<input type="text" class="form__input-text" placeholder="Название нового сценария" name = "NewScenarioName"> <input type="text" class="form__input-text" placeholder="Название нового сценария"
name="NewScenarioName">
</label> </label>
<label class="form__log"> <label class="form__log">
<div class="form__field-title"> <div class="form__field-title">
@@ -87,7 +90,9 @@
<div class="form__controls"> <div class="form__controls">
<div class="form__controls-btns clearfix"> <div class="form__controls-btns clearfix">
<div class="form__controls-right"> <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> </div>
</div> </div>
@@ -136,7 +141,9 @@
<div class="form__controls"> <div class="form__controls">
<div class="form__controls-btns clearfix"> <div class="form__controls-btns clearfix">
<div class="form__controls-right"> <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> </div>
</div> </div>
@@ -151,7 +158,8 @@
<footer class="footer clearfix"> <footer class="footer clearfix">
<div class="container"> <div class="container">
<div class="footer-q clearfix"> <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>
<div class="footer-q clearfix"> <div class="footer-q clearfix">
<a href="/" class="logo-text">j.a.r.v.i.s</a> <a href="/" class="logo-text">j.a.r.v.i.s</a>
@@ -161,27 +169,32 @@
<ul class="footer-messeger"> <ul class="footer-messeger">
<li class="footer-messeger__item "> <li class="footer-messeger__item ">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link "> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
<li class="footer-messeger__item"> <li class="footer-messeger__item">
<a href="" class="footer-messeger__link"> <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> </a>
</li> </li>
</ul> </ul>