added share logic
parent
0406fc6eab
commit
da4fa5c23f
20
app.py
20
app.py
|
@ -1,6 +1,5 @@
|
||||||
import os
|
import os
|
||||||
from flask import Flask, redirect, render_template, session, request, url_for
|
from flask import Flask, redirect, render_template, session, request, url_for
|
||||||
from datetime import date
|
|
||||||
|
|
||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.orm import sessionmaker
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
@ -9,6 +8,7 @@ from auth import login_required, bp as auth_bp
|
||||||
from deck import bp as deck_bp
|
from deck import bp as deck_bp
|
||||||
from menu import bp as menu_bp
|
from menu import bp as menu_bp
|
||||||
from upload import bp as upload_bp
|
from upload import bp as upload_bp
|
||||||
|
from share import share
|
||||||
|
|
||||||
from create_db import Card, Deck
|
from create_db import Card, Deck
|
||||||
from config import CONFIG
|
from config import CONFIG
|
||||||
|
@ -45,15 +45,6 @@ def create_app(test_config=None):
|
||||||
def index():
|
def index():
|
||||||
return 'redirecting' # meče skoz nazaj na login TODO
|
return 'redirecting' # meče skoz nazaj na login TODO
|
||||||
|
|
||||||
@app.route('/deck/beta', methods=["GET", "POST"])
|
|
||||||
def deck2():
|
|
||||||
if request.method == 'POST':
|
|
||||||
pass
|
|
||||||
|
|
||||||
return render_template("deck/index.html")
|
|
||||||
|
|
||||||
|
|
||||||
#@login_required
|
|
||||||
@app.route('/deck/index', methods=["GET", "POST"])
|
@app.route('/deck/index', methods=["GET", "POST"])
|
||||||
def deck():
|
def deck():
|
||||||
if not 'user_id' in session:
|
if not 'user_id' in session:
|
||||||
|
@ -80,10 +71,10 @@ def create_app(test_config=None):
|
||||||
# @TODO preveri, ali je card del trenutnega decka!
|
# @TODO preveri, ali je card del trenutnega decka!
|
||||||
|
|
||||||
# Ali damo share? Potem nastavi na share in ponovi obrazec
|
# Ali damo share? Potem nastavi na share in ponovi obrazec
|
||||||
share = request.form.get("share", None)
|
share_request = request.form.get("share", None)
|
||||||
if share:
|
if share_request:
|
||||||
print(share)
|
|
||||||
# @TODO logika za share!
|
# @TODO logika za share!
|
||||||
|
share(submit_card, user_id)
|
||||||
|
|
||||||
# Če ne, gre za rate!
|
# Če ne, gre za rate!
|
||||||
else:
|
else:
|
||||||
|
@ -150,6 +141,7 @@ def create_app(test_config=None):
|
||||||
def match():
|
def match():
|
||||||
return "match"
|
return "match"
|
||||||
|
|
||||||
|
|
||||||
#app.register_blueprint(bp) # ??
|
#app.register_blueprint(bp) # ??
|
||||||
app.register_blueprint(auth_bp)
|
app.register_blueprint(auth_bp)
|
||||||
app.register_blueprint(deck_bp)
|
app.register_blueprint(deck_bp)
|
||||||
|
@ -161,4 +153,4 @@ def create_app(test_config=None):
|
||||||
|
|
||||||
|
|
||||||
app = create_app()
|
app = create_app()
|
||||||
app.run(debug=True, host="0.0.0.0")
|
app.run(debug=True, host="0.0.0.0")
|
Loading…
Reference in New Issue