This commit is contained in:
Pro100ser
2020-03-18 23:56:38 +03:00
7 changed files with 556 additions and 506 deletions

View File

@@ -67,8 +67,7 @@ def workshop():
actionArgs) actionArgs)
return redirect(url_for('workshop')) return redirect(url_for('workshop'))
if 'NewScenarioName' in request.form: # if 'NewScenarioName' in request.form:
print('писька коня')
if 'TGUsername' in request.form: if 'TGUsername' in request.form:
new_tg_username = request.form['TGUsername'] new_tg_username = request.form['TGUsername']
@@ -81,7 +80,6 @@ def workshop():
User = db_routing.get_user(id=current_user.get_id()) User = db_routing.get_user(id=current_user.get_id())
if User: if User:
tg_username = User.tg_username tg_username = User.tg_username
print(tg_username)
else: else:
tg_username = None tg_username = None
return render_template('workshop.html', triggers_list=triggers_list, actions_list=actions_list, return render_template('workshop.html', triggers_list=triggers_list, actions_list=actions_list,

36
actions.py Normal file
View File

@@ -0,0 +1,36 @@
# будильник
import datetime
import imaplib
import time
def alarm_clock():
dt = datetime.datetime(2020, 3, 18, 18, 6, 15) # дата срабатывания будильника (год,месяц,день,час,минута,секунда)
diff = (dt - datetime.datetime.now()).total_seconds()
print(diff)
time.sleep(diff)
print('сообщение в телегу текст')
# проверка почты на новое письмо gmail
# Нужно включить https://myaccount.google.com/lesssecureapps и https://mail.google.com/mail/u/2/#settings/fwdandpop
#
def check_email(gmail_user, gmail_pass):
mail = imaplib.IMAP4_SSL('imap.gmail.com', 993)
mail.login(gmail_user, gmail_pass)
mail.list()
count_Email_Start = (mail.select("inbox")[1][0]).decode('utf-8')
while True:
mail.list()
count_Email_Current = (mail.select("inbox")[1][0]).decode('utf-8')
if count_Email_Current > count_Email_Start:
print('Отправить сообщение в телегу о том, а) занят б)текст')
count_Email_Start = count_Email_Current
time.sleep(15) # частота проверки нового письма
if __name__ == '__main__':
alarm_clock()
# сценарии должны хранить логины и пароль
# запилить бота, возврат темы и отправителя в словаре.

View File

@@ -48,7 +48,7 @@ class Scenario(db.Model):
__tablename__ = 'Scenarios' __tablename__ = 'Scenarios'
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
owner_id = db.Column(db.Integer, ForeignKey('Users.id')) owner_id = db.Column(db.Integer, ForeignKey('Users.id'))
scenario_name = db.Column(db.String(80)) scenario_name = db.Column(db.String(80), nullable=False)
trigger_id = db.Column(db.Integer, ForeignKey('Triggers.id')) trigger_id = db.Column(db.Integer, ForeignKey('Triggers.id'))
trigger_args = db.Column(db.String(200)) trigger_args = db.Column(db.String(200))
action_id = db.Column(db.Integer, ForeignKey('Actions.id')) action_id = db.Column(db.Integer, ForeignKey('Actions.id'))

View File

@@ -2,97 +2,104 @@
<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>
<body> <body>
<div class="wrapper"> <div class="wrapper">
<!-- header --> <!-- header -->
<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=""
<p class="logo-text">J.a.r.v.i.s </p> class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">
</a> <p class="logo-text">J.a.r.v.i.s </p>
</div> </a>
<div class="header_right"> </div>
<div class="contacts"> <div class="header_right">
<div class="drop"> <div class="contacts">
<a href="" class="contacts__schedule" onclick="activeClass();">Нужна помощь?</a> <div class="drop">
<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">
<div class="triangle triangle_mod"></div> <div class="triangle triangle_mod"></div>
<p>Обратитесь в службу поддержки по адресу:<b>jarvis@mail.ru</b> </p> <p>Обратитесь в службу поддержки по адресу:<b>jarvis@mail.ru</b></p>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</header>
<section class="container error">
<div class="not_found">
<h1 class="not_found-title">404</h1>
<h2 class="not_found-text">not found</h2>
</div>
<div class="not_found-img">
<img src="{{ url_for('static', filename='./img/travolta.png') }}" alt="" class="img404">
</div>
</section>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<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>
</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>
</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>
</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>
</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>
</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>
</li>
</ul>
</div>
</div> </div>
</footer> </header>
<section class="container error">
<div class="not_found">
<h1 class="not_found-title">404</h1>
<h2 class="not_found-text">not found</h2>
</div>
<div class="not_found-img">
<img alt="" class="img404" src="{{ url_for('static', filename='./img/travolta.png') }}">
</div>
</section>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <b
class="footer-text_name"></b></p>
</div>
<div class="footer-q clearfix">
<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 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 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 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 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 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>
</body> </body>
</html> </html>

View File

@@ -2,137 +2,149 @@
<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>
<body> <body>
<div class="wrapper"> <div class="wrapper">
<!-- header-- --> <!-- header-- -->
<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 class="logo-decor"> <a class="logo-decor">
<img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt=""> <img alt=""
<p class="logo-text">J.a.r.v.i.s </p> class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">
</a> <p class="logo-text">J.a.r.v.i.s </p>
</div> </a>
<div class="header_right">
<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>
<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>
</div>
</div>
{% else %}
<div class="contacts__schedule" onclick="activeClass();">Войти</div>
<div class="dropdown" id="dropdown">
<div class="drop-block">
<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">
</label>
<label class="form__cell-header">
<input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserPassw">
</label>
<button type="submit" value="Войти" class="header_btn" name="LogButton" >Вход</button>
</form>
</div>
</div>
{% endif %}
</div>
</div>
</div>
</div> </div>
</header> <div class="header_right">
<div class="contacts">
<section class="hero"> <div class="drop">
<div class="container"> {% if current_user.is_authenticated %}
<div class="hero_con clearfix"> <p class="contacts__schedule contacts__schedule_mod" href="" onclick="activeClass();">{{
<div class="rotateblock_orenge"> current_user.username }}</p>
<div class="ava_logo"> <div class="dropdown dropdown_mod" id="dropdown">
<div class="rotateblock"> <div class="drop-block drop-block_out">
<img src="{{ url_for('static', filename='./img/ava.png') }}" alt="" class="ava"> <div class="triangle triangle_mod"></div>
</div> <a href="/logout">
</div> <button class="header_btn" name="LogOut" type="submit" value="Выйти">Выход</button>
</div>
<div class="content_form">
<div class="animate_text">
<h class="h_content">Jarvis</h>
</div>
<div class="content_form-text">
<p class="text_content">Ваш индивидуальный помощник на каждый день</p>
</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> </a>
{% else %} </div>
<a href="/registration" class="input">
<input type="button" href="/registration" name="scriptbutton" class="welcome__btn" value="Регистрация" >
</a>
{% endif %}
</div> </div>
{% else %}
<div class="contacts__schedule" onclick="activeClass();">Войти</div>
<div class="dropdown" id="dropdown">
<div class="drop-block">
<form action="/login" method="POST">
<div class="triangle"></div>
<label class="form__cell-header ">
<input class="form__input-text-mod" name="LogUserLogin" placeholder="Логин"
type="text">
</label>
<label class="form__cell-header">
<input class="form__input-text-mod" name="LogUserPassw" placeholder="Пароль"
type="password">
</label>
<button class="header_btn" name="LogButton" type="submit" value="Войти">Вход
</button>
</form>
</div>
</div>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
</section>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<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>
</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>
</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>
</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>
</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>
</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>
</li>
</ul>
</div>
</div> </div>
</footer> </header>
<section class="hero">
<div class="container">
<div class="hero_con clearfix">
<div class="rotateblock_orenge">
<div class="ava_logo">
<div class="rotateblock">
<img alt="" class="ava" src="{{ url_for('static', filename='./img/ava.png') }}">
</div>
</div>
</div>
<div class="content_form">
<div class="animate_text">
<h class="h_content">Jarvis</h>
</div>
<div class="content_form-text">
<p class="text_content">Ваш индивидуальный помощник на каждый день</p>
</div>
<div class="input-button">
{% if current_user.is_authenticated %}
<a class="input" href="/workshop">
<input class="welcome__btn" href="/login" name="LogButton" type="button" value="Приступить">
</a>
{% else %}
<a class="input" href="/registration">
<input class="welcome__btn" href="/registration" name="scriptbutton" type="button"
value="Регистрация">
</a>
{% endif %}
</div>
</div>
</div>
</div>
</section>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<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>
</div>
<div class="footer-q clearfix">
<p class="footer-messeger_text">Наши социальные сети</p>
<ul class="footer-messeger">
<li class="footer-messeger__item ">
<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 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 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 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 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>
</body> </body>
</html> </html>

View File

@@ -13,123 +13,136 @@
</head> </head>
<body> <body>
<div class="wrapper"> <div class="wrapper">
<!-- header-- --> <!-- header-- -->
<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 href="/" class="logo-decor">
<img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt=""> <img class="logo_icon"
<p class="logo-text">J.a.r.v.i.s </p> src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
</a> <p class="logo-text">J.a.r.v.i.s </p>
</div> </a>
<div class="header_right"> </div>
<div class="contacts"> <div class="header_right">
<div class="drop"> <div class="contacts">
<div href="" class="contacts__schedule" onclick="activeClass();">Войти</div> <div class="drop">
<div class="dropdown" id="dropdown"> <div href="" class="contacts__schedule" onclick="activeClass();">Войти</div>
<form action="" method="POST"> <div class="dropdown" id="dropdown">
<div class="drop-block"> <form action="" method="POST">
<div class="triangle"></div> <div class="drop-block">
<label class="form__cell-header "> <div class="triangle"></div>
<input type="text" class="form__input-text-mod" placeholder="Логин" name= "LogUserLogin"> <label class="form__cell-header ">
</label> <input type="text" class="form__input-text-mod" placeholder="Логин"
<label class="form__cell-header"> name="LogUserLogin">
<input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserPassw"> </label>
</label> <label class="form__cell-header">
<a href="" class="input"> <input type="password" class="form__input-text-mod" placeholder="Пароль"
<input type="button" name="LogButton" class="header_btn" value="Войти" > name="LogUserPassw">
</a> </label>
</div> <a href="" class="input">
</form> <input type="button" name="LogButton" class="header_btn" value="Войти">
</div> </a>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</header> </div>
</header>
<div class="container"> <div class="container">
<section class="form"> <section class="form">
<div class="form__title"> <div class="form__title">
Создать аккаунт Создать аккаунт
</div> </div>
<!-- лейблы --> <!-- лейблы -->
<form action="/registration" method="POST"> <form action="/registration" method="POST">
<div class="form__fields"> <div class="form__fields">
<div class="form__element"> <div class="form__element">
<div class="form__row clearfix"> <div class="form__row clearfix">
<label class="form__log"> <label class="form__log">
<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="Введите логин"
</label> name="RegUserLogin">
<label class="form__log"> </label>
<div class="form__field-title" > <label class="form__log">
Введите пароль <div class="form__field-title">
</div> Введите пароль
<input type="password" class="form__input-text" placeholder="Введите пароль" name = "RegUserPassw"> </div>
</label> <input type="password" class="form__input-text" placeholder="Введите пароль"
</div> name="RegUserPassw">
<div class="form__btns"> </label>
<div class="form__controls"> </div>
<div class="form__controls-btns clearfix"> <div class="form__btns">
<div class="form__controls-right"> <div class="form__controls">
<button type="submit" value="Отправить" class="form__submit" name="RegButton">Регистрация</button> <div class="form__controls-btns clearfix">
</div> <div class="form__controls-right">
<button type="submit" value="Отправить" class="form__submit" name="RegButton">
Регистрация
</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</form> </div>
</form>
</section> </section>
</div>
</div> </div>
</div>
<!-- заглушка --> <!-- заглушка -->
<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
</div> class="footer-text_name"></b></p>
<div class="footer-q clearfix">
<a href="/" class="logo-text">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>
</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>
</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>
</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>
</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>
</li>
</ul>
</div>
</div> </div>
<div class="footer-q clearfix">
<a href="/" class="logo-text">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>
</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>
</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>
</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>
</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>
</li>
</ul>
</div>
</div>
</footer> </footer>
<!-- <a href="#" data-fancybox data-src="#test-popup">открыть всплывашку</a> --> <!-- <a href="#" data-fancybox data-src="#test-popup">открыть всплывашку</a> -->
<div class="popup" id="test-popup"> <div class="popup" id="test-popup">

View File

@@ -11,211 +11,195 @@
</head> </head>
<body> <body>
<div class="wrapper"> <div class="wrapper">
<!-- header-- --> <!-- header-- -->
<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 href="/" class="logo-decor">
<img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt=""> <img class="logo_icon"
<p class="logo-text">J.a.r.v.i.s </p> src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
</a> <p class="logo-text">J.a.r.v.i.s </p>
</div> </a>
<div class="header_right">
<div class="contacts">
<div class="drop">
<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>
</a>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</header> <div class="header_right">
<section class="container form_content"> <div class="contacts">
<!-- условия --> <div class="drop">
<section class="condition"> <p href="" class="contacts__schedule contacts__schedule_mod" onclick="activeClass();">{{
<div class="form"> current_user.username }}</p>
<div class="form__title"> <div class="dropdown dropdown_mod" id="dropdown">
Условия <div class="drop-block drop-block_out">
</div> <div class="triangle triangle_mod"></div>
<form action="/workshop" name="NewSceanrio" method="POST"> <a href="/logout" class="input">
<div class="form_condition"> <button type="submit" value="Выйти" class="header_btn" name="LogOut">Выход</button>
<label class="form__log"> </a>
<div class="form__field-title" >
Название
</div>
<input type="text" class="form__input-text" placeholder="Введите название сбытия" name = "NewScenarioName">
</label>
<label class="form__log">
<div class="form__field-title" >
Условие:
</div>
<select class="form__input-text" name = "TriggerName">
{% for trigger in triggers_list %}
<option>{{ trigger.name }}</option>
{% endfor %}
</select>
</label>
<div class="form__row">
<label class="form__textaria-label">
<textarea class="form__texterea" placeholder="Введине указания" name = "TriggerArgs"></textarea>
</label>
</div>
<label class="form__log">
<div class="form__field-title" >
Действие:
</div>
<select class="form__input-text" name = "ActionName">
{% for action in actions_list %}
<option>{{ action.name }}</option>
{% endfor %}
</select>
</label>
<div class="form__row">
<label class="form__textaria-label">
<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>
</div>
</div>
</div>
</div> </div>
</div> </div>
</form>
</div>
</section>
<!-- лист событий -->
<section class="events">
<section class="form">
<div class="form__title">
Лист событий
</div> </div>
<form action="/workshop" name="Scenarios" method="POST">
<ul class="events_list">
{% if user_scripts_list %}
{% for user_script in user_scripts_list%}
<form action="/workshop" name="" method="POST">
<li class="events_item">
<p>{{ user_script.name }}</p>
<p style="display: none;" ></p>
<a class="cl-btn-7" ></a>
</li>
{% endfor %}
{% else %}
<p>У вас пока отсутствуют сценарии</p>
{% endif %}
</ul>
</form>
</section>
</section>
<!-- лист телеги -->
<section class="telegram">
<div class="form">
<div class="form__title">
Ваш Telegram
</div>
<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">
{% else %}
<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>
</div>
</div>
</div>
</div>
</form>
</div> </div>
<div class="form">
<div class="form__title">
Удалить событие
</div>
<form action="/workshop" name="" method="POST">
<label class="form__log">
<div class="form__field-title" >
Выберите событие
</div>
<select class="form__input-text" name = "">
{% for trigger in triggers_list %}
<option>{{ trigger.name }}</option>
{% endfor %}
</select>
</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="" >Удалить</button>
</div>
</div>
</div>
</div>
</form>
</div>
</section>
</section>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<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>
</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>
</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>
</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>
</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>
</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>
</li>
</ul>
</div> </div>
</div> </div>
</footer> </header>
<section class="container form_content">
<!-- условия -->
<section class="condition">
<div class="form">
<div class="form__title">
Создать новый
</div>
<form action="/workshop" name="NewSceanrio" method="POST">
<div class="form_condition">
<label class="form__log">
<div class="form__field-title">
Название
</div>
<input type="text" class="form__input-text" placeholder="Название нового сценария"
name="NewScenarioName">
</label>
<label class="form__log">
<div class="form__field-title">
Условие:
</div>
<select class="form__input-text" name="TriggerName">
{% for trigger in triggers_list %}
<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>
</label>
</div>
<label class="form__log">
<div class="form__field-title">
Действие:
</div>
<select class="form__input-text" name="ActionName">
{% for action in actions_list %}
<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>
</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>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</section>
<!-- лист событий -->
<section class="events">
<section class="form">
<div class="form__title">
Список сценариев
</div>
<form action="/workshop" name="Scenarios" method="POST">
<ul class="events_list">
{% if user_scripts_list %}
{% for user_script in user_scripts_list%}
<li class="events_item">
<p>{{ user_script.scenario_name }}</p>
<div class="cl-btn-7"></div>
</li>
{% endfor %}
{% else %}
<p>У вас пока отсутствуют сценарии</p>
{% endif %}
</ul>
</form>
</section>
</section>
<!-- лист телеги -->
<section class="telegram">
<div class="form">
<div class="form__title">
Ваш Telegram
</div>
<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">
{% else %}
<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>
</div>
</div>
</div>
</div>
</form>
</div>
</section>
</section>
</div>
<!-- заглушка -->
<footer class="footer clearfix">
<div class="container">
<div class="footer-q clearfix">
<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>
</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>
</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>
</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>
</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>
</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>
</li>
</ul>
</div>
</div>
</footer>
</body> </body>
</html> </html>