merge page changes

config/urls.py

@@ -19,5 +19,5 @@ from django.urls import path, include
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('notes/', include('notes.urls')),
-    path('', include('pages.urls'))
+    path('', include('pages.urls')),
 ]

notes/migrations/0001_initial.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.1.2 on 2020-10-20 13:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NotionPage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('url', models.URLField(max_length=300)),
+            ],
+        ),
+    ]

notes/templates/notes/meeting.html

@@ -5,5 +5,7 @@
 {% endblock css %}
 
 {% block content %}
-    {{ html|safe }}
+<div class="container">
+    {{html|safe}}
+</div>
 {% endblock content %}

notes/templates/notes/test.html

@@ -1,4 +1,10 @@
 {% extends 'pages/base.html' %}
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'pages/css/styles.css' %}">
+{% endblock css %}
 {% block content %}
-{{html|safe}}
+<div class="container">
+    {{html|safe}}
+</div>
 {% endblock content %}

notes/urls.py

@@ -2,6 +2,6 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.test),
+    path('', views.test, name='notes'),
     path('meeting/<str:meeting_id>/', views.show_meeting, name='show_meetings'),
 ]

pages/templates/pages/base.html

@@ -20,7 +20,7 @@
         <![endif]-->
 
         <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-            <a class="navbar-brand" href="#">TJ '23 CC</a>
+            <a class="navbar-brand" href="{% url 'index' %}"><img style="width: 50px;" src="{% static 'pages/css/img/TJLogo.png' %}">&emsp;Class of 2023</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarLinks">
                 <span class="navbar-toggler-icon"></span>
             </button>
@@ -30,10 +30,18 @@
                         <a class="nav-link" href="#">Link</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="#">Link</a>
+                        <a class="nav-link" href="{% url 'events' %}">Events</a>
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">Link</a>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                          Council
+                        </a>
+                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+                          <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>
+                        </div>
                     </li>
                 </ul>
             </div>

pages/templates/pages/council.html

@@ -0,0 +1,19 @@
+{% extends 'pages/base.html' %}
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'pages/css/styles.css' %}">
+{% endblock css %}
+{% block content %}
+<div class="jumbotron jumbotron-fluid">
+    <div class="container">
+    <h1 class="display-4">The Class Council</h1>
+    <p class="lead">We are here to serve you.</p>
+    </div>
+</div>
+<div class="council container">
+    <h3 class="display-6">About us</h3>
+    <p>Some description of what we do</p>
+    <h6>Our Team</h6>
+    <p>pics, description, role, and quote, of every class council member</p>
+</div>
+{% endblock content %}

pages/templates/pages/events.html

@@ -0,0 +1,17 @@
+{% extends 'pages/base.html' %}
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'pages/css/styles.css' %}">
+{% endblock css %}
+{% block content %}
+<div class="jumbotron jumbotron-fluid">
+    <div class="container">
+    <h1 class="display-4">Events</h1>
+    <p class="lead">Come and join your friends!</p>
+    </div>
+</div>
+<div class="container">
+    <iframe src="https://calendar.google.com/calendar/embed?src=tjhsst2023%40gmail.com&ctz=America%2FNew_York" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+</div>
+{% endblock content %}
+

pages/templates/pages/index.html

@@ -5,8 +5,9 @@
 {% endblock css %}
 {% block content %}
 <div class="jumbotron jumbotron-fluid">
-  <div class="container mt-5">
+  <div class="container">
     <h1 class="display-4">2023 Class Council</h1>
     <p class="lead">We work for you.</p>
   </div>
+</div>
 {% endblock content %}

pages/urls.py

@@ -2,5 +2,7 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.index, name="index")
+    path('', views.index, name="index"),
+    path('council/', views.council, name='council'),
+    path('events/', views.events, name='events')
 ]

pages/views.py

@@ -1,5 +1,14 @@
 from django.shortcuts import render
 
+
 # Create your views here.
-def index (request):
-    return render(request, 'pages/index.html')
+def index(request):
+    return render(request, 'pages/index.html')
+
+
+def council(request):
+    return render(request, 'pages/council.html')
+
+
+def events(request):
+    return render(request, 'pages/events.html')