From 480d7501be62a08986ff98fa391dc70063b5e16f Mon Sep 17 00:00:00 2001
From: Babit Shrestha <babit.shrestha@cas.com.np>
Date: Sat, 11 Jan 2025 18:25:13 +0545
Subject: [PATCH] few changes in  model

---
 sahara/db.sqlite3                             | Bin 143360 -> 131072 bytes
 sahara/main/__pycache__/admin.cpython-312.pyc | Bin 411 -> 324 bytes
 .../main/__pycache__/models.cpython-312.pyc   | Bin 3086 -> 2184 bytes
 sahara/main/__pycache__/views.cpython-312.pyc | Bin 3960 -> 2357 bytes
 sahara/main/admin.py                          |   4 +-
 sahara/main/migrations/0001_initial.py        |  38 ++++------
 .../__pycache__/0001_initial.cpython-312.pyc  | Bin 4912 -> 5003 bytes
 ...02_alter_baseuser_username.cpython-312.pyc | Bin 0 -> 746 bytes
 .../0003_alter_baseuser_price.cpython-312.pyc | Bin 0 -> 794 bytes
 sahara/main/models.py                         |  68 +++++++++---------
 sahara/main/utilities.py                      |   2 +-
 sahara/main/views.py                          |  34 +--------
 12 files changed, 54 insertions(+), 92 deletions(-)
 create mode 100644 sahara/main/migrations/__pycache__/0002_alter_baseuser_username.cpython-312.pyc
 create mode 100644 sahara/main/migrations/__pycache__/0003_alter_baseuser_price.cpython-312.pyc

