From 7de2d58b803676888be0b475f3b41bd65e6b49d8 Mon Sep 17 00:00:00 2001 From: Krzysztof Date: Fri, 5 Feb 2021 18:05:47 +0100 Subject: [PATCH] Update users app, add login/registser/profile template --- vagus/template/index.html | 7 +- vagus/template/offer/add-offer.html | 7 +- vagus/template/offer/add-offertest.html | 26 ----- vagus/template/offer/offer-detail.html | 96 +++++++++++++----- vagus/template/users/login.html | 41 ++++++++ vagus/template/users/profile.html | 57 ++++++++++- vagus/template/users/register.html | 41 ++++++++ vagus/users/__pycache__/admin.cpython-37.pyc | Bin 1560 -> 1328 bytes vagus/users/__pycache__/forms.cpython-37.pyc | Bin 1128 -> 1489 bytes vagus/users/__pycache__/models.cpython-37.pyc | Bin 3360 -> 2989 bytes vagus/users/__pycache__/urls.cpython-37.pyc | Bin 446 -> 600 bytes vagus/users/__pycache__/views.cpython-37.pyc | Bin 2636 -> 3465 bytes vagus/users/admin.py | 13 +-- vagus/users/forms.py | 15 +-- vagus/users/migrations/0001_initial.py | 11 +- .../migrations/0002_auto_20210114_1136.py | 39 ------- .../migrations/0002_auto_20210205_1512.py | 21 ++++ .../users/migrations/0003_base_user_avatar.py | 18 ---- .../migrations/0004_auto_20210114_2051.py | 18 ---- .../users/migrations/0005_base_user_phone.py | 19 ---- .../migrations/0006_auto_20210128_1355.py | 19 ---- .../__pycache__/0001_initial.cpython-37.pyc | Bin 2411 -> 2470 bytes .../0002_auto_20210205_1512.cpython-37.pyc | Bin 0 -> 771 bytes ...0007_remove_base_user_phone.cpython-37.pyc | Bin 0 -> 511 bytes .../__pycache__/__init__.cpython-37.pyc | Bin 148 -> 148 bytes vagus/users/models.py | 10 -- vagus/users/urls.py | 5 +- vagus/users/views.py | 71 +++++++++---- 28 files changed, 305 insertions(+), 229 deletions(-) delete mode 100755 vagus/template/offer/add-offertest.html create mode 100755 vagus/template/users/login.html create mode 100755 vagus/template/users/register.html delete mode 100755 vagus/users/migrations/0002_auto_20210114_1136.py create mode 100755 vagus/users/migrations/0002_auto_20210205_1512.py delete mode 100755 vagus/users/migrations/0003_base_user_avatar.py delete mode 100755 vagus/users/migrations/0004_auto_20210114_2051.py delete mode 100755 vagus/users/migrations/0005_base_user_phone.py delete mode 100755 vagus/users/migrations/0006_auto_20210128_1355.py create mode 100755 vagus/users/migrations/__pycache__/0002_auto_20210205_1512.cpython-37.pyc create mode 100755 vagus/users/migrations/__pycache__/0007_remove_base_user_phone.cpython-37.pyc diff --git a/vagus/template/index.html b/vagus/template/index.html index 5dac01b..9976360 100755 --- a/vagus/template/index.html +++ b/vagus/template/index.html @@ -10,6 +10,7 @@ +
@@ -21,9 +22,7 @@
KAMPERY - O NAS - FAQ - KONTAKT + DODAJ OFERTĘ
@@ -36,7 +35,7 @@ Witaj, Adminie {% endif %} {% else %} - Witaj, nieznajomy + Witaj, nieznajomy {% endif %}
diff --git a/vagus/template/offer/add-offer.html b/vagus/template/offer/add-offer.html index 88bcb11..006b835 100755 --- a/vagus/template/offer/add-offer.html +++ b/vagus/template/offer/add-offer.html @@ -13,18 +13,20 @@
{% endfor %} - +
{% endblock content %} diff --git a/vagus/template/offer/add-offertest.html b/vagus/template/offer/add-offertest.html deleted file mode 100755 index 78ef207..0000000 --- a/vagus/template/offer/add-offertest.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends 'index.html' %} - {% load static %} - - - {% block content %} - -
-{% csrf_token %} -{{ form.as_p}} -{{ formset.management_form }} - - -{% for photo in formset %} -
-
- -
-
-{% endfor %} - - - -
- - {% endblock content %} - diff --git a/vagus/template/offer/offer-detail.html b/vagus/template/offer/offer-detail.html index 8dc7ee4..2e1ab77 100755 --- a/vagus/template/offer/offer-detail.html +++ b/vagus/template/offer/offer-detail.html @@ -1,39 +1,79 @@ {% extends 'index.html' %} + {% load static %} {% block content %} +
+
+
+
+ {% if offer.status != 'Active'%} + OFERTA NIEAKTYWNA + {% endif %} +
+
+ {{offer.title}} +
+
+
+ {% if offer.images.all %} + {% for photo in offer.images.all %} + {% if photo.main_image == True%} + + {% endif %} + {% endfor %} + {%endif%} +
+
+ {% if offer.images.all %} + {% for photo in offer.images.all %} + + {% endfor %} + {% endif %} +
+
+ {{offer.description}} +
+ +
+
    +
  • 'DMC' {{offer.DMC}}
    • +
  • 'Places_to_sleep' {{offer.Places_to_sleep}}
    • +
  • 'cooker' {{offer.cooker}}
    • +
  • 'fridge' {{offer.fridge}}
    • +
  • 'microwave' {{offer.microwave}}
    • +
  • 'Webasto' {{offer.Webasto}}
    • +
  • 'auto_temp_control' {{offer.auto_temp_control}}
    • +
  • 'water_level_indicator' {{offer.water_level_indicator}}
    • +
  • 'battery_level' {{offer.battery_level}}
    • +
  • 'photovoltaic_panels' {{offer.photovoltaic_panels}}
    • +
  • 'gearbox {{offer.gearbox}}
    • +
  • 'tempomat' {{offer.tempomat}}
    • +
