Compare commits
3 Commits
2a01481440
...
520f38e0d6
Author | SHA1 | Date |
---|---|---|
Kostanjevec | 520f38e0d6 | |
Kostanjevec | 2e2a986028 | |
Kostanjevec | c77d7b1cff |
7
app.py
7
app.py
|
@ -1,4 +1,3 @@
|
||||||
import os
|
|
||||||
from flask import Flask, redirect, render_template, session, request, url_for, flash
|
from flask import Flask, redirect, render_template, session, request, url_for, flash
|
||||||
|
|
||||||
from auth import login_required, bp as auth_bp
|
from auth import login_required, bp as auth_bp
|
||||||
|
@ -47,9 +46,6 @@ def create_app(test_config=None):
|
||||||
deck_query.filter(Deck)
|
deck_query.filter(Deck)
|
||||||
return index()
|
return index()
|
||||||
|
|
||||||
|
|
||||||
deck_id = deck_object.id
|
|
||||||
|
|
||||||
# Smo oddali obrazec?
|
# Smo oddali obrazec?
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
card_id = request.form.get('card_id', None)
|
card_id = request.form.get('card_id', None)
|
||||||
|
@ -74,7 +70,6 @@ def create_app(test_config=None):
|
||||||
if not rate:
|
if not rate:
|
||||||
raise Exception("manjka rate info!")
|
raise Exception("manjka rate info!")
|
||||||
|
|
||||||
|
|
||||||
if rate == "Yes":
|
if rate == "Yes":
|
||||||
submit_card.interest_rate = 1
|
submit_card.interest_rate = 1
|
||||||
|
|
||||||
|
@ -104,6 +99,7 @@ def create_app(test_config=None):
|
||||||
|
|
||||||
deck_object.current_card = next_card
|
deck_object.current_card = next_card
|
||||||
dbsession.commit()
|
dbsession.commit()
|
||||||
|
dbsession.close()
|
||||||
|
|
||||||
# Loudamo naslednjo karto v decku
|
# Loudamo naslednjo karto v decku
|
||||||
show_card_index = deck_object.current_card
|
show_card_index = deck_object.current_card
|
||||||
|
@ -130,6 +126,7 @@ def create_app(test_config=None):
|
||||||
print("share!!!")
|
print("share!!!")
|
||||||
return redirect(url_for("deck"))
|
return redirect(url_for("deck"))
|
||||||
|
|
||||||
|
|
||||||
@app.route('/logout')
|
@app.route('/logout')
|
||||||
def logout():
|
def logout():
|
||||||
session.pop("user_id", None)
|
session.pop("user_id", None)
|
||||||
|
|
6
auth.py
6
auth.py
|
@ -28,11 +28,11 @@ def register():
|
||||||
elif not password:
|
elif not password:
|
||||||
error = 'Password is required.'
|
error = 'Password is required.'
|
||||||
elif not mail:
|
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:
|
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:
|
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:
|
if error is None:
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from flask import flash, redirect, render_template, url_for, Blueprint, request, session
|
from flask import flash, render_template, Blueprint, request, session
|
||||||
from create_db import User, get_session
|
from create_db import User, get_session
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue