diff --git a/app/routes.py b/app/routes.py index ae156c5..241330a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -102,7 +102,7 @@ def index(): if not token: return redirect(url_for("main.set_token")) else: - return render_template('index.html', active_banner=get_active_banner(), decks=get_unlocked_decks(token), user_name=token.name, active_course=token.active_course, courses=get_all_courses()) + return render_template('index.html', active_banner=get_active_banner(), decks=get_unlocked_decks(token), user_name=token.name, active_course_name=token.active_course.name, courses=get_all_courses()) @main.route('/set_token', methods=['POST', 'GET']) def set_token(): @@ -291,8 +291,7 @@ def serve_deck(deck, course_folder, path='index.html'): @main.route('/admin', methods=['GET', 'POST']) @flask_login.login_required def admin(): - active_course_id = flask_login.current_user.active_course_id - active_course = get_course(active_course_id) + active_course = get_course(flask_login.current_user.active_course_id) if active_course is None: raise Exception deck_form = DeckForm() @@ -338,7 +337,7 @@ def admin(): print(f"Error in {getattr(password_form, field).label.text}: {error}", flush=True) return redirect(url_for('main.admin')) - return render_template("admin.html", deck_form=deck_form, password_form=password_form, decks=decks, passwords=get_passwords(active_course), courses=get_all_courses(), active_course_id=active_course_id) + return render_template("admin.html", deck_form=deck_form, password_form=password_form, decks=decks, passwords=get_passwords(active_course), courses=get_all_courses(), active_course_name=active_course.name) @main.route('/admin/switch_course/', methods=['POST']) @flask_login.login_required diff --git a/app/static/css/.gitignore b/app/static/css/.gitignore new file mode 100644 index 0000000..b702919 --- /dev/null +++ b/app/static/css/.gitignore @@ -0,0 +1 @@ +output.css diff --git a/app/static/css/input.css b/app/static/css/input.css new file mode 100644 index 0000000..b5c61c9 --- /dev/null +++ b/app/static/css/input.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/app/static/favicon.ico b/app/static/favicon.ico new file mode 100644 index 0000000..72b4b3e Binary files /dev/null and b/app/static/favicon.ico differ diff --git a/app/templates/admin.html b/app/templates/admin.html index 9952fec..742ad49 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -6,31 +6,10 @@ Deck Admin - - - - - + + - -