+
+ +
+
+
+
+ + {% csrf_token %} + {{ form.media }} + {{form.as_p}} + + +
+
+ +
+ +
+
+
{% endblock content %} - {% if offer.status != 'Active'%} -

OFERTA NIEKATYWNA

-{% endif %} -

{{ offer.title }}

- {{offer.created_by}} -

{{ offer.price }} PLN / dzień

-
    -
  • 'DMC' {{offer.DMC}}
    • -
  • 'Places_to_sleep' {{offer.Places_to_sleep}}
    • -
  • 'cooker' {{offer.cooker}}
    • -
  • 'fridge' {{offer.fridge}}
    • -
  • 'microwave' {{offer.microwave}}
    • -
  • 'Webasto' {{offer.Webasto}}
    • -
  • 'auto_temp_control' {{offer.auto_temp_control}}
    • -
  • 'water_level_indicator' {{offer.water_level_indicator}}
    • -
  • 'battery_level' {{offer.battery_level}}
    • -
  • 'photovoltaic_panels' {{offer.photovoltaic_panels}}
    • -
  • 'gearbox {{offer.gearbox}}
    • -
  • 'tempomat' {{offer.tempomat}}
    • -
- -

THUMBNAIL

- - -

GALLERY

-{% for photo in offer.images.all %} - -{% endfor %} \ No newline at end of file diff --git a/vagus/template/users/login.html b/vagus/template/users/login.html new file mode 100755 index 0000000..e1d1b8f --- /dev/null +++ b/vagus/template/users/login.html @@ -0,0 +1,41 @@ +{% extends 'index.html' %} +{% load static %} + +{% block content %} +
+
+
+
+
+
Login
+
+
+ {% csrf_token %} + {% for field in form %} +
+ +
+ {{field}} + {% for error in field.errors %} +

{{ error }}

+ {% endfor %} +
+
+ {% endfor %} +
+ + Nie masz konta? Zarejestruj się! + +
+
+
+
+
+
+
+ +
+ +{% endblock %} \ No newline at end of file diff --git a/vagus/template/users/profile.html b/vagus/template/users/profile.html index 86bfb30..6f45bcb 100755 --- a/vagus/template/users/profile.html +++ b/vagus/template/users/profile.html @@ -21,9 +21,60 @@
- {% for offer in offers%} - {{offer.id}} - {% endfor %} + {% if user_offers %} +

Moje oferty

+ + + + + + + + + + + + {% for offer in user_offers %} + + + + + + + + {% endfor %} + +
Tytuł ofertyData DodaniaKategoriaCenaStatus
+ {{ offer.title }} + {{ offer.date_added }}{{ offer.category }}{{ offer.price|capfirst }} {{offer.status}}
+ {% endif%} + {% if user_reservations %} +

Moje rezerwacje

