Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies = [
"gunicorn~=23.0",
"python-dotenv~=1.0",
"psycopg[binary,pool]~=3.2.13",
"djangorestframework-simplejwt>=5.5.1",
]

[dependency-groups]
Expand Down
9 changes: 9 additions & 0 deletions server/server/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
"rest_framework",
"corsheaders",
"healthcheck",
"user_profile",
"task_planner",
]

MIDDLEWARE = [
Expand All @@ -70,6 +72,13 @@

ROOT_URLCONF = "server.urls"

REST_FRAMEWORK = {
"DEFAULT_AUHTENTICATION_CLASSES": (
"rest_framework.authenticaiton.SessionAuthenticaiton",
"rest_framework_simplejwt.authentication.JWTAuthenticaiton",
)
}

TEMPLATES = [
{
"BACKEND": "django.template.backends.django.DjangoTemplates",
Expand Down Expand Up @@ -111,7 +120,7 @@



# Password validation

Check failure on line 123 in server/server/settings.py

View workflow job for this annotation

GitHub Actions / Run Flake8

too many blank lines (3)
# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
Expand Down
7 changes: 7 additions & 0 deletions server/server/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@
from django.contrib import admin
from django.urls import include, path

from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView

urlpatterns = [
path("admin/", admin.site.urls),
path("api-auth/", include("rest_framework.urls")),
path("api/token/", TokenObtainPairView.as_view(), name="token_obtain_pair"),
path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
path("api/healthcheck/", include("healthcheck.urls")),
path("api/user/", include("user_profile.urls")),
path("api/planner/", include("task_planner.urls")),
]
Empty file added server/task_planner/__init__.py
Empty file.
8 changes: 8 additions & 0 deletions server/task_planner/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from django.contrib import admin

from .models import Task, Time, Topic

# Register your models here.
admin.site.register(Task)
admin.site.register(Time)
admin.site.register(Topic)
6 changes: 6 additions & 0 deletions server/task_planner/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class TaskPlannerConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "task_planner"
95 changes: 95 additions & 0 deletions server/task_planner/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# Generated by Django 5.2.8 on 2025-12-07 11:16

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name="Task",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=255)),
("description", models.TextField(blank=True)),
("completed", models.BooleanField(default=False)),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to=settings.AUTH_USER_MODEL,
),
),
],
),
migrations.CreateModel(
name="Time",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("day", models.IntegerField()),
("start_time", models.TimeField()),
("end_time", models.TimeField()),
("repeating", models.BooleanField(default=False)),
(
"task",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="task",
to="task_planner.task",
),
),
],
),
migrations.CreateModel(
name="Topic",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=255)),
("color_hex", models.PositiveIntegerField()),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to=settings.AUTH_USER_MODEL,
),
),
],
),
migrations.AddField(
model_name="task",
name="topics",
field=models.ManyToManyField(to="task_planner.topic"),
),
]
Empty file.
29 changes: 29 additions & 0 deletions server/task_planner/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
from django.db import models
from django.contrib.auth import get_user_model


# Create your models here.
User = get_user_model()


class Topic(models.Model):
name = models.CharField(max_length=255)
color_hex = models.PositiveIntegerField()
user = models.ForeignKey(User, on_delete=models.CASCADE)


class Task(models.Model):
name = models.CharField(max_length=255)
description = models.TextField(blank=True)
completed = models.BooleanField(default=False)
user = models.ForeignKey(User, on_delete=models.CASCADE)
topics = models.ManyToManyField(Topic)


class Time(models.Model):
day = models.IntegerField()
start_time = models.TimeField()
end_time = models.TimeField()
repeating = models.BooleanField(default=False)
task = models.ForeignKey(
Task, related_name="times", on_delete=models.CASCADE)
31 changes: 31 additions & 0 deletions server/task_planner/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
from rest_framework import serializers
from .models import Task, Topic, Time


class TopicSerializer(serializers.ModelSerializer):
class Meta:
model = Topic
fields = "__all__"


class TimeSerializer(serializers.ModelSerializer):
class Meta:
model = Time
fields = "__all__"


