yash and delbert committe update (front page)

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 {

hknweb/templates/home.html

@@ -165,15 +165,19 @@
 </div>
 
 <div class="what">
-    <div class="whatpic what_1"></div>
-    <div class="whatpic what_2"></div>
     <div class="what-about">
         <div class="what-about-title">What is HKN?</div>
         <div class="what-about-subtitle">
                 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!
         </div>
     </div>
-    <div class="whatpic what_3"></div>
+    <div class="what-photos">
+        <div class="whatpic what_1"></div>
+        <div class="whatpic what_2"></div>
+        <div class="whatpic what_3"></div>
+        <div class="whatpic what_4"></div>
+        <div class="whatpic what_5"></div>
+    </div>
 </div>
 
 <div class="services">
@@ -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.
             </div>
         </div>
-        <a href="">
+        <a href="/tutoring">
             <div class="servicespic" style="width: 90%; background-image: url({% static "img/services-tutoring.png" %})">
                 <div class="servicespic-gradient" style="padding-bottom: 76.304023845%;"></div>
                 <div class="services-text">
@@ -214,11 +218,11 @@
                 </div>
             </div>
         </a>
-        <a href="">
+        <a href="https://hkn.eecs.berkeley.edu/courseguides">
             <div class="servicespic" style="width: 70%; background-image: url({% static "img/services-course-map.png" %});">
                 <div class="servicespic-gradient" style="padding-bottom: 102.1035598706%;"></div>
                 <div class="services-text">
-                    <b>Course map</b> <br>
+                    <b>Course Guides</b> <br>
                     See what prerequisites you'll need to pursue a concentration.
                 </div>
             </div>
@@ -237,21 +241,4 @@
 {% endblock %}
 
 {% block extra-footer %}
-<div class="help-form-container">
-    <div class="help-form">
-        <div class="form-title">We're here for <span style="border-bottom: 5px solid #FDB515;">you</span>.</div>
-        <form class="footer-block-text">
-            <input id="first_name" type="text" class="validate">
-            <label for="first_name">Your name</label>
-            <br>
-
-            <input id="last_name" type="text" class="validate">
-            <label for="last_name">Your email</label>
-            <br>
-
-            <input id="last_name" type="text" class="validate">
-            <label for="last_name">How can we help?</label>
-        </form>
-    </div>
-</div>
 {% endblock %}

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]