+ + + + + + + + + + + + {% for reservation in user_reservations %} + + + + + + + + {% endfor %} + +
Tytuł ofertyData rezerwacjiPoczątek rezerwacjiKoniec rezerwacjiStatus
+ {{ reservation.offer.title }} + {{ reservation.created_date }}{{ reservation.reservation_start_date }}{{ reservation.reservation_end_date }} {{reservation.status}}
+ {% endif %}
diff --git a/vagus/template/users/register.html b/vagus/template/users/register.html new file mode 100755 index 0000000..b2d8f9f --- /dev/null +++ b/vagus/template/users/register.html @@ -0,0 +1,41 @@ +{% extends 'index.html' %} +{% load static %} + +{% block content %} +
+
+
+
+
+
Register
+
+
+ {% csrf_token %} + {% for field in form %} + +
+ +
+ {{field}} + {% for error in field.errors %} +

{{ error }}

+ {% endfor %} +
+
+ {% endfor %} +
+ + Masz ju konto? Zaloguj się! +
+
+ +
+
+
+
+ + +
+{% endblock %} \ No newline at end of file diff --git a/vagus/users/__pycache__/admin.cpython-37.pyc b/vagus/users/__pycache__/admin.cpython-37.pyc index 9fe3d05a2d94262264fe307c1fb0a717ef291da5..1b193decc4757e3dfbdc69625ba7d35ac59c49a5 100755 GIT binary patch delta 640 zcmZuuy>8S%5caIsKkL8qT?mPD1WrikFY9Kw`#`pkY_@X};NSXLe@KqHjU67sr8xYyWunc*WPrHk_`< zyDP9Hle}_jw{UB(@Q_>5sr*_LqVwG!~F@>7QECSMWOeWEU|;gbXkeD1kh| zc<*bfY?YidusYUP;W=QQ@X*SmORAqk>y)yd%`XAjwVbtLuWZ!O%SP!|JX_9{UjJH| z4{T&U!yRzU1>AM}DAj%Q6CPyLgg|Rt1RpqVO|i+kzX>nQZ?BVJtb>knn6MF53c<+n^k#y6CbI*NL^||NbOOkD;sc`Ul_O1PL)0<@j_&VEI zIj%hEfuoq>rC$Xys6rWH>?p5{Dj~(3`(<1uG6Cm-qXHFva#X0{Rr=AD87h$ysEEHx z3zb+Us3cloMUHy=w4+^}pD}ReQCBBtfRoebt~1PL=ekdD#80%T#&tcOPU;~u1I(GL2t#Q2(OBuBnD?6%N?a#cwOj7e=%UcjII~VI ztO*XvqONsqu2Bs0)?xd9!^qhtER@*5?MD~=gfv`V#H(ne{xxQ`q i+U-kDZo)g&RJ|?rUBJ4UDiY{H4hbZz<8}OeIfFl%shwE> diff --git a/vagus/users/__pycache__/forms.cpython-37.pyc b/vagus/users/__pycache__/forms.cpython-37.pyc index 1f7197ad07d3e6bc2e1d37e723603ba35e39ff5d..824e5d8e5cc1775bec8cc60f9258e47a230b7d54 100755 GIT binary patch literal 1489 zcmbVMOK;Oa5cc{N$8p*KrBEn$a*2;z5UN^HE)Z4Xaqwl?cDH%RYlmICK(FP>PvF3j zzqD6Q{Rq`t?iHey( zNH)n$d^%COq6L$}v~xCBLw3e0riRdHMD1TnO-!jQd7TT;6G}hSEXO!XRSTLi0sIuX z2~QC<{ligP;I-mcn!YRZS_+-Md6FKfaw<+LdcfpNsPv4DYMs`At4=LZgV|@}V~-t( z*NAUKe4@5N8TKQ!iCKFnZlQo_b4>gk4`b<47^OTE7;)7^quoVc1OnIJ2pD#GF>35=aFq-3vGKxCcb~X6qWti$Pk-wHT2baJI89n`NvySOV>+E{Y8hz|Sfk zNQJtM;tq-h2iJ~|xFB|`*!ruv{t4iHh(-!Dq8|~3_R^7W4qy9aIhxqZxRd}B@4?cT zdXB&FnmHf2Fyj{e^NmIL6-XwUF|9wAivK@8_ptWL?A;un9f-zBYw&Ru+QWX=gnSB5 zP1y|XPGbyC%A!(};{mIy@xb1IW_+=FwmZY;sIbowwKvOdY3`T`V2cUuz0>v*+CjE- h7#|-rTY23OnCNM9m!IMDrg5wi(j$qRc)h3>`~kgJGI;<1 delta 556 zcmZ{f%}N6?6ovCMna0kH&S(|HE=obmbnix_hy}$>7m6rZh=l|z*iOl`xO6eTz!3Ch z+_>=pbR~TPU%;K9;q{RB+i7~8XgOm2PSR866*t_-uGEn!ldUtbmO2(3J6JE-q7@gk z4-Ele9>4$|fC8XPe`-vsMX0z1+%G{Fn@6%%so0nQ0%k-o^G;&(LY8NTIH2X5Ijf+- z>DWXocBc&%;BNsC0%myw(_nHs>>sV4u-`fBzZJ(pOI8RrO@eB8X~mwYvCbycvpkIW Vb~lm3E7ia-3xRwbVxRalT2%l5 diff --git a/vagus/users/__pycache__/models.cpython-37.pyc b/vagus/users/__pycache__/models.cpython-37.pyc index 95601147c7e62cab772601c2ea442526144688bd..75c7f425eb3ab575c8b8aaa816ef84c08d6982b9 100755 GIT binary patch delta 595 zcmY*VJ8#oa6!!5We&pJ5oWyC8f+B`mZXps=g;Wr^(fQuHbbmqC zc@8d4fsEVqrms(e;T}t2AP>~YzAK@P&O$giGiWcDcf}REyW0jgs4P5hqC52wK*(PPM6ex<)s{Xc|K~k(!mN= zNm|8PRO5asMRoMCzL26dnrRIiG*cs$qXsrH5mczynYA!3S4iz+?|xS(OX2p(GokQ|z@fb29EBkNJ!zn@v68XK3iAhWJjDAw;KBtlfUWT>K-IH>V}>O*fZD_A6X6d#aFW)X2#BFg7cW) Xf;`@*k3kiv3t)-``E?Yx<*ok#*qMe# delta 919 zcmYjNJ#Q015WT%m`+T;~XP+HARxkp^I3GZPlnRs&@KV_b_ zElK(*l7GuUu#Bhw<+$2uCPT6#LyB6E5@<*BlIs$r!9J3}rfR5oDaSrIB+XxHRq}(MXmf{g&~Ovb!5FEYNtI3lVwe+%gNclVOp+Rq2nkqNsY4Rk z)PzMj7ufWL?(|3*_uANFkBFDSI~%78j1oIpoS6y99i*I*?B&Ej$Wj+_;9_eY@?L>X zg_2i<0!$rAUJ2C~p@iy7q3lh=G%7Fi7y3e_9!WJdQiGxIN7|O(3ZAoTXnkY=-DwT| z0e`12U1D=cv3U^|FdUfmHtP>6jaHZbnvo=~7*(>!=Z&{ynSV7tx@%a}S24thO4t&D z20pi9y8JYD)nYmlk+!$n3n>2<`>-gc_i+xETf`wYapXM76I-!}B|EY$tFkV~6gG<` z+s7IA@D>6pc?2X+M(rxqFzRFDWi;5pEJov?puu9R=!pp$YStsO(PQ0~|D;dZmgs7V zF1{Ccvvnlz;h7kbBdpHf$D1X#E@q4$vetUty;iVa3D8M)o!>BL^Gx)NrLy}16-2nr z_s#j@2EvDUCKDaP1kib>9Q LO0lP%8OQhwv6MWZiM%4R|qT1X`w z*xH1RVlrPyaltEQ0(dVPoi91NG30m{o1b>*6zb3W2mK1Y3>sN23JrhP>J7;?7}*~` U>DIHxyOS}95D#g`IKnah1<$QvBme*a delta 180 zcmcb?vX5EaiI|rA0Xfi6teeMR~<58HxmemKF(2W@2*U1G$ce5e!*`7y%%G BD}Vq1 diff --git a/vagus/users/__pycache__/views.cpython-37.pyc b/vagus/users/__pycache__/views.cpython-37.pyc index 076411f3b7537394a3debaac019b4302389e6159..2ec2f8aa2e98cdda3303e71a3d8cc1af05a8bb27 100755 GIT binary patch literal 3465 zcmai1OLHT)5eDYP;X@Q9aix7ovesTdSg}PrFIT0uT(XtdA(pmw9UpMWWOe{atdbg zdcINI7N8XD+sN+}cg0n?koT6@;p`7gw&cnSCRbE*;*0xo zRj$2Y;%(r!cUn3R37(;?0DLPwJz35_O!|@ z2x;axn`rgT2v`z0twPz8QYKPmrA}?BL3Z_v)TjhSyXxWDKxrg9z6-wYsWVrj{S?tL z?uiu4HqwzjQ3Kn{Qmb4@JGls6dM!uysTaml6kA{M?1R5;<%m%$4* z;UfB$1x!=`-O$w^>GG(T({VDy79SLdtq#q+2c2aT*5^lT%>T(RJnQxSelTYJQ1X|2 z>`Ct-8+#zmKL7=58QMe1$&@#VW0@3yC##Lq?!Y0)u$@0{gB>6AiaO7c5fr! z2ZfMjFljI^=I6`T)a}GBPLe@ds3dWTc%8_m)$v2}kpU%+9bqq3e1-o~lb4xQU zGnMB_ve>%A^$spV4fF-Zy>-s*aaYR0l4(R4WD^tn<)R8 zr~fkdAV_U5`KwTdula>ELec3^+6SwCeaY@9JpeWEui)g$7qX0Ds0j16zXiQJ!dBU($)Ef+CP@M}}fW--D$Z zz1PL11}!1Z^eyC}Z+1fc0BMxxmaHm$K4rTE;xca;Cu}+G+jO0 zlY$+LL3U{MOmg*dkQ$ZHsKwN15k)^)&IOq2^fu1Dh21Z)TYyD4Vc7l(8o|zZ%wsPA zYe8CAdE?NS$L0selsZ57-(i3U#lvf9IldPqbab{x~AcO>5_>c{nmd}BNv8@7-(GCF{1&x5Kz&%9Q3__-x z*ezp620(A>R2SImU*ps@=t-Z3PS27{okS&_rip82alx=O_A`({?#Uo}B8VHX4sXy8 zXs_mxomStp6MlFA?s6?gNa;OPYT*EjX!!+9V4J1nxT>;1mKl^{}1*3e|CoD5R5bEshzXu zSZtj^9@oEtHJw1W;HB4~bCsEv8Z#T@?*}+@f8JqKx%#wLOR!9M0*qO8fY#H$h4De> z1JRQGbZ}hmnv+u7Y-G)}#tbnBm}x}gRY?9Nwr7j6Y|*`^yO;xZ=Y^)BE7)z!7L9B# zH&i-|GlRL!# literal 2636 zcma(T$!;4rl$;q!V{Mjgc}tuoEz%ZB3#pf)Jp@G>cRM+OvmAJtj)#;y%8W)KIZ zmnuL`=@0bM9t-pjdd^Sq+EacZhobLMvLqWxVG88D$K~yd?$&B$0^{)SwIBZ~5%Lcr zXTt;F4ovkgESzwfkd!h?33s@gIH}8AfC=}e`>Dq~ix-kYT4Y5F7n4%zGvB@`B`ax} zmD38Vq*Ye6=YCR4>#T0!m1H$-u!e=p$y&P3)-7B~Hqs_*TDY2Qrdw>w!nI^O-C;YF zd{20tuRbSyb>gsHz#4oFureNNbQzW0E%uDu2ukQOyXDF$4~*K~?*?dM8o=_4iNz7(O3v%z&1gWil;ejaoB03LLX;5;3CRos59Ae&C1O2FzReN}1cI8ZfAVRB);0UdTm$s0xm4=?)x+rG*ozEf^8V7#grhpZ+Mdb#ZFC>?n zfSQdt*)Z3~fk?wR*@c5MIc~mNj>Ut6R>Al|FbGo-1g0DWX~y#e;c5^(&BJ7RVilCz z=cTZgL{a1#EKOvMw)Y+1wL9k=joRJ8D^*w)js`b5W(}QrKaQS!9YqgxsB?ADa^((O zl&Fxrg3H`*Q^@kY3I`ZCR%M?`#4pWt_tCH?LoUGc-8c~svw5&zk~?y~zQi5zOLO1* zCL0aT^Is(1B?Y(!3_n;B0P%AIpgVA=&tN$-`U}#fHp6`83QrU;%U(LXz>CkxgtFob z;t^H?$CONEW*f}>d91oX3ugrhe*}vr6Vj($GN!-MpB?S=-M%*_{Q{>i>Db}UZ8CO% zoO=KzpgheS9vq#pVus~FL1q_J4oPPkJ)wgr8))&94tS_T*#PpUlpSGeDpLeMLHbJ{ zb|FA8DNOOnD3m>AO0##sV$7&er z=om-p!ngd38G|ZIXs<+~&hi#4rZ%%pB$DLJKA2fh zW6+hhvdH%U`Vi(UovWVRITu;~m(G=Md8}vBT{4nC1#X`sN35Zc$cWDa4tb&4*4&t6 z8jL-Ge*~KT?u_9d!XFO6E_Wu>nmos(WSP?8t6#*c-);=Ep$tcZSlk$$VDB1*gOfM3 z)AA(NBDo5SDXBb)pi{{@U|@{5`Jggwd;#`@FX7rOlzdvHvIF=*>jrD^emLl5ZFQVU z9pze0J9425O;t(MLSp1VpP$~tsFm?i8!K{q-jS8{nAx6P%5|KmDRjfICH0@eF0S!EkBqpobcnec&15;U?bY%_ip6wh%Ten6r^~D_&+1icOBHJ(9 zGg&ZSZSA+ESfaBeRwWxi)~nW1OVK@VBF4Wx?LA+iztv4xs$kg$%qk>n)y1#<73+T8 K#b2XQcmD$fmQYLp diff --git a/vagus/users/admin.py b/vagus/users/admin.py index 5694c0c..789e208 100755 --- a/vagus/users/admin.py +++ b/vagus/users/admin.py @@ -1,13 +1,10 @@ from django.contrib import admin -from .models import Base_User, OwnerUser, NormalUser +from .models import Base_User, OwnerUser from .forms import CustomUserCreationForm, CustomUserChangeForm from django.contrib.auth.admin import UserAdmin from django.contrib.auth.models import Group -class NormalUserInline(admin.StackedInline): - model = NormalUser - can_delete = False - verbose_name_plural = 'Normal user' + class OwnerUserInLine(admin.StackedInline): model = OwnerUser @@ -20,17 +17,17 @@ class CustomUserAdmin(UserAdmin): form = CustomUserChangeForm model = Base_User - inlines = (NormalUserInline,OwnerUserInLine) + inlines = [OwnerUserInLine,] list_display = ('id','email', "is_staff", "is_active","is_superuser",'status') fieldsets = ( - (None, {'fields': ('email','phone','first_name','last_name', 'password','status','avatar')}), + (None, {'fields': ('email','first_name','last_name', 'password','status','avatar')}), ('Permissions', {'fields': ('is_staff', 'is_active',)}), ) add_fieldsets = ( (None, { 'classes': ('wide',), - 'fields': ('email','phone','first_name','last_name', 'password1', 'password2', 'is_staff', 'is_active','status','avatar')} + 'fields': ('email','first_name','last_name', 'password1', 'password2', 'is_staff', 'is_active','status','avatar')} ), ) ordering = ('email',) diff --git a/vagus/users/forms.py b/vagus/users/forms.py index 063b27d..4bb3f12 100755 --- a/vagus/users/forms.py +++ b/vagus/users/forms.py @@ -6,17 +6,20 @@ from .models import Base_User class CustomUserCreationForm(UserCreationForm): - phone = PhoneNumberField() + email = forms.EmailField(max_length=254,) + class Meta(UserCreationForm): model = Base_User - fields =['email','password','phone'] + fields =['email','first_name','last_name','avatar'] - class CustomUserChangeForm(UserChangeForm): - phone = PhoneNumberField() class Meta: model = Base_User - fields = ['email','password','phone'] + fields = ['email','first_name','last_name','avatar'] - \ No newline at end of file +class LoginForm(forms.Form): + + class Meta: + model = Base_User + fields = ['email','password'] \ No newline at end of file diff --git a/vagus/users/migrations/0001_initial.py b/vagus/users/migrations/0001_initial.py index 3ccb536..b7f931d 100755 --- a/vagus/users/migrations/0001_initial.py +++ b/vagus/users/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.3 on 2021-01-09 19:40 +# Generated by Django 3.1.3 on 2021-02-05 14:58 from django.conf import settings from django.db import migrations, models @@ -22,10 +22,13 @@ class Migration(migrations.Migration): ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), ('id', models.AutoField(primary_key=True, serialize=False)), ('email', models.EmailField(max_length=254, unique=True, verbose_name='Email')), + ('first_name', models.CharField(default='', max_length=30, verbose_name='First Name')), + ('last_name', models.CharField(default='', max_length=30, verbose_name='Last name')), + ('avatar', models.ImageField(blank=True, null=True, upload_to='media/avatars')), ('is_staff', models.BooleanField(default=False)), ('is_active', models.BooleanField(default=True)), ('date_joined', models.DateTimeField(auto_now_add=True, verbose_name='Date joined')), - ('status', models.CharField(choices=[('Company_Account', 'Company account'), ('Regular_Account', 'Regular account'), ('Need_verification', 'Wait for verification'), ('BaseAcc', 'Base account'), ('Moderaotr', 'Moderator')], default='BaseAcc', max_length=32)), + ('status', models.CharField(choices=[('Company_Account', 'Company account'), ('Regular_Account', 'Regular account'), ('Need_verification', 'Wait for verification'), ('BaseAcc', 'Base account'), ('Moderator', 'Moderator')], default='BaseAcc', max_length=32)), ('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')), ], @@ -38,8 +41,6 @@ class Migration(migrations.Migration): name='OwnerUser', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('first_name', models.CharField(max_length=30, verbose_name='First Name')), - ('last_name', models.CharField(max_length=30, verbose_name='Last name')), ('company_name', models.CharField(blank=True, max_length=30, verbose_name='Company name')), ('user', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], @@ -48,8 +49,6 @@ class Migration(migrations.Migration): name='NormalUser', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('first_name', models.CharField(max_length=30, verbose_name='First Name')), - ('last_name', models.CharField(max_length=30, verbose_name='Last name')), ('birth_date', models.DateField(blank=True, null=True, verbose_name='Birth date')), ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], diff --git a/vagus/users/migrations/0002_auto_20210114_1136.py b/vagus/users/migrations/0002_auto_20210114_1136.py deleted file mode 100755 index ff21769..0000000 --- a/vagus/users/migrations/0002_auto_20210114_1136.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.1.3 on 2021-01-14 11:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='normaluser', - name='first_name', - ), - migrations.RemoveField( - model_name='normaluser', - name='last_name', - ), - migrations.RemoveField( - model_name='owneruser', - name='first_name', - ), - migrations.RemoveField( - model_name='owneruser', - name='last_name', - ), - migrations.AddField( - model_name='base_user', - name='first_name', - field=models.CharField(default='', max_length=30, verbose_name='First Name'), - ), - migrations.AddField( - model_name='base_user', - name='last_name', - field=models.CharField(default='', max_length=30, verbose_name='Last name'), - ), - ] diff --git a/vagus/users/migrations/0002_auto_20210205_1512.py b/vagus/users/migrations/0002_auto_20210205_1512.py new file mode 100755 index 0000000..f9e26f2 --- /dev/null +++ b/vagus/users/migrations/0002_auto_20210205_1512.py @@ -0,0 +1,21 @@ +# Generated by Django 3.1.3 on 2021-02-05 15:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='base_user', + name='status', + field=models.CharField(choices=[('Company_Account', 'Company account'), ('Need_verification', 'Wait for verification'), ('BaseAcc', 'Base account'), ('Moderator', 'Moderator')], default='BaseAcc', max_length=32), + ), + migrations.DeleteModel( + name='NormalUser', + ), + ] diff --git a/vagus/users/migrations/0003_base_user_avatar.py b/vagus/users/migrations/0003_base_user_avatar.py deleted file mode 100755 index 93be0fc..0000000 --- a/vagus/users/migrations/0003_base_user_avatar.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.3 on 2021-01-14 11:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_auto_20210114_1136'), - ] - - operations = [ - migrations.AddField( - model_name='base_user', - name='avatar', - field=models.ImageField(blank=True, null=True, upload_to='media/avatars'), - ), - ] diff --git a/vagus/users/migrations/0004_auto_20210114_2051.py b/vagus/users/migrations/0004_auto_20210114_2051.py deleted file mode 100755 index df39c0e..0000000 --- a/vagus/users/migrations/0004_auto_20210114_2051.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.3 on 2021-01-14 20:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_base_user_avatar'), - ] - - operations = [ - migrations.AlterField( - model_name='base_user', - name='status', - field=models.CharField(choices=[('Company_Account', 'Company account'), ('Regular_Account', 'Regular account'), ('Need_verification', 'Wait for verification'), ('BaseAcc', 'Base account'), ('Moderator', 'Moderator')], default='BaseAcc', max_length=32), - ), - ] diff --git a/vagus/users/migrations/0005_base_user_phone.py b/vagus/users/migrations/0005_base_user_phone.py deleted file mode 100755 index 4578eb5..0000000 --- a/vagus/users/migrations/0005_base_user_phone.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.3 on 2021-01-26 19:13 - -from django.db import migrations -import phonenumber_field.modelfields - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_auto_20210114_2051'), - ] - - operations = [ - migrations.AddField( - model_name='base_user', - name='phone', - field=phonenumber_field.modelfields.PhoneNumberField(blank=True, default='', max_length=128, null=True, region=None, unique=True), - ), - ] diff --git a/vagus/users/migrations/0006_auto_20210128_1355.py b/vagus/users/migrations/0006_auto_20210128_1355.py deleted file mode 100755 index 16ba289..0000000 --- a/vagus/users/migrations/0006_auto_20210128_1355.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.3 on 2021-01-28 13:55 - -from django.db import migrations -import phonenumber_field.modelfields - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0005_base_user_phone'), - ] - - operations = [ - migrations.AlterField( - model_name='base_user', - name='phone', - field=phonenumber_field.modelfields.PhoneNumberField(default='', max_length=128, region=None, unique=True), - ), - ] diff --git a/vagus/users/migrations/__pycache__/0001_initial.cpython-37.pyc b/vagus/users/migrations/__pycache__/0001_initial.cpython-37.pyc index dca9659bb5fbe430185421c5dfded24f309aab9c..e2a97493e970a88f5f8533d30442e74af3b34727 100755 GIT binary patch delta 658 zcmZvY%TLr$6vpS?cKRAR107_Br+_c2z&MKF0|XIK7K|nY6HN>@`AS3MINGT!*syV1 z6TDluvNmDw)~)N=n7GoIxbhG1+?It#+w|mqzwbNewEf{6mhENRwsLeCPllgP9@uZJ zDv2d}+Mf^J@9rDuLj_gzC(1U*fUk!c89XLKL~Jm+hcS|7P7<+Dz-Yp#V=PtdSdEi1 zDSHa16He|K(gx1r946r6e2~WlOkygXGfiG`pTad-qfjmwEfO*7IUekJ9zn9F!j z#8q6w^>-XM62;Gl8s<@=Y=N?jUT6U~6P5ZG)1{0)YYDf~RdpgIFuyzO3H8tk%YJWo z0?XuiJWy~u;pw=Q|Bkyu&3);LRhWN{`)A-?xjvg0D32?+w~=$#j$ZSZtY&TRMD2L% zx!3eNx$h(N`}eF>iAEcQTqWuu6cuFYq9Q(Ml_|~J^p-Ye60*Zn#yk zp}*CvwWb&N;)@<@o6_49kBkR{^K>-0s%WapIPYc--C1?SN2A|#*tjB{Uh&OXA85$N OeA@kYc_{9iL%#t^J)a2x delta 642 zcmb7B%}&%%80Fq}I&(W#Is?O>h~t1_1r!ibP+>&k!Z<_*RwM?SoH9-WGfAl~*v!V2 zNlEY~uH4ECu=Gu4=aTpUZvF11F&bC4Y5Sd@`<;{YwC_jJS#un_hpzg!!kgxab8MFg zROvbFo_u}Zv606>!uB`@gKTJnrD%wdAT*4Tgp+!Oa1NumiZNV6xskzjR4|?xq)m|K zkoN{|ViLD70WYzLzn$_^nxDqZ1>eZy4(?+13&&h1F@j8JVII9?&eIY`h3;V?F=@el z9lD4Iuyl!sDPBtPvc?RHc!bBg$|NzD!Ghk<4YOe(ECzjHKb|O!Dz7A5r>*`@>-Y+MU}I9=9JCbd(G%D-fj5@!TA{dyd(R$BFY;?bj7}(YDeNFjb&w% zKdq`WMOKeTv-FAP;*_NCOBzvq|THxNPFvxGZul>Oxhw~^3*=3F$j;`8Zz zHl0t8`0QvlKiu4E_x`%H%^pEN=!T)^)Az~`y*9R-gf@b;sB(1(SFMEhx7*<3Uu~_| Sl*9JlZkzGWsWVRVv*16)SJ)T; literal 0 HcmV?d00001 diff --git a/vagus/users/migrations/__pycache__/0007_remove_base_user_phone.cpython-37.pyc b/vagus/users/migrations/__pycache__/0007_remove_base_user_phone.cpython-37.pyc new file mode 100755 index 0000000000000000000000000000000000000000..56bf7fa280df33482c1b30ad2d9cb4cde2ea80f7 GIT binary patch literal 511 zcmY*VJx{|h5Vi9~8d|}|#KM-PNs9^$2qBPwg{lI?kj13+DI`kb5I2>WVdaPLSNI8D znfMD#oKs50Nq4$?e)n|GXT6?BFg~K)hbv0Rryf>eVRMQp_pornX-*0nQA#ceH@Nvq zxCt~fUd+hg)-CbvFXR!QDz8YBI-aMZlrs&j;-4Uph;o9fG@+3RR%UBaZoL^eJKRP= zM|G}OO1`1&MnWy4oiGd!SlrA78-~L{I2azW!TxBZI@4GJ((J@e08qXJuS~ zvUDB$8_H!Zz?kwFLqd}S_FcxFnmE@aJ#na@5dyzK<$l&fUnA9SJ*_@rn1+s%hoHR0MT?Fed3ee9Xt6OdMXMwd2`qgu7 xqPBx6T`aEYSQa&Ci;jI$b$Aw+iRklbdt{5R&slccxTxIYrPC9wC$*uj`2&aAg$Muu literal 0 HcmV?d00001 diff --git a/vagus/users/migrations/__pycache__/__init__.cpython-37.pyc b/vagus/users/migrations/__pycache__/__init__.cpython-37.pyc index 3a6be256e6bc094675017c7bee83cb3d64152d37..d5e9c9194b9ab8a2e95276a0a03e9616e2c1f817 100755 GIT binary patch delta 19 ZcmbQjIE9hhiI