diff --git a/config/settings.py b/config/settings.py index 25d8ec0..42d3b27 100644 --- a/config/settings.py +++ b/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 diff --git a/my_secrets/definitions.py b/my_secrets/definitions.py index 3c4e567..5ad295b 100644 --- a/my_secrets/definitions.py +++ b/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", diff --git a/pages/static/pages/css/img/chinmay.png b/pages/static/pages/css/img/chinmay.png index c38a600..1651bbb 100644 Binary files a/pages/static/pages/css/img/chinmay.png and b/pages/static/pages/css/img/chinmay.png differ diff --git a/pages/static/pages/css/img/christina.png b/pages/static/pages/css/img/christina.png index 41e858d..5404297 100644 Binary files a/pages/static/pages/css/img/christina.png and b/pages/static/pages/css/img/christina.png differ diff --git a/pages/static/pages/css/img/favicon.png b/pages/static/pages/css/img/favicon.png index 6f75e56..7991002 100644 Binary files a/pages/static/pages/css/img/favicon.png and b/pages/static/pages/css/img/favicon.png differ diff --git a/pages/static/pages/css/img/grace.png b/pages/static/pages/css/img/grace.png index c274df0..ce74f23 100644 Binary files a/pages/static/pages/css/img/grace.png and b/pages/static/pages/css/img/grace.png differ diff --git a/pages/static/pages/css/img/hero.png b/pages/static/pages/css/img/hero.png index acd2dce..56c5089 100644 Binary files a/pages/static/pages/css/img/hero.png and b/pages/static/pages/css/img/hero.png differ diff --git a/pages/static/pages/css/img/katelyn.png b/pages/static/pages/css/img/katelyn.png index 9951cec..fe4e23e 100644 Binary files a/pages/static/pages/css/img/katelyn.png and b/pages/static/pages/css/img/katelyn.png differ diff --git a/pages/static/pages/css/img/logo.png b/pages/static/pages/css/img/logo.png index 8c91c18..92011f2 100644 Binary files a/pages/static/pages/css/img/logo.png and b/pages/static/pages/css/img/logo.png differ diff --git a/pages/static/pages/css/img/rushil.png b/pages/static/pages/css/img/rushil.png index a86c1a0..40d70f0 100644 Binary files a/pages/static/pages/css/img/rushil.png and b/pages/static/pages/css/img/rushil.png differ diff --git a/pages/static/pages/css/img/semicolon.jpg b/pages/static/pages/css/img/semicolon.jpg new file mode 100644 index 0000000..d960831 Binary files /dev/null and b/pages/static/pages/css/img/semicolon.jpg differ diff --git a/pages/static/pages/css/img/semicolon.png b/pages/static/pages/css/img/semicolon.png deleted file mode 100644 index 5843062..0000000 Binary files a/pages/static/pages/css/img/semicolon.png and /dev/null differ diff --git a/pages/static/pages/css/img/us.png b/pages/static/pages/css/img/us.png index ad669ce..751412a 100644 Binary files a/pages/static/pages/css/img/us.png and b/pages/static/pages/css/img/us.png differ diff --git a/pages/static/pages/css/img/vinay.png b/pages/static/pages/css/img/vinay.png index 8abaac8..d29db16 100644 Binary files a/pages/static/pages/css/img/vinay.png and b/pages/static/pages/css/img/vinay.png differ diff --git a/pages/static/pages/css/img/yulee.png b/pages/static/pages/css/img/yulee.png index 1817b13..f357819 100644 Binary files a/pages/static/pages/css/img/yulee.png and b/pages/static/pages/css/img/yulee.png differ diff --git a/pages/static/pages/css/styles.css b/pages/static/pages/css/styles.css index 59068f8..d6b5148 100644 --- a/pages/static/pages/css/styles.css +++ b/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; } } \ No newline at end of file diff --git a/pages/templates/pages/base.html b/pages/templates/pages/base.html index 5460e52..d484b22 100644 --- a/pages/templates/pages/base.html +++ b/pages/templates/pages/base.html @@ -41,7 +41,7 @@ About us Our Meetings
- Contact Us + Contact Us diff --git a/pages/templates/pages/contact.html b/pages/templates/pages/contact.html new file mode 100644 index 0000000..c04eddc --- /dev/null +++ b/pages/templates/pages/contact.html @@ -0,0 +1,11 @@ +{% extends 'pages/base.html' %} +{% load static %} +{% block title %}Council{% endblock title %} +{% block css %} + +{% endblock css %} +{% block content %} +
+

Contact Us!

+
+{% endblock %} \ No newline at end of file diff --git a/pages/templates/pages/council.html b/pages/templates/pages/council.html index a31318c..06e9fdf 100644 --- a/pages/templates/pages/council.html +++ b/pages/templates/pages/council.html @@ -6,87 +6,96 @@ {% endblock css %} {% block content %}
-

The Class Council

-

We are here to serve you.

+

The Class Council

+

We are here to serve you.

-
+

Our Mission

Some description of what we do

-

Our Team

-

-
- -
-

The President

-

Vinay Ayala
- “Live life to the fullest.” -

+

Our Team

+
+
+
+ +
+

The Vice President

+

Praneeth Chinmay Bhandaru

+ “You don't need to be a potato to be good in life, all you need to do is trust yourself.” +
+
+
+
+
+ +
+

The President

+

Vinay Ayala

+ “Live life to the fullest.” + +
+
+
+
+
+ +
+

The Treasurer

+

Grace Guan

+ “I'm excited to serve again as a member of your class clowncil!” + +
+
-

-
- -
-

The Vice President

-

Praneeth Chinmay Bhandaru
- “You don't need to be a potato to be good in life, all you need to do is trust yourself.” -

+
+
+
+ +
+

The Secretary

+

Christina Han

+ “I keep no secrets” +
+
+
+
+
+ +
+

Senator

+

Rushil Umaretiya

+ “Just failed his chem test, again.” +
+
+
+
+
+ +
+

Senator

+

Yulee Kang

+ “Is a Cutie :)” + +
+
-

-
- -
-

The Treasurer

-

Grace Guan
- “I'm excited to serve again as a member of your class clowncil!” -

-
-
-

-
- -
-

The Secretary

-

Christina Han
- “I keep no secrets” -

-
-
-

-
- -
-

Senator

-

Yulee Kang
- “Is a Cutie :)” -

-
-
-

-
- -
-

Senator

-

Rushil Umaretiya
- “Just failed his chem test, again.” -

-
-
-

-
- -
-

The Historian

-

Katelyn Chen
- “🅱️🅾️📈🎋” -

+
+
+
+ +
+

The Historian

+

Katelyn Chen

+ “🅱️🅾️📈🎋” +
+
-



+ {% endblock content %} diff --git a/pages/templates/pages/index.html b/pages/templates/pages/index.html index 2898d6e..6837d35 100644 --- a/pages/templates/pages/index.html +++ b/pages/templates/pages/index.html @@ -7,7 +7,7 @@ {% block content %}
-

TJHSST Class of 2023

+

TJHSST Class of 2023

We are the class to beat!

diff --git a/pages/urls.py b/pages/urls.py index 05862fe..4d5450e 100644 --- a/pages/urls.py +++ b/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'), ] diff --git a/pages/views.py b/pages/views.py index 5002778..e86a131 100644 --- a/pages/views.py +++ b/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') \ No newline at end of file