From 9860a9a36c0ffe7d6c3f89880eb6be8ad95e1b06 Mon Sep 17 00:00:00 2001 From: Kobe Date: Tue, 27 May 2025 10:53:06 +0200 Subject: [PATCH] fix some errors --- __pycache__/forms.cpython-313.pyc | Bin 5341 -> 5301 bytes forms.py | 1 - requirements.txt | 3 +- routes/__pycache__/contacts.cpython-313.pyc | Bin 15917 -> 15549 bytes routes/contacts.py | 6 +- templates/contacts/form.html | 4 - templates/contacts/list.html | 80 +++++++++++--------- 7 files changed, 46 insertions(+), 48 deletions(-) diff --git a/__pycache__/forms.cpython-313.pyc b/__pycache__/forms.cpython-313.pyc index 62aa08cdad1a82bf71099e701f6768ab4ea39132..4baab873e8609be8aa4fab610d91e4c9e7c73627 100644 GIT binary patch delta 879 zcmZXS%TE(g6vprEn=(@#Ewq$ZMFNbFl89C73sD3$T98RKB#q6>rz6H*KqA*4QEbCH$c^Ba1sk zqd9Gmzic(>2>;zW)d8cpFoZaTIL)sr6M-oVvwTCD7@U@&gVvpIo)N3Bj$sagGQev!cV5B>k>;~)mjiBL ziN9!jlfvr=U(PHu7(-DUkwEk!@{K#~CfyV*mSdR3nzhaZO=$|8#Nx7q2pNV|v1*0^ zZJ0ZP7{`Lwv~A(BN+ML3&8pxD^Oz5oS@|vlM+A$jRjbGx%@5cF;WOc$BLepyxL;Za z*B`$uDY6gyjWGFK=K#%e*7;-;U#WHe=Y`Ayb`S8+1qE>vfm^{XM2m#*T9q0woCXoD zc_v1#g9{ifO8ng+e6jm%w9Vlw(S@d$%X~MwGwizTO8&K9gwB+!rMk_|0r0KZxH3#* STMze${On!hA7e=$HslXjdc*$! delta 905 zcmZXSO-vI(6vt=UvMp`5g|^UA3RJ+*1!4^pVi5@Vfq1Y83lX77UFcR8yKVAzi$M=1 zoIIM02QOZXCVJ4s5KX+0c=7Ia5^tWoig)KN3DG!*-}{_5GymO>%6CQnCCh#ymU1z- zv;IN;N?k80YlibIPNtURI zWvX^fxK4YsRF%Ypu3}PjB+qtqtKCTgDYbWvR~5>=Wxb*`s`exQeAzT=>6Lm_UpN}`=q`CkoX1-#23R&^*emH7jUVN` z2{#>PEB=g>#d}|32mVygIJ#5V-o9q(uuuo{!k$(&%9^eBv(NtHz@#X?B?>JlX?7UU z=n(r67*Fw5!zyXcT_A%qe2B}4X_g6&N;!0=*hX-)Z%()t$~6bhaWO0*aE~>>UI#w~ z+EUNg-`L;UatAlrhFqbO?2G(@W?3n8BXLEv6_gNM#eLTh*AWZsI5aV^gzjwwwgKMu z^psWf5Lwn4UX+}|Dl3QIr*k67Jq69wLBXatB7x{e+&LO+(`XZJiGb6z5`;XaH!<{; zN=D7FOC<xEwuPRf-7o-86%NFeiQ=eN3P3|0Zai5BCSyFUBGO diff --git a/forms.py b/forms.py index 652057a..715229c 100644 --- a/forms.py +++ b/forms.py @@ -13,7 +13,6 @@ class UserForm(FlaskForm): company = StringField('Company (Optional)', validators=[Optional(), Length(max=100)]) position = StringField('Position (Optional)', validators=[Optional(), Length(max=100)]) notes = TextAreaField('Notes (Optional)', validators=[Optional()]) - is_active = BooleanField('Active', default=True) is_admin = BooleanField('Admin Role', default=False) new_password = PasswordField('New Password (Optional)') confirm_password = PasswordField('Confirm Password (Optional)') diff --git a/requirements.txt b/requirements.txt index 418acc9..27949a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,5 @@ WTForms==3.1.1 python-dotenv==1.0.1 psycopg2-binary==2.9.9 gunicorn==21.2.0 -Flask-SocketIO==5.3.6 \ No newline at end of file +Flask-SocketIO==5.3.6 +email_validator==2.1.0.post1 \ No newline at end of file diff --git a/routes/__pycache__/contacts.cpython-313.pyc b/routes/__pycache__/contacts.cpython-313.pyc index b2f5bb38df5d6533a9213050429dc0cd482a2728..3b1a4be76a8f39c9e04771b17825775290623b68 100644 GIT binary patch delta 1122 zcmb7COH30{6rDR$TIh62>GU(jPFpCHmO@Lxs)2y5MiM~;XRM+VB1rtiAbtpmBx+*f z#)XM`H)`T9QRBv6#^{RZj^Hm<7Mi%xjSDx_=mHlez9~M62^-(yz5DLDpL0L=Pfkw> zKLo+bkmEU(K4^U`(zgXX8|HO<$jL?o@?+6x7j?p z$$JFwlynPrW6*aQX7NQ(((}F!7B~C5koPxWK3aj#{C01YhAO?aOpd{$jcyG3MQo`m zw-KI=6vj-0i&c`BqB8c%5}%@atqsRzxotK5D{H7!dR1HdAj6C-FpTD)T17G{*5~Bw zfDeP8IR9}0^GPq>4t3*vXg{#HqvkvAsyzmC_^S3aYT%(ydT$2LVTBi~vd_evYnUpE4-OZFa4d zdKHnbn2eQj0Mf+~osW6=CWh)$Rq-~^< zY9R#-i!L0F`k=eGD>@nZP2$sIu(Hf9F$@wOssE){BlOW!IkVD(1Bq&O+=6zwwR%~h zmNdI)HC|4v`u}btZyKB!b7LYBz~N>WW=s{3#6UzcwkQ@Lyja!R-cGtGk~x?)RPVoLlEVx*)AfQkWsXzwZv8zWuRe%k1X?{5r7Hy(}LGNV;p$KUm%d^C12h zQc#bp(79oCiM%E64c7!)Fe{kTlw@=iXeoxtGR_k%i($+sz5KTo1*a8Bd^CQ(px_5e zuXxPQcP8E2%0++zP9?r!&yHhOU1T{Hqhm?;JM|2N->qG#HPm8VE#i^XRdzK<;HD6? z8Ti$m)hrg{nF7wF#gNh}iL+Wi^}|8`2^*L43H+_Q3m@l&V70_BPABewF+&gIU+3jUjWGiH<;M!9a3FY%Y+Fs=L-Z55Qq8)5Y36{owR=k>kxGu9dsvJ2ns=<*O-% zv3N(OG$Z3AT>X;PF#B;izfBz6WHLm>y7H|eJ7quSWexV}k7mJRxLZ*0jXw3ElRY?< zN#N2BF=dhRud03#XPhJ0pZSAymg zZJQ>vcjdWr?LK)TCUB;tklE}A?DB-BvXV)~AGCnPTH$@9msC%uf}a(WVBz9`iuZ~i zf=xv))jI4BU-(v<57>%X5g!U^vUkyaP;%+OcHyC&ss=vfA4GTL;=pgI>)e`^zT5Er+(7}hLsu+uS0xU>An8)jT6^TEfX6KtU~lY Vdl=yL_N9YO-U~FJ!58+w^dD7cFsuLo diff --git a/routes/contacts.py b/routes/contacts.py index 2d1be88..e474c71 100644 --- a/routes/contacts.py +++ b/routes/contacts.py @@ -110,7 +110,7 @@ def new_contact(): company=form.company.data, position=form.position.data, notes=form.notes.data, - is_active=form.is_active.data, + is_active=True, # Set default value is_admin=form.is_admin.data, profile_picture=profile_picture ) @@ -141,7 +141,6 @@ def edit_profile(): current_user.company = form.company.data current_user.position = form.position.data current_user.notes = form.notes.data - current_user.is_active = form.is_active.data current_user.is_admin = form.is_admin.data # Set password if provided if form.new_password.data: @@ -159,7 +158,6 @@ def edit_profile(): form.company.data = current_user.company form.position.data = current_user.position form.notes.data = current_user.notes - form.is_active.data = current_user.is_active form.is_admin.data = current_user.is_admin return render_template('contacts/form.html', form=form, title='Edit Profile', total_admins=total_admins) @@ -180,7 +178,6 @@ def edit_contact(id): form.company.data = user.company form.position.data = user.position form.notes.data = user.notes - form.is_active.data = user.is_active form.is_admin.data = user.is_admin if form.validate_on_submit(): # Handle profile picture removal @@ -225,7 +222,6 @@ def edit_contact(id): user.company = form.company.data user.position = form.position.data user.notes = form.notes.data - user.is_active = form.is_active.data user.is_admin = form.is_admin.data # Set password if provided if form.new_password.data: diff --git a/templates/contacts/form.html b/templates/contacts/form.html index 1acfabe..bad06bd 100644 --- a/templates/contacts/form.html +++ b/templates/contacts/form.html @@ -145,10 +145,6 @@
-
- {{ form.is_active(class="h-4 w-4 focus:ring-blue-500 border-gray-300 rounded", style="accent-color: #16767b;") }} - {{ form.is_active.label(class="ml-2 block text-sm text-gray-900") }} -
{% set is_last_admin = current_user.is_admin and total_admins <= 1 %} {{ form.is_admin( diff --git a/templates/contacts/list.html b/templates/contacts/list.html index 14b8981..181a560 100644 --- a/templates/contacts/list.html +++ b/templates/contacts/list.html @@ -30,11 +30,6 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-200">
- - - + {% endif %}
+ {% if user.email != current_user.email %} + + + {% endif %} {% endfor %}