Merge pull request 'add devel to master' (#4) from devel into master

Reviewed-on: LibertaCasa/webdev#4

.gitignore

@@ -2,3 +2,4 @@ venv/
 .vscode/
 __pycache__/
 db.sqlite3
+.env

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "public/libcasa/themes/risotto"]
+	path = public/libcasa/themes/risotto
+	url = https://github.com/joeroe/risotto.git

api/api/models.py

@@ -1,3 +1,5 @@
 from django.db import models
 
 # Create your models here.
+
+

api/control/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

api/control/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ControlConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'control'

api/control/models.py

@@ -0,0 +1,34 @@
+from django.db import models
+
+class ScheduledTask(models.Model):
+    from control.tasks import REGISTERED_TASKS
+
+    class CatchupMode(models.IntegerChoices):
+        SKIP = 0, ('SKIP TO LATEST')
+        EXEC = 1, ('EXECUTE ALL')
+
+    class Interval(models.IntegerChoices):
+        HOURS = 1, ('HOURS')
+        DAYS = 24, ('DAYS')
+        WEEKS = 168, ('WEEKS')
+
+    active = models.BooleanField(default=False)
+    name = models.CharField(max_length=128)
+    action = models.CharField(max_length=128, choices=zip(
+        REGISTERED_TASKS.keys(), REGISTERED_TASKS.keys()))
+    kwargs = models.JSONField(blank=True, null=True)
+    repeat = models.IntegerField('Repeat Every', default=0)
+    repeat_interval = models.IntegerField(
+        'Interval', choices=Interval.choices, default=1)
+    start_datetime = models.DateTimeField()
+    end_datetime = models.DateTimeField(blank=True, null=True)
+    next_cycle = models.DateTimeField(blank=True, null=True)
+    catchup_mode = models.IntegerField(
+        default=0, choices=CatchupMode.choices)
+
+    class Meta():
+        verbose_name = 'Scheduled Task'
+        verbose_name_plural = 'Scheduled Tasks'
+
+    def __str__(self):
+        return self.name

api/control/tasks.py

@@ -0,0 +1,9 @@
+from datetime import datetime, timezone, timedelta, 
+
+### TASKS ###
+
+# def test_task(comms: dict, debug=False):
+#     timestamp = datetime.now(tz=timezone.utc).strftime("%b %d %Y %H:%M")
+#     text = "Test Task fired at " + timestamp
+#     blocks = [make_section(text)]
+#     process_comms(comms, blocks, debug)

api/posts/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from posts.models import *
+
+admin.site.register(Post)

api/posts/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class BlogConfig(AppConfig):
+class PostsConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'blog'
+    name = 'posts'

api/posts/urls.py

@@ -0,0 +1,11 @@
+from django.urls import path, include
+from rest_framework.routers import DefaultRouter
+from . import views
+
+router = DefaultRouter()
+router.register(r'posts', views.PostsViewSet)
+# router.register(r'users', views.UserViewSet)
+
+urlpatterns = [
+    path('', include(router.urls)),
+]

api/posts/views.py

@@ -0,0 +1,30 @@
+from django.contrib.auth.models import User
+from django.shortcuts import render
+from snippets.serializers import UserSerializer
+from .models import Post
+from .serializers import PostSerializer
+from posts.permissions import IsOwnerOrReadOnly
+from rest_framework import permissions, renderers
+from rest_framework.reverse import reverse
+from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
+
+class PostsViewSet(viewsets.ModelViewSet):
+    """
+    docstring
+    """
+    queryset = Post.objects.all()
+    serializer_class = PostSerializer
+    permission_classes = [permissions.IsAuthenticatedOrReadOnly,
+                         IsOwnerOrReadOnly]
+
+    def perform_create(self, serializer):
+        serializer.save(owner=self.request.user)
+
+class UserViewSet(viewsets.ReadOnlyModelViewSet):
+    """
+    This viewset automatically provides `list` and `retrieve` actions.
+    """
+    queryset = User.objects.all()
+    serializer_class = UserSerializer

api/snippets/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

api/website/settings.py

