Compare commits
No commits in common. "520f38e0d6bc8298ca56082397c2aee4bfc9ef42" and "2a01481440529d72a1c99473241e5836b03f3832" have entirely different histories.
520f38e0d6
...
2a01481440
7
app.py
7
app.py
|
@ -1,3 +1,4 @@
|
|||
import os
|
||||
from flask import Flask, redirect, render_template, session, request, url_for, flash
|
||||
|
||||
from auth import login_required, bp as auth_bp
|
||||
|
@ -46,6 +47,9 @@ def create_app(test_config=None):
|
|||
deck_query.filter(Deck)
|
||||
return index()
|
||||
|
||||
|
||||
deck_id = deck_object.id
|
||||
|
||||
# Smo oddali obrazec?
|
||||
if request.method == 'POST':
|
||||
card_id = request.form.get('card_id', None)
|
||||
|
@ -70,6 +74,7 @@ def create_app(test_config=None):
|
|||
if not rate:
|
||||
raise Exception("manjka rate info!")
|
||||
|
||||
|
||||
if rate == "Yes":
|
||||
submit_card.interest_rate = 1
|
||||
|
||||
|
@ -99,7 +104,6 @@ def create_app(test_config=None):
|
|||
|
||||
deck_object.current_card = next_card
|
||||
dbsession.commit()
|
||||
dbsession.close()
|
||||
|
||||
# Loudamo naslednjo karto v decku
|
||||
show_card_index = deck_object.current_card
|
||||
|
@ -126,7 +130,6 @@ def create_app(test_config=None):
|
|||
print("share!!!")
|
||||
return redirect(url_for("deck"))
|
||||
|
||||
|
||||
@app.route('/logout')
|
||||
def logout():
|
||||
session.pop("user_id", None)
|
||||
|
|
6
auth.py
6
auth.py
|
@ -28,11 +28,11 @@ def register():
|
|||
elif not password:
|
||||
error = 'Password is required.'
|
||||
elif not mail:
|
||||
error = 'Please enter your email adress.'
|
||||
error = 'Please enter your email adress'
|
||||
elif dbsession.query(User).filter(User.username == username).first() != None:
|
||||
error = "Username already exists, please choose another one."
|
||||
error = "Username already exists, please choose another one"
|
||||
elif dbsession.query(User).filter(User.email == mail).first() != None:
|
||||
error = "This email adress is already in use, please choose another one."
|
||||
error = "This email adress is already in use, please choose another one"
|
||||
|
||||
if error is None:
|
||||
try:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from flask import flash, render_template, Blueprint, request, session
|
||||
from flask import flash, redirect, render_template, url_for, Blueprint, request, session
|
||||
from create_db import User, get_session
|
||||
import json
|
||||
|
||||
|
|
Loading…
Reference in New Issue