Merge branch 'elif_addition' into dev

Author: cosmicproc

.github/workflows/ci.yml

@@ -28,4 +28,4 @@ jobs:
       - name: Run tests
         run: |
           source venv/bin/activate
-          python backend/manage.py test
+          python backend/manage.py test

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": false
+}

.gitignore backend/.gitignore.gitignore renamed to backend/.gitignore

@@ -409,4 +409,3 @@ cython_debug/
 .cursorignore
 .cursorindexingignore
 
-venv/

backend/backend/settings.py

@@ -40,17 +40,17 @@
 
     'corsheaders',
     'rest_framework',
-    'rest_framework.authtoken',  # Add this for token authentication
+    'rest_framework.authtoken',
     'giraph',
     'users',
     'programs',
     'outcomes',
 ]
 
 MIDDLEWARE = [
+    'corsheaders.middleware.CorsMiddleware',  # Must be first
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -60,8 +60,36 @@
 
 ROOT_URLCONF = 'backend.urls'
 
+REST_FRAMEWORK = {
+    'DEFAULT_AUTHENTICATION_CLASSES': [
+        'rest_framework.authentication.TokenAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
+    ],
+    'DEFAULT_PERMISSION_CLASSES': [
+        'rest_framework.permissions.IsAuthenticated',
+    ],
+}
+
+# CORS settings
 CORS_ALLOWED_ORIGINS = [
     "http://localhost:3000",
+    "http://127.0.0.1:3000",
+    "http://localhost:3001",
+    "http://127.0.0.1:3001",
+]
+
+CORS_ALLOW_CREDENTIALS = True
+
+CORS_ALLOW_HEADERS = [
+    'accept',
+    'accept-encoding',
+    'authorization',
+    'content-type',
+    'dnt',
+    'origin',
+    'user-agent',
+    'x-csrftoken',
+    'x-requested-with',
 ]
 
 # Add custom user model
@@ -72,17 +100,6 @@
     'django.contrib.auth.backends.ModelBackend',
 ]
 
-# Add REST Framework configuration
-REST_FRAMEWORK = {
-    'DEFAULT_AUTHENTICATION_CLASSES': [
-        'rest_framework.authentication.TokenAuthentication',
-        'rest_framework.authentication.SessionAuthentication',
-    ],
-    'DEFAULT_PERMISSION_CLASSES': [
-        'rest_framework.permissions.AllowAny',  # Change to IsAuthenticated later
-    ],
-}
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -153,3 +170,12 @@
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+# Email Configuration for Gmail
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'smtp.gmail.com'
+EMAIL_PORT = 587
+EMAIL_USE_TLS = True
+EMAIL_HOST_USER = '[email protected]'  
+###EMAIL_HOST_PASSWORD = 
+DEFAULT_FROM_EMAIL = '[email protected]'

backend/backend/urls.py

@@ -1,10 +1,33 @@
+"""
+URL configuration for backend project.
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/5.2/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
 from django.contrib import admin
 from django.urls import path, include
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('outcomes/', include('outcomes.urls')),
+
+    # API route namespaces
+    path('api/auth/', include('users.urls')),
+    path('api/users/', include('users.urls')),
+
+    # Programs and Giraph endpoints expected by the frontend
+    path('api/programs/', include('programs.urls')),
     path('api/giraph/', include('giraph.urls')),
-    path('api/users/', include("users.urls")),
-    path('api/outcomes/', include("outcomes.urls")),
-    path('api/programs/', include("programs.urls")),
-]
+    # Expose outcomes upload API under /api/outcomes/
+    path('api/outcomes/', include('outcomes.urls')),
+]

backend/giraph/migrations/0004_add_score_to_node.py

@@ -0,0 +1,18 @@
+# Generated by assistant on 2026-01-07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('giraph', '0003_node_course'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='node',
+            name='score',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

backend/giraph/migrations/0005_node_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.8 on 2026-01-08 07:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('giraph', '0004_add_score_to_node'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='node',
+            name='description',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

backend/giraph/migrations/0006_remove_node_description.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.8 on 2026-01-08 07:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('giraph', '0005_node_description'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='node',
+            name='description',
+        ),
+    ]

backend/giraph/models.py

@@ -14,9 +14,11 @@ class Node(models.Model):
     course = models.ForeignKey(
         Program, on_delete=models.CASCADE, related_name="nodes", null=True, blank=True
     )
+    # Optional numeric score assigned from CSV imports or other sources
+    score = models.FloatField(null=True, blank=True)
 
     def __str__(self):
-        return f"{self.id} | {self.layer} | {self.name}"
+        return f"{self.id} | {self.layer} | {self.name}" 
 
 
 class Relation(models.Model):