From 85d7112bbfe524a51bd2b7a1d0a8ae6bcd988ada Mon Sep 17 00:00:00 2001
From: Mahdi Ghasemi <106802820+ProdByGodfather@users.noreply.github.com>
Date: Sat, 6 Jan 2024 08:45:13 +0330
Subject: [PATCH] `v2.2.0` - Make profile form for update user data

---
 .idea/workspace.xml                         |  26 ++++++++++---
 chat/migrations/0004_alter_message_image.py |  18 +++++++++
 db.sqlite3                                  | Bin 184320 -> 204800 bytes
 templates/panel/base.html                   |   8 ++--
 templates/panel/profile.html                |  25 +++++++++++++
 users/forms.py                              |  39 +++++++++++++++++++-
 users/migrations/0004_user_bio.py           |  18 +++++++++
 users/models.py                             |   1 +
 users/urls.py                               |   3 +-
 users/views.py                              |  16 +++++++-
 10 files changed, 141 insertions(+), 13 deletions(-)
 create mode 100644 chat/migrations/0004_alter_message_image.py
 create mode 100644 templates/panel/profile.html
 create mode 100644 users/migrations/0004_user_bio.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f215f8..fa64e20 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="75d6329d-a681-4243-9015-c19bce1ea42e" name="Changes" comment="`v2.1.2` - Update Docs cleaning the codes.">
+    <list default="true" id="75d6329d-a681-4243-9015-c19bce1ea42e" name="Changes" comment="`v2.1.3` - fix redirect url bugs.">
+      <change afterPath="$PROJECT_DIR$/templates/panel/profile.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/django_channels/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/django_channels/settings.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/panel/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/panel/base.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/users/forms.py" beforeDir="false" afterPath="$PROJECT_DIR$/users/forms.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/users/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/users/models.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/users/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/users/urls.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/users/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/users/views.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -111,7 +117,8 @@
       <workItem from="1704396860327" duration="3966000" />
       <workItem from="1704439103722" duration="110000" />
       <workItem from="1704439430679" duration="940000" />
-      <workItem from="1704479280544" duration="365000" />
+      <workItem from="1704479280544" duration="1569000" />
+      <workItem from="1704489421984" duration="2427000" />
     </task>
     <task id="LOCAL-00001" summary="`v1.1.2` - fix some bugs">
       <option name="closed" value="true" />
@@ -161,7 +168,15 @@
       <option name="project" value="LOCAL" />
       <updated>1704404638083</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="`v2.1.3` - fix redirect url bugs.">
+      <option name="closed" value="true" />
+      <created>1704480250935</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1704480250935</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -174,6 +189,7 @@
     <MESSAGE value="`v2.1.0` - Create Register Form" />
     <MESSAGE value="`v2.1.1` - Update Docs and user experience" />
     <MESSAGE value="`v2.1.2` - Update Docs cleaning the codes." />
-    <option name="LAST_COMMIT_MESSAGE" value="`v2.1.2` - Update Docs cleaning the codes." />
+    <MESSAGE value="`v2.1.3` - fix redirect url bugs." />
+    <option name="LAST_COMMIT_MESSAGE" value="`v2.1.3` - fix redirect url bugs." />
   </component>
 </project>
