From c35952667e493583ee6952a8edcc480f7fd135db Mon Sep 17 00:00:00 2001
From: TimOsahenru <timosahenru@gmail.com>
Date: Tue, 1 Nov 2022 14:36:55 +0000
Subject: [PATCH 1/3] user categories to profile

---
 project/accounts/forms.py                     |  8 +++++++
 .../accounts/templates/accounts/account.html  | 23 +++++++++++--------
 .../accounts/templates/accounts/settings.html |  6 ++---
 project/accounts/views.py                     |  3 +++
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/project/accounts/forms.py b/project/accounts/forms.py
index af0d18db..1b30594c 100644
--- a/project/accounts/forms.py
+++ b/project/accounts/forms.py
@@ -110,6 +110,7 @@ class ProfileEditForm(forms.ModelForm):
 
     class Meta:
         model = Profile
+
         fields = [
             "first_name",
             "last_name",
@@ -117,7 +118,9 @@ class Meta:
             "profile_image",
             "username",
             "email",
+            "categories",
         ]
+        widgets = {"categories": forms.CheckboxSelectMultiple()}
 
     first_name = forms.CharField(label="First Name", max_length=63, required=False)
     last_name = forms.CharField(label="Last Name", max_length=63, required=False)
@@ -125,6 +128,11 @@ class Meta:
     email = forms.EmailField(label="Email", disabled=True)
     username = forms.CharField(label="Username", disabled=True)
     profile_image = forms.ImageField(required=False)
+    # categories = forms.ModelMultipleChoiceField(
+    #     queryset=Category.objects.all(),
+    #     required=False,
+    #     widget=forms.CheckboxSelectMultiple
+    # )
 
 
 class UpdatePassword(forms.ModelForm):
diff --git a/project/accounts/templates/accounts/account.html b/project/accounts/templates/accounts/account.html
index e9c6602b..cbf49e6b 100644
--- a/project/accounts/templates/accounts/account.html
+++ b/project/accounts/templates/accounts/account.html
@@ -22,15 +22,15 @@
 
     <!-- Prevent users from following themselves. -->
     {% if not profile == request.user.profile %}
-      {% if profile not in request.user.profile.following.all %}
-        <a href="{% url 'profile-follow' profile.user.username %}" class="waves-effect waves-light btn follow-btn" id="sidebar-follow-btn">
-          follow
-        </a>
-      {% else %}
-          <a href="{% url 'profile-unfollow' profile.user.username %}" class="waves-effect waves-light btn follow-btn" id="sidebar-follow-btn">
-            unfollow
-          </a>
-      {% endif %}
+    {% if profile not in request.user.profile.following.all %}
+    <a href="{% url 'profile-follow' profile.user.username %}" class="waves-effect waves-light btn follow-btn" id="sidebar-follow-btn">
+      follow
+    </a>
+    {% else %}
+    <a href="{% url 'profile-unfollow' profile.user.username %}" class="waves-effect waves-light btn follow-btn" id="sidebar-follow-btn">
+      unfollow
+    </a>
+    {% endif %}
     {% endif %}
 
     <div class="user-info section">
@@ -45,6 +45,11 @@
           <div class="section-title">ABOUT ME</div>
           <div class="divider"></div>
           <div class="about-me">{{ profile.about_me }}</div>
+          <div class="divider"></div>
+          <div class="section-title">CATEGORIES</div>
+          {% for category in categories %}
+          <div class="about-me">{{ category.name }}</div>
+          {% endfor %}
         </div>
       </div>
     </div>
diff --git a/project/accounts/templates/accounts/settings.html b/project/accounts/templates/accounts/settings.html
index 8fb956d2..67fface2 100644
--- a/project/accounts/templates/accounts/settings.html
+++ b/project/accounts/templates/accounts/settings.html
@@ -68,9 +68,9 @@
                         </div>
                     </div>
                     <div class="row center">
-                        {%if not readonly %}
+                        {% if not readonly %}
                         <button class='btn' type='submit' value="Save Changes">Save Changes</button>
-                        {% endif%}
+                        {% endif %}
                     </div>
                 </form>
                 <div class="row center">
