diff --git a/config/urls.py b/config/urls.py index 5ec3a6d..22f11ae 100644 --- a/config/urls.py +++ b/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')), ] diff --git a/notes/migrations/0001_initial.py b/notes/migrations/0001_initial.py new file mode 100644 index 0000000..3064601 --- /dev/null +++ b/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)), + ], + ), + ] diff --git a/notes/migrations/__init__.py b/notes/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/notes/templates/notes/meeting.html b/notes/templates/notes/meeting.html index 5236bdd..886fdf7 100644 --- a/notes/templates/notes/meeting.html +++ b/notes/templates/notes/meeting.html @@ -5,5 +5,7 @@ {% endblock css %} {% block content %} - {{ html|safe }} +
+ {{html|safe}} +
{% endblock content %} \ No newline at end of file diff --git a/notes/templates/notes/test.html b/notes/templates/notes/test.html index 785c4da..6db2367 100644 --- a/notes/templates/notes/test.html +++ b/notes/templates/notes/test.html @@ -1,4 +1,10 @@ {% extends 'pages/base.html' %} +{% load static %} +{% block css %} + +{% endblock css %} {% block content %} -{{html|safe}} +
+ {{html|safe}} +
{% endblock content %} \ No newline at end of file diff --git a/notes/urls.py b/notes/urls.py index ae2334a..f96ad5e 100644 --- a/notes/urls.py +++ b/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//', views.show_meeting, name='show_meetings'), ] \ No newline at end of file diff --git a/pages/static/pages/css/img/TJLogo.png b/pages/static/pages/css/img/TJLogo.png new file mode 100644 index 0000000..8c91c18 Binary files /dev/null and b/pages/static/pages/css/img/TJLogo.png differ diff --git a/pages/static/pages/css/styles.css b/pages/static/pages/css/styles.css index 64f3439..4d92072 100644 --- a/pages/static/pages/css/styles.css +++ b/pages/static/pages/css/styles.css @@ -1,3 +1,3 @@ .jumbotron { - background-image: url('img/hero.png') + background-image: url('img/hero.png'); } \ No newline at end of file diff --git a/pages/templates/pages/base.html b/pages/templates/pages/base.html index 014298b..d8fae87 100644 --- a/pages/templates/pages/base.html +++ b/pages/templates/pages/base.html @@ -20,7 +20,7 @@