Skip to content
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ frontend/.env
# vim
*.swp
*.*~
/*~

# OS files
.DS_Store
Expand Down
Empty file added .idea/.gitignore
Empty file.
14 changes: 14 additions & 0 deletions .idea/arch-vim.iml

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

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

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

6 changes: 6 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

100 changes: 100 additions & 0 deletions .idea/workspace.xml

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

111 changes: 108 additions & 3 deletions backend/api/models.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,116 @@
from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models

# Create your models here.
from colorfield.fields import ColorField

from django.contrib.auth.models import User

class UserProgress(models.Model):
class UserProfile(models.Model):
user = models.OneToOneField(User, on_delete=models.CASCADE)


class UserProgress(models.Model):
user = models.OneToOneField(UserProfile, on_delete=models.CASCADE)
data = models.JSONField(default=dict)

def __str__(self):
return f"{self.user.username}'s level progress"
return f"{self.user.username}'s level progress"



class Level(models.Model):
COLOR_PALETTE = [
("#FFFFFF", "white",),
("#000000", "black",),
]
level = models.IntegerField(default=1, blank=True, null=True)
level_name = models.CharField(max_length=200)
experience = models.IntegerField(default=0, blank=True, null=True)
icon = models.ImageField(blank=True, null=True)
color_wheel = ColorField(samples=COLOR_PALETTE, blank=True, null=True)
color = models.CharField(max_length=500, blank=True, null=True, help_text="Comma-separated hex colors for gradient")
display_name = models.CharField(
max_length=300,
blank=True,
editable=False,
verbose_name="Display Name (with Roman if needed)"
)

is_active = models.IntegerField(
default=1,
blank=True,
null=True,
help_text='1->Active, 0->Inactive',
choices=((1, 'Active'), (0, 'Inactive')),
verbose_name="Set active?"
)

def __str__(self):
return f"{self.level_name} (Level {self.level})"

#essentially treated like a through model branching together users & levels
class User_Level(models.Model):
COLOR_PALETTE = [
("#FFFFFF", "white",),
("#000000", "black",),
]
level = models.ForeignKey(Level, on_delete=models.CASCADE)
min_accuracy = models.FloatField(validators=[MaxValueValidator(100)])
max_keystrokes = models.IntegerField(blank=True, null=True)
stars = models.IntegerField(validators=[MinValueValidator(1), MaxValueValidator(1)]) #create a function to determine accuracy & time, pulled from frontend data
is_active = models.IntegerField(
default=1,
blank=True,
null=True,
help_text='1->Active, 0->Inactive',
choices=((1, 'Active'), (0, 'Inactive')),
verbose_name="Set active?"
)

def __str__(self):
return f"{self.level_name} (Level {self.level})"

class Meta():
verbose_name_plural = "User's Levels"



class UserLevelInstance(models.Model):
user = models.ForeignKey(
User,
on_delete=models.CASCADE,
related_name="level_attempts"
)
level = models.ForeignKey(
Level,
on_delete=models.CASCADE,
related_name="user_instances"
)
max_time = models.FloatField(
blank=True, null=True,
help_text="Time taken (seconds) to complete the level"
)
stroke_count = models.IntegerField(
blank=True, null=True,
help_text="Number of keystrokes used during the attempt"
)
accuracy = models.FloatField(
blank=True, null=True,
help_text="Accuracy percentage (0–100) submitted by the frontend"
)
completed = models.BooleanField(default=False)
stars_earned = models.IntegerField(
default=0,
validators=[MinValueValidator(0), MaxValueValidator(3)],
help_text="0=not completed, 1=completed, 2=+accuracy, 3=+accuracy & time"
)
attempted_at = models.DateTimeField(auto_now_add=True)

class Meta:
ordering = ["-stars_earned", "-attempted_at"]

def __str__(self):
return (
f"{self.user.username} → Level {self.level_id} | "
f"{'✓' if self.completed else '✗'} | ⭐{self.stars_earned}"
)
17 changes: 17 additions & 0 deletions backend/api/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from rest_framework import serializers
from .models import Level

class LevelSerializer(serializers.ModelSerializer):
class Meta:
model = Level
fields = [
'id',
'level',
'level_name',
'display_name',
'experience',
'color',
'color_wheel',
'icon',
'is_active',
]
6 changes: 5 additions & 1 deletion backend/api/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
from django.urls import path
from . import views
from .views import StarView, ProgressView

urlpatterns = [
path('auth/register/', views.RegisterView.as_view()),
path('auth/me/', views.UserDetailView.as_view()),
path('progress/', views.get_progress),
path('progress/', views.UserProgress),
path('progress/save/', views.save_level),
path("api/stars/<int:level_id>/", StarView.as_view(), name="star-view"),
path("api/progress/", ProgressView.as_view(), name="progress"),
path("api/progress/save/", ProgressView.as_view(), name="progress-save"),
]
Loading