From cc6aa003cd999abd38fc341d36a264550b624f2c Mon Sep 17 00:00:00 2001
From: burzuf <poddeo3@gmail.com>
Date: Wed, 18 Mar 2020 21:09:57 +0300
Subject: [PATCH 1/9] =?UTF-8?q?=D0=92=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B2?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/workshop.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/workshop.html b/templates/workshop.html
index 9f364e2..047fd81 100644
--- a/templates/workshop.html
+++ b/templates/workshop.html
@@ -65,7 +65,7 @@
                             </label>
                             <div class="form__row">
                                 <label class="form__textaria-label">
-                                    <textarea  class="form__texterea" placeholder="Введине указания" name = "TriggerArgs"></textarea>
+                                    <textarea  class="form__texterea" placeholder="Дополнения" name = "TriggerArgs"></textarea>
                                 </label>
                             </div>
                             <label class="form__log">
@@ -80,7 +80,7 @@
                             </label>
                             <div class="form__row">
                                 <label class="form__textaria-label">
-                                    <textarea  class="form__texterea" placeholder="Введине указания" name = "ActionArgs"></textarea>
+                                    <textarea  class="form__texterea" placeholder="Дополнения" name = "ActionArgs"></textarea>
                                 </label>
                             </div>
                             <div class="form__btns">

From d8257d0161fa359068c3ba3ba6dc216b732ed636 Mon Sep 17 00:00:00 2001
From: burzuf <poddeo3@gmail.com>
Date: Wed, 18 Mar 2020 21:12:52 +0300
Subject: [PATCH 2/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __init__.py             | 4 +---
 templates/workshop.html | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/__init__.py b/__init__.py
index f95798e..1795944 100644
--- a/__init__.py
+++ b/__init__.py
@@ -67,8 +67,7 @@ def workshop():
                                     actionArgs)
             return redirect(url_for('workshop'))
 
-        if 'NewScenarioName' in request.form:
-            print('писька коня')
+        # if 'NewScenarioName' in request.form:
 
         if 'TGUsername' in request.form:
             new_tg_username = request.form['TGUsername']
@@ -81,7 +80,6 @@ def workshop():
     User = db_routing.get_user(id=current_user.get_id())
     if User:
         tg_username = User.tg_username
