diff --git a/.gitignore b/.gitignore index b3a76d0..b8cfaab 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ static_files .idea/ .vscode/ /static -migrations/ # C extensions *.so diff --git a/notes/admin.py b/notes/admin.py index 0ce7c5c..8c38f3f 100644 --- a/notes/admin.py +++ b/notes/admin.py @@ -1,5 +1,3 @@ from django.contrib import admin -from .models import NotionPage # Register your models here. -admin.site.register(NotionPage) \ No newline at end of file diff --git a/notes/migrations/0001_initial.py b/notes/migrations/0001_initial.py deleted file mode 100644 index 3064601..0000000 --- a/notes/migrations/0001_initial.py +++ /dev/null @@ -1,21 +0,0 @@ -# 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/models.py b/notes/models.py index 97a1f04..71a8362 100644 --- a/notes/models.py +++ b/notes/models.py @@ -1,19 +1,3 @@ from django.db import models -from django.conf import settings -from notion.client import NotionClient - -client = NotionClient(token_v2=settings.NOTION_COOKIE) - # Create your models here. -class NotionPage(models.Model): - url = models.URLField(max_length=300) - page = None - - def __init__(self, *args, **kwargs): - super(NotionPage, self).__init__(*args, **kwargs) - if self.url: - self.page = client.get_block(self.url) - - def __str__(self): - return str(self.page and self.page.title) diff --git a/notes/views.py b/notes/views.py index b0c0770..d024977 100644 --- a/notes/views.py +++ b/notes/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render -from .models import NotionPage from django.conf import settings +from notion.client import NotionClient import time @@ -9,7 +9,8 @@ import time def meeting_overview(request): html = '' - page = NotionPage.objects.get(url=settings.NOTION_URL).page + client = NotionClient(token_v2=settings.NOTION_COOKIE) + page = client.get_block(settings.NOTION_URL) meeting_block = None for block in page.children: @@ -65,7 +66,8 @@ def show_meeting(request, meeting_id): now = time.time() - page = NotionPage.objects.get(url=settings.NOTION_URL).page + client = NotionClient(token_v2=settings.NOTION_COOKIE) + page = client.get_block(settings.NOTION_URL) meeting = None for block in page.children: diff --git a/pages/migrations/0001_initial.py b/pages/migrations/0001_initial.py new file mode 100644 index 0000000..ee3e689 --- /dev/null +++ b/pages/migrations/0001_initial.py @@ -0,0 +1,32 @@ +# Generated by Django 3.1.2 on 2020-10-22 23:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Bar', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=70)), + ('money_raised', models.FloatField()), + ], + ), + migrations.CreateModel( + name='Story', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('header', models.CharField(max_length=50)), + ('img_name', models.CharField(default=None, max_length=50, null=True)), + ('body', models.TextField(max_length=200)), + ('created', models.DateTimeField(auto_now=True)), + ], + ), + ] diff --git a/notes/migrations/__init__.py b/pages/migrations/__init__.py similarity index 100% rename from notes/migrations/__init__.py rename to pages/migrations/__init__.py diff --git a/pages/templates/pages/index.html b/pages/templates/pages/index.html index 4fd9095..761471f 100644 --- a/pages/templates/pages/index.html +++ b/pages/templates/pages/index.html @@ -11,7 +11,7 @@
We are the class to beat!
-