From f79f13f6c15976e84368fa09c0b24998c3765ed7 Mon Sep 17 00:00:00 2001 From: Caitlin Golden Date: Wed, 21 Jul 2021 11:20:19 -0500 Subject: [PATCH 1/4] accessed profile template, motouser model and motouser view to fix avatar issue. this commit should only include those files. will not push until approved by group --- moto_user/.DS_Store | Bin 6148 -> 6148 bytes moto_user/migrations/0001_initial.py | 47 --------------------------- moto_user/migrations/0002_initial.py | 44 ------------------------- moto_user/migrations/__init__.py | 0 moto_user/models.py | 7 +--- moto_user/views.py | 4 +-- templates/profile.html | 6 +++- 7 files changed, 8 insertions(+), 100 deletions(-) delete mode 100644 moto_user/migrations/0001_initial.py delete mode 100644 moto_user/migrations/0002_initial.py delete mode 100644 moto_user/migrations/__init__.py diff --git a/moto_user/.DS_Store b/moto_user/.DS_Store index 9bf20143cab149b419e95b5246963fa6d49b1c43..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 100644 GIT binary patch delta 67 zcmZoMXfc=|&Zs)EP;8=}A_oHyFfuR*Y}^>eKJh@*W_At%4o20D8^1G8<`+@q1WGX^ TfYeMj;Zfe4AhLvcVgm~RE=&+7 delta 127 zcmZoMXfc=|&e%3FQEZ}~q9`K+0|O8XFfb%ClrUs6
- + {% if avatar.url %} + + {%else%} + + {%endif%}
+
- + {% if profile.username == request.user.username %} +
Saved Posts
 +
My Posts
- + {%endif%}
- - {% for post in profile.favorite_posts.all %} - + {% for post in posts %} +
Post picture @@ -73,6 +73,7 @@

Member since: {{ request.user.joined_date }}

  • 5
    • +
    {% endfor %}
    From c0113c1c07e79381a3b04bb8a027ee3ca1c0f1be Mon Sep 17 00:00:00 2001 From: Caitlin Golden Date: Thu, 22 Jul 2021 02:37:36 -0500 Subject: [PATCH 4/4] removed migration files --- notification/migrations/0001_initial.py | 28 --------- post/migrations/0001_initial.py | 77 ------------------------- recipe/migrations/0001_initial.py | 39 ------------- 3 files changed, 144 deletions(-) delete mode 100644 notification/migrations/0001_initial.py delete mode 100644 post/migrations/0001_initial.py delete mode 100644 recipe/migrations/0001_initial.py diff --git a/notification/migrations/0001_initial.py b/notification/migrations/0001_initial.py deleted file mode 100644 index 7aab42e..0000000 --- a/notification/migrations/0001_initial.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.5 on 2021-07-21 16:55 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('post', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Notification', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('read', models.BooleanField(default=False)), - ('date_created', models.DateTimeField(auto_now_add=True)), - ('post_to_notify', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='post.post')), - ('receiver', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/post/migrations/0001_initial.py b/post/migrations/0001_initial.py deleted file mode 100644 index 395ff47..0000000 --- a/post/migrations/0001_initial.py +++ /dev/null @@ -1,77 +0,0 @@ -# Generated by Django 3.2.5 on 2021-07-21 16:55 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import post.models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Post', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('picture', models.ImageField(upload_to=post.models.user_directory_path, verbose_name='Picture')), - ('caption', models.TextField(max_length=500, verbose_name='Caption')), - ('posted', models.DateTimeField(default=django.utils.timezone.now)), - ('likes', models.IntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='Tag', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=80, verbose_name='Tag')), - ('slug', models.SlugField(unique=True)), - ], - options={ - 'verbose_name': 'Tag', - 'verbose_name_plural': 'Tags', - }, - ), - migrations.CreateModel( - name='Stream', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateTimeField()), - ('following', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stream_following', to=settings.AUTH_USER_MODEL)), - ('post', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='post.post')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='PostFileContent', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file', models.FileField(upload_to=post.models.user_directory_path)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='content_owner', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.AddField( - model_name='post', - name='tags', - field=models.ManyToManyField(related_name='tags', to='post.Tag'), - ), - migrations.AddField( - model_name='post', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - migrations.CreateModel( - name='Likes', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='post_like', to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_like', to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/recipe/migrations/0001_initial.py b/recipe/migrations/0001_initial.py deleted file mode 100644 index e8659dc..0000000 --- a/recipe/migrations/0001_initial.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.2.5 on 2021-07-21 16:55 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Tag', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('caption', models.CharField(max_length=20)), - ], - ), - migrations.CreateModel( - name='Recipe', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=50)), - ('description', models.TextField()), - ('time_required', models.CharField(max_length=10)), - ('instruction', models.TextField()), - ('image', models.ImageField(blank=True, null=True, upload_to='recipes')), - ('date', models.DateTimeField(auto_now=True)), - ('author', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recipes', to=settings.AUTH_USER_MODEL)), - ('favorites', models.ManyToManyField(blank=True, related_name='favorite_recipes', to='recipe.Recipe')), - ('tags', models.ManyToManyField(blank=True, related_name='tags', to='recipe.Tag')), - ], - ), - ]