Merge pull request #55 from software-students-spring2024/more-card-crud

More card crud

app.py

@@ -38,11 +38,10 @@ def allDecks(username):
         return render_template('decks.html', mainDecks=mainDecks)
     else:
         if (not current_user.is_authenticated or current_user.id != username):
-            # TODO: Implement proper 404 screen to redirect here.
-            return username + " needs to log in first."
+            return redirect('/login')
         else:
-            # TODO: Redirect to the decks of the current user
-            return "Here would be the decks of " + current_user.id + "."
+            user = db.users.find_one({'user_id': current_user.id})
+            return render_template('decks.html', mainDecks = user['mainDecks'], personalDecks = user['personalDecks'])
 
 
 @app.route("/<username>/<deckTitle>")

authentication.py

@@ -1,5 +1,5 @@
 from flask import render_template, request, redirect, url_for, session, flash
-from flask_login import LoginManager, UserMixin, login_user
+from flask_login import LoginManager, UserMixin, login_user, current_user
 from db import *
 from pymongo import *
 from werkzeug.security import generate_password_hash, check_password_hash
@@ -45,7 +45,7 @@ def auth_login():
         if user and user.verify_password(password):
             # TODO: Redirect to the appropriate page for the logged in user
             login_user(user)
-            return redirect('/')
+            return redirect('/' + user_id + '/decks')
         else:
             return render_template('login.html', invalid_login=True)
     else:
@@ -63,10 +63,10 @@ def auth_signup():
             return render_template('signup.html', username_taken=False, passwords_dont_match=True)
         else:
             user = User(user_id, generate_password_hash(password))
-            db['users'].insert_one({"user_id": user.id, "password": user.password})
+            db['users'].insert_one({"user_id": user.id, "password": user.password, 'mainDecks': [], 'personalDecks': []})
             login_user(user)
             # TODO: Redirect to the appropriate page for the logged in user
-            return redirect('/')
+            return redirect('/' + user_id + '/decks')
 
     else:
         return render_template('signup.html', username_taken=False, passwords_dont_match=False)