Creates Student/Teacher on User creation

Website/api/maker.py

@@ -1,128 +1,128 @@
-from datetime import datetime
-
-f1 = DefFiles(
-    name="instructions.txt"
-)
-f1.save()
-f2 = DefFiles(
-    name="instructions.txt"
-)
-f2.save()
-f3 = DefFiles(
-    name="sample.txt"
-)
-f3.save()
-f4 = DefFiles(
-    name="rubric.txt"
-)
-f4.save()
-
-a1 = Assignment.objects.get(pk=1)
-a1.files.add(f1)
-a1.save()
-a2 = Assignment.objects.get(pk=2)
-a2.files.add(f2)
-a2.save()
-a3 = Assignment.objects.get(pk=3)
-a3.files.add(f3)
-a3.files.add(f4)
-a3.save()
-
-####################################
-
-from api.models import Assignment, Student, Classes, Teacher, DefFiles
-from datetime import datetime
-
-f1 = DefFiles(
-    name="instructions.txt"
-)
-f1.save()
-f2 = DefFiles(
-    name="instructions.txt"
-)
-f2.save()
-f3 = DefFiles(
-    name="sample.txt"
-)
-f3.save()
-f4 = DefFiles(
-    name="rubric.txt"
-)
-f4.save()
-
-A1 = Assignment(
-    name='Week1_HW',
-    due_date=datetime.now(),
-)
-A1.save()
-A1.files.add(f1)
-A1.save()
-
-A2 = Assignment(
-    name='Week2_HW',
-    due_date=datetime.now(),
-     
-)
-A2.save()
-A2.files.add(f2)
-A2.save()
-
-A3 = Assignment(
-     name='Journal1',
-     due_date=datetime.now(),
-)
-A3.save()
-A3.files.add(f3)
-A3.files.add(f4)
-A3.save()
-
-#classes
-math = Classes(
-    name='Math5',
-
-)
-math.save()
-math.assignments.add(A1)
-math.assignments.add(A2)
-math.save()
-
-english = Classes(
-    name='English',
-)
-english.save()
-english.assignments.add(A3)
-english.save()
-
-#students
-raffu = Student(
-    first_name = "Raffu",
-    last_name = "Khondaker",
-    student_id = 1579460,
-    ion_user="2022rkhondak",
-    webmail = "2022rkhondak@tjhsst.edu",
-    grade = 10,
-    repo="https://github.com/therealraffi/2022rkhondak.git",
-)
-raffu.save()
-raffu.classes.add(math)
-raffu.classes.add(english)
-raffu.save()
-
-#teachers
-ng = Teacher(
-    first_name = "Errin",
-    last_name = "Harris",
-    ion_user="eharris1"
-)
-ng.save()
-ng.classes.add(math)
-ng.save()
-
-chao = Teacher(
-    first_name = "Abagail",
-    last_name = "Bailey",
-    ion_user="AKBailey"
-)
-chao.save()
-chao.classes.add(english)
-chao.save()
+# from datetime import datetime
+#
+# f1 = DefFiles(
+#     name="instructions.txt"
+# )
+# f1.save()
+# f2 = DefFiles(
+#     name="instructions.txt"
+# )
+# f2.save()
+# f3 = DefFiles(
+#     name="sample.txt"
+# )
+# f3.save()
+# f4 = DefFiles(
+#     name="rubric.txt"
+# )
+# f4.save()
+#
+# a1 = Assignment.objects.get(pk=1)
+# a1.files.add(f1)
+# a1.save()
+# a2 = Assignment.objects.get(pk=2)
+# a2.files.add(f2)
+# a2.save()
+# a3 = Assignment.objects.get(pk=3)
+# a3.files.add(f3)
+# a3.files.add(f4)
+# a3.save()
+#
+# ####################################
+#
+# from api.models import Assignment, Student, Classes, Teacher, DefFiles
+# from datetime import datetime
+#
+# f1 = DefFiles(
+#     name="instructions.txt"
+# )
+# f1.save()
+# f2 = DefFiles(
+#     name="instructions.txt"
+# )
+# f2.save()
+# f3 = DefFiles(
+#     name="sample.txt"
+# )
+# f3.save()
+# f4 = DefFiles(
+#     name="rubric.txt"
+# )
+# f4.save()
+#
+# A1 = Assignment(
+#     name='Week1_HW',
+#     due_date=datetime.now(),
+# )
+# A1.save()
+# A1.files.add(f1)
+# A1.save()
+#
+# A2 = Assignment(
+#     name='Week2_HW',
+#     due_date=datetime.now(),
+#
+# )
+# A2.save()
+# A2.files.add(f2)
+# A2.save()
+#
+# A3 = Assignment(
+#      name='Journal1',
+#      due_date=datetime.now(),
+# )
+# A3.save()
+# A3.files.add(f3)
+# A3.files.add(f4)
+# A3.save()
+#
+# #classes
+# math = Classes(
+#     name='Math5',
+#
+# )
+# math.save()
+# math.assignments.add(A1)
+# math.assignments.add(A2)
+# math.save()
+#
+# english = Classes(
+#     name='English',
+# )
+# english.save()
+# english.assignments.add(A3)
+# english.save()
+#
+# #students
+# raffu = Student(
+#     first_name = "Raffu",
+#     last_name = "Khondaker",
+#     student_id = 1579460,
+#     ion_user="2022rkhondak",
+#     webmail = "2022rkhondak@tjhsst.edu",
+#     grade = 10,
+#     repo="https://github.com/therealraffi/2022rkhondak.git",
+# )
+# raffu.save()
+# raffu.classes.add(math)
+# raffu.classes.add(english)
+# raffu.save()
+#
+# #teachers
+# ng = Teacher(
+#     first_name = "Errin",
+#     last_name = "Harris",
+#     ion_user="eharris1"
+# )
+# ng.save()
+# ng.classes.add(math)
+# ng.save()
+#
+# chao = Teacher(
+#     first_name = "Abagail",
+#     last_name = "Bailey",
+#     ion_user="AKBailey"
+# )
+# chao.save()
+# chao.classes.add(english)
+# chao.save()

