revert-social (#50)

src/social/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import Post, UserProfile
+from .models import Post #, Comment
 
 admin.site.register(Post)
-admin.site.register(UserProfile)
+# admin.site.register(Comment)

src/social/forms.py

@@ -1,13 +1,14 @@
 from django import forms
 from .models import Post, Comment
 
+
 class PostForm(forms.ModelForm):
     body = forms.CharField(
         label='',
-        widget=forms.Textarea(attrs={
-            'rows': '3',
-            'placeholder': 'Say Something...'
-            }))
+        widget=forms.Textarea(
+            attrs={'rows': '3',
+                   'placeholder': 'Say Something...'}
+        ))
 
     class Meta:
         model = Post
@@ -16,10 +17,10 @@ class PostForm(forms.ModelForm):
 class CommentForm(forms.ModelForm):
     comment = forms.CharField(
         label='',
-        widget=forms.Textarea(attrs={
-            'rows': '3',
-            'placeholder': 'Say Something...'
-            }))
+        widget=forms.Textarea(
+            attrs={'rows': '3',
+                   'placeholder': 'Say Something...'}
+        ))
 
     class Meta:
         model = Comment

src/social/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.1.4 on 2020-12-21 23:54
+# Generated by Django 3.1.4 on 2020-12-20 00:03
 
 from django.conf import settings
 from django.db import migrations, models
@@ -24,4 +24,14 @@ class Migration(migrations.Migration):
                 ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
+        migrations.CreateModel(
+            name='Comment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('comment', models.TextField()),
+                ('created_on', models.DateTimeField(default=django.utils.timezone.now)),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='social.post')),
+            ],
+        ),
     ]

src/social/migrations/0002_comment.py

@@ -1,27 +0,0 @@
-# Generated by Django 3.1.4 on 2021-01-01 18:58
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('social', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Comment',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('comment', models.TextField()),
-                ('created_on', models.DateTimeField(default=django.utils.timezone.now)),
-                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='social.post')),
-            ],
-        ),
-    ]

src/social/migrations/0003_userprofile.py

@@ -1,26 +0,0 @@
-# Generated by Django 3.1.4 on 2021-01-17 18:24
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
-        ('social', '0002_comment'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserProfile',
-            fields=[
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='profile', serialize=False, to='auth.user', verbose_name='user')),
-                ('name', models.CharField(blank=True, max_length=30, null=True)),
-                ('bio', models.TextField(blank=True, max_length=500, null=True)),
-                ('birth_date', models.DateField(blank=True, null=True)),
-                ('location', models.CharField(blank=True, max_length=100, null=True)),
-                ('picture', models.ImageField(blank=True, default='uploads/profile_pictures/default.png', upload_to='uploads/profile_pictures')),
-            ],
-        ),
-    ]

src/social/migrations/0004_userprofile_followers.py

