mirror of
https://github.com/Llloooggg/Jarvis.git
synced 2026-03-06 12:06:23 +03:00
Merge branch 'master' of https://github.com/Llloooggg/Jarvis
This commit is contained in:
@@ -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
36
actions.py
Normal 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()
|
||||||
|
|
||||||
|
# сценарии должны хранить логины и пароль
|
||||||
|
# запилить бота, возврат темы и отправителя в словаре.
|
||||||
@@ -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'))
|
||||||
|
|||||||
@@ -2,34 +2,35 @@
|
|||||||
<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=""
|
||||||
|
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">
|
||||||
<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>
|
||||||
@@ -46,53 +47,59 @@
|
|||||||
|
|
||||||
</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>
|
||||||
|
|
||||||
</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
|
||||||
|
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>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -2,22 +2,23 @@
|
|||||||
<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=""
|
||||||
|
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>
|
||||||
@@ -91,13 +97,14 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
</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
|
||||||
|
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,33 +113,38 @@
|
|||||||
<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>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -13,13 +13,14 @@
|
|||||||
</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"
|
||||||
|
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>
|
||||||
@@ -32,13 +33,15 @@
|
|||||||
<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="Войти">
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -65,20 +68,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>
|
||||||
@@ -88,13 +95,14 @@
|
|||||||
</form>
|
</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
|
||||||
|
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>
|
||||||
@@ -104,27 +112,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>
|
||||||
|
|||||||
@@ -11,25 +11,27 @@
|
|||||||
</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"
|
||||||
|
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>
|
||||||
<a href="/logout" class="input">
|
<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>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -43,51 +45,54 @@
|
|||||||
<section class="condition">
|
<section class="condition">
|
||||||
<div class="form">
|
<div class="form">
|
||||||
<div class="form__title">
|
<div class="form__title">
|
||||||
Условия
|
Создать новый
|
||||||
</div>
|
</div>
|
||||||
<form action="/workshop" name="NewSceanrio" method="POST">
|
<form action="/workshop" name="NewSceanrio" method="POST">
|
||||||
<div class="form_condition">
|
<div class="form_condition">
|
||||||
<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 = "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">
|
||||||
Условие:
|
Условие:
|
||||||
</div>
|
</div>
|
||||||
<select class="form__input-text" name = "TriggerName">
|
<select class="form__input-text" name="TriggerName">
|
||||||
{% for trigger in triggers_list %}
|
{% for trigger in triggers_list %}
|
||||||
<option>{{ trigger.name }}</option>
|
<option value="{{ trigger.id }}">{{ trigger.name }}</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
<div class="form__row">
|
<div class="form__row">
|
||||||
<label class="form__textaria-label">
|
<label class="form__textaria-label">
|
||||||
<textarea class="form__texterea" placeholder="Введине указания" name = "TriggerArgs"></textarea>
|
<textarea class="form__texterea" placeholder="Параметры" name="TriggerArgs"></textarea>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<label class="form__log">
|
<label class="form__log">
|
||||||
<div class="form__field-title" >
|
<div class="form__field-title">
|
||||||
Действие:
|
Действие:
|
||||||
</div>
|
</div>
|
||||||
<select class="form__input-text" name = "ActionName">
|
<select class="form__input-text" name="ActionName">
|
||||||
{% for action in actions_list %}
|
{% for action in actions_list %}
|
||||||
<option>{{ action.name }}</option>
|
<option value="{{ action.id }}">{{ action.name }}</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
<div class="form__row">
|
<div class="form__row">
|
||||||
<label class="form__textaria-label">
|
<label class="form__textaria-label">
|
||||||
<textarea class="form__texterea" placeholder="Введине указания" name = "ActionArgs"></textarea>
|
<textarea class="form__texterea" placeholder="Параметры" name="ActionArgs"></textarea>
|
||||||
</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="SendScenario" >Добавить</button>
|
<button type="submit" value="Добавить" class="form__submit" name="SendScenario">
|
||||||
|
Добавить
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -100,19 +105,16 @@
|
|||||||
<section class="events">
|
<section class="events">
|
||||||
<section class="form">
|
<section class="form">
|
||||||
<div class="form__title">
|
<div class="form__title">
|
||||||
Лист событий
|
Список сценариев
|
||||||
</div>
|
</div>
|
||||||
<form action="/workshop" name="Scenarios" method="POST">
|
<form action="/workshop" name="Scenarios" method="POST">
|
||||||
<ul class="events_list">
|
<ul class="events_list">
|
||||||
{% if user_scripts_list %}
|
{% if user_scripts_list %}
|
||||||
{% for user_script in user_scripts_list%}
|
{% for user_script in user_scripts_list%}
|
||||||
<form action="/workshop" name="" method="POST">
|
|
||||||
<li class="events_item">
|
<li class="events_item">
|
||||||
<p>{{ user_script.name }}</p>
|
<p>{{ user_script.scenario_name }}</p>
|
||||||
<p style="display: none;" ></p>
|
<div class="cl-btn-7"></div>
|
||||||
<a class="cl-btn-7" ></a>
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>У вас пока отсутствуют сценарии</p>
|
<p>У вас пока отсутствуют сценарии</p>
|
||||||
@@ -130,42 +132,18 @@
|
|||||||
<form action="/workshop" name="Telegram" method="POST">
|
<form action="/workshop" name="Telegram" method="POST">
|
||||||
<label class="form__log">
|
<label class="form__log">
|
||||||
{% if tg_username %}
|
{% 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 %}
|
{% else %}
|
||||||
<input type="text" class="form__input-text" placeholder="Логин" name = "TGUsername">
|
<input type="text" class="form__input-text" placeholder="Логин" name="TGUsername">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</label>
|
</label>
|
||||||
<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="TelegButton" >Изменить</button>
|
<button type="submit" value="Отправить" class="form__submit" name="TelegButton">
|
||||||
</div>
|
Изменить
|
||||||
</div>
|
</button>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</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>
|
||||||
</div>
|
</div>
|
||||||
@@ -174,13 +152,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
</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
|
||||||
|
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>
|
||||||
@@ -190,32 +169,37 @@
|
|||||||
<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>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
Reference in New Issue
Block a user