Website/api/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2020-06-13 18:15
+# Generated by Django 3.0.7 on 2020-06-14 19:14
 
 from django.conf import settings
 from django.db import migrations, models
@@ -35,25 +35,15 @@ class Migration(migrations.Migration):
                 ('ion_user', models.CharField(max_length=100, primary_key=True, serialize=False)),
                 ('git', models.CharField(max_length=100)),
                 ('email', models.CharField(blank=True, default='', max_length=100)),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teachers', to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
             name='Student',
             fields=[
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('first_name', models.CharField(max_length=100)),
-                ('last_name', models.CharField(max_length=100)),
-                ('student_id', models.IntegerField()),
-                ('ion_user', models.CharField(max_length=100, primary_key=True, serialize=False)),
-                ('email', models.CharField(blank=True, default='', max_length=100)),
-                ('grade', models.IntegerField()),
-                ('git', models.CharField(max_length=100)),
-                ('repo', models.URLField(blank=True, default='')),
-                ('classes', models.CharField(blank=True, default='', max_length=100)),
-                ('added_to', models.CharField(blank=True, default='', max_length=100)),
-                ('completed', models.TextField(blank=True, default='')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='students', to=settings.AUTH_USER_MODEL)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('website', models.CharField(blank=True, default='https://google.com', max_length=150)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
@@ -67,7 +57,7 @@ class Migration(migrations.Migration):
                 ('default_file', models.CharField(blank=True, default='', max_length=100)),
                 ('confirmed', models.TextField(blank=True, default='')),
                 ('unconfirmed', models.TextField(blank=True, default='')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='classes', to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(

Website/api/migrations/0002_auto_20200614_2034.py

@@ -0,0 +1,52 @@
+# Generated by Django 3.0.7 on 2020-06-14 20:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='student',
+            name='website',
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='added_to',
+            field=models.CharField(blank=True, default='', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='classes',
+            field=models.CharField(blank=True, default='', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='completed',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='git',
+            field=models.CharField(blank=True, default='https://github.com/', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='grade',
+            field=models.IntegerField(blank=True, default=9),
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='repo',
+            field=models.URLField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='student_id',
+            field=models.IntegerField(blank=True, default=0),
+        ),
+    ]

Website/api/migrations/0003_auto_20200614_2044.py

@@ -0,0 +1,43 @@
+# Generated by Django 3.0.7 on 2020-06-14 20:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0002_auto_20200614_2034'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='student',
+            name='student_id',
+        ),
+        migrations.RemoveField(
+            model_name='teacher',
+            name='created',
+        ),
+        migrations.RemoveField(
+            model_name='teacher',
+            name='email',
+        ),
+        migrations.RemoveField(
+            model_name='teacher',
+            name='first_name',
+        ),
+        migrations.RemoveField(
+            model_name='teacher',
+            name='last_name',
+        ),
+        migrations.AlterField(
+            model_name='student',
+            name='git',
+            field=models.CharField(blank=True, default='', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='student',
+            name='grade',
+            field=models.IntegerField(blank=True),
+        ),
+    ]

Website/api/migrations/0004_auto_20200614_2107.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-06-14 21:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0003_auto_20200614_2044'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='student',
+            name='grade',
+            field=models.IntegerField(blank=True, default=0),
+        ),
+    ]

Website/api/models.py

@@ -39,26 +39,26 @@ class Classes(models.Model):
         return super(Classes, self).save(*args, **kwargs)
 
 class Teacher(models.Model):
-    owner = models.ForeignKey('auth.User', related_name='teachers', on_delete=models.CASCADE)
-
-    created = models.DateTimeField(auto_now_add=True)
-    first_name = models.CharField(max_length=100)
-    last_name = models.CharField(max_length=100)
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
     # classes = models.ManyToManyField(Classes, default="")
     classes=models.CharField(max_length=100, default="", blank=True)
     ion_user=models.CharField(primary_key=True, max_length=100)
     git=models.CharField(max_length=100)
-    email=models.CharField(max_length=100, default="", blank=True)
+
+    def save(self, *args, **kwargs):
+        super(Teacher, self).save(*args, **kwargs)
 
 class Student(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
-    student_id = models.IntegerField()
-    grade = models.IntegerField()
-    git=models.CharField(max_length=100)
+    grade = models.IntegerField(default=0, blank=True)
+    git=models.CharField(default="", max_length=100, blank=True)
     repo=models.URLField(default="", blank=True)
     classes=models.CharField(max_length=100, default="", blank=True)
     added_to=models.CharField(max_length=100, default="", blank=True)
     completed=models.TextField(default="", blank=True)
 
     def save(self, *args, **kwargs):
-        return super(Student, self).save(*args, **kwargs)
+        super(Student, self).save(*args, **kwargs)
+
+    def __str__(self):
+        return f"{self.user.username}'s Profile"

Website/api/signals.py

@@ -2,7 +2,4 @@ from django.contrib.auth.models import User
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from .models import Student, Teacher
-
-@receiver(post_save, sender=User)
-def save_profile(sender, instance, **kwargs):
-    instance.profile.save()
+)

Website/config/settings.py

@@ -43,8 +43,6 @@ INSTALLED_APPS = [
     'api',
     'crispy_forms',
     'django_forms_bootstrap',
-
-
 ]
 
 REST_FRAMEWORK = {

Website/skoolos/static/skoolos/styles.css

@@ -0,0 +1,100 @@
+@font-face {
+    font-family: Futura;
+    src: url(futura.ttf);
+}
+
+@font-face {
+  font-family: 'Segoe UI';
+  src: url('Segoe UI.ttf');
+}
+
+body {
+  background: #fafafa;
+  color: #333333;
+  margin-top: 5rem;
+  font-family: 'Segoe UI';
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: #444444;
+}
+
+ul {
+  margin: 0;
+}
+
+.bg-steel {
+  background: #3cba54;
+}
+
+.site-header .navbar-nav .nav-link {
+  color: #cbd5db;
+}
+
+.site-header .navbar-nav .nav-link:hover {
+  color: #ffffff;
+}
+
+.site-header .navbar-nav .nav-link.active {
+  font-weight: 500;
+}
+
+.content-section {
+  background: #ffffff;
+  padding: 10px 20px;
+  border: 1px solid #dddddd;
+  border-radius: 3px;
+  margin-bottom: 20px;
+}
+
+.article-title {
+  color: #444444;
+}
+
+a.article-title:hover {
+  color: #428bca;
+  text-decoration: none;
+}
+
+.article-content {
+  white-space: pre-line;
+}
+
+.article-img {
+  height: 65px;
+  width: 65px;
+  margin-right: 16px;
+}
+
+.article-metadata {
+  padding-bottom: 1px;
+  margin-bottom: 4px;
+  border-bottom: 1px solid #e3e3e3
+}
+
+.article-metadata a:hover {
+  color: #333;
+  text-decoration: none;
+}
+
+.article-svg {
+  width: 25px;
+  height: 25px;
+  vertical-align: middle;
+}
+
+.account-img {
+  height: 125px;
+  width: 125px;
+  margin-right: 20px;
+  margin-bottom: 16px;
+}
+
+.account-heading {
+  font-size: 2.5rem;
+}
+
+.nounderline {
+  text-decoration: none !important;
+  color: black !important;
+}

Website/skoolos/templates/skoolos/base.html

@@ -17,6 +17,32 @@
 
   </head>
   <body>
+    <header class="site-header">
+      <nav class="navbar navbar-expand-md navbar-dark bg-steel fixed-top">
+        <div class="container">
+          <a class="navbar-brand" href="#">
+            <img src="/docs/4.3/assets/brand/bootstrap-solid.svg" width="30" height="30" class="d-inline-block align-top" alt="">
+            Bootstrap
+          </a>
+          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+          </button>
+          <div class="collapse navbar-collapse" id="navbarToggle">
+            <div class="navbar-nav mr-auto">
+              <a class="nav-item nav-link" href="{% url 'home' %}">Home</a>
+            </div>
+            <!-- Navbar Right Side -->
+            <div class="navbar-nav">
+            {% if user.is_authenticated %}
+              <a class="nav-item nav-link" href="{% url 'profile' %}">{{ user.username }}</a>
+              <a class="nav-item nav-link" href="{% url 'logout' %}">Logout</a>
+            {% endif %}
+            </div>
+          </div>
+        </div>
+      </nav>
+    </header>
+
     {% block content %}{% endblock %}
     <!-- Bootstrap JS -->
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>

Website/skoolos/templates/skoolos/home.html

@@ -1,5 +1,3 @@
 {% extends "skoolos/base.html" %}
 {% block content %}
-  <h1>welcome to skoolos</h1>
-  <h2>it's the future you've been waiting for</h2>
 {% endblock content %}

Website/skoolos/urls.py

@@ -1,6 +1,9 @@
 from django.urls import path
 
+from . import views
 
-
+# Additionally, we include login URLs for the browsable API.
 urlpatterns = [
+    path('', views.home, name='home'),
+    path('profile/', views.profile, name='profile')
 ]

Website/skoolos/views.py

@@ -6,3 +6,7 @@ from django.contrib.auth.decorators import login_required
 @login_required()
 def home (request):
     return render(request, "skoolos/home.html")
+
+@login_required()
+def profile (request):
+    pass

Website/users/forms.py

@@ -14,6 +14,7 @@ class UserCreationForm(forms.ModelForm):
     first_name = forms.CharField(disabled=True)
     last_name = forms.CharField(disabled=True)
     isStudent = forms.BooleanField(widget = forms.HiddenInput())
+    git = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Git Username'}))
     password = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Password'}))
     confirm_password = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Confirm Password'}))
     token = forms.CharField(widget = forms.HiddenInput())
@@ -23,14 +24,9 @@ class UserCreationForm(forms.ModelForm):
 
     def clean(self):
         cleaned_data = super(UserCreationForm, self).clean()
-        password = cleaned_data.get("password")
-        confirm_password = cleaned_data.get("confirm_password")
-
-        if password != confirm_password:
-            raise forms.ValidationError("Passwords do not match!")
 
         return cleaned_data
 
     class Meta:
         model = User
-        fields = ('username', 'email', 'first_name', 'last_name', 'password')
+        fields = ('username', 'email', 'first_name', 'last_name', 'git', 'password', 'confirm_password')

Website/users/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2020-06-13 08:25
+# Generated by Django 3.0.7 on 2020-06-14 19:13
 
 from django.db import migrations, models
 

Website/users/migrations/0002_auto_20200614_2044.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-06-14 20:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='token',
+            name='isStudent',
+            field=models.BooleanField(default=True),
+        ),
+    ]

Website/users/migrations/0003_token_grade.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-06-14 21:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_auto_20200614_2044'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='token',
+            name='grade',
+            field=models.IntegerField(default=9),
+        ),
+    ]

