From 8ffdeab1d0df4b9c9421fbb91aeaebd36908fdd8 Mon Sep 17 00:00:00 2001 From: Rushil Umaretiya Date: Sun, 13 Dec 2020 13:20:08 -0500 Subject: [PATCH] fixed migrations --- site/api/migrations/0001_initial.py | 66 +++++-------------- .../0002_remove_profile_profile_pic.py | 17 ----- .../api/migrations/0003_auto_20201213_0246.py | 29 -------- .../api/migrations/0004_auto_20201213_0331.py | 22 ------- site/config/settings.py | 6 +- 5 files changed, 18 insertions(+), 122 deletions(-) delete mode 100644 site/api/migrations/0002_remove_profile_profile_pic.py delete mode 100644 site/api/migrations/0003_auto_20201213_0246.py delete mode 100644 site/api/migrations/0004_auto_20201213_0331.py diff --git a/site/api/migrations/0001_initial.py b/site/api/migrations/0001_initial.py index 99207f5d..410e4f51 100644 --- a/site/api/migrations/0001_initial.py +++ b/site/api/migrations/0001_initial.py @@ -1,9 +1,8 @@ -# Generated by Django 3.1.4 on 2020-12-12 22:37 +# Generated by Django 3.1.4 on 2020-12-13 17:43 -import django.db.models.deletion -import django.db.models.fields from django.conf import settings from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): @@ -16,59 +15,24 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name="Profile", + name='Profile', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "profile_pic", - models.ImageField(default="default.jpg", upload_to="profile_pics"), - ), - ( - "user", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), migrations.CreateModel( - name="Classroom", + name='Classroom', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=30)), - ("teacher", models.CharField(max_length=30)), - ( - "period", - models.CharField( - blank=True, - max_length=1, - unique=True, - verbose_name=django.db.models.fields.PositiveIntegerField, - ), - ), - ( - "student", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="api.profile" - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=30)), + ('teacher', models.CharField(max_length=30)), + ('link', models.CharField(max_length=100)), + ('period', models.PositiveIntegerField(blank=True)), + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='classes', to='api.profile')), ], + options={ + 'ordering': ['period'], + }, ), ] diff --git a/site/api/migrations/0002_remove_profile_profile_pic.py b/site/api/migrations/0002_remove_profile_profile_pic.py deleted file mode 100644 index f038310b..00000000 --- a/site/api/migrations/0002_remove_profile_profile_pic.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.4 on 2020-12-12 22:49 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("api", "0001_initial"), - ] - - operations = [ - migrations.RemoveField( - model_name="profile", - name="profile_pic", - ), - ] diff --git a/site/api/migrations/0003_auto_20201213_0246.py b/site/api/migrations/0003_auto_20201213_0246.py deleted file mode 100644 index 5f244fb8..00000000 --- a/site/api/migrations/0003_auto_20201213_0246.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 3.1.4 on 2020-12-13 07:46 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("api", "0002_remove_profile_profile_pic"), - ] - - operations = [ - migrations.AddField( - model_name="classroom", - name="link", - field=models.CharField(default="https://meet.google.com/", max_length=100), - preserve_default=False, - ), - migrations.AlterField( - model_name="classroom", - name="student", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="classes", - to="api.profile", - ), - ), - ] diff --git a/site/api/migrations/0004_auto_20201213_0331.py b/site/api/migrations/0004_auto_20201213_0331.py deleted file mode 100644 index f3938e71..00000000 --- a/site/api/migrations/0004_auto_20201213_0331.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.1.4 on 2020-12-13 08:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("api", "0003_auto_20201213_0246"), - ] - - operations = [ - migrations.AlterModelOptions( - name="classroom", - options={"ordering": ["period"]}, - ), - migrations.AlterField( - model_name="classroom", - name="period", - field=models.PositiveIntegerField(blank=True), - ), - ] diff --git a/site/config/settings.py b/site/config/settings.py index 5ddeb66b..29b21645 100644 --- a/site/config/settings.py +++ b/site/config/settings.py @@ -100,9 +100,9 @@ DATABASES = { # 'ENGINE' : 'django_cockroachdb', # 'NAME' : 'spaceout', # 'USER' : 'spaceout', -# 'PASSWORD': 'spaceout', -# 'HOST' : 'localhost', -# 'PORT' : 35767, +# 'PASSWORD': r"eVYfYQ`W.`y3AW%'[hdyVR.cn,_[mP5h,$~.7#(8SM8@Z8=T:(", +# 'HOST' : 'spaceout-86g.gcp-us-east4.cockroachlabs.cloud', +# 'PORT' : 26257, # } # }