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

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

Browse Source
This commit is contained in:
Denis Podshivalov
2020-03-19 00:01:46 +03:00
parent 870228f4c1
commit 99bd0d596e
6 changed files with 104 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
__init__.py
View File

@@ -1,11 +1,13 @@
from flask import render_template, request, redirect, url_for
import db_routing
from flask_login import LoginManager, login_user, login_required, logout_user, current_user
from db_routing import app, db
import os
import hashlib import hashlib
import os
from re import match from re import match
from flask import render_template, request, redirect, url_for
from flask_login import LoginManager, login_user, login_required, logout_user, current_user
import db_routing
from db_routing import app, db
login_manager = LoginManager(app) login_manager = LoginManager(app)

2
db_routing.py
View File

@@ -1,6 +1,6 @@
from flask import Flask
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from sqlalchemy import ForeignKey from sqlalchemy import ForeignKey
from flask import Flask
app = Flask('Jarvis', static_folder='static', template_folder='templates') app = Flask('Jarvis', static_folder='static', template_folder='templates')
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db' app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db'

3
templates/error.html
View File

@@ -18,7 +18,8 @@
<div class="header_left clearfix"> <div class="header_left clearfix">
<a class="logo-decor" href="/"> <a class="logo-decor" href="/">
<img alt="" <img alt=""
class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}"> 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>

3
templates/index.html
View File

@@ -18,7 +18,8 @@
<div class="header_left clearfix"> <div class="header_left clearfix">
<a class="logo-decor"> <a class="logo-decor">
<img alt="" <img alt=""
class="logo_icon" src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}"> 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>

89
templates/registration.html
View File

@@ -2,12 +2,12 @@
<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" href="{{ url_for('static', filename = './css/main.css') }}"> <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet">
<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">
<link rel="stylesheet" href="{{ url_for('static', filename='./css/plugins/jquery.fancybox.css') }}"> <link href="{{ url_for('static', filename='./css/plugins/jquery.fancybox.css') }}" rel="stylesheet">
<script src="{{ url_for('static', filename = './js/main.js') }}"></script> <script src="{{ url_for('static', filename = './js/main.js') }}"></script>
</head> </head>
@@ -18,30 +18,30 @@
<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" <img alt=""
src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" 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">
<div href="" class="contacts__schedule" onclick="activeClass();">Войти</div> <div class="contacts__schedule" href="" onclick="activeClass();">Войти</div>
<div class="dropdown" id="dropdown"> <div class="dropdown" id="dropdown">
<form action="" method="POST"> <form action="" method="POST">
<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="Логин" <input class="form__input-text-mod" name="LogUserLogin" placeholder="Логин"
name="LogUserLogin"> type="text">
</label> </label>
<label class="form__cell-header"> <label class="form__cell-header">
<input type="password" class="form__input-text-mod" placeholder="Пароль" <input class="form__input-text-mod" name="LogUserPassw" placeholder="Пароль"
name="LogUserPassw"> type="password">
</label> </label>
<a href="" class="input"> <a class="input" href="">
<input type="button" name="LogButton" class="header_btn" value="Войти"> <input class="header_btn" name="LogButton" type="button" value="Войти">
</a> </a>
</div> </div>
</form> </form>
@@ -68,22 +68,22 @@
<div class="form__field-title"> <div class="form__field-title">
Введите логин Введите логин
</div> </div>
<input type="text" class="form__input-text" placeholder="Введите логин" <input class="form__input-text" name="RegUserLogin" placeholder="Введите логин"
name="RegUserLogin"> type="text">
</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="Введите пароль" <input class="form__input-text" name="RegUserPassw" placeholder="Введите пароль"
name="RegUserPassw"> type="password">
</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 class="form__submit" name="RegButton" type="submit" value="Отправить">
Регистрация Регистрация
</button> </button>
</div> </div>
@@ -105,53 +105,54 @@
class="footer-text_name"></b></p> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> src="{{ url_for('static', filename='./img/mail.png') }}">
</a> </a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</footer> </footer>
<!-- <a href="#" data-fancybox data-src="#test-popup">открыть всплывашку</a> --> <!-- <a href="#" data-fancybox data-src="#test-popup">открыть всплывашку</a> -->
<div class="popup" id="test-popup"> <div class="popup" id="test-popup">
<h1>Пользователь уже существует</h1> <h1>Пользователь уже существует</h1>
<p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Eum, totam aperiam. Fugit modi exercitationem eos itaque sequi molestiae, voluptates magnam?</p> <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Eum, totam aperiam. Fugit modi exercitationem eos
<a href="#" class="close welcome__btn ">Закрыть</a> itaque sequi molestiae, voluptates magnam?</p>
</div> <a class="close welcome__btn " href="#">Закрыть</a>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="{{ url_for('static', filename = './js/plugins/jquery.fancybox.min.js') }}"></script> <script src="{{ url_for('static', filename = './js/plugins/jquery.fancybox.min.js') }}"></script>
</body> </body>
</html> </html>