Website/users/models.py

@@ -9,7 +9,8 @@ class Token(models.Model):
     email = models.TextField()
     first_name = models.TextField()
     last_name = models.TextField()
-    isStudent = models.BooleanField()
+    grade = models.IntegerField(default=9)
+    isStudent = models.BooleanField(default=True)
     token = models.CharField(max_length=255)
 
     def save(self, *args, **kwargs):

Website/users/views.py

@@ -53,12 +53,13 @@ def callback (request):
                 first_name = profile['first_name']
                 last_name = profile['last_name']
                 isStudent = profile['is_student']
+                grade = profile['grade']['number']
 
                 if User.objects.filter(username=username).count() != 0:
                     messages.success(request, "This user already exists!")
                     return redirect('/login/')
                 else:
-                    token = Token(username = username, email = email, first_name = first_name, last_name = last_name, isStudent = isStudent)
+                    token = Token(username = username, email = email, first_name = first_name, last_name = last_name, isStudent = isStudent, grade=grade)
                     token.save()
                     tokenHash = token.token
                     print(f'/create_account/?token={tokenHash}')
@@ -83,8 +84,12 @@ def create_account (request):
             first_name = token.first_name
             last_name = token.last_name
             isStudent = token.isStudent
+            grade = token.grade
+            git = cleaned_data.get('git')
             password = cleaned_data.get('password')
 
+
+
             user = User.objects.create_user(username=username,
                                             email=email,
                                             first_name=first_name,
@@ -92,6 +97,14 @@ def create_account (request):
                                             password=password)
             user.save()
             token.delete()
+
+            if isStudent:
+                profile = Student(user=user, git=git, grade=grade)
+            else:
+                profile = Teacher(user=user, git=git)
+
+            profile.save()
+
             print (user)
             messages.success(request, "Your SkoolOS account has successfully been created")
             return redirect(f'/login/?username={username}')
@@ -109,11 +122,14 @@ def create_account (request):
         first_name = token.first_name
         last_name = token.last_name
         isStudent = token.isStudent
+        grade = token.grade
+
         initial = {
             'username': username,
             'email': email,
             'first_name': first_name,
             'last_name': last_name,
+            'grade': grade,
             'isStudent': isStudent,
             'token': token.token,
         }
@@ -128,4 +144,4 @@ def create_account (request):
 def logout(request):
     auth_logout(request)
     messages.success(request, "You've been logged out!")
-    return redirect(request, "/login/")
+    return redirect(request, "/login")