diff --git a/__init__.py b/__init__.py index 1795944..86e74ee 100644 --- a/__init__.py +++ b/__init__.py @@ -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 os 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) diff --git a/db_routing.py b/db_routing.py index 720d0e1..5e3e08d 100644 --- a/db_routing.py +++ b/db_routing.py @@ -1,6 +1,6 @@ +from flask import Flask from flask_sqlalchemy import SQLAlchemy from sqlalchemy import ForeignKey -from flask import Flask app = Flask('Jarvis', static_folder='static', template_folder='templates') app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db' diff --git a/templates/error.html b/templates/error.html index 2f81dba..0063140 100644 --- a/templates/error.html +++ b/templates/error.html @@ -18,7 +18,8 @@
+ class="logo_icon" + src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">

J.a.r.v.i.s

diff --git a/templates/index.html b/templates/index.html index c260755..cb215f8 100644 --- a/templates/index.html +++ b/templates/index.html @@ -18,7 +18,8 @@
+ class="logo_icon" + src="{{ url_for('static', filename='./img/815a836e51c6f20226cb07df7f32895c.png') }}">

J.a.r.v.i.s

diff --git a/templates/registration.html b/templates/registration.html index ad58c20..01214d2 100644 --- a/templates/registration.html +++ b/templates/registration.html @@ -2,14 +2,14 @@ - - + + Jarvis - - - + + + - + @@ -18,30 +18,30 @@
-
Войти
+
Войти
-
@@ -105,53 +105,54 @@ class="footer-text_name">

- - - - - - + + + + + + \ No newline at end of file diff --git a/templates/workshop.html b/templates/workshop.html index f92561f..b2f2a99 100644 --- a/templates/workshop.html +++ b/templates/workshop.html @@ -2,11 +2,11 @@ - - + + Jarvis - - + + @@ -16,22 +16,22 @@
-

{{ +

{{ current_user.username }}

@@ -47,14 +47,14 @@
Создать новый
-
+