class TaskSerializer(serializers.ModelSerializer):
topics = TopicSerializer(many=True, read_only=True)
times = TimeSerializer(many=True, read_only=True)

class Meta:
model = Task
fields = (
"id",
"name",
"description",
"completed",
"user",
"topics",
"times",
)
3 changes: 3 additions & 0 deletions server/task_planner/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

Check failure on line 1 in server/task_planner/tests.py

View workflow job for this annotation

GitHub Actions / Run Flake8

'django.test.TestCase' imported but unused

# Create your tests here.
10 changes: 10 additions & 0 deletions server/task_planner/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from django.urls import path

from . import views

app_name = "task_planner"
urlpatterns = [
path("task/", views.TaskList.as_view(), name="task-list"),
path("topic/", views.TopicList.as_view(), name="topic-list"),
path("time/", views.TimeList.as_view(), name="time-list"),
]
30 changes: 30 additions & 0 deletions server/task_planner/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
from django.shortcuts import render

Check failure on line 1 in server/task_planner/views.py

View workflow job for this annotation

GitHub Actions / Run Flake8

'django.shortcuts.render' imported but unused

# from rest_framework import generics, permissions
from rest_framework.response import Response
from rest_framework.views import APIView

from .models import Task, Topic, Time
from .serializers import TaskSerializer, TopicSerializer, TimeSerializer


# Create your views here.
class TaskList(APIView):
def get(self, request):
tasks = Task.objects.all()
serializer = TaskSerializer(tasks, many=True)
return Response(serializer.data)


class TopicList(APIView):
def get(self, request):
topics = Topic.objects.all()
serializer = TopicSerializer(topics, many=True)
return Response(serializer.data)


class TimeList(APIView):
def get(self, request):
times = Time.objects.all()
serializer = TimeSerializer(times, many=True)
return Response(serializer.data)
Empty file added server/user_profile/__init__.py
Empty file.
6 changes: 6 additions & 0 deletions server/user_profile/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.contrib import admin

from .models import Profile

# Register your models here.
admin.site.register(Profile)
6 changes: 6 additions & 0 deletions server/user_profile/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class UserProfileConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'user_profile'
26 changes: 26 additions & 0 deletions server/user_profile/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 5.2.8 on 2025-11-29 06:33

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Profile',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('bio', models.TextField()),
('age', models.PositiveIntegerField(null=True)),
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 5.2.8 on 2025-12-02 03:35

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("user_profile", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name="profile",
name="age",
field=models.PositiveIntegerField(blank=True, null=True),
),
migrations.AlterField(
model_name="profile",
name="bio",
field=models.TextField(blank=True),
),
]
Empty file.
21 changes: 21 additions & 0 deletions server/user_profile/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
from django.db import models
from django.contrib.auth import get_user_model
from django.db.models.signals import post_save
from django.dispatch import receiver

# Create your models here.
User = get_user_model()


class Profile(models.Model):
user = models.OneToOneField(User, on_delete=models.CASCADE)
bio = models.TextField(blank=True)
age = models.PositiveIntegerField(null=True, blank=True)

def __str__(self):
return f"Profile: {self.user.username}"


@receiver(post_save, sender=User)
def create_or_update_user_profile(sender, instance, created, **kwargs):
Profile.objects.get_or_create(user=instance)

Check warning on line 21 in server/user_profile/models.py

View workflow job for this annotation

GitHub Actions / Run Flake8

no newline at end of file
12 changes: 12 additions & 0 deletions server/user_profile/permissions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from rest_framework import permissions
from django.contrib.auth import get_user_model

User = get_user_model()

class IsUserOrReadOnly(permissions.BasePermission):

Check failure on line 6 in server/user_profile/permissions.py

View workflow job for this annotation

GitHub Actions / Run Flake8

expected 2 blank lines, found 1
def has_object_permission(self, request, view, obj):
if isinstance(obj, User):
# If this is for the user object check against logged in user
return obj == request.user
# Otherwise check user field against logged in user
return obj.user == request.user

Check warning on line 12 in server/user_profile/permissions.py

View workflow job for this annotation

GitHub Actions / Run Flake8

no newline at end of file
Loading
Loading