-        print(tg_username)
     else:
         tg_username = None
     return render_template('workshop.html', triggers_list=triggers_list, actions_list=actions_list,
diff --git a/templates/workshop.html b/templates/workshop.html
index 047fd81..eea7b4b 100644
--- a/templates/workshop.html
+++ b/templates/workshop.html
@@ -51,7 +51,7 @@
                                 <div class="form__field-title" > 
                                     Название
                                 </div>
-                                <input type="text" class="form__input-text" placeholder="Введите название сбытия" name = "NewScenarioName">
+                                <input type="text" class="form__input-text" placeholder="Название нового сценария" name = "NewScenarioName">
                             </label>  
                             <label class="form__log">
                                 <div class="form__field-title" > 

From b5f9d2c9b162326c8399471f07dc8ad734dbb50c Mon Sep 17 00:00:00 2001
From: Mnimqa <39854123+Mnimqa@users.noreply.github.com>
Date: Wed, 18 Mar 2020 21:31:23 +0300
Subject: [PATCH 3/9] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D1=81=D0=B5=D1=80=20gmai?=
 =?UTF-8?q?l=20=D0=B8=20=D0=B1=D1=83=D0=B4=D0=B8=D0=BB=D1=8C=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Actions.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 Actions.py

diff --git a/Actions.py b/Actions.py
new file mode 100644
index 0000000..762082d
--- /dev/null
+++ b/Actions.py
@@ -0,0 +1,29 @@
+#будильник
+import time, datetime,imaplib,re, 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()
+
+#сценарии должны хранить логины и пароль 
+#запилить бота, возврат темы и отправителя в словаре
\ No newline at end of file

From e11de6e720a4a7c5c6cfb9134b8e5c5bb3ce0cee Mon Sep 17 00:00:00 2001
From: Mnimqa <39854123+Mnimqa@users.noreply.github.com>
Date: Wed, 18 Mar 2020 21:32:04 +0300
Subject: [PATCH 4/9] Rename Actions.py to actions.py

---
 Actions.py => actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename Actions.py => actions.py (95%)

diff --git a/Actions.py b/actions.py
similarity index 95%
rename from Actions.py
rename to actions.py
index 762082d..2980afb 100644
--- a/Actions.py
+++ b/actions.py
@@ -26,4 +26,4 @@ if __name__ == '__main__':
     Alarm_Clock()
 
 #сценарии должны хранить логины и пароль 
-#запилить бота, возврат темы и отправителя в словаре
\ No newline at end of file
+#запилить бота, возврат темы и отправителя в словаре

From e49b1216533c023f5a642619b2323037bf8bf8cc Mon Sep 17 00:00:00 2001
From: Mnimqa <39854123+Mnimqa@users.noreply.github.com>
Date: Wed, 18 Mar 2020 21:33:37 +0300
Subject: [PATCH 5/9] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D1=81=D0=B5=D1=80=20gmai?=
 =?UTF-8?q?l=20=D0=B8=20=D0=B1=D1=83=D0=B4=D0=B8=D0=BB=D1=8C=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions.py b/actions.py
index 2980afb..04db574 100644
--- a/actions.py
+++ b/actions.py
@@ -26,4 +26,4 @@ if __name__ == '__main__':
     Alarm_Clock()
 
 #сценарии должны хранить логины и пароль 
-#запилить бота, возврат темы и отправителя в словаре
+#запилить бота, возврат темы и отправителя в словаре.

From bcf73321919d21980695417c38d522ab52626c27 Mon Sep 17 00:00:00 2001
From: burzuf <poddeo3@gmail.com>
Date: Wed, 18 Mar 2020 22:44:33 +0300
Subject: [PATCH 6/9] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BE=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=81=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BE=D0=BC=D1=83=20=D1=81=D1=86=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/workshop.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/workshop.html b/templates/workshop.html
index eea7b4b..e6d1978 100644
--- a/templates/workshop.html
+++ b/templates/workshop.html
@@ -43,7 +43,7 @@
             <section class="condition">
                 <div class="form">
                     <div class="form__title">
-                        Условия
+                        Создать новый
                     </div>
                     <form action="/workshop" name="NewSceanrio" method="POST">
                         <div class="form_condition">
@@ -59,13 +59,13 @@
                                 </div>
                                 <select class="form__input-text" name = "TriggerName">
                                     {% for trigger in triggers_list %}
-                                        <option>{{ trigger.name }}</option>
+                                        <option  value="{{ trigger.id }}" >{{ trigger.name }}</option>
                                     {% endfor %}
                                     </select>
                             </label>
                             <div class="form__row">
                                 <label class="form__textaria-label">
-                                    <textarea  class="form__texterea" placeholder="Дополнения" name = "TriggerArgs"></textarea>
+                                    <textarea  class="form__texterea" placeholder="Параметры" name = "TriggerArgs"></textarea>
                                 </label>
                             </div>
                             <label class="form__log">
@@ -74,13 +74,13 @@
                                 </div>
                                 <select class="form__input-text" name = "ActionName">
                                     {% for action in actions_list %}
-                                        <option>{{ action.name }}</option>
+                                        <option value="{{ action.id }}" >{{ action.name }}</option>
                                     {% endfor %}
                                     </select>
                             </label>
                             <div class="form__row">
                                 <label class="form__textaria-label">
-                                    <textarea  class="form__texterea" placeholder="Дополнения" name = "ActionArgs"></textarea>
+                                    <textarea  class="form__texterea" placeholder="Параметры" name = "ActionArgs"></textarea>
                                 </label>
                             </div>
                             <div class="form__btns">
@@ -100,14 +100,14 @@
             <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.name }}</p>
+                                        <p>{{ user_script.scenario_name }}</p>
                                         <div class="cl-btn-7" ></div>
                                     </li>
                                 {% endfor %}

From 2685a66c1f2e9f8522e7316d07213e9a6f4175b3 Mon Sep 17 00:00:00 2001
From: burzuf <poddeo3@gmail.com>
Date: Wed, 18 Mar 2020 22:46:20 +0300
Subject: [PATCH 7/9] =?UTF-8?q?=D0=9E=D1=82=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D1=8C=20=D0=B4=D0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db_routing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db_routing.py b/db_routing.py
index 5fd503c..720d0e1 100644
--- a/db_routing.py
+++ b/db_routing.py
@@ -48,7 +48,7 @@ class Scenario(db.Model):
     __tablename__ = 'Scenarios'
     id = db.Column(db.Integer, primary_key=True)
     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_args = db.Column(db.String(200))
     action_id = db.Column(db.Integer, ForeignKey('Actions.id'))

