diff --git a/.gitignore b/.gitignore index a1b194b..e4e9202 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ led / optimized / DLL files __pycache__/ *.py[cod] *$py.class +secrets.py +static_files +.idea/ # C extensions *.so diff --git a/config/settings.py b/config/settings.py index 309be78..387beea 100644 --- a/config/settings.py +++ b/config/settings.py @@ -11,8 +11,7 @@ https://docs.djangoproject.com/en/3.1/ref/settings/ """ from pathlib import Path -import os -from my_secrets import secrets +from my_secrets.secrets import * # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -21,9 +20,6 @@ BASE_DIR = Path(__file__).resolve().parent.parent # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = secrets.SECRET_KEY - # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -34,6 +30,7 @@ ALLOWED_HOSTS = [] INSTALLED_APPS = [ 'pages', + 'notes', 'django.contrib.admin', 'django.contrib.auth', @@ -61,7 +58,7 @@ ROOT_URLCONF = 'config.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [BASE_DIR / 'templates', BASE_DIR / 'notion_updater/templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -125,4 +122,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.1/howto/static-files/ STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, 'static/') + +import os +STATIC_ROOT = os.path.join(BASE_DIR, 'static_files') +STATICFILES_DIRS = [BASE_DIR / "static"] \ No newline at end of file diff --git a/config/urls.py b/config/urls.py index f43975b..5ec3a6d 100644 --- a/config/urls.py +++ b/config/urls.py @@ -16,10 +16,8 @@ Including another URLconf from django.contrib import admin from django.urls import path, include -from django.conf import settings -from django.conf.urls.static import static - urlpatterns = [ path('admin/', admin.site.urls), + path('notes/', include('notes.urls')), path('', include('pages.urls')) -] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) +] diff --git a/my_secrets/definitions.py b/my_secrets/definitions.py index 67c7212..3c4e567 100644 --- a/my_secrets/definitions.py +++ b/my_secrets/definitions.py @@ -8,4 +8,6 @@ SECRET_KEYS = [ # start with your Django secret key like this: "SECRET_KEY", + "NOTION_URL", + "NOTION_COOKIE", ] diff --git a/my_secrets/secrets.py.sample.py b/my_secrets/secrets.py.sample.py new file mode 100644 index 0000000..3e6e702 --- /dev/null +++ b/my_secrets/secrets.py.sample.py @@ -0,0 +1,11 @@ +# Django +SECRET_KEY = "" # Add your django secret key + +# Notion Client +NOTION_URL = "" # Add the notion url manually +NOTION_COOKIE = "" # Follow the steps listed below + +# 1. Login to notion and navigate to the home page of your page. (Not in Guest or Incognito) +# 2. Open up developer tools by pressing Ctrl + Shift + i, and navigate to the application tab +# 3. Click on the cookie dropdown and click on the single cookie that is located there. +# 4. Copy the token_v2 info and paste it into NOTION_COOKIE diff --git a/pages/migrations/__init__.py b/notes/__init__.py similarity index 100% rename from pages/migrations/__init__.py rename to notes/__init__.py diff --git a/notes/admin.py b/notes/admin.py new file mode 100644 index 0000000..0ce7c5c --- /dev/null +++ b/notes/admin.py @@ -0,0 +1,5 @@ +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/apps.py b/notes/apps.py new file mode 100644 index 0000000..b6155ac --- /dev/null +++ b/notes/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class NotesConfig(AppConfig): + name = 'notes' diff --git a/notes/models.py b/notes/models.py new file mode 100644 index 0000000..97a1f04 --- /dev/null +++ b/notes/models.py @@ -0,0 +1,19 @@ +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/static/notes/css/base.css b/notes/static/notes/css/base.css new file mode 100644 index 0000000..0c81722 --- /dev/null +++ b/notes/static/notes/css/base.css @@ -0,0 +1,4 @@ +.content { + padding: 15px; + margin: 10px; +} \ No newline at end of file diff --git a/notes/static/notes/css/meeting.css b/notes/static/notes/css/meeting.css new file mode 100644 index 0000000..1a1b82a --- /dev/null +++ b/notes/static/notes/css/meeting.css @@ -0,0 +1,30 @@ +@import url('https://fonts.googleapis.com/css2?family=Lemonada&display=swap'); +h2 { + font-size: 40px; + margin-top: 10px; + text-align: center; + font-family: 'Lemonada', cursive; +} +.BulletedListBlock { +} +.TodoBlock { + font-weight: bold; +} +.SubheaderBlock { + list-style-type: none; + padding: 0px; + margin: 0px; + font-size: 30px; + margin-top: 5px; + font-family: 'Lemonada', cursive; +} +.SubsubheaderBlock { + list-style-type: none; + padding: 0px; + margin: 0px; + font-size: 30px; + margin-top: 5px; + font-family: 'Lemonada', cursive; +} +.TextBlock { +} \ No newline at end of file diff --git a/notes/templates/notes/base.html b/notes/templates/notes/base.html new file mode 100644 index 0000000..086c05e --- /dev/null +++ b/notes/templates/notes/base.html @@ -0,0 +1,18 @@ +{% load static %} + + + + + TJ 2023 - {% block title %}{% endblock title %} + + {% block css %}{% endblock css %} + {% block js %}{% endblock js %} + + +
+ {% block body %} + + {% endblock body %} +
+ + \ No newline at end of file diff --git a/notes/templates/notes/meeting.html b/notes/templates/notes/meeting.html new file mode 100644 index 0000000..60729a8 --- /dev/null +++ b/notes/templates/notes/meeting.html @@ -0,0 +1,8 @@ +{% extends 'notion/base.html' %} +{% load static %} +{% block css %} + +{% endblock css %} +{% block body %} +{{ html|safe }} +{% endblock body %} \ No newline at end of file diff --git a/notes/templates/notes/test.html b/notes/templates/notes/test.html new file mode 100644 index 0000000..9face0e --- /dev/null +++ b/notes/templates/notes/test.html @@ -0,0 +1,13 @@ + + + + + Test + + + +
+{{ html|safe }} +
+ + \ No newline at end of file diff --git a/notes/tests.py b/notes/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/notes/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/notes/urls.py b/notes/urls.py new file mode 100644 index 0000000..ae2334a --- /dev/null +++ b/notes/urls.py @@ -0,0 +1,7 @@ +from django.urls import path +from . import views + +urlpatterns = [ + path('', views.test), + path('meeting//', views.show_meeting, name='show_meetings'), +] \ No newline at end of file diff --git a/notes/views.py b/notes/views.py new file mode 100644 index 0000000..b1dce7f --- /dev/null +++ b/notes/views.py @@ -0,0 +1,81 @@ +from django.shortcuts import render +from .models import NotionPage +from django.conf import settings + + +# Create your views here. +def test(request): + html = '' + + page = NotionPage.objects.get(url=settings.NOTION_URL).page + + meeting_block = None + for block in page.children: + if block.id == '383b2866-a0ae-4f4e-b246-4131117721c0': + meeting_block = block.collection + break + + for meeting in meeting_block.get_rows(): + html += f'