\ No newline at end of file
diff --git a/chat/migrations/0004_alter_message_image.py b/chat/migrations/0004_alter_message_image.py
new file mode 100644
index 0000000..eba3ecf
--- /dev/null
+++ b/chat/migrations/0004_alter_message_image.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0 on 2024-01-05 21:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chat', '0003_message_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='image',
+            field=models.CharField(blank=True, max_length=500, null=True),
+        ),
+    ]
diff --git a/db.sqlite3 b/db.sqlite3
index 78733807d18227cfa39a84cdf794aea6ac2d8fb3..f310c9df64e855dc577db5e55788ca1a2898349e 100644
GIT binary patch
delta 1239
zcmb``Z)h8390%}wp3CKW$tAxSZIWirUS`)ZY?`~|k~GocG8whDvqLwXqD#{D+Jxnw
zNw&rpBb{Xf5vg01dm$T&8=G{qXe{UEi}lSwDyWQt)xj_f#Wy1Qrs(|lJcm;d!8acF
z{qQ^ozvp-NaL?=;_SqHj6~7y?48w#;wvuopJ5Th5F=F4%oB`G^oL%5uibYr#&bCsn
zywFtq9OK=VI#koDHCdL`G##bK^X0G{R)ew<l%rBuNk$^cNTNR~N99Q3{w|K`9868*
zvURf}Td0$gqE@SAr?qsxNc^{AHJ*^wXu?PO#sBKp>hXWi3D;m0jzbdeZ3Sc=x;pJ_
z2$i&%bei_Ky|T|`Uw9zYiw-VKgi6TYx)$n}2W;d6eb8j!7ubLw;XC*iZo&=t0@mPD
zScR*w0w2OMEWz9G7MubdPQXiW44SQh%n&p=79o6>>7Ax`n1ZRp)MhG}c9`;}*uo0P
zNAXfTlunA9;-WYyBE?RzQaFl*!m_OX+k-gJbrr6_C1}A#I0tXS>+l-P!;3HnM_P%@
zE^yOs9X?YpmGkJYj^QNg)K|xFd=AYTXcqn6<Q-%u7#Fk5<6lE885q2be*%d<C6|Sy
zha^DKM-u!q0Yln>Pj8k=h1gWI8Xqr~RZS^m^J=7#%h#02+|;4NQ>t9mZ#;|NAFl0G
zk`uAU!9Bx|jWkN*x!uEBU8__p1AEoSBlV}pVowHx`?bpcM{<SA!_&3fe}R&qzfd%m
z49ENBm@F$X<N5*omFqvd8rREs1K=OUdb^1w2Ry{E;t%9@o^h<T0@6*<eKdoBIXajU
zyxvU?L5Pg(()Z5eiSEDaql&Dk#cXaezne0Y%ht4_zB-R1ckii|r>ogwQL9SX(xfz_
zjZ2f-VXaWEXjNnFWn4yd4=)=-^Z2r>yTilStsLW6acmb)+Lmn%p>5^(wsTGt>?P|y
za<;zaY;#X3yf+X)$B!7&dAx$$ebN?kvbIQdtx=aA-8VYAU2mVmQL-@lSpQ@P>NXPR
zahyd_{kcUvh&uG8Mf?m>b@2j@Bc9GS8R-kS7o&)7&7vOEZ`_wfBM3!}jU_BdDn0KA
zZV{O<+yblf9p@8H-tmE>;E=?R#OKAW_Rs7u*dw-YY{zV2VIBXB7s<QMVB;djeLM;o
zUkdnhPS}Qd#+yO{qhA6n3B8C;1u|^|-i#H`dl`!)d+;Iy>*Q=5`2QOj?JM{m7n1(~
D|FA9X

delta 454
zcmZoTz|*jRdxDe@!!HH~23;VA0h@_BMobL9HYP0LXO`d+oy;y^xLHx*F6U-Zsei1T
zR{WRvefZn>RW~adaPo@_b1`c(=B1X$$CnnT78Qd@CIPm|Hu`FenUj<C^B5&IU((kz
z*!F;lMWLCcVLM9$<DYtVR-k2!{J*!dGyT<Pmf)}7&Thc;lYdfyJY)ZM1qY^ivI^Oj
zIaOI1rRfG{DT!%@rKXnoS&5~IIjIKOsX3K-B?Z&(#WHR2EHDhQa?Oi(i!8{?bM;Ls
zOHK53&x$Zjswj+1%PDuOvWP0w4K>V2FZB)yE=kKaGB7gHH89jQv{W#(urfBWGBVaP
zH#9RgG}(STj_H8_L0h-q&S(10&yS{g`onrA1zw<+n0c=-^E>k`;k^P3v17d3uk<qI
zGqN<AGxBYB?`PU2APZE(&Hj*qubKA%uO`nV9!~B&uB}`ZoDVs~*dK0o6j;SReNO_T
w<n)KjnM|3RJq)LxbzoH3Zn=WVoOwEb3gi3j@oSjWn6|SfGFCG#+rXp%0RB9Q?*IS*

diff --git a/templates/panel/base.html b/templates/panel/base.html
index 6a7c987..f836e41 100644
--- a/templates/panel/base.html
+++ b/templates/panel/base.html
@@ -16,16 +16,16 @@
     <div class="wrapper">
         <nav id="sidebar" class="active">
             <div class="sidebar-header">
-                <img src="{% static 'assets/img/logo.jpg' %}" alt="Abarvision Logo" width="40px" class="app-logo">
+                <img src="{{ user.image.url }}" alt="Profile {{ user.username }}" width="40px" class="app-logo">
             </div>
             <ul class="list-unstyled components text-secondary">
                 <li>
                     <a href="{% url 'panel' %}"><i class="fas fa-home"></i> Dashboard</a>
                 </li>
 