From 3b678c4124468fb480841f44b8e5cb293311a18f Mon Sep 17 00:00:00 2001
From: burzuf <poddeo3@gmail.com>
Date: Wed, 18 Mar 2020 22:47:57 +0300
Subject: [PATCH 8/9] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D1=80=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions.py | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/actions.py b/actions.py
index 04db574..d1f1164 100644
--- a/actions.py
+++ b/actions.py
@@ -1,29 +1,36 @@
-#будильник
-import time, datetime,imaplib,re, time
-def Alarm_Clock():      
-    dt=datetime.datetime(2020, 3, 18, 18, 6,15 )#дата срабатывания будильника (год,месяц,день,час,минута,секунда)
+# будильник
+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
+
+
+# проверка почты на новое письмо 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)
+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')
+    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')
+        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()
+            count_Email_Start = count_Email_Current
+        time.sleep(15)  # частота проверки нового письма
 
-#сценарии должны хранить логины и пароль 
-#запилить бота, возврат темы и отправителя в словаре.
+
+if __name__ == '__main__':
+    alarm_clock()
+
+# сценарии должны хранить логины и пароль
+# запилить бота, возврат темы и отправителя в словаре.

From 7685a073397fd72de5106b237da02ace47492cb1 Mon Sep 17 00:00:00 2001
From: burzuf <poddeo3@gmail.com>
Date: Wed, 18 Mar 2020 22:55:04 +0300
Subject: [PATCH 9/9] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D1=80=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/error.html        | 169 +++++++++---------
 templates/index.html        | 252 ++++++++++++++-------------
 templates/registration.html | 219 +++++++++++++-----------
 templates/workshop.html     | 329 +++++++++++++++++++-----------------
 4 files changed, 507 insertions(+), 462 deletions(-)

diff --git a/templates/error.html b/templates/error.html
index 304e56e..2f81dba 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -2,97 +2,104 @@
 <html lang="ru-RU">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta content="width=device-width, initial-scale=1.0" name="viewport">
+    <meta content="ie=edge" http-equiv="X-UA-Compatible">
     <title>Jarvis</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename = './css/main.css') }}">
-    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='./img/favicon.ico') }}">
+    <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet" type="text/css">
+    <link href="{{ url_for('static', filename='./img/favicon.ico') }}" rel="icon" type="image/x-icon">
     <script src="{{ url_for('static', filename = './js/main.js') }}"></script>
 </head>
 
 <body>
-    <div class="wrapper">
-<!-- header -->
-        <header class="header">
-            <div class="container clearfix">
-                <div class="header_left clearfix">
-                    <a href="/" class="logo-decor">
-                        <img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
-                        <p class="logo-text">J.a.r.v.i.s </p>
-                    </a>
-                </div>
-                <div class="header_right">
-                    <div class="contacts">
-                        <div class="drop">                   
-                            <a href="" class="contacts__schedule"  onclick="activeClass();">Нужна помощь?</a>
+<div class="wrapper">
+    <!-- header -->
+    <header class="header">
+        <div class="container clearfix">
+            <div class="header_left clearfix">
+                <a class="logo-decor" href="/">
+                    <img alt=""
+                         class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">
+                    <p class="logo-text">J.a.r.v.i.s </p>
+                </a>
+            </div>
+            <div class="header_right">
+                <div class="contacts">
+                    <div class="drop">
+                        <a class="contacts__schedule" href="" onclick="activeClass();">Нужна помощь?</a>
 
-                             <div class="dropdown dropdown_mod" id="dropdown">
-                                <div class="drop-block drop-block_mod">
-                                    <div class="triangle triangle_mod"></div>
-                                    <p>Обратитесь в службу поддержки по адресу:<b>jarvis@mail.ru</b> </p>
-                                </div>
-                            </div> 
+                        <div class="dropdown dropdown_mod" id="dropdown">
+                            <div class="drop-block drop-block_mod">
+                                <div class="triangle triangle_mod"></div>
+                                <p>Обратитесь в службу поддержки по адресу:<b>jarvis@mail.ru</b></p>
+                            </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>
-    </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>
 </html>
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 20193ab..c260755 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,137 +2,149 @@
 <html lang="ru-RU">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta content="width=device-width, initial-scale=1.0" name="viewport">
