Skip to content

Commit

Permalink
Merge pull request #56 from software-students-spring2024/more-card-crud
Browse files Browse the repository at this point in the history
Removed mainDecks
  • Loading branch information
shriyakalakata authored Feb 28, 2024
2 parents f3bec41 + 99c2464 commit 30f9887
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ def allDecks(username):
return redirect('/login')
else:
user = db.users.find_one({'user_id': current_user.id})
return render_template('decks.html', mainDecks = user['mainDecks'], personalDecks = user['personalDecks'])
mainDecks = db.decks.find({})
return render_template('decks.html', mainDecks = mainDecks, personalDecks = user['personalDecks'])


@app.route("/<username>/<deckTitle>")
Expand Down
2 changes: 1 addition & 1 deletion authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ 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, 'mainDecks': [], 'personalDecks': []})
db['users'].insert_one({"user_id": user.id, "password": user.password, 'personalDecks': []})
login_user(user)
# TODO: Redirect to the appropriate page for the logged in user
return redirect('/' + user_id + '/decks')
Expand Down

0 comments on commit 30f9887

Please sign in to comment.