diff --git a/sahara/db.sqlite3 b/sahara/db.sqlite3
index 3c6d0fb81ef445da5b1501c8a92df817205eb222..a9ec1ea8f281ad7d37ef132a13d6d8449e11c400 100644
GIT binary patch
delta 2609
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
MsL4&M*00{;Un79V&Hw-a

delta 2437
zcmds3ZERCj7`|`6Zs~1%TGp;xKX2QWeL8OMM|;bdW6=c&%Yfh#G11y>b&kyrx5<Yf
ztixyo0~-f(@Q1;G34fFjYaqmrfc`L15|!u=jWHPGA2PoZKYpOWbGp&1#+c|&oAl(K
z=Y8JyJ?DMj^PV$1YoEPtpAUHx9LFW;|Mu^Wg${*+oux}w3IV#w1oaC$>m8OWFfHsC
zdhPph+Vhp;sZI5Kpt%{I9VCMZh=HA4)*(dZ6R==@Xl#n?OhTNLl90qNn2!j%3RA-m
z7p7V?sg?9JK?^Sq4s6^y*hh{gAy%7=HbI|vW^%k(N{F{LGAf?8^zmb*nc`@1ia1lS
z4NXl>6!T*v32|s_lnO{%fq;d91iGL_jQjaOECzGlnZnRS@sYw<DbIwp4_q+$s&w4z
z&?F`@+{sd_II#I1abU2&ze7w^J&hEnhZEvVanB4BRr1!T85%1G>=#XL6o|*6JYIE_
zYrqGDHm_XuGgO!^J~myPTA2$_R0l8FlY-|e{mxg-;H%t1>jhVOjjF6sluk*@$vWN^
zy3<`l6kSzSd@7_h)F4^TNs{ETa)DHDVdN1U2?v+?a%WE0R8_;iaMFM>>9i)}zVKQD
zQZy~6;A3IcfMi+KW&BY%Ye15w=nAfnbk!g|C+B1t=Ob$jNSCr%8J~^x7*HlF%W3>$
zL^B{wlXMAZqZtEIHC0jZzNoPXUCzp?g5Qj0mqQ|V>gjYgjUm=;=t*f!*KmK#*kV>s
z=Q0w0B4%tct4OM*;df*0;!@z`&Meha(=K$4v!Xc@dL4a@=FrQCRJ=QPB0RU+2VqQB
zcQw#5uUj#)qfi>1%nwh}YAekIOlAde!ByADm!=(*z@xn!`WC&9K11iwUUURKUx`b@
z2tVE9b@MKZ-w!PJtY+}Zo(Xf<brtjL+R!$4uY0vS=61S%c3pQ}t;EG=T^J2m5AwUl
zio5f-OC{{LKs)dw#fjofv4)10P<nbwqXrsWX@L~*g^`gOu@PD5F|<`pvL!TlEszA;
zvN?tXmXKvrQ<L6_V!hh}5wI~kj8Q2JoPm`*+QXr5(5L7<^a?tO4x>GEn?p$S@D|P=
zVOzYtWT%ZHeq+=5iHhZW-UEEaJNq44*kXMNJjdrP<}kV+^YdvtnnYu07~M}p5J3%A
zGXNj1j-l!ptd5P9$4(tvXATS3Fn_%bz3qI_dBFLgbDc9N{3u+bs>g*kF>K|ax%tll
zysJ<W+4e<t@R~xD(caGE@x`EA1%gY!Un0qrmY}Lyw2`t>DIQ;0^c`es;RXuCnvJ;D
zys&_Y0V++l|1ru;z7%w^%BWvr)S^C7{DVuz2>K}_lBy+viD^Q_DKpE+7mJCy)91z4
zz~X5`CYeJ`?rUzFt4p}y_|36-#c}%%{)Fut+jd)%b=D-qFYpGpiz_WGtP^ZO8*AR&
z++B?eKdDg18g!U!$$|~{!=mY*+Lhq_zqI$YEW-b$y;nPbtKzc-*2l?YJ2c?a_CU3H
z<A<zgNq+}?Qn_Srfr`_1uc`9oimia-uJ<q6I^iaqfe$?`LLcWfah%|Ae6Zpfdx&P|
zf{nKpESt<TCgS?lwbl8SaM`)nL~qd@<kxOEM1D@g4RhJoM%ufe8<NDE20uB_1-<6-
zeR1-*0(pp#BN>{!V;XpfO@%FXkq=C7gz{ceR-lR8r-73kRbdt77{u)wxX8CE^gxVs
zYVat%o`1+v`&BDc*g|e<u)!YX19VdEBR^yyNX}*GU9~F%KKe~fJwRRG$iPNuWV0j@
zvfv}*S-8U<<^%gQn5$!It4OmB_2hFZga+p1kfUq~@qvxaP)@NW)<swz=$)O{GWxJ8
z4Qqe8CCT9oM0|gxB*e`Fq?~{{=dvWxIyW99yLH$A{)@Dln*jbpX*(})`~Lprk};Pv
zE#w{gh5(T)cEM3-CHvOG8Yg=t+1Xhtdz#6WwKPjHmZcbpc7tYG#gnTN+znBN4Vj;W
k6uH$69T30RaVLCSK7HPE0t9P}sz<ARv2yDcc<7n_9e%}}O#lD@

diff --git a/sahara/main/__pycache__/admin.cpython-312.pyc b/sahara/main/__pycache__/admin.cpython-312.pyc
index 00e14cdb46e73fb70811c0c64e98acf37f2dda83..736ac7f3078f59eb75b14a2fff4736af84b5a1ca 100644
GIT binary patch
delta 154
zcmbQue1wVjG%qg~0}vcbZAx#Q$SY|U1msL-NMT4}%wfo7jACSDNMTB0&SA=Bj$&qH
zNM+3804YZWS=<v7<R)&B;A6bS;gndM8d{uM<fq9t@qyB0cE&(MUZ845ATE{%5+9fu
l85!>~C_H75`M|-z$kxu)$aS4T_#%Vw1dpo>vPIlLH2_kxAB_M2

delta 229
zcmX@YG@F_CG%qg~0}!y=HKi|}$SY~p1LRC+NMT4}%wfo7jACSDNMTB0&SA=Bj$+Pb
ziDF@7NM+0dYXNCPfGpmLF>*S%<Php$tW=hX1xg}Jw>X><i&I03Q;Tk~1m)+X`f0LH
zT%g2M#5Qq%h%+BhF(VKc8v=<B%#4hTcNr9(Gbn!GU|?ix=W67-&LDh|L3o146$aTG
Q46H~ZE>{^Oi+F&#0RKoTod5s;

diff --git a/sahara/main/__pycache__/models.cpython-312.pyc b/sahara/main/__pycache__/models.cpython-312.pyc
index 8ced3f8dc7aa15000d82e06c755f4f0a049716ca..49e3c15104dd481e17f7b85205905c7e94f2cfba 100644
GIT binary patch
literal 2184
zcma)7O>7fK6rT02|JP2iV<$L2gcJh~QmWDvwWvac*r5>+XmC@>inLmLCeFfo*UYY4
zh(NNc9MV&B<BEDpl^k-+F-IgWSh8emBu+i$77?mSocd<hF(wLCN7^^<&3yCz=Dpch
zkw^%^kjSrP#fQ*eTsRuu4s&=JnCA#1Ea<2r6a<0u9^F$B3!;EL=qAGA8p0A0wnX<#
zL3-lN`1ZMw5tw|vXxUUP**{u@g6yl9nCMo?#kv%XJLB-0hZ`fPAYfGRcn}dE1Uh>?
z6Be)sd$z@{L9c_9dmtUw!AV=7m5+k|f8qiTF6N%<rP%9e^mQ$VK8f@nLxvsXP_H(Z
z$AM$fL>%PE3CQ4fXiIR{3w;i1`~*}O%Z|p#mej$X`Xn|A*uL%lZagsuc~a!3$_U5)
z5O92Zpo@+>=!+-#;Mq=eJx%-vD%nLPKWTaJSSAPY&>AWXIi+_RN-x#D-_uWqGb1c;
zL$wI6w$*42s8XfovZfR3^L$2R!CF-}Rjk-1^A>g0c*rE9rt29G<%LFrK=%8905nul
zA1gXB%JxdnCWg(`NQqEeTh>ad4SHvxto@iQt2N!;=Pk9*3oawM8n9N@Y>P!PDQOi|
zSE{;NB36$^-Zo|UoRJY}KQQzZClMg~ya6*}#>0Fwx94*6c{;!sJj{DNduMK*CS0li
zer{oLZYHPPTe!P8m(4BEBy6}?k%ob1{?dx6anoEa?@YC3n~GunqNo^y95|Bq5foXe
zQ)qxiTt?i@!xWI`=qY*t^YL*Xl+JTKJnM#9A;3!((U&cLeEj`X_Uh8@8@bt~@72;n
z)m|};rTglNO4TLHohqtkEV<9aRP_n-D+;_Ein7{&bfHt7m2;ra;_Y5X?Y{W$&whLM
zIxup`{rTuwIf~$rXY9kXf`x*JJ@8728R>nbtNRYI)zu&u$DQH{by;gZ<7ELw;V~%+
z3n>aXS<^W$E6Ssqs&{tep9w9R7IBa)-Ydbi*Ql!hiRd^uL&tzHiJPPoz+QmQ;@7f<
z+Jh78a(isD5g2x%8Cagrr08cbQyw`@b0Ps@p}C4$CbJsRG4n!ol?e;x$z$7H5sRA1
z{BXIHSQZP;K(5`5Xvs8ec#;*PRw)w7!X?etR*7M)XjK-Rg=TSa;hr*Q@(t6}iE4DV
zG)sZ_pa%$Ma@MVFcgtI)P-e_eRa-O47LzEPW05TMN?xmURLd2@O)HjW0Jg8wqe`uc
z0S3X?=0jr8GdxnB0LmYk52>U4kKquW25TB_dJP=}P-JX<wk3}?<k8m`zuuExPB-Oy
z^;|oYT0h?kr5d5si-FB-GxSA$rX3wyUv5Rm8qu*A`5mbl{i=Smok(viwi4+^BE1va
zo!-OE#I5>#J2tU#z7?Bj#3nXNy90aKW^As0t9Mn|%f7Umv3&j3fe*#cb9A~9OK*~9
zY}#3ijB~fnG~_dzmv_}Y`}M+NQ~n7Yi=O39oNYwUZvL?Q=;gU)^ltqoD3M3jue8F$
zjqq?go?!jB-9PlsFUh`o_8^J|E^b_D#V<7C7k2W^_|^LDc5-rKxs{x3Bqw*W&Ez-r
zyPzU6%59D`<dIErXL=Vm<(Yc!tt5Cy|M7Xem);^EZbEr3d4;F&1Jx*-Q@l8+R-A(8
zU}ef}N6MR@1v>y-bgIw2gpV)gec)TSH?Gm|;0W(PYY@nRC<wwE^yM2g@=i(%m)4*D
JjbL&d_!s@H2&Di3

literal 3086
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

diff --git a/sahara/main/__pycache__/views.cpython-312.pyc b/sahara/main/__pycache__/views.cpython-312.pyc
index 3454408968d5c0c01db70c06ed24606939b1ff44..8adbc42781db78e794a3246e5f9d5b6d2c75632d 100644
GIT binary patch
delta 185
zcmew%w^fMmG%qg~0}yZ~Hl@dMOyrYb+%i#pD@&!IrqIS`3T&DnIc6aK%mO5)GgLBY
zGWuz97YP7)x7hQOvQm>vif=Ker<P3Kz+=sOi?t*_J2meXOKEXx(d4f@YEs5Pg$6)e
z%nBqL7;dm|6^Q{^ews3yU-61Es)FQKGJwU3M1bsH95%W6DWy57c0~?AE+Y^ZJ5AQ)
Oci{Rg#m^`MRtNyLkSneL

delta 1777
zcmbVNO-vg{6rSDnt_{2XiGL`+u_+Ydv~kn4YWS&WAp8^sOjLqWs#dFwcQH0=JDpvJ
zV6AHl^#D>N5^)GpQmImVNClUu%BAY1Tzgr|RCX;Na^Thr4XBFJOJ^1@roB|^llIM<
zdEa~UX6Jpo&)hH1I)1U+8v&9FpR7i&aSt5L#E%bppEZhSz5<`NuegJrr_TdS&WaEe
zdJe}403HGrM;H<(O{+e}>AG!NBC$hmqgX6ipyGUn#BHWkA2o1-Bt<Gqs%*}5YJ};E
zbLLuod<0adITI}!86|e;?OK74z}IA!5}B+;J#&JwYCxkz+hfv1Wogx8dNtbIE1P3f
z-^sE?W7H;d7H>AK`lx|;Ykg)~Q9`448n$cih5#!d*ci^Z(uxGHNOy(AZCMIMQi&i@
zp{0ZnlPlh+l$4;LN+O?AQ%h2kUzDJfaS4$~DxFjZgoqlugWM>>BEYDUxp-5OQ3ffX
zrUJ9Vq5y@!g}`-L5)>&gTmuK@Q)!51Mv9Dk`8a|%b_^}52{}ksEV!nMvz9-WO7b~5
zmRv&na2UZSBt;RTQqTci=x`Nl>Q-Ees7i&3N-D$`P-#pEOA>Ds4OzUvh$(cYB*d)-
z@s+~{tQf3tFI3#4W8=efQ#bhWk7uU&vFYK-DflLG1g$UxKn_5BEfxAW<=Z&y4XiHW
zRr_rj<u=PwaK6B?Kri;Y6)7q5|2Qh_Lk^S}DBDQo!9MFLv26vmt;G5ZtY7cx(^-F!
z?az-^xvmnI3l+G~6Sc^_mme#0ujj|AEx{+f#g<E@mi|IZzur9X(`EhYoc{SO{j<p4
zpr{W>decIF=70gtVIn_q!~k!%-rZMrdCP6*|DdTs<`7U`Ykum813v$jR`kA=pGGL!
zQMNhDHec1|D%rXUwytu6eWP_f*Sf})eVu=@49!5?dy&($J0a()LC%K%K~ELmgdsa8
z49k)l3HwB(dAr4QYh;|=Y@ph6s@+_QJ4~xSYCxn+P7&Y~<18kpX2Gcp?s}wYp$sS7
zB>*~8owW?gar{M?1zkYJcWg*EfbV9h|4OUAX5ux<ET&%SJP<*a`jYzBc1Fl-&9_V}
zgWO$e9xM|<YZ%eOZqSG4V~EEQ^+v{D<5!?YAxR7<=|}|8W+5%hE1eZuPDNwMO!H*&
zjv&WG6Nji4z)TB4{6d0U#WIJO2;V^ycnPVB4>QvsD<|^{FqJsw*k;f=*a+XpFx=Cd
zUs!u`BgmLWkMbC)JUAdZ`rN+Lv!ShPC8xjO^zVhP>P~;rIl5-~jdecn=v*7U7cO(I
zjmh=Nd)KO*x5Tv<xc04^de6ij_fgf;wlz`obn9IAKIh#CuZOoT>)k`Yav!3$<-GUD
zi)@>2X?uA@1J3sXTqo#rsEIcm>yG=&-%;NTf6J6?y}GTp%6d%fUk5Zoy;9Di3Rj0a
zMo92;pb6<+vSDP1+GYJC{nTzhjqGr+<A<kKA8{Vj7UH9Q4-6g{1b=1wAdwQ&vNQx|
bkPH81l!?vXZC9Kxnpz3waL7Tl8|c3QOFf0M

diff --git a/sahara/main/admin.py b/sahara/main/admin.py
index 29298ee..bf461d9 100644
--- a/sahara/main/admin.py
+++ b/sahara/main/admin.py
@@ -1,8 +1,8 @@
 from django.contrib import admin
 
-from .models import BaseUser,Role
+from .models import BaseUser
 
 # Register your models here.
 
 admin.site.register(BaseUser)
-admin.site.register(Role)
+
diff --git a/sahara/main/migrations/0001_initial.py b/sahara/main/migrations/0001_initial.py
index 72bd337..c2014a6 100644
--- a/sahara/main/migrations/0001_initial.py
+++ b/sahara/main/migrations/0001_initial.py
@@ -1,7 +1,7 @@
-# Generated by Django 5.1.4 on 2025-01-11 11:43
+# Generated by Django 5.1.4 on 2025-01-11 12:36
 
 import django.contrib.auth.models
-import django.db.models.deletion
+import django.contrib.auth.validators
 import django.utils.timezone
 from django.db import migrations, models
 
@@ -15,14 +15,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Role',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('role', models.CharField(max_length=20)),
-                ('role_desc', models.TextField()),
-            ],
-        ),
         migrations.CreateModel(
             name='BaseUser',
             fields=[
@@ -30,32 +22,32 @@ class Migration(migrations.Migration):
                 ('password', models.CharField(max_length=128, verbose_name='password')),
                 ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
                 ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
                 ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
                 ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
                 ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
                 ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('image', models.ImageField(blank=True, null=True, upload_to='')),
+                ('image', models.ImageField(blank=True, null=True, upload_to='user_profiles/')),
                 ('bio', models.TextField(blank=True, null=True)),
-                ('address', models.CharField(blank=True, max_length=50, null=True)),
-                ('contact_number', models.CharField(blank=True, max_length=15, null=True, unique=True)),
-                ('email', models.EmailField(max_length=254, unique=True)),
-                ('citizenship', models.FileField(blank=True, null=True, upload_to='uploads/citizenship')),
-                ('certificate', models.FileField(blank=True, null=True, upload_to='uploads/certificates')),
-                ('token', models.CharField(blank=True, max_length=64, null=True)),
+                ('address', models.TextField(blank=True, null=True)),
+                ('contact_number', models.CharField(blank=True, max_length=15, null=True)),
+                ('citizenship', models.CharField(blank=True, max_length=100, null=True)),
+                ('certificate', models.FileField(blank=True, null=True, upload_to='certificates/')),
                 ('is_verified', models.BooleanField(default=False)),
-                ('price', models.DecimalField(blank=True, decimal_places=2, max_digits=9999, null=True)),
-                ('ratings', models.IntegerField(default=1)),
+                ('price', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+                ('ratings', models.DecimalField(decimal_places=2, default=0.0, max_digits=3)),
+                ('role', models.CharField(choices=[('CLIENT', 'CLIENT'), ('ADMIN', 'ADMIN'), ('SERVICE_PROVIDER', 'SERVICE_PROVIDER')], default='CLIENT', max_length=50)),
                 ('member_since', models.DateTimeField(auto_now_add=True)),
                 ('profile_updated', models.DateTimeField(auto_now=True)),
+                ('token', models.CharField(blank=True, max_length=256, null=True)),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
-                ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='users', to='main.role')),
             ],
             options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'abstract': False,
+                'verbose_name': 'Base User',
+                'verbose_name_plural': 'Base Users',
             },
             managers=[
                 ('objects', django.contrib.auth.models.UserManager()),
diff --git a/sahara/main/migrations/__pycache__/0001_initial.cpython-312.pyc b/sahara/main/migrations/__pycache__/0001_initial.cpython-312.pyc
index 8ac686c81de4780ee4a6149d77a2d8f555fc98f2..0a08844e38d70b1c17aecf519f31ec9a025a4434 100644
GIT binary patch
delta 2229
zcmZuzO>7fK6y6`N?KrWs4hczY2R6hZaYF160|m-|5+FbVm=H)Pn2l#*ud%&hcEgXQ
zHngXzRn^jwDk`-S>anp<P8Ekr<y1v#4;v{`qD5+ZYuz3i3RR^ZP-k}eaVUG3H}89I
zzWLtlo3-aRf7s#s!Rz%f<oOZ4muAG<zAvlWsY{;64}{y_6rI3b^2~8~8@uUKR;aBh
zdFOaLKE(ka{)KH`CxBWYmi!fX9X9yp)^(s>VL<~}4_H`}4cMzHN6hgNwiSQv47k%Q
zs4F$jIdPP0_pb-dr9cH;kkADQ8d`(4;1Pmu02|k!(lbe|VAC2&Z3GYc!=QZ)x*6|d
zn?{McaHTGLp56Q!tn>dE=qPp0aW+oQB*HP!mF>c}`1K;_Ds@-Xu?3feU@cqfsYs7f
zOt3KgJ>TgoZLL_)XB8d?>>6|%{z(XlVEY>G9klKSq4dTa`$Ec2OG+=1(y)IQ*iC5O
zoO8U0?y;k<DQFki3-*=vR|q*kgfum!8F26`790ZorGbjzAU#B!6&i3qyG|s#9IenW
zL`!Hq_DTuIt-brGvX&EI7>t0E;CSiOob!dc(=Ri2C9I4yV6-wL9RO#+7&!L@2hP8~
zy|N+vROn#0lLp)9AAeqXnw<#VoQPb&rgKk~`;e@`vl>J==sFN`Ps^HiT}7aLi|B}O
zrYA4oNakQ6t!MB(*LSn-8IoF%^U!q86qKtouoyWgQB1n7=ov}R$hzgy6iLn@D1)04
zyrF2i7A+o5z^gL~f*>kw-QFvuGBT1=Iz*bJB54X<hbStYfI3CCNI*#|x+cj5ARUNB
zW8JZySW-H#7IHVE<<F=%r|E+TsVJF;nkJ{AhMEYB>gYhPn(4VF=M*68D$-D`1xzVO
z)00$N(PPaeI*;(E9)IKx2Lzaxm0bBL$t`-Vxg-OC2tA&6|32GDnJpqg$&(F>K3aHk
z8mUuC4r(#VLsJ^)UR5*GIaLNpT{ZbhMU8M3G1oIz)0a{UIyr)5VJ1HbQJIoIXR+$A
zsH#(nt`y;HLCYx9WkA`hQxNIOl#-HlSoBsnTFk6gwB$92NECtyi>PW-m_|wpmgyZW
z(~n)mVaYLl0H#PSx#V<CPC?Cn-S)}bWw?;6D}}U{W|&#Bjyz@h@gpMR#8~8L8=097
zq~^#;l9qAypBNe(8AUs39%l*%2Zo16&@S5(&kQEUhWZDSrxGW}h6V-`XgB4dx#d2Z
z!keyCMkQi3o17klS(AtPN&JUrN421<S74#ckSmU*>JOaOfj8m#>i3(ARkW2Q+RH`H
zi>VgjaK0uOb*YnCn9{X~!*tmFOU@?;G}EO{>xx>?Om|)`khhAokw^%CTa&|aZ~IOc
zeM3l@L@p|`g^Fo9TToIeur3W{8hhSlre~1$&tb}o&w1N~s!@1D$G5y2#oA%HaC20p
zqaFU!JIyxY%f5E}tM8rJpwZHEXKcBpXR)Q{e#SVe8GH3rhB?R$@x+Yr<J3&@Q`G2u
zk^hI9LykwbvAiR;cf?_N3ENB9-WA)s;&@CK<Q;@X;|tWh?KmPlVLZ%+qXO~#Ljq3K
z?rd%{0^N5uF9*681KsoC2XW&pSPDQxoWh^ieq3b?Ut9`YGQ=eA6+6f8gQZZvAr7qg
zTaC8(-5twq@x`|I{qRDcF?xQfZQKwiR{R?bsrRmPS?XPsdgt{8-bjosN#_jl{Hvh{
zVIv_gNt1?{!oP`KXU2`o&$eFi2aHhc&f(=yY%vtOe|4eFn7FVMddm<muJ{{`=E$A(
z%gvF+=Ez?R6F<U{YEE<G)J$<1?g_&L6zcf19PaZ+n@ELSw8E~%K-YZzgSLf%rNC)J
zOyEoYV*Tp&V7+g3H`BUhr6c}G;2V6a9vrXhaq}H@&UcR?1!w9y!V|O?Hh`>LNUPCj
zT@saN^i1^SX9wS_>pPX9oukkpONM{ld-5un$-#X{B`*D`(&+z<Ri0(p$4-Xb^pI(P
b$b^1oI-fXWtn(AkvKU?z!+$fxv1tASE45>E

delta 2107
zcmaJ>OKclO81}BcekHMY6DO%1*L9wb9qOb>o2E@^L)(NVbxWH^AG9c1d&bVX&f4AG
z&^8BBI8jwdR3o7rKq_1~*oSZcDh@Okq#%%33rn`P2e={Mj9M-T5Hq_?>WGRx{5$hM
zzVDm=pWXYRjXu{8O-)V{e%`wJUh1j)f$Nio9<s&H)1dXiSF4tSGf$yWstdVjyDLej
z%!S50ZDc(7(d%de7TN@DX%^+o?TDdR%7t=_mvaMGf!$6_(ttyv#e0YX6lgBA<jn>E
z_Ivc|J;uJ?0tU2#wnBT}i~@8o=LNn(M_rvCvvi#Dg1x)Ef&W3<2Z97`hq=?p#kyO$
zF3`Oz)`QjVp<xpWT3gX?l&3pbFU?qk-a=p90Ym66-N8|yzYwk?iJ%F}?<x$`CB8zG
z+x7#h5XEQv)!aXUmk08e9bv<|u<bF_5rYw&d9V)Zke=B`THiXli}&!0h<j{T<OrcZ
zanzvS;T$)bQAhTC37EpMJhhYes-D+Rnl^qMoWLj(b;@7Uqmh@OoZN+Sid+UaRXAOT
zJV|`$2;)KDncLdWfN3xT&VttqvAlJM{T$jfckDf{$KC)JcE#*EcN8mYv%seG5bCmq
z(5FnxO#0wU^jrk9g}FSljhymgwu|`6&3|kL3%GprzcuMG0!fXdzbIcD{t&3brR}4q
z=r;p*E{Ct6RqHXvGMmjn^w>HvXOZx#>cLQ9N^>srw-+-|Oess6g9H`<loMfEvxxjM
z)T~JXW`L~OPx3NckfEg6bG$6y%1WSmmmttmGk&2C+vA`!DM+%iNb0H|Vdtvh2oguw
zEcwtE_8wHTSJ(F9pyb9zV}xZs1vL{16K4l;I#zO-EDsiytY(f2SxoUFX5#^npe$F1
zapravQDBt15?N8<6IjH`avVxkLK3zZ^*dQ>nsr4KZmvL$fy=y*ss2N<jDtu~yw(~L
zf+DO!QC<>qt1X5cd9cojGoYjhNg=^2aMiPu@xm!<jFP<p#p;9(D9DR%LkSl^5bmHP
z(gBUhNkRfv$zMxwhYX?Ub7#=4cfls{iXf)sDuvE9oIvXh_pEvw0w~n@{+h<D;9<zC
z4txMHO6C@3>e}SUig=D0s6goyhL<L>!QIk(-hze1voh2NwV2DSNPI@K^Kn^`aOX5z
zHlBtFMaFF-S43*X20L?#kQMPgSms4MF-DTlhxZ|_DZ@DC;cW%oY8pUKn!47Ulcb|l
z<kD!4DIo)mW#eg>z@vU1Xq*-mn1YfKbD!hIJM&p$4Tp0oD?uS8o`rWb8pJibeiBTt
z+2<zb7tb%mVw#N%S`y-tjmT>tHxmQ!Xxx>g%;+;$FV&8=T)~6wsyDpeR`!OA-tfk3
z$vdX9M=G3O4Mf+I<v_F;i2fWHQrQDFo5kaL#@HOr8jHSh-AAf>6m_y6*tcd&z6&aQ
z5q-_}uWg>(nlJfhRd%kzb*kMX4@b-0BgO8KM?G7^>iiXzho$bM%BCvZ9@RIn-dFYw
z6nz65^5(&k?~KY$SGa&09C~Oi2ZxHmp$%oTN1aWTf=enZyeza-3JNNl*3lvujq^o{
zzQ~4Wvug_j>Z-=LNbs5(PnLWsm0hZEKGi?CK2`P)7X5>dsFMGv%8sKixhVRZyM3*~
z;dVqwJ0e9d#(8vlYwD-z@2AVL>&4jhatsz@upASMF|lScy+cjX_%%Z>(9cXJ-zBo)
zF4MIUpT|`jGj)b4p=ib5`Mb^1>Z&!Od(HdpErZS0cW0y<=-cMdzN=&~UXbR+R5l9Y
z(d8^2qa59yC33V3Ur3V+c7vD<Hh<cW;iQ!eJTBeDTk?08d$FmRDT;b(HBntpOu;86
a|1YNgXV$}%^+RWw?J2T7f0*z_hxr$iSUQ9N

diff --git a/sahara/main/migrations/__pycache__/0002_alter_baseuser_username.cpython-312.pyc b/sahara/main/migrations/__pycache__/0002_alter_baseuser_username.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b1485a6a47cb454fe68834430175ca8fbd82ca97
GIT binary patch
literal 746
zcmY*XO=}ZD7=CAWGu>TMsX_3wLPHStQlbYBA}xMZky;OWS{8;$X1dw9yGi#0%uS^S
zkG<8OptL{0|KKSgB+S)QZ-G>Vo}Agu5}m_4&-2dv^~}tV)m0nhy5ITae?b7h6scBi
z0p?p090LP}LWq!yBF)thXz(1Eb_h)8sE@0p<$j`<*wsgdQ#(_{(S#iZenPWg5T^o1
z1IEL&yUYPF7i8X%;21c#h=Hpy<Re$tfE)c{;D1v<j=|I!?qB-fuNX5}?G&GA<;m$v
zHI}Srj!efA)~jkFIi3;GAQts@yM31gagYTx6lRB}JWqKdOl4yl@iQjNy)ER>_ax-8
zpY;UJ<KQ6YjxI$iVMIj=qp-F8fQM{PwlhiLCq&qU$hbV@64wbi$Z4oz6=QtJW5(ld
zz|%zCqp%-^8BcapmBdgE>q(E6T-bvlU)<?8m@A<dub)2fb{{|6@m|pGJDT+dvG<0`
z1nQ;brgVDCxA3ImdxWYUq>@W2wVT6Hq8_*~3Z&c89KsBPwK3DREBM3i%m(ZBXM19<
zkInVz)s5-po6|<~=+30k95<R@yWd+s8{6kAhGoxm+`u1SCfBQqdyXM2)~B&Q*kqkT
zZXvPkc};~Cu{R{TFdvq8ww2tHRDM}V6`1J=p+6XqbB^l>AK8<&)_AS;8zd>R{{oV{
ByH@}J

literal 0
HcmV?d00001

diff --git a/sahara/main/migrations/__pycache__/0003_alter_baseuser_price.cpython-312.pyc b/sahara/main/migrations/__pycache__/0003_alter_baseuser_price.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2ad906887b569f04a3e64aec2d590f8061ca4d8e
GIT binary patch
literal 794
zcmZ8f&ubGw6n?Y6y1S&M4T6G=A~eEYO4OT3L5Wo)_M!(_R))#WG~IN6#N7nUO{E8q
z_0)esY5xepi{Qn8kT6$Ixdl=YdU9qrONw)N^Sw9kz4_iZ^J8_@2C+W*A3EO<z;Ef4
zOJ9KbjsPb>fuay1<f2G%6$A=A0jeAURT=6UWzlj!RSWE@L(S2r(s2}SM?ohg{UC`m
zZbS)XVdgJu0CGAaFy9yE1Q@u8f~!!}L9VI*)4FBGr7EgWd1iFiE(I5mYE-8N)y`H<
zwIXz8mefQ~b7(m>x1N`*1Vt?(LCiNBjmBL}!ahrJn`CT|2_Q{OBF4=!#Pwbp`0V9W
z5zVKPo1<~P9g_HvuTka)5eacGBtFZ;?Bp$`K_}>ET#E-`=%^wlHNbgOEw}o9z(Ts`
zSlq;U9Aj={Eb;~+6S#u$n*j-BuJkDDv6!;h4_KB;$+`VdlHQeFQaLiOGz%Vih}%hz
zEneUY%*8oew3_$5)}zO}-c#ZqlKw#wdoRcVNr{&gn^eSGzMLntx%a;|xenXCVJiPZ
zZY0Q>!W_ZO0PD_7RjwHCS~DB08z1elSsR(P$<<qvjcb!?{rL8{S|3&GpPOGdzNbH5
zdB3W!&sQ|do~cIFc>gTjEZgo0g)Q18aVOcP?R@5Z&f?<hGA+-o33OpTD1_TdZwgm@
gameK1OhpL&H2^v1Mg<wi_IQ13w7&HRgp*hQ1De^+6951J

literal 0
HcmV?d00001

diff --git a/sahara/main/models.py b/sahara/main/models.py
index 9341214..efa7069 100644
--- a/sahara/main/models.py
+++ b/sahara/main/models.py
@@ -1,43 +1,41 @@
-from django.db import models
 from django.contrib.auth.models import AbstractUser
-from django.dispatch import receiver
-from django.db.models.signals import post_save
-
-
-
-
-class Role(models.Model):
-    role = models.CharField(max_length=20)
-    role_desc = models.TextField()
-
-    def __str__(self):
-        return self.role
+from django.db import models
 
 class BaseUser(AbstractUser):
-    username = None
-    image = models.ImageField(null=True, blank=True)
-    bio = models.TextField(null=True, blank=True)
-    address = models.CharField(null=True, blank=True, max_length=50)
-    contact_number = models.CharField(unique=True, max_length=15, null=True, blank=True)
-    email = models.EmailField(unique=True)
-    citizenship = models.FileField(upload_to='uploads/citizenship', null=True, blank=True)
-    certificate = models.FileField(upload_to='uploads/certificates', blank=True, null=True)
-    #is_activated = models.BooleanField(default=False)
-    token = models.CharField(max_length=64,blank=True,null=True)
+    # Additional fields to extend the default user model
+    
+    # Profile-related fields
+    image = models.ImageField(upload_to='user_profiles/', blank=True, null=True)
+    bio = models.TextField(blank=True, null=True)
+    address = models.TextField(blank=True, null=True)
+    contact_number = models.CharField(max_length=15, blank=True, null=True)
+    citizenship = models.CharField(max_length=100, blank=True, null=True)
+    certificate = models.FileField(upload_to='certificates/', blank=True, null=True)
+    
+    # Verification and status
     is_verified = models.BooleanField(default=False)
-    price = models.DecimalField(max_digits=9999, decimal_places=2, null=True, blank=True)
-    ratings = models.IntegerField(default=1)
-    role = models.ForeignKey('Role', on_delete=models.SET_NULL, related_name="users", null=True, blank=True)
+    
+    # Financial or business-related fields
+    price = models.DecimalField(max_digits=10, decimal_places=2, blank=True, null=True)
+    ratings = models.DecimalField(max_digits=3, decimal_places=2, default=0.00)
+    
+    # Role and other identifiers
+    role = models.CharField(
+        max_length=50, 
+        choices=[('CLIENT', 'CLIENT'), ('ADMIN', 'ADMIN'), ('SERVICE_PROVIDER', 'SERVICE_PROVIDER')],
+        default='CLIENT'
+    )
+    
+    # Time-related fields
     member_since = models.DateTimeField(auto_now_add=True)
     profile_updated = models.DateTimeField(auto_now=True)
-
-    USERNAME_FIELD = "email"
-    REQUIRED_FIELDS = ["image", "contact_number", "bio", "address", "citizenship", "certificate", "price", "password"]
-
+    
+    # Token field for verification or authentication purposes
+    token = models.CharField(max_length=256, blank=True, null=True)
+    
     def __str__(self):
-        return self.email
+        return self.username
     
-    @receiver(post_save, sender=AbstractUser)
-    def user_to_inactive(sender, instance, created, update_fields, **kwargs):
-        if created:
-            instance.is_active = False
+    class Meta:
+        verbose_name = 'Base User'
+        verbose_name_plural = 'Base Users'
diff --git a/sahara/main/utilities.py b/sahara/main/utilities.py
index 83705ba..846fc18 100644
--- a/sahara/main/utilities.py
+++ b/sahara/main/utilities.py
@@ -4,7 +4,7 @@ from django.utils.html import strip_tags
 from django.conf import settings
 from django.urls import reverse
 from django.contrib.sites.shortcuts import get_current_site
-from django.contrib.auth.tokens import default_token_generator
+
 
 def send_welcome_email(user, request):
     token = 'generated_token_here'
diff --git a/sahara/main/views.py b/sahara/main/views.py
index 449ef55..94cd1dc 100644
--- a/sahara/main/views.py
+++ b/sahara/main/views.py
@@ -43,41 +43,13 @@ def send_mail_page():
             result = f'Error sending email: {e}'
 
 
-def send_welcome_email(user, request):
-    # Generate activation link
-    user = BaseUser.objects.get(email="user@example.com")  # Replace with your user object
-    token = default_token_generator.make_token(user)
-    token = 'generated_token_here'  # This token will be generated based on your activation logic
-    activation_link = f"{get_current_site(request).domain}{reverse('account:activate', args=[token])}"
-    
-    # Prepare email subject and message
-    subject = "Welcome to Sahara - Please Activate Your Account"
-    
-    # Render the HTML email
-    html_message = render_to_string('welcome_email.html', {
-        'user': user,
-        'activation_link': activation_link,
-    })
-    
-    # Render the plain-text version of the email
-    plain_message = strip_tags(html_message)
-    
-    # Send the email
-    send_mail(
-        subject,
-        plain_message,
-        settings.DEFAULT_FROM_EMAIL,
-        [user.email],
-        html_message=html_message,
-    )
-
-
 
 
-def activate_account(request, token):
+def activate_account(request,token):
+    return
     try:
         # Decode token and retrieve user
-        user = User.objects.get(email__iexact=user_email_from_token)
+        user = BaseUser.objects.get(email__iexact="")
         if user:
             # Activate user account
             user.is_active = True