diff --git a/acmsite/main/__init__.py b/acmsite/main/__init__.py index 52f99d2..0032b01 100644 --- a/acmsite/main/__init__.py +++ b/acmsite/main/__init__.py @@ -4,4 +4,12 @@ bp = Blueprint('main', __name__) @bp.route("/") def homepage(): - return render_template("index.html") \ No newline at end of file + return render_template("index.html") + +@bp.route("/events") +def events(): + return render_template("events.html") + +@bp.route("/join") +def join(): + return render_template("join.html") diff --git a/acmsite/static/css/style.css b/acmsite/static/css/style.css new file mode 100644 index 0000000..3524aee --- /dev/null +++ b/acmsite/static/css/style.css @@ -0,0 +1,8 @@ +.carousel-item { + height: 100rem; +} +.header-image { + height: 15rem; + object-position: 0 75%; + object-fit: cover; +} diff --git a/acmsite/static/img/carousel/hackathon1.webp b/acmsite/static/img/carousel/hackathon1.webp new file mode 100644 index 0000000..4978d9f Binary files /dev/null and b/acmsite/static/img/carousel/hackathon1.webp differ diff --git a/acmsite/static/img/carousel/hackathon2.webp b/acmsite/static/img/carousel/hackathon2.webp new file mode 100644 index 0000000..e3d2b04 Binary files /dev/null and b/acmsite/static/img/carousel/hackathon2.webp differ diff --git a/acmsite/templates/bootstrap-base.html b/acmsite/templates/bootstrap-base.html index fd542cc..1b9e804 100644 --- a/acmsite/templates/bootstrap-base.html +++ b/acmsite/templates/bootstrap-base.html @@ -16,11 +16,14 @@ {% block styles %} {{ bootstrap.load_css() }} + - + +
{% block navbar %}{% endblock %} @@ -38,6 +41,7 @@ {{ bootstrap.load_js() }} {% endblock %} +
diff --git a/acmsite/templates/index.html b/acmsite/templates/index.html index 1d419a3..0d8fb55 100644 --- a/acmsite/templates/index.html +++ b/acmsite/templates/index.html @@ -1,5 +1,33 @@ {% extends 'layout.html' %} {% block app_content %} +
+
+ +
+
+

Association for Computing Machinery @ WPI

+ WPI's Professional Society for computer scientists, software + designers, Developers, coders, makers... +
+
+

Welcome to ACM!

+

We're the student chapter of the Association + for Computing Machinery on campus. We host workshops, social events, + and WPI's annual hackathon in C term.

+
+
+

We also support WPI's linux community with our mirrors. + Currently, we provide + mirrors for:

+ +

If you would like a package mirror for your linux distribution, please + reach out! Space is limited, but we want to support the community.

+
{% endblock app_content %} diff --git a/acmsite/templates/join.html b/acmsite/templates/join.html new file mode 100644 index 0000000..5a7a3ed --- /dev/null +++ b/acmsite/templates/join.html @@ -0,0 +1,8 @@ +{% extends 'layout.html' %} + +{% block app_content %} + +

Join ACM

+

Want to join us? Show up to our GBMs and events every week!

+ +{% endblock %} diff --git a/acmsite/templates/layout.html b/acmsite/templates/layout.html index cbdfd06..918c112 100644 --- a/acmsite/templates/layout.html +++ b/acmsite/templates/layout.html @@ -29,8 +29,8 @@
-{% block header %} - -{% endblock header %} {% endblock %}