{meeting.title}

' + + html += '
' + return render(request, 'notes/test.html', {'html': html}) + + +def has_children(block): + try: + block.children + return True + except AttributeError: + return False + + +def pprint(dicti): + print('{') + for k in dicti.keys(): + print(f'\t{k.title} : {dicti[k]}') + print('}') + + +def getHtml(html_dict, meeting_dict, node): + string = html_dict[node] + temp = '' + for child in meeting_dict.get(node, {}): + temp += getHtml(html_dict, meeting_dict, child) + return string.format(temp) + + +def show_meeting(request, meeting_id): + + page = NotionPage.objects.get(url=settings.NOTION_URL).page + + meeting = None + for block in page.children: + if block.id == '383b2866-a0ae-4f4e-b246-4131117721c0': + for row in block.collection.get_rows(): + if row.id == meeting_id: + meeting = row + break + + meeting_dict = dict() + html_dict = {meeting: '

' + meeting.title.strip() + '

'} + + q = [meeting] + + while q and has_children(temp := q.pop(0)): + for children in temp.children: + + if children.parent in meeting_dict.keys(): + meeting_dict[children.parent].append(children) + else: + meeting_dict[children.parent] = [children] + + q.append(children) + + block_type = str(type(children)).replace('', '').replace('notion.block.', '').replace("'", "").strip() + html_dict[children] = "
  • " + children.title.strip() + "
      {}
    • " + + html = getHtml(html_dict, meeting_dict, meeting) + print(html) + + return render(request, "notes/meeting.html", {'html': html}) diff --git a/requirements.txt b/requirements.txt index 7c44035..40ec83f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,23 @@ asgiref==3.2.10 +beautifulsoup4==4.9.3 +bs4==0.0.1 +cached-property==1.5.2 +certifi==2020.6.20 +chardet==3.0.4 +commonmark==0.9.1 +dictdiffer==0.8.1 Django==3.1.2 django-extensions==3.0.9 django-secrets==1.0.2 future==0.18.2 +idna==2.10 +notion==0.0.25 +python-slugify==4.0.1 pytz==2020.1 +requests==2.24.0 six==1.15.0 +soupsieve==2.0.1 sqlparse==0.4.1 +text-unidecode==1.3 +tzlocal==2.1 +urllib3==1.25.11