yeah, it looks like somehow i didn't complete the merge before pushing. now also ignoring sqlite

Author: hcientist

.gitignore

@@ -273,4 +273,5 @@ mailpit
 thoughtswap/media/
 
 .pytest_cache/
-.env
+.env
+*.sqlite3

local.sqlite3

@@ -17,9 +17,5 @@ crispy-bootstrap5==2024.10  # https://github.com/django-crispy-forms/crispy-boot
 django-redis==5.4.0  # https://github.com/jazzband/django-redis
 PyJWT==2.10.1 # https://docs.allauth.org/en/dev/installation/requirements.html
 channels==4.2.0 # in order ot use django channels for the in-class communication
-<<<<<<< HEAD
-daphne==4.1.2 # in order ot use django channels for the in-class communication
-=======
 daphne==4.1.2 # in order ot use django channels for the in-class communication
 channels-redis==4.2.1
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd

requirements/base.txt

@@ -18,9 +18,6 @@ def seed_mvp(apps, schema_editor):
     teacher = User.objects.create_user(
         username="teacher",
         email="[email protected]",
-<<<<<<< HEAD
-        password=make_password("teacher"),
-=======
         password="teacher",
     )
     teacher.first_name = "Teacher"
@@ -32,20 +29,13 @@ def seed_mvp(apps, schema_editor):
         username="teacher2",
         email="[email protected]",
         password="teacher",
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
     )
     teacher.first_name = "Teacher"
     teacher.last_name = "User"
     teacher.save()
 
     # create a course
     course = Course.objects.create(
-<<<<<<< HEAD
-        title="Example Course",
-        creator=teacher,
-    )
-
-=======
         title="Example Course CS 455",
         creator=teacher,
     )
@@ -55,60 +45,40 @@ def seed_mvp(apps, schema_editor):
         creator=teacher2,
     )
 
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
     # enroll the teacher in the course
     Enrollment.objects.create(
         user=teacher,
         course=course,
         role="f",
     )
 
-<<<<<<< HEAD
-=======
     # enroll the teacher2 in the course
     Enrollment.objects.create(
         user=teacher2,
         course=course2,
         role="f",
     )
 
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
     # create a student
     student1 = User.objects.create_user(
         username="student1",
         email="[email protected]",
-<<<<<<< HEAD
-        password=make_password("student"),
-    )
-    student1.first_name = "Student1"
-    student1.last_name = "User"
-    student1.save()
-=======
         password="student",
     )
     # student1.first_name = "Student1"
     # student1.last_name = "User"
     # student1.save()
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
 
     student2 = User.objects.create_user(
         username="student2",
         email="[email protected]",
-<<<<<<< HEAD
-        password=make_password("student"),
-    )
-    student2.first_name = "Student2"
-    student2.last_name = "User"
-    student2.save()
-=======
         password="student",
         # first_name = "Student2",
         # last_name = "User"
     )
     # student2.first_name = "Student2"
     # student2.last_name = "User"
     # student2.save()
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
 
     Enrollment.objects.create(
         user=student1,

thoughtswap/thoughtswap/migrations/0003_seed_example_model_instances_20250324_0943.py

@@ -22,11 +22,7 @@ class Course(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     def __str__(self):
-<<<<<<< HEAD
-        return self.name
-=======
         return self.title
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
 
 
 # since the coockiecutter-django starter code has groups and permissions to go
@@ -65,13 +61,9 @@ def __str__(self):
 
 
 class Session(models.Model):
-<<<<<<< HEAD
-    course = models.ForeignKey(Course, on_delete=models.CASCADE)
-=======
     course = models.ForeignKey(
         Course, on_delete=models.CASCADE, related_name="sessions"
     )
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
 
     SESSION_STATE = (
         ("a", "Active"),
@@ -82,43 +74,28 @@ class Session(models.Model):
     state = models.CharField(
         max_length=1,
         choices=SESSION_STATE,
-<<<<<<< HEAD
-        default="d",
-        help_text="Session state",
-    )
-
-=======
         default="a",
         help_text="Session state",
     )
 
     is_swapping = models.BooleanField(default=False)
 
-
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
     begin = models.DateTimeField(blank=True, null=True)
     end = models.DateTimeField(blank=True, null=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
-<<<<<<< HEAD
-=======
     def __str__(self):
         return f"{self.state}"
 
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
-
 # 2 use cases:
 # 1. prof wants to use this prompt in class tmr, so make it (the Prompt) today so they can just click it in realtime tmr (which would then instantiate the PromptUse). to be fully motivating we actually have to imagine they have 2 prompts in mind for tmr
 # 2. prof wants to use the prompt at the beginning of sem and then again at the end
 class PromptUse(models.Model):
     prompt = models.ForeignKey(Prompt, on_delete=models.CASCADE)
     # our docs show begin and end fields, but we don't remember why
     session = models.ForeignKey(Session, on_delete=models.CASCADE)
-<<<<<<< HEAD
-=======
     is_active = models.BooleanField(default=False)
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 

thoughtswap/thoughtswap/models.py

@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-from django.shortcuts import render
-
-# Create your views here.
-=======
 from django.shortcuts import render, redirect, get_object_or_404
 from thoughtswap.users.models import User
 from .models import Enrollment, Prompt, Course, Session
@@ -152,5 +147,3 @@ def thoughtswap_room(request, join_code):
             },
         )
 
-
->>>>>>> 06c019e81daa0338677ab2300c11b559078586dd