From 9ef4f85fe907fc59fdd44defa85f041193682bfa Mon Sep 17 00:00:00 2001
From: duongban <duongduban11@gmail.com>
Date: Wed, 26 May 2021 00:12:38 +0700
Subject: [PATCH] Refactor get tag

---
 flash_cards.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/flash_cards.py b/flash_cards.py
index 8547334..cd9e433 100644
--- a/flash_cards.py
+++ b/flash_cards.py
@@ -75,7 +75,8 @@ def cards():
     '''
     cur = db.execute(query)
     cards = cur.fetchall()
-    return render_template('cards.html', cards=cards, filter_name="all")
+    tags = getAllTag()
+    return render_template('cards.html', cards=cards, tags=tags, filter_name="all")
 
 
 @app.route('/filter_cards/<filter_name>')
@@ -97,7 +98,8 @@ def filter_cards(filter_name):
         return redirect(url_for('cards'))
 
     db = get_db()
-    fullquery = "SELECT id, type, front, back, known FROM cards " + query + " ORDER BY id DESC"
+    fullquery = "SELECT id, type, front, back, known FROM cards " + \
+        query + " ORDER BY id DESC"
     cur = db.execute(fullquery)
     cards = cur.fetchall()
     return render_template('cards.html', cards=cards, filter_name=filter_name)
@@ -276,8 +278,8 @@ def logout():
     flash("You've logged out")
     return redirect(url_for('index'))
 
-@app.route('/tags')
-def tags():
+
+def getAllTag():
     if not session.get('logged_in'):
         return redirect(url_for('login'))
     db = get_db()
@@ -288,8 +290,17 @@ def tags():
     '''
     cur = db.execute(query)
     tags = cur.fetchall()
+    return tags
+
+
+@app.route('/tags')
+def tags():
+    if not session.get('logged_in'):
+        return redirect(url_for('login'))
+    tags = getAllTag()
     return render_template('tags.html', tags=tags, filter_name="all")
 
+
 @app.route('/addTag', methods=['POST'])
 def add_tag():
     if not session.get('logged_in'):
@@ -301,6 +312,7 @@ def add_tag():
     flash('New tag was successfully added.')
     return redirect(url_for('tags'))
 
+
 @app.route('/editTag/<tag_id>')
 def edit_tag(tag_id):
     if not session.get('logged_in'):
@@ -315,6 +327,7 @@ def edit_tag(tag_id):
     tag = cur.fetchone()
     return render_template('editTag.html', tag=tag)
 
+
 @app.route('/updateTag', methods=['POST'])
 def update_tag():
     if not session.get('logged_in'):
@@ -334,5 +347,6 @@ def update_tag():
     flash('Tag saved.')
     return redirect(url_for('tags'))
 
+
 if __name__ == '__main__':
     app.run(host='0.0.0.0')