Fixed Merge Issues

config/settings.py

@@ -21,10 +21,11 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
 
+if DEBUG:
+    ALLOWED_HOSTS = ['*']
+else:
+    ALLOWED_HOSTS = ['tj2023.sites.tjhsst.edu']
 
 # Application definition
 

my_secrets/definitions.py

@@ -7,6 +7,7 @@
 
 SECRET_KEYS = [
     # start with your Django secret key like this:
+    'DEBUG',
     "SECRET_KEY",
     "NOTION_URL",
     "NOTION_COOKIE",

pages/static/pages/css/styles.css

@@ -8,11 +8,17 @@ html {
   overflow-x: hidden;
 }
 
-.person_cont {
+.person {
     text-align: center;
     margin: 20px;
 }
 
+.card-img-top {
+  width: 100%;
+  height: 12vw;
+  object-fit: cover;
+}
+
 .photo {
     width: 300px;
     margin: 15px;
@@ -20,10 +26,6 @@ html {
     box-shadow: 12px 12px rgb(0, 0, 0, 0.1), -12px -12px rgb(0, 0, 0, 0.3);
 }
 
-.council h2{
-    text-align: center;
-}
-
 .details p a {
     font-size: 25px;
 }
@@ -70,6 +72,8 @@ nav {
 
 .hero-text {
   margin-top: 25vh;
+  mix-blend-mode: exclusion;
+  color: white;
 }
 
 .home {
@@ -86,13 +90,17 @@ body {
   color: #444;
 }
 
-.contrast {
-    mix-blend-mode: exclusion;
-    color: white;
-}
+/* mobile styles */
 
 @media (max-width: 768px) {
   .hero-text {
-    margin-top: 30vh;
+    margin-top: 10vh;
+    mix-blend-mode: unset;
+    color: inherit;
+  }
+
+  .no-mobile {
+    display: none;
+    pointer-events: none;
   }
 }

pages/templates/pages/base.html

@@ -41,7 +41,7 @@
                           <a class="dropdown-item" href="{% url 'council' %}">About us</a>
                           <a class="dropdown-item" href="{% url 'notes' %}">Our Meetings</a>
                           <div class="dropdown-divider"></div>
-                          <a class="dropdown-item" href="#">Contact Us</a>
+                          <a class="dropdown-item" href="{% url 'contact' %}">Contact Us</a>
                         </div>
                     </li>
                 </ul>

pages/templates/pages/contact.html

@@ -0,0 +1,11 @@
+{% extends 'pages/base.html' %}
+{% load static %}
+{% block title %}Council{% endblock title %}
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'pages/css/styles.css' %}">
+{% endblock css %}
+{% block content %}
+<div class="container mt-5">
+    <h1 class="display-4">Contact Us!</h1>
+</div>
+{% endblock %}

pages/templates/pages/council.html

@@ -6,87 +6,96 @@
 {% endblock css %}
 {% block content %}
 <div class="container mt-5">
-<h1 class="display-4">The Class Council</h1>
-<p class="lead">We are here to serve you.</p>
+    <h1 class="display-4">The Class Council</h1>
+    <p class="lead">We are here to serve you.</p>
 </div>
 <hr>
-<div class="council container">
+<div class="container">
     <h2 class="display-6">Our Mission</h2>
     <p>Some description of what we do</p>
 </div>
 <hr>
 <div class="council">
-    <h2>Our Team</h2>
-    <br><br>
-    <div class="person_cont">
-        <img src="{% static 'pages/css/img/vinay.png' %}" class="photo">
-        <div class="details">
-            <h3><b>The President</b></h3>
-            <p><a>Vinay Ayala</a><br>
-                <i>“Live life to the fullest.”</i>
-            </p>
+    <h2 class="text-center">Our Team</h2>
+    <div class="row">
+        <div class="col-md-4">
+            <div class="person">
+                <img src="{% static 'pages/css/img/chinmay.png' %}" class="photo">
+                <div class="details">
+                    <h3><b>The Vice President</b></h3>
+                    <p><a>Praneeth Chinmay Bhandaru</a></p>
+                    <i>“You don't need to be a potato to be good in life, all you need to do is trust yourself.”</i>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="person">
+                <img src="{% static 'pages/css/img/vinay.png' %}" class="photo">
+                <div class="details">
+                    <h3><b>The President</b></h3>
+                    <p><a>Vinay Ayala</a></p>
+                    <i>“Live life to the fullest.”</i>
+
+                </div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="person">
+                <img src="{% static 'pages/css/img/grace.png' %}" class="photo">
+                <div class="details">
+                    <h3><b>The Treasurer</b></h3>
+                    <p><a>Grace Guan</a></p>
+                    <i>“I'm excited to serve again as a member of your class clowncil!”</i>
+
+                </div>
+            </div>
         </div>
     </div>
-    <br><br>
-    <div class="person_cont">
-        <img src="{% static 'pages/css/img/chinmay.png' %}" class="photo">
-        <div class="details">
-            <h3><b>The Vice President</b></h3>
-            <p><a>Praneeth Chinmay Bhandaru</a><br>
-                <i>“You don't need to be a potato to be good in life, all you need to do is trust yourself.”</i>
-            </p>
+    <div class="row">
+        <div class="col-md-4">
+            <div class="person">
+                <img src="{% static 'pages/css/img/christina.png' %}" class="photo">
+                <div class="details">
+                    <h3><b>The Secretary</b></h3>
+                    <p><a>Christina Han</a></p>
+                    <i>“I keep no secrets”</i>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="person">
+                <img src="{% static 'pages/css/img/rushil.png' %}" class="photo">
+                <div class="details">
+                    <h3><b>Senator</b></h3>
+                    <p><a>Rushil Umaretiya </a></p>
+                    <i>“Just failed his chem test, again.”</i>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="person">
+                <img src="{% static 'pages/css/img/yulee.png' %}" class="photo">
+                <div class="details">
+                    <h3><b>Senator</b></h3>
+                    <p><a>Yulee Kang</a></p>
+                    <i>“Is a Cutie :)”</i>
+
+                </div>
+            </div>
         </div>
     </div>
-    <br><br>
-    <div class="person_cont">
-        <img src="{% static 'pages/css/img/grace.png' %}" class="photo">
-        <div class="details">
-            <h3><b>The Treasurer</b></h3>
-            <p><a>Grace Guan</a><br>
-                <i>“I'm excited to serve again as a member of your class clowncil!”</i>
-            </p>
-        </div>
-    </div>
-<br><br>
-    <div class="person_cont">
-        <img src="{% static 'pages/css/img/christina.png' %}" class="photo">
-        <div class="details">
-            <h3><b>The Secretary</b></h3>
-            <p><a>Christina Han</a><br>
-                <i>“I keep no secrets”</i>
-            </p>
-        </div>
-    </div>
-<br><br>
-    <div class="person_cont">
-        <img src="{% static 'pages/css/img/yulee.png' %}" class="photo">
-        <div class="details">
-            <h3><b>Senator</b></h3>
-            <p><a>Yulee Kang</a><br>
-                <i>“Is a Cutie :)”</i>
-            </p>
-        </div>
-    </div>
-<br><br>
-    <div class="person_cont">
-        <img src="{% static 'pages/css/img/rushil.png' %}" class="photo">
-        <div class="details">
-            <h3><b>Senator</b></h3>
-            <p><a>Rushil Umaretiya </a><br>
-                <i>“Just failed his chem test, again.”</i>
-            </p>
-        </div>
-    </div>
-<br><br>
-    <div class="person_cont">
-        <img src="{% static 'pages/css/img/katelyn.png' %}" class="photo">
-        <div class="details">
-            <h3><b>The Historian</b></h3>
-            <p><a>Katelyn Chen</a><br>
-                “&#127345;&#65039;&#127358;&#65039;&#128200;&#127883;”
-            </p>
+    <div class="row">
+        <div class="col-md-4 offset-md-4">
+            <div class="person">
+                <img src="{% static 'pages/css/img/katelyn.png' %}" class="photo">
+                <div class="details">
+                    <h3><b>The Historian</b></h3>
+                    <p><a>Katelyn Chen</a></p>
+                    “&#127345;&#65039;&#127358;&#65039;&#128200;&#127883;”
+                </div>
+            </div>
         </div>
     </div>
 </div>
-<br><br><br><br>
+
 {% endblock content %}

pages/templates/pages/index.html

@@ -7,7 +7,7 @@
 {% block content %}
 <div class="jumbotron jumbotron-fluid">
   <div class="container hero-text contrast">
-    <h1 class="display-4"><strong>TJHSST Class of 2023</strong></h1>
+    <h1 class="display-4"><strong><span class="no-mobile">TJHSST</span> Class of 2023</strong></h1>
     <p class="lead">We are the class to beat!</p>
   </div>
 </div>

pages/urls.py

@@ -3,6 +3,7 @@ from . import views
 
 urlpatterns = [
     path('', views.index, name="index"),
+    path('contact/', views.contact, name='contact'),
     path('council/', views.council, name='council'),
-    path('events/', views.events, name='events')
+    path('events/', views.events, name='events'),
 ]

pages/views.py

@@ -19,3 +19,6 @@ def council(request):
 
 def events(request):
     return render(request, 'pages/events.html')
+
+def contact(request):
+    return render (request, 'pages/contact.html')