diff --git a/README.md b/README.md index e2f59ef..4489dd8 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ $ python deploydb.py ## Distribusi This is currently added as a git submodule but I have no clue how that actually works -to install a local git repository into your virtual env pip you can try. +* to install a local git repository into your virtual env pip you can try. ``` $ pip install git+file:///home/full/path/to/distribusi#egg=distribusi diff --git a/notes.md b/notes.md index 4e8c358..04bb805 100644 --- a/notes.md +++ b/notes.md @@ -1,5 +1,5 @@ #notes -pip install git+file:///distribusi#egg=distribusi + # Shit! We need entire CRUD functionality. diff --git a/verse/deploydb.py b/verse/deploydb.py index 3815b02..8c4c49c 100644 --- a/verse/deploydb.py +++ b/verse/deploydb.py @@ -2,6 +2,7 @@ def deploy(): """Run deployment of database.""" from app import create_app, db from flask_migrate import upgrade, migrate, init, stamp + from usermodel import User app = create_app() app.app_context().push() diff --git a/verse/start.py b/verse/start.py index adcc308..f56cdd0 100644 --- a/verse/start.py +++ b/verse/start.py @@ -36,7 +36,8 @@ from registerform import RegisterForm from uploadform import UploadForm # Tada! -import distribusi +from distribusi.cli import build_argparser +from distribusi.distribusi import distribusify APP = create_app() @@ -58,7 +59,7 @@ def login(): if loginform.validate_on_submit(): try: user = User.query.filter_by(email=loginform.email.data).first() - if check_password_hash(user.pwd, loginform.password.data): + if check_password_hash(user.password, loginform.password.data): login_user(user) flash("Logged in successfully.", "success") next = request.args.get("next") @@ -78,17 +79,17 @@ def register(): if registerform.validate_on_submit(): try: email = registerform.email.data - pwd = registerform.confirmpassword.data + password = registerform.confirmpassword.data newuser = User( email=email, - pwd=generate_password_hash(pwd), + password=generate_password_hash(password), ) db.session.add(newuser) db.session.commit() flash("Account Succesfully created", "success") - return redirect(url_for("login")) + return redirect(url_for("index")) except InvalidRequestError: db.session.rollback() diff --git a/verse/templates/distribusi.html b/verse/templates/distribusi.html index 22539ac..cca85af 100644 --- a/verse/templates/distribusi.html +++ b/verse/templates/distribusi.html @@ -1,29 +1,38 @@ {% extends "base.html" %} {% block main %} -
Upload button
- -dropdown css file selector
-go to CSS editor
-run distribusi on your files
+Upload button
+ +dropdown css file selector
+go to CSS editor
+run distribusi on your files
+