-    {#                <li>#}
-    {#                    <a href="icons.html"><i class="fas fa-icons"></i> Icons</a>#}
-    {#                </li>#}
+                    <li>
+                        <a href="{% url 'profile' %}"><i class="fas fa-file-alt"></i>Profile</a>
+                    </li>
     {#                <li>#}
     {#                    <a href="#uielementsmenu" data-bs-toggle="collapse" aria-expanded="false" class="dropdown-toggle no-caret-down"><i class="fas fa-layer-group"></i> UI Elements</a>#}
     {#                    <ul class="collapse list-unstyled" id="uielementsmenu">#}
diff --git a/templates/panel/profile.html b/templates/panel/profile.html
new file mode 100644
index 0000000..45da6e5
--- /dev/null
+++ b/templates/panel/profile.html
@@ -0,0 +1,25 @@
+{% extends 'panel/base.html' %}
+{% load static %}
+{% block title %}
+    Register
+{% endblock %}
+
+{% block content %}
+        <div class="card">
+            <div class="card-header">Profile</div>
+            <div class="card-body">
+                <h5 class="card-title">You Can See Or Edit Your Profile</h5>
+                <form accept-charset="utf-8">
+                    <div class="row g-2">
+                        {% csrf_token %}
+                        {{ form }}
+                    </div>
+                    <br>
+                    <button type="submit" class="btn btn-success">Edit Profile</button>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/users/forms.py b/users/forms.py
index 6ee6d6e..db3ebe6 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -1,6 +1,6 @@
 from django import forms
 from users.models import User
-from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.forms import UserCreationForm,UserChangeForm
 
 class RegisterForm(UserCreationForm):
     # fields we want to include and customize in our form
@@ -43,3 +43,40 @@ class Meta:
         fields = ['first_name', 'last_name', 'username', 'email', 'password1', 'password2']
 
 
+
+class ProfileForm(UserChangeForm):
+    # fields we want to include and customize in our form
+    first_name = forms.CharField(max_length=100,
+                                 required=True,
+                                 widget=forms.TextInput(attrs={'placeholder': 'First Name',
+                                                               'class': 'form-control col-md-6',
+                                                               }))
+    last_name = forms.CharField(max_length=100,
+                                required=True,
+                                widget=forms.TextInput(attrs={'placeholder': 'Last Name',
+                                                              'class': 'form-control col-md-6',
+                                                              }))
+    username = forms.CharField(max_length=100,
+                               required=True,
+                               widget=forms.TextInput(attrs={'placeholder': 'Username',
+                                                             'class': 'form-control col-md-6',
+                                                             }))
+    email = forms.EmailField(required=False,
+                             widget=forms.EmailInput(attrs={'placeholder': 'Email',
+                                                           'class': 'form-control col-md-6',
+                                                           }))
+
+    bio = forms.CharField(max_length=255,
+                                required=False,
+                                widget=forms.Textarea(attrs={'placeholder': 'bio',
+                                                                  'class': 'form-control',
+                                                                  'data-toggle': 'bio',
+                                                                  'id': 'bio',
+                                                                  }))
+    password = None
+
+    class Meta:
+        model = User
+        fields = ['first_name', 'last_name', 'username', 'email', 'image', 'bio']
+
+
diff --git a/users/migrations/0004_user_bio.py b/users/migrations/0004_user_bio.py
new file mode 100644
index 0000000..e6861ad
--- /dev/null
+++ b/users/migrations/0004_user_bio.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0 on 2024-01-05 21:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0003_alter_user_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='bio',
+            field=models.TextField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
index 6c9074b..f40f264 100644
--- a/users/models.py
+++ b/users/models.py
@@ -4,3 +4,4 @@
 # Create your models here.
 class User(AbstractUser):
     image = models.ImageField(upload_to='users/%Y/%m/', blank=True,null=True)
+    bio = models.TextField(max_length=255, blank=True,null=True)
diff --git a/users/urls.py b/users/urls.py
index c0a8cb2..0d6a058 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -8,5 +8,6 @@
     # login auth user model
     path("login/", auth_views.LoginView.as_view(template_name='chat/login.html'), name='login'),
     # register have a view
-    path('register/', views.RegisterView.as_view(), name='register')
+    path('register/', views.RegisterView.as_view(), name='register'),
+    path("profile/",views.Profile.as_view(),name='profile')
 ]
\ No newline at end of file
diff --git a/users/views.py b/users/views.py
index aa25b12..e51e9f0 100644
--- a/users/views.py
+++ b/users/views.py
@@ -5,7 +5,8 @@
 from django.shortcuts import render, redirect
 from django.urls import reverse_lazy
 from django.views import View
-
+from django.views.generic import UpdateView, DetailView
+from users.forms import ProfileForm
 from chat import models
 from users.forms import RegisterForm
 from users.models import User
@@ -78,4 +79,15 @@ def post(self, request, *args, **kwargs):
 
             return redirect(to='/')
 
-        return render(request, self.template_name, {'form': form})
\ No newline at end of file
+        return render(request, self.template_name, {'form': form})
+
+
+
+# Detail Profile
+class Profile(UpdateView,DetailView):
+    model = User
+    template_name = 'panel/profile.html'
+    form_class = ProfileForm
+    success_url = reverse_lazy("profile")
+    def get_object(self):
+        return User.objects.get(pk = self.request.user.pk)
\ No newline at end of file