82
templates/workshop.html
View File

@@ -2,11 +2,11 @@
<html lang="ru-RU"> <html lang="ru-RU">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta content="width=device-width, initial-scale=1.0" name="viewport">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta content="ie=edge" http-equiv="X-UA-Compatible">
<title>Jarvis</title> <title>Jarvis</title>
<link rel="stylesheet" href="{{ url_for('static', filename = './css/main.css') }}"> <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet">
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='./img/favicon.ico') }}"> <link href="{{ url_for('static', filename='./img/favicon.ico') }}" rel="icon" type="image/x-icon">
<script src="{{ url_for('static', filename = './js/main.js') }}"></script> <script src="{{ url_for('static', filename = './js/main.js') }}"></script>
</head> </head>
@@ -16,22 +16,22 @@
<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" <img alt=""
src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}" 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">
<p href="" class="contacts__schedule contacts__schedule_mod" onclick="activeClass();">{{ <p class="contacts__schedule contacts__schedule_mod" href="" onclick="activeClass();">{{
current_user.username }}</p> 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 class="input" 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>
@@ -47,14 +47,14 @@
<div class="form__title"> <div class="form__title">
Создать новый Создать новый
</div> </div>
<form action="/workshop" name="NewSceanrio" method="POST"> <form action="/workshop" method="POST" name="NewSceanrio">
<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="Название нового сценария" <input class="form__input-text" name="NewScenarioName" placeholder="Название нового сценария"
name="NewScenarioName"> type="text">
</label> </label>
<label class="form__log"> <label class="form__log">
<div class="form__field-title"> <div class="form__field-title">
@@ -68,7 +68,7 @@
</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" name="TriggerArgs" placeholder="Параметры"></textarea>
</label> </label>
</div> </div>
<label class="form__log"> <label class="form__log">
@@ -83,14 +83,14 @@
</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" name="ActionArgs" placeholder="Параметры"></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 class="form__submit" name="SendScenario" type="submit" value="Добавить">
Добавить Добавить
</button> </button>
</div> </div>
@@ -107,7 +107,7 @@
<div class="form__title"> <div class="form__title">
Список сценариев Список сценариев
</div> </div>
<form action="/workshop" name="Scenarios" method="POST"> <form action="/workshop" method="POST" name="Scenarios">
<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%}
@@ -129,19 +129,19 @@
<div class="form__title"> <div class="form__title">
Ваш Telegram Ваш Telegram
</div> </div>
<form action="/workshop" name="Telegram" method="POST"> <form action="/workshop" method="POST" name="Telegram">
<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 class="form__input-text" name="TGUsername" placeholder={{tg_username}} type="text">
{% else %} {% else %}
<input type="text" class="form__input-text" placeholder="Логин" name="TGUsername"> <input class="form__input-text" name="TGUsername" placeholder="Логин" type="text">
{% 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 class="form__submit" name="TelegButton" type="submit" value="Отправить">
Изменить Изменить
</button> </button>
</div> </div>
@@ -154,12 +154,12 @@
<div class="form__title"> <div class="form__title">
Удалить событие Удалить событие
</div> </div>
<form action="/workshop" name="" method="POST"> <form action="/workshop" method="POST" name="">
<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 = ""> <select class="form__input-text" name="">
{% for trigger in triggers_list %} {% for trigger in triggers_list %}
<option>{{ trigger.name }}</option> <option>{{ trigger.name }}</option>
{% endfor %} {% endfor %}
@@ -169,7 +169,7 @@
<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="" >Удалить</button> <button class="form__submit" name="" type="submit" value="Удалить">Удалить</button>
</div> </div>
</div> </div>
</div> </div>
@@ -188,39 +188,39 @@
class="footer-text_name"></b></p> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> 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" <img alt="" class="footer-messeger__icon"
alt=""> src="{{ url_for('static', filename='./img/mail.png') }}">
</a> </a>
</li> </li>
</ul> </ul>