@@ -86,7 +86,7 @@
 <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function(event) {
         const button = document.getElementById('delete-account-button');
-        
+
         button.addEventListener('click', (event) => {
             // Confirm user intent before committing to expunge
             if (window.confirm('Are you certain you want to expunge your information? This action is irreversible.')) {
diff --git a/project/accounts/views.py b/project/accounts/views.py
index e0d68b60..083906ab 100644
--- a/project/accounts/views.py
+++ b/project/accounts/views.py
@@ -168,6 +168,7 @@ def get_initial(self):
                 "last_name": profile.last_name or None,
                 "about_me": profile.about_me or None,
                 "profile_image": profile.profile_image or None,
+                "categories": profile.categories.add() or None,
             }
         )
         return super(SettingsView, self).get_initial()
@@ -178,12 +179,14 @@ class UserProfileView(LoginRequiredMixin, View):
 
     def get(self, request, username=None):
         profile = get_object_or_404(Profile, user__username=username)
+        categories = profile.categories.all()
 
         return TemplateResponse(
             request,
             "account.html",
             {
                 "profile": profile,
+                "categories": categories,
             },
         )
 

From 2f63423ca1ce0208aa7f2b73783c0d3599978c66 Mon Sep 17 00:00:00 2001
From: TimOsahenru <timosahenru@gmail.com>
Date: Wed, 2 Nov 2022 09:51:08 +0000
Subject: [PATCH 2/3] Added categories to user profile

---
 project/accounts/forms.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/accounts/forms.py b/project/accounts/forms.py
index 1b30594c..723854c1 100644
--- a/project/accounts/forms.py
+++ b/project/accounts/forms.py
@@ -1,6 +1,7 @@
 import re
 
 from accounts.models import Profile
+from categories.models import Category
 from django import forms
 from django.contrib.auth import get_user_model
 from django.core.files.images import get_image_dimensions
@@ -120,7 +121,6 @@ class Meta:
             "email",
             "categories",
         ]
-        widgets = {"categories": forms.CheckboxSelectMultiple()}
 
     first_name = forms.CharField(label="First Name", max_length=63, required=False)
     last_name = forms.CharField(label="Last Name", max_length=63, required=False)
@@ -128,11 +128,11 @@ class Meta:
     email = forms.EmailField(label="Email", disabled=True)
     username = forms.CharField(label="Username", disabled=True)
     profile_image = forms.ImageField(required=False)
-    # categories = forms.ModelMultipleChoiceField(
-    #     queryset=Category.objects.all(),
-    #     required=False,
-    #     widget=forms.CheckboxSelectMultiple
-    # )
+    categories = forms.ModelMultipleChoiceField(
+        queryset=Category.objects.all(),
+        required=False,
+        widget=forms.CheckboxSelectMultiple(),
+    )
 
 
 class UpdatePassword(forms.ModelForm):

From ed37c544e790d2ee24e87425694168c5150bea17 Mon Sep 17 00:00:00 2001
From: TimOsahenru <timosahenru@gmail.com>
Date: Sat, 5 Nov 2022 19:02:05 +0000
Subject: [PATCH 3/3] modified users category in profile

---
 .../accounts/templates/accounts/account.html  |   8 +-
 .../accounts/templates/accounts/settings.html | 132 +++++++++---------
 project/accounts/views.py                     |   4 +-
 3 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/project/accounts/templates/accounts/account.html b/project/accounts/templates/accounts/account.html
index cbf49e6b..9858595d 100644
--- a/project/accounts/templates/accounts/account.html
+++ b/project/accounts/templates/accounts/account.html
@@ -47,8 +47,12 @@
           <div class="about-me">{{ profile.about_me }}</div>
           <div class="divider"></div>
           <div class="section-title">CATEGORIES</div>
-          {% for category in categories %}
-          <div class="about-me">{{ category.name }}</div>
+          {% for category in profile.categories.all %}
+          {% if forloop.last %}
+          <p class="about-me">{{ category }}.</p>
+          {% else %}
+          <p class="about-me">{{ category }},</p>
+          {% endif %}
           {% endfor %}
         </div>
       </div>
diff --git a/project/accounts/templates/accounts/settings.html b/project/accounts/templates/accounts/settings.html
index 67fface2..b61d8f00 100644
--- a/project/accounts/templates/accounts/settings.html
+++ b/project/accounts/templates/accounts/settings.html
@@ -10,75 +10,75 @@
 
 {% block content %}
 <section style='display: flex;justify-content: center; padding-top: 20px;'>
-    <div class="setting card" style="width: 75%;">
-        <div class="card-content">
-            <div class="step-title">
-                <div class="section">
-                    <div class="title-lato center">
-                        Account Settings
-                    </div>
-                </div>
-                <div class="accent-line"></div>
-                {{form.non_field_errors}}
-                <form method="POST" enctype="multipart/form-data">
-                    {% csrf_token %}
-                    <div class='row'>
-                        <div class=" col s12 m6 ">
-                            <span class='error'>{{form.first_name.errors}}</span>
-                            {{form.first_name.label_tag}}
-                            {{form.first_name}}
-                        </div>
-                        <div class=" col s12 m6 ">
-                            <span class='error'>{{form.last_name.errors}}</span>
-                            {{form.last_name.label_tag}}
-                            {{form.last_name}}
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class=" col s12 m6 ">
-                            <span class='error'>{{form.profile_image.errors}}</span>
-                            {{form.profile_image.label_tag}}
-                            {{form.profile_image}}
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class=" col s12 m6 ">
-                            <span class='error'>{{form.username.errors}}</span>
-                            {{form.username.label_tag}}
-                            {{form.username}}
-                        </div>
-                        <div class=" col s12 m6 ">
-                            <span class='error'>{{form.email.errors}}</span>
-                            {{form.email.label_tag}}
-                            {{form.email}}
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class="col s24 m12">
-                            <span> {{form.about_me.errors}}</span>
-                            {{form.about_me.label_tag}}
-                            {{form.about_me}}
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class="col s24 m12">
-                            <span> {{form.categories.errors}}</span>
-                            {{form.categories.label_tag}}
-                            {{form.categories}}
-                        </div>
-                    </div>
-                    <div class="row center">
-                        {% if not readonly %}
-                        <button class='btn' type='submit' value="Save Changes">Save Changes</button>
-                        {% endif %}
-                    </div>
-                </form>
-                <div class="row center">
-                    <button id="delete-account-button" style="background-color: #ee6e73" class="cd-popup-trigger btn">Expunge Account</button>
-                </div>
+  <div class="setting card" style="width: 75%;">
+    <div class="card-content">
+      <div class="step-title">
+        <div class="section">
+          <div class="title-lato center">
+            Account Settings
+          </div>
+        </div>
+        <div class="accent-line"></div>
+        {{form.non_field_errors}}
+        <form method="POST" enctype="multipart/form-data">
+          {% csrf_token %}
+          <div class='row'>
+            <div class=" col s12 m6 ">
+              <span class='error'>{{form.first_name.errors}}</span>
+              {{form.first_name.label_tag}}
+              {{form.first_name}}
+            </div>
+            <div class=" col s12 m6 ">
+              <span class='error'>{{form.last_name.errors}}</span>
+              {{form.last_name.label_tag}}
+              {{form.last_name}}
+            </div>
+          </div>
+          <div class="row">
+            <div class=" col s12 m6 ">
+              <span class='error'>{{form.profile_image.errors}}</span>
+              {{form.profile_image.label_tag}}
+              {{form.profile_image}}
+            </div>
+          </div>
+          <div class='row'>
+            <div class=" col s12 m6 ">
+              <span class='error'>{{form.username.errors}}</span>
+              {{form.username.label_tag}}
+              {{form.username}}
+            </div>
+            <div class=" col s12 m6 ">
+              <span class='error'>{{form.email.errors}}</span>
+              {{form.email.label_tag}}
+              {{form.email}}
+            </div>
+          </div>
+          <div class='row'>
+            <div class="col s24 m12">
+              <span> {{form.about_me.errors}}</span>
+              {{form.about_me.label_tag}}
+              {{form.about_me}}
+            </div>
+          </div>
+          <div class='row'>
+            <div class="col s12 m6">
+              {{form.categories.errors}}
+              {{form.categories.label_tag}}
+              {{form.categories}}
             </div>
+          </div>
+          <div class="row center">
+            {% if not readonly %}
+            <button class='btn' type='submit' value="Save Changes">Save Changes</button>
+            {% endif %}
+          </div>
+        </form>
+        <div class="row center">
+          <button id="delete-account-button" style="background-color: #ee6e73" class="cd-popup-trigger btn">Expunge Account</button>
         </div>
+      </div>
     </div>
+  </div>
 </section>
 {% endblock content %}
 
diff --git a/project/accounts/views.py b/project/accounts/views.py
index 083906ab..04b2a4cb 100644
--- a/project/accounts/views.py
+++ b/project/accounts/views.py
@@ -179,14 +179,14 @@ class UserProfileView(LoginRequiredMixin, View):
 
     def get(self, request, username=None):
         profile = get_object_or_404(Profile, user__username=username)
-        categories = profile.categories.all()
+        # categories = profile.categories.all()
 
         return TemplateResponse(
             request,
             "account.html",
             {
                 "profile": profile,
-                "categories": categories,
+                # "categories": categories,
             },
         )