From 8857f17f7f2367ec8532cd85583ef8898a0580bb Mon Sep 17 00:00:00 2001 From: crunk Date: Sun, 13 Feb 2022 23:06:16 +0100 Subject: [PATCH] last code clean up of the night --- verse/app.py | 12 ++++++------ verse/deploydb.py | 1 + verse/distribusimodel.py | 2 +- verse/forms/themeform.py | 5 ++--- verse/start.py | 2 -- verse/usermodel.py | 1 - 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/verse/app.py b/verse/app.py index fcc01f4..8291340 100644 --- a/verse/app.py +++ b/verse/app.py @@ -17,10 +17,10 @@ login_manager = LoginManager() def create_app(): APP = Flask(__name__, static_folder="static") - APP.secret_key = 'secret-key' - APP.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:///data/distribusiverse.db" - APP.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True - #APP.config['MAX_CONTENT_LENGTH'] = 150 * 1024 * 1024 + APP.secret_key = "secret-key" + APP.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///data/distribusiverse.db" + APP.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = True + APP.config["MAX_CONTENT_LENGTH"] = 150 * 1024 * 1024 login_manager.session_protection = "strong" login_manager.login_view = "index" @@ -28,8 +28,8 @@ def create_app(): csrf = CSRFProtect() - APP.config['SECRET_KEY'] = os.urandom(24) - APP.config['UPLOAD_FOLDER'] = 'tmpupload' + APP.config["SECRET_KEY"] = os.urandom(24) + APP.config["UPLOAD_FOLDER"] = "tmpupload" csrf.init_app(APP) login_manager.init_app(APP) diff --git a/verse/deploydb.py b/verse/deploydb.py index d7d6439..236baf8 100644 --- a/verse/deploydb.py +++ b/verse/deploydb.py @@ -6,6 +6,7 @@ def deploy(): # This model is required for flask_migrate to make the table from usermodel import User # noqa: F401 from distribusimodel import Distribusis # noqa: F401 + app = create_app() app.app_context().push() db.create_all() diff --git a/verse/distribusimodel.py b/verse/distribusimodel.py index 79cfe38..7d601a4 100644 --- a/verse/distribusimodel.py +++ b/verse/distribusimodel.py @@ -7,7 +7,7 @@ class Distribusis(db.Model): __tablename__ = "distribusis" id = db.Column(db.Integer, primary_key=True) - distribusiname = db.Column(db.String(300), nullable=True, unique=True) + distribusiname = db.Column(db.String(300), nullable=True, unique=True) userid = db.Column(db.Integer, db.ForeignKey("users.id")) term = db.Column(db.Integer, nullable=False, unique=False) diff --git a/verse/forms/themeform.py b/verse/forms/themeform.py index ec845e4..d867478 100644 --- a/verse/forms/themeform.py +++ b/verse/forms/themeform.py @@ -1,7 +1,5 @@ """Form object declaration.""" from flask_wtf import FlaskForm -from flask_wtf.file import FileField, FileAllowed -from wtforms import validators from wtforms import ( RadioField, SubmitField, @@ -10,12 +8,13 @@ from wtforms import ( class ThemeForm(FlaskForm): """Publication upload form.""" + theme = RadioField( "Select your theme:", choices=[ ("hacking", "Hacking"), ("peachsunset", "Peach sunset"), - ("wdka", "WdkA") + ("wdka", "WdkA"), ], ) save = SubmitField("Save") diff --git a/verse/start.py b/verse/start.py index 1edc671..9d2411d 100644 --- a/verse/start.py +++ b/verse/start.py @@ -23,7 +23,6 @@ from flask_login import ( current_user, ) -from flask_bcrypt import generate_password_hash from flask_wtf.csrf import CSRFError from app import create_app, db, login_manager @@ -31,7 +30,6 @@ from usermodel import User from distribusimodel import Distribusis # Forms! -from forms.registerform import RegisterForm from forms.uploadform import UploadForm from forms.distribusiform import DistribusiForm from forms.themeform import ThemeForm diff --git a/verse/usermodel.py b/verse/usermodel.py index d2183cc..aa1ceba 100644 --- a/verse/usermodel.py +++ b/verse/usermodel.py @@ -11,6 +11,5 @@ class User(UserMixin, db.Model): email = db.Column(db.String(150), unique=True, nullable=False) password = db.Column(db.String(300), nullable=False, unique=False) - def __repr__(self): return "" % self.email