mirror of
https://github.com/Llloooggg/Jarvis.git
synced 2026-03-06 12:06:23 +03:00
Рефракторинг
This commit is contained in:
28
__init__.py
28
__init__.py
@@ -1,6 +1,9 @@
|
|||||||
from flask import Flask, render_template
|
from flask import Flask, render_template, flash, redirect, url_for, session, logging, request
|
||||||
|
from flask_sqlalchemy import SQLAlchemy
|
||||||
|
|
||||||
app = Flask(__name__, static_folder="static", template_folder="templates")
|
app = Flask(__name__, static_folder="static", template_folder="templates")
|
||||||
|
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db'
|
||||||
|
db = SQLAlchemy(app)
|
||||||
|
|
||||||
|
|
||||||
@app.route('/', methods=['GET'])
|
@app.route('/', methods=['GET'])
|
||||||
@@ -8,9 +11,26 @@ def index():
|
|||||||
return render_template('index.html')
|
return render_template('index.html')
|
||||||
|
|
||||||
|
|
||||||
@app.route('/login', methods=['GET'])
|
@app.route("/registration", methods=["GET", "POST"])
|
||||||
def login():
|
def register():
|
||||||
return render_template('login.html')
|
if request.method == "POST":
|
||||||
|
|
||||||
|
UserLogin = request.form['login']
|
||||||
|
UserPass = request.form['password']
|
||||||
|
|
||||||
|
#db.session.add(UserLogin, UserPass)
|
||||||
|
#db.session.commit()
|
||||||
|
|
||||||
|
#return redirect(url_for(""))
|
||||||
|
|
||||||
|
print(UserLogin, ' ', UserPass)
|
||||||
|
|
||||||
|
return render_template("registration.html")
|
||||||
|
|
||||||
|
|
||||||
|
# @app.route('/login', methods=['GET'])
|
||||||
|
# def login():
|
||||||
|
# return render_template('login.html')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
</nav>
|
</nav>
|
||||||
<div class="header_right">
|
<div class="header_right">
|
||||||
<div class="contacts">
|
<div class="contacts">
|
||||||
<a href="/login" class="contacts__schedule">LogIn</a>
|
<a href="/registration" class="contacts__schedule">LogIn</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -48,8 +48,8 @@
|
|||||||
<p class="text_content">Ваш индивидуальный помощник на каждый день</p>
|
<p class="text_content">Ваш индивидуальный помощник на каждый день</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="input-button">
|
<div class="input-button">
|
||||||
<a href="/login" class="input">
|
<a href="/registration" class="input">
|
||||||
<input type="button" href="/login" name="scriptbutton" class="welcome__btn" value="Авторизоваться" >
|
<input type="button" href="/registration" name="scriptbutton" class="welcome__btn" value="Авторизоваться" >
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,155 +1,155 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<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 name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<meta http-equiv="X-UA-Compatible" content="ie=edge">
|
<meta http-equiv="X-UA-Compatible" content="ie=edge">
|
||||||
<title>jarvis</title>
|
<title>jarvis</title>
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename = './css/main.css') }}">
|
<link rel="stylesheet" href="{{ url_for('static', filename = './css/main.css') }}">
|
||||||
</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="img/815a836e51c6f20226cb07df7f32895c.png" alt="">
|
<img class="logo_icon" src="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>
|
||||||
<!-- menu -->
|
<!-- menu -->
|
||||||
|
|
||||||
|
|
||||||
</nav>
|
</nav>
|
||||||
<div class="header_right clearfix">
|
<div class="header_right clearfix">
|
||||||
<label class="form__cell-header ">
|
<label class="form__cell-header ">
|
||||||
<input type="text" class="form__input-text-mod" placeholder="email">
|
<input type="text" class="form__input-text-mod" placeholder="email" >
|
||||||
</label>
|
</label>
|
||||||
<label class="form__cell-header">
|
<label class="form__cell-header">
|
||||||
<input type="text" class="form__input-text-mod" placeholder="password">
|
<input type="text" class="form__input-text-mod" placeholder="password">
|
||||||
</label>
|
</label>
|
||||||
<a href="" class="input">
|
<a href="" class="input">
|
||||||
<input type="button" href="/comments.html" name="scriptbutton" class="header_btn" value="Войти" >
|
<input type="button" href="/comments.html" name="scriptbutton" class="header_btn" value="Войти" >
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<section class="form">
|
<section class="form">
|
||||||
<div class="form__title">
|
<div class="form__title">
|
||||||
Создать аккаунт
|
Создать аккаунт
|
||||||
</div>
|
</div>
|
||||||
<!-- лейблы -->
|
<!-- лейблы -->
|
||||||
<div class="form__fields">
|
<div class="form__fields">
|
||||||
<div class="form__element" method="post">
|
<div class="form__element" method="post">
|
||||||
<div class="form__row clearfix">
|
<div class="form__row clearfix">
|
||||||
<label class="form__cell">
|
<label class="form__cell">
|
||||||
<div class="form__field-title">
|
<div class="form__field-title">
|
||||||
Ваше имя
|
Ваше имя
|
||||||
</div>
|
</div>
|
||||||
<input type="text" class="form__input-text" placeholder="Введите имя">
|
<input type="text" class="form__input-text" placeholder="Введите имя">
|
||||||
</label>
|
</label>
|
||||||
<label class="form__cell">
|
<label class="form__cell">
|
||||||
<div class="form__field-title">
|
<div class="form__field-title">
|
||||||
Ваша фамилия
|
Ваша фамилия
|
||||||
</div>
|
</div>
|
||||||
<input type="text" class="form__input-text" placeholder="Введите фамилию">
|
<input type="text" class="form__input-text" placeholder="Введите фамилию">
|
||||||
</label>
|
</label>
|
||||||
<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="Введите login">
|
<input type="text" class="form__input-text" placeholder="Введите login" name = "login">
|
||||||
</label>
|
</label>
|
||||||
<label class="form__log">
|
<label class="form__log">
|
||||||
<div class="form__field-title">
|
<div class="form__field-title">
|
||||||
Введите email
|
Введите email
|
||||||
</div>
|
</div>
|
||||||
<input type="text" class="form__input-text" placeholder="Введите email">
|
<input type="text" class="form__input-text" placeholder="Введите email">
|
||||||
</label>
|
</label>
|
||||||
<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 type="text" class="form__input-text" placeholder="Введите пароль" name = "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__container-left">
|
<div class="form__container-left">
|
||||||
<p class="form__field-title">
|
<p class="form__field-title">
|
||||||
Пол
|
Пол
|
||||||
</p>
|
</p>
|
||||||
<div class="form__controls-left">
|
<div class="form__controls-left">
|
||||||
<label class="form__radio">
|
<label class="form__radio">
|
||||||
<input type="radio" name="review" class="form__radio-elem" checked>
|
<input type="radio" name="review" class="form__radio-elem" checked>
|
||||||
<div class="form__radio-fake"></div>
|
<div class="form__radio-fake"></div>
|
||||||
<div class="form__radio-text">Муж.</div>
|
<div class="form__radio-text">Муж.</div>
|
||||||
</label>
|
</label>
|
||||||
<label class="form__radio">
|
<label class="form__radio">
|
||||||
<input type="radio" name="review" class="form__radio-elem" >
|
<input type="radio" name="review" class="form__radio-elem" >
|
||||||
<div class="form__radio-fake"></div>
|
<div class="form__radio-fake"></div>
|
||||||
<div class="form__radio-text ">Жен.</div>
|
<div class="form__radio-text ">Жен.</div>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form__controls-right">
|
<div class="form__controls-right">
|
||||||
<button type="submit" value="Отправить" class="form__submit">Регистрация</button>
|
<button type="submit" value="Отправить" class="form__submit" >Регистрация</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</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">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <br> Автор работы: <b class="footer-text_name">Трухачев Сергей</b> </p>
|
<p class="footer-full-text">Сделано с любовью и старанием на курсе ВГУ "Тестирование ПО" <br> Автор работы: <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>
|
||||||
</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 href="" class="footer-messeger__link">
|
||||||
<img src="{{ url_for('static', filename='./img/afrodita/vk.png') }}" class="footer-messeger__icon" alt="">
|
<img src="{{ url_for('static', filename='./img/afrodita/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/afrodita/fb.png') }}" class="footer-messeger__icon" alt="">
|
<img src="{{ url_for('static', filename='./img/afrodita/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/afrodita/google.png') }}" class="footer-messeger__icon" alt="">
|
<img src="{{ url_for('static', filename='./img/afrodita/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/afrodita/twitter.png') }}" class="footer-messeger__icon" alt="">
|
<img src="{{ url_for('static', filename='./img/afrodita/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/afrodita/mail.png') }}" class="footer-messeger__icon" alt="">
|
<img src="{{ url_for('static', filename='./img/afrodita/mail.png') }}" class="footer-messeger__icon" alt="">
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
17
user_registration.py
Normal file
17
user_registration.py
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import sqlite3 as sql
|
||||||
|
import json
|
||||||
|
|
||||||
|
|
||||||
|
db = "data.db"
|
||||||
|
|
||||||
|
with open("pkg.json") as req:
|
||||||
|
json.dump(data, write_file)
|
||||||
|
|
||||||
|
|
||||||
|
def add_user(login, hash_password):
|
||||||
|
con = sql.connect(db)
|
||||||
|
cur = con.cursor()
|
||||||
|
cur.execute("INSERT INTO Users (UserLogin , UserPass) VALUES (?,?)", (login, hash_password))
|
||||||
|
con.commit()
|
||||||
|
con.close()
|
||||||
|
|
||||||
Reference in New Issue
Block a user