Mega update lol

.gitignore

@@ -1,2 +1,2 @@
-venv/
+venv/
 .env

.vscode/settings.json

@@ -1,3 +1,3 @@
-{
-    "git.ignoreLimitWarning": true
+{
+    "git.ignoreLimitWarning": true
 }

README.md

@@ -1,24 +1,24 @@
-# CourseCal
-Automate the process of transferring your semester's calendar from your university's end to your personal calendar (google calendar/outlook calendar/etc)
-
-# Virtual Environment
-- `python3 -m venv venv`
-- `source venv/bin/activate`
-To deactivate, simply enter `deactivate`
-
-# Dependencies
-- `python3 -m pip install -r requirements.txt` then lock the requirements
-- `pip freeze > requirements.txt`
-
-# Starting the server & stuff
-- `cd web_app`
-- `python3 manage.py runserver`
-
-Since we're working with a MongoDB, we don't have to worry about migrations :smiley:
-
-# Next?
-- Work on the project
-- Setup Docker shit for professionalism (lol) & for ease of deployment
-- Work on RPI's automation
-- Integrate a ReCaptcha solver (I bet some universities have implemented Google ReCaptcha or something similar)
+# CourseCal
+Automate the process of transferring your semester's calendar from your university's end to your personal calendar (google calendar/outlook calendar/etc)
+
+# Virtual Environment
+- `python3 -m venv venv`
+- `source venv/bin/activate`
+To deactivate, simply enter `deactivate`
+
+# Dependencies
+- `python3 -m pip install -r requirements.txt` then lock the requirements *(you may need to run `wget https://bootstrap.pypa.io/get-pip.py` then `sudo python3.6 get-pip.py`)*
+- `pip freeze > requirements.txt`
+
+# Starting the server & stuff
+- `cd web_app`
+- `python3 manage.py runserver`
+
+Since we're working with a MongoDB, we don't have to worry about migrations :smiley:
+
+# Next?
+- Work on the project
+- Setup Docker shit for professionalism (lol) & for ease of deployment
+- Work on RPI's automation
+- Integrate a ReCaptcha solver (I bet some universities have implemented Google ReCaptcha or something similar)
 -- maybe make our own ReCaptcha solver (that'd be an insane side project)

requirements.txt

@@ -1,5 +1,6 @@
-Django==2.2.13
-git+https://github.com/django-nonrel/mongodb-engine
-git+https://github.com/django-nonrel/djangotoolbox
-git+https://github.com/django-nonrel/[email protected]
-python-dotenv
+# Django==2.2.13
+git+https://github.com/django-nonrel/mongodb-engine
+git+https://github.com/django-nonrel/djangotoolbox
+git+https://github.com/django-nonrel/[email protected]
+python-dotenv
+django-mongodb-engine-py3

web_app/app/migrations/0001_initial.py

@@ -0,0 +1,44 @@
+# Generated by Django 2.2.13 on 2020-12-27 10:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='University',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200)),
+                ('address', models.CharField(max_length=500)),
+                ('phone_num', models.IntegerField(default='-1')),
+                ('domain', models.CharField(max_length=20)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='URLCalendar',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('calendar', models.CharField(max_length=200)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Student',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('username', models.CharField(max_length=10)),
+                ('email', models.CharField(max_length=100)),
+                ('first_name', models.CharField(max_length=100)),
+                ('last_name', models.CharField(max_length=100)),
+                ('phone_num', models.IntegerField()),
+                ('calendar_link', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.URLCalendar')),
+            ],
+        ),
+    ]

web_app/app/models.py

@@ -4,16 +4,16 @@
 class University(models.Model):
     name = models.CharField(max_length=200, null=False, blank=False)
     address = models.CharField(max_length=500, null=False, blank=False)
-    phone_num = models.IntegerField(max_length=10 null=False, blank=False, default="-1")
+    phone_num = models.IntegerField(null=False, blank=False, default="-1")
     domain = models.CharField(max_length=20, null=False, blank=False)
 
 class Student(models.Model):
     username = models.CharField(max_length=10, null=False, blank=False)
     email = models.CharField(max_length=100, null=False, blank=False)
     first_name = models.CharField(max_length=100, null=False, blank=False)
     last_name = models.CharField(max_length=100, null=False, blank=False)
-    phone_num = models.IntegerField(max_length=10 null=False, blank=False)
-    calendar_link = models.ForeignKey(URLCalendar, on_delete=models.CASCADE)
+    phone_num = models.IntegerField(null=False, blank=False)
+    calendar_link = models.ForeignKey("URLCalendar", on_delete=models.CASCADE)
 
 class URLCalendar(models.Model):
-    calendar = models.CharField(null=False, blank=False)
+    calendar = models.CharField(max_length=200, null=False, blank=False)

web_app/manage.py

@@ -1,21 +1,21 @@
-#!/usr/bin/env python
-"""Django's command-line utility for administrative tasks."""
-import os
-import sys
-
-
-def main():
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'web_app.settings')
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        raise ImportError(
-            "Couldn't import Django. Are you sure it's installed and "
-            "available on your PYTHONPATH environment variable? Did you "
-            "forget to activate a virtual environment?"
-        ) from exc
-    execute_from_command_line(sys.argv)
-
-
-if __name__ == '__main__':
-    main()
+#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'web_app.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exec
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()