+    <meta content="ie=edge" http-equiv="X-UA-Compatible">
     <title>Jarvis</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename = './css/main.css') }}">
-    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='./img/favicon.ico') }}">
+    <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet" type="text/css">
+    <link href="{{ url_for('static', filename='./img/favicon.ico') }}" rel="icon" type="image/x-icon">
     <script src="{{ url_for('static', filename = './js/main.js') }}"></script>
 </head>
 
 <body>
-    <div class="wrapper">
-<!-- header-- -->
-        <header class="header">
-            <div class="container clearfix">
-                <div class="header_left clearfix">
-                    <a class="logo-decor">
-                        <img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
-                        <p class="logo-text">J.a.r.v.i.s </p>
-                    </a>
-                </div>
-                <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 class="wrapper">
+    <!-- header-- -->
+    <header class="header">
+        <div class="container clearfix">
+            <div class="header_left clearfix">
+                <a class="logo-decor">
+                    <img alt=""
+                         class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">
+                    <p class="logo-text">J.a.r.v.i.s </p>
+                </a>
             </div>
-        </header>
-        
-        <section class="hero"> 
-            <div class="container">
-                <div class="hero_con clearfix">
-                    <div class="rotateblock_orenge">
-                        <div class="ava_logo">
-                            <div class="rotateblock">
-                                <img src="{{ url_for('static', filename='./img/ava.png') }}" alt="" class="ava">
-                            </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 href="/workshop" class="input">
-                                    <input type="button" href="/login" name="LogButton" class="welcome__btn" value="Приступить" >
+            <div class="header_right">
+                <div class="contacts">
+                    <div class="drop">
+                        {% if current_user.is_authenticated %}
+                        <p class="contacts__schedule contacts__schedule_mod" href="" onclick="activeClass();">{{
+                            current_user.username }}</p>
+                        <div class="dropdown dropdown_mod" id="dropdown">
+                            <div class="drop-block drop-block_out">
+                                <div class="triangle triangle_mod"></div>
+                                <a href="/logout">
+                                    <button class="header_btn" name="LogOut" type="submit" value="Выйти">Выход</button>
                                 </a>
-                                {% else %}
-                                <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>
-        </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>
-    </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>
 </html>
\ No newline at end of file
diff --git a/templates/registration.html b/templates/registration.html
index 82c7234..9adfdf9 100644
--- a/templates/registration.html
+++ b/templates/registration.html
@@ -11,123 +11,136 @@
 </head>
 
 <body>
-    <div class="wrapper">
-<!-- header-- -->
-        <header class="header">
-            <div class="container clearfix">
-                <div class="header_left clearfix">
-                    <a href="/" class="logo-decor">
-                        <img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
-                        <p class="logo-text">J.a.r.v.i.s </p>
-                    </a>
-                </div>
-                <div class="header_right">
-                    <div class="contacts">
-                        <div class="drop">                   
-                            <div href="" class="contacts__schedule" onclick="activeClass();">Войти</div>
-                            <div class="dropdown" id="dropdown">
-                                <form action="" method="POST">
-                                    <div class="drop-block">
-                                        <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>
-                                        <a href="" class="input">
-                                            <input type="button" name="LogButton" class="header_btn" value="Войти" >
-                                        </a> 
-                                    </div>
-                                </form>
-                            </div>
+<div class="wrapper">
+    <!-- header-- -->
+    <header class="header">
+        <div class="container clearfix">
+            <div class="header_left clearfix">
+                <a href="/" class="logo-decor">
+                    <img class="logo_icon"
+                         src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
+                    <p class="logo-text">J.a.r.v.i.s </p>
+                </a>
+            </div>
+            <div class="header_right">
+                <div class="contacts">
+                    <div class="drop">
+                        <div href="" class="contacts__schedule" onclick="activeClass();">Войти</div>
+                        <div class="dropdown" id="dropdown">
+                            <form action="" method="POST">
+                                <div class="drop-block">
+                                    <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>
+                                    <a href="" class="input">
+                                        <input type="button" name="LogButton" class="header_btn" value="Войти">
+                                    </a>
+                                </div>
+                            </form>
                         </div>
                     </div>
                 </div>
             </div>
-        </header>
-        
+        </div>
+    </header>
 