@@ -11,10 +11,26 @@ https://docs.djangoproject.com/en/4.0/ref/settings/
 """
 
 from pathlib import Path
+import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
+## ENVARS ##
+
+POSTGRES_DB = os.getenv('POSTGRES_DB')
+POSTGRES_USER = os.getenv('POSTGRES_USER')
+POSTGRES_PASSWORD = os.getenv('POSTGRES_PASSWORD')
+POSTGRES_HOST = os.getenv('POSTGRES_HOST')
+
+
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = False
+if os.getenv('DEBUG') == 'True':
+    DEBUG = True
+
+
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
@@ -39,8 +55,9 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'rest_framework',
     'snippets.apps.SnippetsConfig',
-    'blog.apps.BlogConfig',
+    'posts.apps.PostsConfig',
     'api.apps.ApiConfig',
+    'control.apps.ControlConfig',
 ]
 
 MIDDLEWARE = [
@@ -79,11 +96,23 @@ WSGI_APPLICATION = 'website.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': POSTGRES_DB,
+        'USER': POSTGRES_USER,
+        'PASSWORD': POSTGRES_PASSWORD,
+        'HOST': POSTGRES_HOST,
+        'PORT': '5432',
     }
 }
 
+if os.getenv('DEV') == 'true':
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': BASE_DIR / 'db.sqlite3',
+        }
+    }
+
 
 # Password validation
 # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
@@ -133,4 +162,27 @@ REST_FRAMEWORK = {
         'rest_framework.authentication.BasicAuthentication',
         'rest_framework.authentication.SessionAuthentication',
         ]
-}
+}
+
+# LOGGING = {
+#     'version': 1,
+#     'disable_existing_loggers': False,
+#     'handlers': {
+#         'file': {
+#             'level': 'DEBUG',
+#             'class': 'logging.FileHandler',
+#             'filename': './debug.log',
+#         },
+#         'error_file': {
+#             'level': 'ERROR',
+#             'class': 'logging.FileHandler',
+#             'filename': './error.log',
+#         },
+#     },
+#     'loggers': {
+#         'django': {
+#             'handlers': ['file', 'error_file'],
+#             'propagate': True,
+#         },
+#     },
+# }

api/website/urls.py

@@ -18,7 +18,8 @@ from django.urls import path, include
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', include('snippets.urls')),
+    path('snippets/', include('snippets.urls')),
+    path('posts/', include('posts.urls'))
 ]
 
 urlpatterns += [

public/libcasa/archetypes/default.md

@@ -0,0 +1,6 @@
+---
+title: "{{ replace .Name "-" " " | title }}"
+date: {{ .Date }}
+draft: true
+---
+

public/libcasa/config.yml

@@ -0,0 +1,53 @@
+baseURL: https://liberta.casa
+theme: risotto
+languageCode: en-us
+title: Liberta Casa
+paginate: 3
+authors: [ Georg Pfuetzenreuter, Pratyush Desai ]
+
+# Automatically add content sections to main menu
+sectionPagesMenu: main
+
+params:
+  theme:
+    palette: monokai-dark
+    mode: dark-mode
+  about:
+    title: Liberta Casa
+    description: 'For those who FLOSS shall be free.'
+    logo: images/logo.png
+  socialLinks:
+    - icon: fab fa-irc
+      title: IRC
+      url: 'https://liberta.casa/gamja'
+    - icon: fas fa-envelope
+      title: Email
+      url: 'mailto:hello@liberta.casa'
+
+menu:
+  main:
+    - identifier: about
+      name: About
+      url: /about/
+      weight: 10
+    - identifier: rules
+      name: Rules
+      url: /rules/
+      weight: 10
+    - identifier: faqs
+      name: FAQ
+      url: /faqs/
+      weight: 10
+    - identifier: accounts
+      name: Account
+      url: /accounts/
+      weight: 10
+    - identifier: tools
+      name: Tools
+      url: /tools/
+      weight: 10
+
+taxonomies:
+  category: categories
+  tag: tags
+  series: series

public/libcasa/content/_index.md

@@ -0,0 +1,3 @@
++++
+author = "LibCasa Authors"
++++

public/libcasa/content/about.md

@@ -0,0 +1,7 @@
++++
+title = "About"
+description = "Liberta Casa, providing services.. for some reason."
+date = "2021-12-12"
+aliases = ["about-us", "about-libertacasa", "contact"]
+author = "LibCasa Authors"
++++

public/libcasa/content/accounts/_index.md

@@ -0,0 +1,6 @@
+---
+title: "Accounts"
+date: 2022-01-08T15:14:39+05:30
+draft: true
+---
+

public/libcasa/content/faqs/_index.md

@@ -0,0 +1,6 @@
+---
+title: "Faqs"
+date: 2022-01-08T15:14:13+05:30
+draft: true
+---
+

public/libcasa/content/rules.md

@@ -0,0 +1,3 @@
++++
+title = "Rules"
++++

public/libcasa/content/tools/_index.md

@@ -0,0 +1,6 @@
+---
+title: "Tools"
+date: 2022-01-08T15:14:47+05:30
+draft: true
+---
+

public/libcasa/themes/risotto

@@ -0,0 +1 @@
+Subproject commit 07f1b3ecfd4202a69847d47c89ece4e4d01278c4

website/blog/admin.py

@@ -1,5 +0,0 @@
-from django.contrib import admin
-
-from blog.models import *
-
-admin.site.register(Post)

website/blog/urls.py

@@ -1,7 +0,0 @@
-from django.urls import path, include
-from . import views
-
-urlpatterns = [
-    path('blogs/', include('blog.urls')),
-    path('', views.index, name='index')
-]