@@ -1,20 +0,0 @@
-# Generated by Django 3.1.4 on 2021-01-26 00:21
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('social', '0003_userprofile'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='userprofile',
-            name='followers',
-            field=models.ManyToManyField(blank=True, related_name='followers', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

src/social/migrations/0005_auto_20210131_1615.py

@@ -1,25 +0,0 @@
-# Generated by Django 3.1.4 on 2021-01-31 16:15
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('social', '0004_userprofile_followers'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='post',
-            name='dislikes',
-            field=models.ManyToManyField(blank=True, related_name='dislikes', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='post',
-            name='likes',
-            field=models.ManyToManyField(blank=True, related_name='likes', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

src/social/migrations/0006_alter_comment_id_alter_post_id.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.0.3 on 2024-04-01 10:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('social', '0005_auto_20210131_1615'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='comment',
-            name='id',
-            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-        migrations.AlterField(
-            model_name='post',
-            name='id',
-            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-    ]

src/social/models.py

@@ -1,37 +1,16 @@
 from django.db import models
 from django.utils import timezone
 from django.contrib.auth.models import User
-from django.db.models.signals import post_save
-from django.dispatch import receiver
 
 
 class Post(models.Model):
     body = models.TextField()
     created_on = models.DateTimeField(default=timezone.now)
     author = models.ForeignKey(User, on_delete=models.CASCADE)
-    likes = models.ManyToManyField(User, blank=True, related_name='likes')
-    dislikes = models.ManyToManyField(User, blank=True, related_name='dislikes')
 
-class Comment(models.Model):
- 	comment = models.TextField()
- 	created_on = models.DateTimeField(default=timezone.now)
- 	author = models.ForeignKey(User, on_delete=models.CASCADE)
- 	post = models.ForeignKey('Post', on_delete=models.CASCADE)
-
-class UserProfile(models.Model):
-	user = models.OneToOneField(User, primary_key=True, verbose_name='user', related_name='profile', on_delete=models.CASCADE)
-	name = models.CharField(max_length=30, blank=True, null=True)
-	bio = models.TextField(max_length=500, blank=True, null=True)
-	birth_date=models.DateField(null=True, blank=True)
-	location = models.CharField(max_length=100, blank=True, null=True)
-	picture = models.ImageField(upload_to='uploads/profile_pictures', default='uploads/profile_pictures/default.png', blank=True)
-	followers = models.ManyToManyField(User, blank=True, related_name='followers')
-
-@receiver(post_save, sender=User)
-def create_user_profile(sender, instance, created, **kwargs):
-	if created:
-		UserProfile.objects.create(user=instance)
 
-@receiver(post_save, sender=User)
-def save_user_profile(sender, instance, **kwargs):
-	instance.profile.save()
+class Comment(models.Model):
+    comment = models.TextField()
+    created_on = models.DateTimeField(default=timezone.now)
+    post = models.ForeignKey('Post', on_delete=models.CASCADE)
+    author = models.ForeignKey(User, on_delete=models.CASCADE)

src/social/templates/social/comment_delete.html

@@ -1,24 +1,24 @@
 {% extends 'landing/base.html' %}
+{% load crispy_forms_tags %}
 
 {% block content %}
 <div class="container">
     <div class="row mt-5">
-        <div class="col-md-5 col-sm-6">
-            <a href="{% url 'post-detail' object.post.pk %}" class="btn btn-light">Back To Post</a>
+        <div class="col-md-3 col-sm-6">
+            <a href="{% url 'post-detail' object.post.pk %}" class="btn btn-light">Back to Feed</a>
         </div>
     </div>
-
-    <div class="row justify-content-center mt-3 mb-5">
-        <div class="col-md-5 col-sm-12 border-bottom">
-            <form method="POST">
-                {% csrf_token %}
-                <h5>Are You Sure?</h5>
-                <p>You are about to delete this comment, this cannot be undone.</p>
-                <div class="d-grid gap-2">
-                    <button class="btn btn-danger mt-3">Delete</button>
-                </div>
-            </form>
-        </div>
+    <div class="row justify-content-center mt-5">
+        <div class="col-md-5 col-sm-12">
+            <h5>Are You Sure?</h5>
+            <p>You are about to delete this comment, this cannot be undone.</p>
+        <form method="POST">
+            {% csrf_token %}
+            <div class="d-grid gap-2">
+                <button type="submit" class="btn btn-danger">Delete</button>
+            </div>
+        </form>
+    </div>
     </div>
 </div>
 {% endblock content %}

src/social/templates/social/post_delete.html

@@ -1,24 +1,24 @@
 {% extends 'landing/base.html' %}
+{% load crispy_forms_tags %}
 
 {% block content %}
 <div class="container">
     <div class="row mt-5">
-        <div class="col-md-5 col-sm-6">
-            <a href="{% url 'post-detail' object.pk %}" class="btn btn-light">Back To Post</a>
+        <div class="col-md-3 col-sm-6">
+            <a href="{% url 'post-detail' object.pk %}" class="btn btn-light">Back to Feed</a>
         </div>
     </div>
-
-    <div class="row justify-content-center mt-3 mb-5">
-        <div class="col-md-5 col-sm-12 border-bottom">
-            <form method="POST">
-                {% csrf_token %}
-                <h5>Are You Sure?</h5>
-                <p>You are about to delete this post, this cannot be undone.</p>
-                <div class="d-grid gap-2">
-                    <button class="btn btn-danger mt-3">Delete</button>
-                </div>
-            </form>
-        </div>
+    <div class="row justify-content-center mt-5">
+        <div class="col-md-5 col-sm-12">
+            <h5>Are You Sure?</h5>
+            <p>You are about to delete this post, this cannot be undone.</p>
+        <form method="POST">
+            {% csrf_token %}
+            <div class="d-grid gap-2">
+                <button type="submit" class="btn btn-danger">Delete</button>
+            </div>
+        </form>
+    </div>
     </div>
 </div>
 {% endblock content %}

src/social/templates/social/post_detail.html

@@ -4,47 +4,28 @@
 {% block content %}
 <div class="container">
     <div class="row mt-5">
-        <div class="col-md-5 col-sm-6">
-            <a href="{% url 'post-list' %}" class="btn btn-light">Back To Feed</a>
+        <div class="col-md-3 col-sm-6">
+            <a href="{% url 'post-list' %}" class="btn btn-light">Back to Feed</a>
         </div>
     </div>
-
     <div class="row justify-content-center mt-3">
         <div class="col-md-5 col-sm-12 border-bottom">
-                <div>
-                    <a href="{% url 'profile' post.author.profile.pk %}">
-                        <img class="round-circle post-img" height="30" width="30" src="{{ post.author.profile.picture.url }}" />
-                    </a>
-                    <p class="post-text">
-                        <a class="text-primary post-link" href="{% url 'profile' post.author.profile.pk %}">@{{ post.author }}</a> {{ post.created_on }}
-                    </p>
-                </div>
+            <p>
+                <strong>{{ post.author }}</strong> {{ post.created_on }}
                 {% if request.user == post.author %}
-                    <a href="{% url 'post-edit' post.pk %}" class="edit-color"><i class="far fa-edit"></i></a>
-                    <a href="{% url 'post-delete' post.pk %}" class="edit-color"><i class="fas fa-trash"></i></a>
+                <a href="{% url 'post-edit' post.pk %}" style="color: #333;"><i class="far fa-edit"></i></a>
+                <a href="{% url 'post-delete' post.pk %}" style="color: #333;"><i class="fas fa-trash"></i></a>
                 {% endif %}
+            </p>
             <p>{{ post.body }}</p>
-
-            <div class="d-flex flex-row">
-                <form method="POST" action="{% url 'like' post.pk %}">
-                    {% csrf_token %}
-                    <input type="hidden" name="next" value="{{ request.path }}">
-                    <button class="remove-default-btn" type="submit">
-                        <i class="far fa-thumbs-up"> <span>{{ post.likes.all.count }}</span></i>
-                    </button>
-                </form>
-
-                <form method="POST" action="{% url 'dislike' post.pk %}">
-                    {% csrf_token %}
-                    <input type="hidden" name="next" value="{{ request.path }}">
-                    <button class="remove-default-btn" type="submit">
-                        <i class="far fa-thumbs-down"> <span>{{ post.dislikes.all.count }}</span></i>
-                    </button>
-                </form>
-        </div>
         </div>
     </div>
 
+    <div class="row justify-content-center mt-3">
+        <div class="col-md-5 col-sm-12">
+            <h5>Add a Comment!</h5>
+        </div>
+    </div>
     <div class="row justify-content-center mt-3 mb-5">
         <div class="col-md-5 col-sm-12">
             <form method="POST">
@@ -57,19 +38,12 @@
         </div>
     </div>
     {% for comment in comments %}
-    <div class="row justify-content-center mt-3 mb-5">
-        <div class="col-md-5 col-sm-12 border-bottom">
+    <div class="row justify-content-center mt-3 mb-5 border-bottom">
+        <div class="col-md-5 col-sm-12">
             <p>
-                <div>
-                    <a href="{% url 'profile' comment.author.profile.pk %}">
-                        <img class="round-circle post-img" height="30" width="30" src="{{ comment.author.profile.picture.url }}" />
-                    </a>
-                    <p class="post-text">
-                        <a class="text-primary post-link" href="{% url 'profile' comment.author.profile.pk %}">@{{ comment.author }}</a> {{ comment.created_on }}
-                    </p>
-                </div>
+                <strong>{{ comment.author }}</strong> {{ comment.created_on }}
                 {% if request.user == comment.author %}
-                    <a href="{% url 'comment-delete' post.pk comment.pk %}" class="edit-color"><i class="fas fa-trash"></i></a>
+                <a href="{% url 'comment-delete' post.pk comment.pk %}" style="color: #333;"><i class="fas fa-trash"></i></a>
                 {% endif %}
             </p>
             <p>{{ comment.comment }}</p>
@@ -77,4 +51,4 @@
     </div>
     {% endfor %}
 </div>
-{% endblock content %}
+{% endblock content %}

src/social/templates/social/post_edit.html

@@ -4,19 +4,17 @@
 {% block content %}
 <div class="container">
     <div class="row mt-5">
-        <div class="col-md-5 col-sm-6">
-            <a href="{% url 'post-detail' object.pk %}" class="btn btn-light">Back To Post</a>
+        <div class="col-md-3 col-sm-6">
+            <a href="{% url 'post-detail' object.pk %}" class="btn btn-light">Back to Feed</a>
         </div>
     </div>
-
-    <div class="row justify-content-center mt-3">
-        <div class="col-md-5 col-sm-12 border-bottom">
-            <h5>Update Your Post!</h5>
+    <div class="row justify-content-center mt-5">
+        <div class="col-md-5 col-sm-12">
+            <h5>Update Your Post</h5>
         </div>
     </div>
-
     <div class="row justify-content-center mt-3 mb-5">
-        <div class="col-md-5 col-sm-12 border-bottom">
+        <div class="col-md-5 col-sm-12">
             <form method="POST">
                 {% csrf_token %}
                 {{ form | crispy }}
@@ -27,4 +25,4 @@
         </div>
     </div>
 </div>
-{% endblock content %}
+{% endblock content %}

src/social/templates/social/post_list.html

@@ -2,59 +2,31 @@
 {% load crispy_forms_tags %}
 
 {% block content %}
-<div class="container">
-    <div class="row justify-content-center mt-3">
-        <div class="col-md-5 col-sm-12 border-bottom">
-            <h5>Add a Post!</h5>
-        </div>
-    </div>
-
-    <div class="row justify-content-center mt-3 mb-5">
-        <div class="col-md-5 col-sm-12 border-bottom">
-            <form method="POST">
-                {% csrf_token %}
-                {{ form | crispy }}
-                <div class="d-grid gap-2">
-                    <button class="btn btn-success mt-3">Submit!</button>
-                </div>
-            </form>
+    <div class="container">
+        <div class="row justify-content-center mt-3">
+            <div class="col-md-5 col-sm-12">
+                <h5>Add a Post!</h5>
+            </div>
         </div>
-    </div>
-
-    {% for post in post_list %}
-    <div class="row justify-content-center mt-3">
-        <div class="col-md-5 col-sm-12 border-bottom position-relative">
-            <div>
-                <a href="{% url 'profile' post.author.profile.pk %}">
-                    <img class="round-circle post-img" height="30" width="30" src="{{ post.author.profile.picture.url }}" />
-                </a>
-                <p class="post-text">
-                    <a class="text-primary post-link" href="{% url 'profile' post.author.profile.pk %}">@{{ post.author }}</a> {{ post.created_on }}
-                </p>
+        <div class="row justify-content-center mt-3 mb-5">
+            <div class="col-md-5 col-sm-12">
+                <form method="POST">
+                    {% csrf_token %}
+                    {{ form | crispy }}
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-success mt-3">Submit!</button>
+                    </div>
+                </form>
             </div>
-            <div class="position-relative">
+        </div>
+        {% for post in post_list %}
+        <div class="row justify-content-center mt-3">
+            <div class="col-md-5 col-sm-12 border-bottom position-relative">
+                <p><strong>{{ post.author }}</strong> {{ post.created_on }}</p>
                 <p>{{ post.body }}</p>
-                <a href="{% url 'post-detail' post.pk %}" class="stretched-link"></a>
+                <a class="stretched-link" href="{% url 'post-detail' post.pk %}"></a>
             </div>
-
-            <div class="d-flex flex-row">
-                <form method="POST" action="{% url 'like' post.pk %}">
-                    {% csrf_token %}
-                    <input type="hidden" name="next" value="{{ request.path }}">
-                    <button class="remove-default-btn" type="submit">
-                        <i class="far fa-thumbs-up"> <span>{{ post.likes.all.count }}</span></i>
-                    </button>
-                </form>
-
-                <form method="POST" action="{% url 'dislike' post.pk %}">
-                    {% csrf_token %}
-                    <input type="hidden" name="next" value="{{ request.path }}">
-                    <button class="remove-default-btn" type="submit">
-                        <i class="far fa-thumbs-down"> <span>{{ post.dislikes.all.count }}</span></i>
-                    </button>
-                </form>
         </div>
+        {% endfor %}
     </div>
-    {% endfor %}
-</div>
-{% endblock content %}
+{% endblock content %}

src/social/templates/social/profile.html

@@ -1,101 +0,0 @@
-{% extends 'landing/base.html' %}
-
-{% block content %}
-<div class="container">
-    <div class="row mt-5">
-        <div class="col-md-3 col-sm-6">
-            <a href="{% url 'post-list' %}" class="btn btn-light">Back to Feed</a>
-        </div>
-    </div>
-
-    <div class="row justify-content-center mt-5">
-        <div class="card shadow-sm col-md-8 col-sm-12 border-bottom px-5 pt-3">
-            <img src="{{ profile.picture.url }}" class="rounded-circle" width="100" height="100" />
-            {% if profile.name %}
-            <h3 class="py-4">{{ profile.name }}
-                <span>
-                    {% if request.user == user %}
-                        <a href="{% url 'profile-edit' profile.pk %}" class="edit-color"><i class="far fa-edit"></i></a>
-                    {% endif %}
-                </span>
-                {% else %}
-                <h3 class="py-4">{{ user.username }}
-                    <span>
-                        {% if request.user == user %}
-                            <a href="{% url 'profile-edit' profile.pk %}" class="edit-color"><i class="far fa-edit"></i></a>
-                        {% endif %}
-                    </span>
-                </h3>
-                {% endif %}
-            </h3>
-
-            {% if profile.location %}
-            <p>{{ profile.location }}</p>
-            {% endif %}
-
-            {% if profile.birth_date %}
-            <p>{{ profile.birth_date }}</p>
-            {% endif %}
-
-            {% if profile.bio %}
-            <p>{{ profile.bio }}</p>
-            {% endif %}
-
-            <div class="mb-3">
-                <p>Followers: {{ number_of_followers }}</p>
-                {% if user == request.user %}
-                {% else %}
-                {% if is_following %}
-                <form method="POST" action="{% url 'remove-follower' profile.pk %}">
-                    {% csrf_token %}
-                    <button class="btn btn-outline-danger" type="submit">Unfollow</button>
-                </form>
-                {% else %}
-                <form method="POST" action="{% url 'add-follower' profile.pk %}">
-                    {% csrf_token %}
-                    <button class="btn btn-outline-success" type="submit">Follow</button>
-                </form>
-                {% endif %}
-                {% endif %}
-            </div>
-        </div>
-    </div>
-
-    {% for post in posts %}
-    <div class="row justify-content-center mt-5">
-        <div class="col-md-8 col-sm-12 border-bottom">
-            <div>
-                <a href="{% url 'profile' post.author.profile.pk %}">
-                    <img class="round-circle post-img" height="30" width="30" src="{{ post.author.profile.picture.url }}" />
-                </a>
-                <p class="post-text">
-                    <a class="text-primary post-link" href="{% url 'profile' post.author.profile.pk %}">@{{ post.author }}</a> {{ post.created_on }}
-                </p>
-            </div>
-            <div class="position-relative">
-                <p>{{ post.body }}</p>
-                <a href="{% url 'post-detail' post.pk %}" class="stretched-link"></a>
-            </div>
-
-            <div class="d-flex flex-row">
-                <form method="POST" action="{% url 'like' post.pk %}">
-                    {% csrf_token %}
-                    <input type="hidden" name="next" value="{{ request.path }}">
-                    <button class="remove-default-btn" type="submit">
-                        <i class="far fa-thumbs-up"> <span>{{ post.likes.all.count }}</span></i>
-                    </button>
-                </form>
-
-                <form method="POST" action="{% url 'dislike' post.pk %}">
-                    {% csrf_token %}
-                    <input type="hidden" name="next" value="{{ request.path }}">
-                    <button class="remove-default-btn" type="submit">
-                        <i class="far fa-thumbs-down"> <span>{{ post.dislikes.all.count }}</span></i>
-                    </button>
-                </form>
-        </div>
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endblock content %}

src/social/templates/social/profile_edit.html

@@ -1,30 +0,0 @@
-{% extends 'landing/base.html' %}
-{% load crispy_forms_tags %}
-
-{% block content %}
-<div class="container">
-    <div class="row mt-5">
-        <div class="col-md-5 col-sm-6">
-            <a href="{% url 'profile' object.pk %}" class="btn btn-light">Back To Profile</a>
-        </div>
-    </div>
-
-    <div class="row justify-content-center mt-3">
-        <div class="col-md-5 col-sm-12 border-bottom">
-            <h5>Update Your Profile</h5>
-        </div>
-    </div>
-
-    <div class="row justify-content-center mt-3 mb-5">
-        <div class="col-md-5 col-sm-12 border-bottom">
-            <form method="POST" enctype="multipart/form-data">
-                {% csrf_token %}
-                {{ form | crispy }}
-                <div class="d-grid gap-2">
-                    <button class="btn btn-success mt-3">Submit!</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-{% endblock content %}

src/social/templates/social/search.html

@@ -1,31 +0,0 @@
-{% extends 'landing/base.html' %}
-
-{% block content %}
-<div class="container">
-    <div class="row mt-5">
-        <div class="col-md-5 col-sm-6">
-            <a href="{% url 'post-list' %}" class="btn btn-light">Back To Feed</a>
-        </div>
-    </div>
-    
-    {% for profile in profile_list %}
-        <div class="row justify-content-center mt-3">
-            <div class="col-md-5 col-sm-12 border-bottom position-relative">
-                <div>
-                    <a href="{% url 'profile' profile.pk %}">
-                        <img class="round-circle post-img" height="30" width="30" src="{{ profile.picture.url }}" />
-                    </a>
-                    <p class="post-text">
-                        <a class="text-primary post-link" href="{% url 'profile' profile.pk %}">@{{ profile.user }}</a>
-                    </p>
-                </div>
-                <p><a class="text-primary post-link" href="{% url 'profile' profile.pk %}">@{{ profile.user }}</a></p>
-                {% if profile.location %}
-                    <p>{{ profile.location }}</p>
-                {% endif %}
-                <p>Followers: {{ profile.followers.all.count }}</p>
-            </div>
-        </div>
-    {% endfor %}
-</div>
-{% endblock content %}

src/social/urls.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from .views import PostListView, PostDetailView, PostEditView, PostDeleteView, CommentDeleteView, ProfileView, ProfileEditView, AddFollower, RemoveFollower, AddLike, AddDislike, UserSearch
+from .views import PostListView, PostDetailView, PostEditView, PostDeleteView, CommentDeleteView
 
 urlpatterns = [
     path('', PostListView.as_view(), name='post-list'),
@@ -7,11 +7,4 @@ urlpatterns = [
     path('post/edit/<int:pk>/', PostEditView.as_view(), name='post-edit'),
     path('post/delete/<int:pk>/', PostDeleteView.as_view(), name='post-delete'),
     path('post/<int:post_pk>/comment/delete/<int:pk>/', CommentDeleteView.as_view(), name='comment-delete'),
-    path('post/<int:pk>/like', AddLike.as_view(), name='like'),
-    path('post/<int:pk>/dislike', AddDislike.as_view(), name='dislike'),
-    path('profile/<int:pk>/', ProfileView.as_view(), name='profile'),
-    path('profile/edit/<int:pk>/', ProfileEditView.as_view(), name='profile-edit'),
-    path('profile/<int:pk>/followers/add', AddFollower.as_view(), name='add-follower'),
-    path('profile/<int:pk>/followers/remove', RemoveFollower.as_view(), name='remove-follower'),
-    path('search/', UserSearch.as_view(), name='profile-search'),
 ]

src/social/views.py

@@ -1,34 +1,25 @@
-from django.shortcuts import render, redirect
-from django.db.models import Q
+from django.shortcuts import render
 from django.urls import reverse_lazy
-from django.http import HttpResponseRedirect
 from django.contrib.auth.mixins import UserPassesTestMixin, LoginRequiredMixin
 from django.views import View
-from .models import Post, Comment, UserProfile
-from .forms import PostForm, CommentForm
 from django.views.generic.edit import UpdateView, DeleteView
+from .models import Post, Comment
+from .forms import PostForm, CommentForm
 
 
 class PostListView(LoginRequiredMixin, View):
     def get(self, request, *args, **kwargs):
-        logged_in_user = request.user
-        posts = Post.objects.filter(
-            author__profile__followers__in=[logged_in_user.id]
-        ).order_by('-created_on')
+        posts = Post.objects.all().order_by('-created_on')
         form = PostForm()
 
         context = {
             'post_list': posts,
             'form': form,
         }
-
         return render(request, 'social/post_list.html', context)
 
     def post(self, request, *args, **kwargs):
-        logged_in_user = request.user
-        posts = Post.objects.filter(
-            author__profile__followers__in=[logged_in_user.id]
-        ).order_by('-created_on')
+        posts = Post.objects.all().order_by('-created_on')
         form = PostForm(request.POST)
 
         if form.is_valid():
@@ -40,14 +31,12 @@ class PostListView(LoginRequiredMixin, View):
             'post_list': posts,
             'form': form,
         }
-
         return render(request, 'social/post_list.html', context)
 
 class PostDetailView(LoginRequiredMixin, View):
     def get(self, request, pk, *args, **kwargs):
         post = Post.objects.get(pk=pk)
         form = CommentForm()
-
         comments = Comment.objects.filter(post=post).order_by('-created_on')
 
         context = {
@@ -57,6 +46,7 @@ class PostDetailView(LoginRequiredMixin, View):
         }
 
         return render(request, 'social/post_detail.html', context)
+
     def post(self, request, pk, *args, **kwargs):
         post = Post.objects.get(pk=pk)
         form = CommentForm(request.POST)
@@ -66,7 +56,7 @@ class PostDetailView(LoginRequiredMixin, View):
             new_comment.author = request.user
             new_comment.post = post
             new_comment.save()
-
+        
         comments = Comment.objects.filter(post=post).order_by('-created_on')
 
         context = {
@@ -81,11 +71,11 @@ class PostEditView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
     model = Post
     fields = ['body']
     template_name = 'social/post_edit.html'
-
+    
     def get_success_url(self):
         pk = self.kwargs['pk']
         return reverse_lazy('post-detail', kwargs={'pk': pk})
-
+    
     def test_func(self):
         post = self.get_object()
         return self.request.user == post.author
@@ -108,135 +98,5 @@ class CommentDeleteView(LoginRequiredMixin, UserPassesTestMixin, DeleteView):
         return reverse_lazy('post-detail', kwargs={'pk': pk})
 
     def test_func(self):
-        post = self.get_object()
-        return self.request.user == post.author
-
-class ProfileView(View):
-    def get(self, request, pk, *args, **kwargs):
-        profile = UserProfile.objects.get(pk=pk)
-        user = profile.user
-        posts = Post.objects.filter(author=user).order_by('-created_on')
-
-        followers = profile.followers.all()
-
-        if len(followers) == 0:
-            is_following = False
-
-        for follower in followers:
-            if follower == request.user:
-                is_following = True
-                break
-            else:
-                is_following = False
-
-        number_of_followers = len(followers)
-
-        context = {
-            'user': user,
-            'profile': profile,
-            'posts': posts,
-            'number_of_followers': number_of_followers,
-            'is_following': is_following,
-        }
-
-        return render(request, 'social/profile.html', context)
-
-class ProfileEditView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
-    model = UserProfile
-    fields = ['name', 'bio', 'birth_date', 'location', 'picture']
-    template_name = 'social/profile_edit.html'
-
-    def get_success_url(self):
-        pk = self.kwargs['pk']
-        return reverse_lazy('profile', kwargs={'pk': pk})
-
-    def test_func(self):
-        profile = self.get_object()
-        return self.request.user == profile.user
-
-class AddFollower(LoginRequiredMixin, View):
-    def post(self, request, pk, *args, **kwargs):
-        profile = UserProfile.objects.get(pk=pk)
-        profile.followers.add(request.user)
-
-        return redirect('profile', pk=profile.pk)
-
-class RemoveFollower(LoginRequiredMixin, View):
-    def post(self, request, pk, *args, **kwargs):
-        profile = UserProfile.objects.get(pk=pk)
-        profile.followers.remove(request.user)
-
-        return redirect('profile', pk=profile.pk)
-
-class AddLike(LoginRequiredMixin, View):
-    def post(self, request, pk, *args, **kwargs):
-        post = Post.objects.get(pk=pk)
-
-        is_dislike = False
-
-        for dislike in post.dislikes.all():
-            if dislike == request.user:
-                is_dislike = True
-                break
-
-        if is_dislike:
-            post.dislikes.remove(request.user)
-
-        is_like = False
-
-        for like in post.likes.all():
-            if like == request.user:
-                is_like = True
-                break
-
-        if not is_like:
-            post.likes.add(request.user)
-
-        if is_like:
-            post.likes.remove(request.user)
-
-        next = request.POST.get('next', '/')
-        return HttpResponseRedirect(next)
-
-class AddDislike(LoginRequiredMixin, View):
-    def post(self, request, pk, *args, **kwargs):
-        post = Post.objects.get(pk=pk)
-
-        is_like = False
-
-        for like in post.likes.all():
-            if like == request.user:
-                is_like = True
-                break
-
-        if is_like:
-            post.likes.remove(request.user)
-
-        is_dislike = False
-
-        for dislike in post.dislikes.all():
-            if dislike == request.user:
-                is_dislike = True
-                break
-
-        if not is_dislike:
-            post.dislikes.add(request.user)
-
-        if is_dislike:
-            post.dislikes.remove(request.user)
-
-        next = request.POST.get('next', '/')
-        return HttpResponseRedirect(next)
-
-class UserSearch(View):
-    def get(self, request, *args, **kwargs):
-        query = self.request.GET.get('query')
-        profile_list = UserProfile.objects.filter(
-            Q(user__username__icontains=query)
-        )
-
-        context = {
-            'profile_list': profile_list,
-        }
-
-        return render(request, 'social/search.html', context)
+        comment = self.get_object()
+        return self.request.user == comment.author