Tracking PR for registration rewrite #5

Merged
Muirrum merged 32 commits from rewrite into master 2022-12-15 18:32:08 -05:00
3 changed files with 11 additions and 2 deletions
Showing only changes of commit 4fec7f7da6 - Show all commits

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "templates/home"]
path = templates/home
url = https://github.com/wpi-acm/hack-wpi-static.git
[submodule "goathacks/templates/home"]
path = goathacks/templates/home
url = https://github.com/WPI-ACM/Hack-WPI-Static

View file

@ -1,4 +1,4 @@
from flask import Flask, render_template
from flask import Flask, render_template, send_from_directory
from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate
from flask_login import LoginManager
@ -47,7 +47,12 @@ def create_app():
# Homepage
@app.route("/")
def index():
return render_template("index.html")
return render_template("home/index.html")
# homepage assets
@app.route("/assets/<path:path>")
def assets(path):
return send_from_directory('templates/home/assets', path)
return app

@ -0,0 +1 @@
Subproject commit d24d276382d7b50f5a2bdbdc661567ab102f7971