-        <div class="container">
-            <section class="form">
-                <div class="form__title">
-                    Создать аккаунт
-                </div>
-                <!-- лейблы -->
-                <form action="/registration" method="POST">
-                    <div class="form__fields">
-                        <div class="form__element">
-                            <div class="form__row clearfix">   
 
-                                <label class="form__log">
-                                    <div class="form__field-title">  
-                                        Введите логин     
-                                    </div>
-                                    <input type="text" class="form__input-text" placeholder="Введите логин" name = "RegUserLogin">
-                                </label> 
-                                <label class="form__log">
-                                    <div class="form__field-title" > 
-                                        Введите пароль
-                                    </div>
-                                    <input type="password" class="form__input-text" placeholder="Введите пароль" name = "RegUserPassw">
-                                </label>   
-                            </div>
-                            <div class="form__btns">
-                                <div class="form__controls">
-                                    <div class="form__controls-btns clearfix">
-                                        <div class="form__controls-right">
-                                            <button type="submit" value="Отправить" class="form__submit" name="RegButton" >Регистрация</button>
-                                        </div>
+    <div class="container">
+        <section class="form">
+            <div class="form__title">
+                Создать аккаунт
+            </div>
+            <!-- лейблы -->
+            <form action="/registration" method="POST">
+                <div class="form__fields">
+                    <div class="form__element">
+                        <div class="form__row clearfix">
+
+                            <label class="form__log">
+                                <div class="form__field-title">
+                                    Введите логин
+                                </div>
+                                <input type="text" class="form__input-text" placeholder="Введите логин"
+                                       name="RegUserLogin">
+                            </label>
+                            <label class="form__log">
+                                <div class="form__field-title">
+                                    Введите пароль
+                                </div>
+                                <input type="password" class="form__input-text" placeholder="Введите пароль"
+                                       name="RegUserPassw">
+                            </label>
+                        </div>
+                        <div class="form__btns">
+                            <div class="form__controls">
+                                <div class="form__controls-btns clearfix">
+                                    <div class="form__controls-right">
+                                        <button type="submit" value="Отправить" class="form__submit" name="RegButton">
+                                            Регистрация
+                                        </button>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </form>
+                </div>
+            </form>
         </section>
-       </div>
     </div>
+</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>
+<!-- заглушка -->
+<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>
-    </footer>
+        <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>
 </html>
\ No newline at end of file
diff --git a/templates/workshop.html b/templates/workshop.html
index e6d1978..31fd6d1 100644
--- a/templates/workshop.html
+++ b/templates/workshop.html
@@ -11,182 +11,195 @@
 </head>
 
 <body>
-    <div class="wrapper">
-<!-- header-- -->
-        <header class="header">
-            <div class="container clearfix">
-                <div class="header_left clearfix">
-                    <a href="/" class="logo-decor">
-                        <img class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
-                        <p class="logo-text">J.a.r.v.i.s </p>
-                    </a>
-                </div>
-                <div class="header_right">
-                    <div class="contacts">
-                        <div class="drop">                   
-                            <p href="" class="contacts__schedule contacts__schedule_mod" onclick="activeClass();">{{ current_user.username }}</p>
-                            <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 class="wrapper">
+    <!-- header-- -->
+    <header class="header">
+        <div class="container clearfix">
+            <div class="header_left clearfix">
+                <a href="/" class="logo-decor">
+                    <img class="logo_icon"
+                         src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" alt="">
+                    <p class="logo-text">J.a.r.v.i.s </p>
+                </a>
+            </div>
+            <div class="header_right">
+                <div class="contacts">
+                    <div class="drop">
+                        <p href="" class="contacts__schedule contacts__schedule_mod" onclick="activeClass();">{{
+                            current_user.username }}</p>
+                        <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>
-        </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>
+    </header>
+    <section class="container form_content">
+        <!-- условия -->
+        <section class="condition">
+            <div class="form">
+                <div class="form__title">
+                    Создать новый
                 </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">
+                <form action="/workshop" name="NewSceanrio" method="POST">
+                    <div class="form_condition">
                         <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__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="TelegButton" >Изменить</button>
+                                        <button type="submit" value="Добавить" class="form__submit" name="SendScenario">
+                                            Добавить
+                                        </button>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </form>
+                    </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>     
-    </div>
+        </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>
+<!-- заглушка -->
+<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>
-    </footer>
+        <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>
 </html>
\ No newline at end of file