?

app.py

@@ -16,6 +16,7 @@ engine = create_engine(CONFIG['DB_CONNECTION'])
 dbsessionmaker = sessionmaker(bind=engine)
 dbsession = dbsessionmaker()
 
+deck_index=-1
 
 def create_app(test_config=None):
     # create and configure the app
@@ -44,33 +45,38 @@ def create_app(test_config=None):
     def index():
         return 'redirecting' # meče skoz nazaj na login TODO
 
+
     #@login_required
     @app.route('/deck/index', methods=("GET", "POST"))
     def deck():
         if 'user_id' in session:
+            global deck_index
             user_id = session['user_id']
             username = session['username']
             d = get_deck(user_id)
             
-            for card in d: #TODO to ne dela, nevem kako renderat zapooredno kartic
-                if request.method == 'POST':
-                    rate = request.form['rate']
-                    cardtitle = request
-                    print(rate)
-                    if rate == "Yes":
-                        k = 1
-                    elif rate == "Maybe":
-                        k = 0.5
-                    elif rate == "No":
-                        k = 0.1
+            deck_index+=1
+            card = d[deck_index]
 
-        
-                    print(card.id)
-                    print(user_id)
-                    dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1
-                    dbsession.commit()  
-                    render_template("deck/index.html", username=username, card = card)
-                return render_template("deck/index.html", username=username, card = card) # no idea kaj se tu dogaja...
+            #for card in d: #TODO to ne dela, nevem kako renderat zapooredno kartic
+            if request.method == 'POST':
+                rate = request.form['rate']
+                cardtitle = request
+                print(rate)
+                if rate == "Yes":
+                    k = 1
+                elif rate == "Maybe":
+                    k = 0.5
+                elif rate == "No":
+                    k = 0.1
+
+    
+                print(card.id)
+                print(user_id)
+                dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1
+                dbsession.commit()  
+                #render_template("deck/index.html", username=username, card = card)
+            return render_template("deck/index.html", username=username, card = card) # no idea kaj se tu dogaja...
         else:
             return index()
 
@@ -82,7 +88,6 @@ def create_app(test_config=None):
 
 
     #app.register_blueprint(bp) # ??
-    
     app.register_blueprint(auth_bp)
     app.register_blueprint(deck_bp)
     app.add_url_rule('/', endpoint='index')

create_db.py

@@ -30,8 +30,9 @@ class Card(Base):
     __tablename__   = 'card'
     id              = Column(Integer, primary_key=True, autoincrement=True)
     title           = Column(String(1024))
-    interest_rate   = Column(Float)
     owner_id        = Column(Integer, ForeignKey("user.id"), nullable=False)
+    interest_rate   = Column(Float)
+
 #   shared          = Column(Bool)
 #   item_location   = Column(String)
 #   item_type       = Column(String)
@@ -44,6 +45,22 @@ class Card(Base):
 #   due             = Column(DateTime)
 
 
+"""
+class Card(Base):
+    item_id = None
+    user_id = None
+    deck_id = None # generated session id
+    timestamp = None
+    interest_rate   = Column(Float)
+
+""" 
+
+
+    
+
+
+
+
 
 engine = create_engine(CONFIG['DB_CONNECTION'])
 

deck.py

@@ -21,7 +21,15 @@ dbsession = dbsessionmaker()
 @bp.route('/deck', methods=['GET'])
 # @login_required
 def get_deck(user_id):
-
     user_collection = dbsession.query(Card).filter(Card.owner_id == user_id).all()
 
-    return user_collection
+    return user_collection
+
+
+def render_card(card, user):
+    
+    return next_card()
+
+
+def next_card():
+    pass

static/style.css

@@ -12,7 +12,7 @@ html {
   
   h1, h2, h3, h4, h5, h6 {
     font-family: serif;
-    color: #377ba8;
+    color: #000000;
     margin: 1rem 0;
   }
   
@@ -26,7 +26,7 @@ html {
   }
   
   nav {
-    background: lightgray;
+    background: D9D2C6;
     display: flex;
     align-items: center;
     padding: 0 0.5rem;

templates/deck/index.html

@@ -8,15 +8,15 @@
   <p>BODY</p>
 
   <article class="post">
-    <header>
-      <div>
+    <div>
+        <header>
         <h1>{{ card['title'] }}</h1>
+        </header>
         <form method="post">
           <button input type="submit" name="rate" data-cardtitle=card[title] value="Yes">Yes</button>
           <button input type="submit" name="rate" value="Maybe">Maybe</button>
           <button input type="submit" name="rate" value="No">No</button>
         </form>
       </div>
-    </header>
   </article>
 {% endblock %}