diff --git a/hknweb/static/css/home.css b/hknweb/static/css/home.css index 957bc57b..8bfb4b74 100644 --- a/hknweb/static/css/home.css +++ b/hknweb/static/css/home.css @@ -134,44 +134,44 @@ body { /* ABOUT HKN SECTION */ .what { margin-top: 50px; - height: 500px; display: flex; + flex-direction: column; align-items: center; - justify-content: space-between; } -.whatpic { - width: 350px; - height: 500px; - margin: 20px; - max-width: 20%; +.what-photos { + display: flex; + flex-direction: row; + width: 100%; + height: 350px; + margin-top: 30px; } -.what_1 { - margin-left: 0px; - background: url('../img/what1.jpg'); +.whatpic { + flex: 1; + height: 350px; background-size: cover; background-repeat: no-repeat; - background-position: -200px 0px; + background-position: center center; +} +.what_1 { + background-image: url('../img/Copy of F811F8BE-5589-4A73-A618-2DC7DDCEB5AC_1_105_c.jpeg'); } .what_2 { - background: url('../img/what2.jpg'); - background-size: cover; - background-repeat: no-repeat; - background-position: -100px 0px; - margin-right: 30px; + background-image: url('../img/Copy of IMG_9028.jpg'); } .what_3 { - background: url('../img/what3.jpg'); - background-size: cover; - background-repeat: no-repeat; - background-position: 0px 0px; - margin-left: 30px; - margin-right: 0px; + background-image: url('../img/Copy of KD0A6610.JPG'); +} +.what_4 { + background-image: url('../img/Copy of RAD01382.JPG'); +} +.what_5 { + background-image: url('../img/Copy of RAD01394.JPG'); } .what-about { padding-left: 13px; padding-right: 13px; - margin: 0 auto; - max-width: 35%; + text-align: center; + max-width: 700px; } .what-about-title { font-size: 2em; @@ -185,12 +185,9 @@ body { line-height: 1.75em; } @media screen and (max-width: 1200px) { - .what_2 { + .what_4, .what_5 { display: none; } - .what_1 { - margin-right: 30px; - } } @media screen and (max-width: 800px) { .whatpic { diff --git a/hknweb/static/img/Copy of F811F8BE-5589-4A73-A618-2DC7DDCEB5AC_1_105_c.jpeg b/hknweb/static/img/Copy of F811F8BE-5589-4A73-A618-2DC7DDCEB5AC_1_105_c.jpeg new file mode 100644 index 00000000..c9fa287b Binary files /dev/null and b/hknweb/static/img/Copy of F811F8BE-5589-4A73-A618-2DC7DDCEB5AC_1_105_c.jpeg differ diff --git a/hknweb/static/img/Copy of IMG_9028.jpg b/hknweb/static/img/Copy of IMG_9028.jpg new file mode 100644 index 00000000..cada629b Binary files /dev/null and b/hknweb/static/img/Copy of IMG_9028.jpg differ diff --git a/hknweb/static/img/Copy of KD0A6610.JPG b/hknweb/static/img/Copy of KD0A6610.JPG new file mode 100644 index 00000000..a7df1bd1 Binary files /dev/null and b/hknweb/static/img/Copy of KD0A6610.JPG differ diff --git a/hknweb/static/img/Copy of RAD01382.JPG b/hknweb/static/img/Copy of RAD01382.JPG new file mode 100644 index 00000000..a4cbcc96 Binary files /dev/null and b/hknweb/static/img/Copy of RAD01382.JPG differ diff --git a/hknweb/static/img/Copy of RAD01394.JPG b/hknweb/static/img/Copy of RAD01394.JPG new file mode 100644 index 00000000..d5735202 Binary files /dev/null and b/hknweb/static/img/Copy of RAD01394.JPG differ diff --git a/hknweb/templates/home.html b/hknweb/templates/home.html index 11858795..dc10a66e 100644 --- a/hknweb/templates/home.html +++ b/hknweb/templates/home.html @@ -165,15 +165,19 @@
-
-
What is HKN?
Eta Kappa Nu (HKN) is the national Electrical and Computer Engineering honor society. The Berkeley chapter is among the most active engineering societies at Berkeley, providing services to fellow undergraduates. Welcome to our website!
-
+
+
+
+
+
+
+
@@ -184,7 +188,7 @@ We host a variety of acdemic, industry, and service events to help grow our EECS community. Here's a look at what we do.
- +
@@ -214,11 +218,11 @@
- +
- Course map
+ Course Guides
See what prerequisites you'll need to pursue a concentration.
@@ -237,21 +241,4 @@ {% endblock %} {% block extra-footer %} -
-
-
We're here for you.
- -
-
{% endblock %} diff --git a/hknweb/views/landing.py b/hknweb/views/landing.py index 51993639..5a886ef8 100644 --- a/hknweb/views/landing.py +++ b/hknweb/views/landing.py @@ -3,7 +3,7 @@ from hknweb.models import Announcement from hknweb.events.models import Event -from hknweb.utils import allow_public_access +from hknweb.utils import allow_public_access, get_access_level NUM_EVENTS = 4 @@ -12,9 +12,11 @@ @allow_public_access def home(request): # TODO: determine earliest weekday for which tutoring still has yet to complete, and query those tutors - upcoming_events = Event.objects.filter(end_time__gte=timezone.now()).order_by( - "start_time" - ) + user_access_level = get_access_level(request.user) + upcoming_events = Event.objects.filter( + start_time__range=(timezone.now(), timezone.now() + timezone.timedelta(days=7)), + access_level__gte=get_access_level(request.user), + ).order_by("start_time") upcoming_review_sessions = upcoming_events.filter(event_type__type="Review Session") upcoming_events = upcoming_events[:NUM_EVENTS]