From 1cf8297720639b1cf54c481eb7dd34ab30040b2d Mon Sep 17 00:00:00 2001 From: gothack329 Date: Mon, 5 Mar 2018 18:05:04 +0800 Subject: [PATCH] fix bug --- db.sqlite3 | Bin 360448 -> 360448 bytes static/bootstrap/css/style.css | 4 ++ userpage/__pycache__/admin.cpython-36.pyc | Bin 702 -> 802 bytes userpage/__pycache__/models.cpython-36.pyc | Bin 3362 -> 3577 bytes userpage/__pycache__/views.cpython-36.pyc | Bin 3630 -> 3631 bytes userpage/admin.py | 2 +- .../migrations/0008_auto_20180305_1717.py | 67 ++++++++++++++++++ .../0008_auto_20180305_1717.cpython-36.pyc | Bin 0 -> 1271 bytes userpage/models.py | 10 ++- userpage/views.py | 20 +----- 10 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 userpage/migrations/0008_auto_20180305_1717.py create mode 100644 userpage/migrations/__pycache__/0008_auto_20180305_1717.cpython-36.pyc diff --git a/db.sqlite3 b/db.sqlite3 index 2a388d1ed9d040519239840b55304a583b84a2ec..6bd8864cb5f2fcab9505e93c6127553a2918b976 100644 GIT binary patch delta 2901 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 diff --git a/static/bootstrap/css/style.css b/static/bootstrap/css/style.css index 43d5de5..912ce6a 100755 --- a/static/bootstrap/css/style.css +++ b/static/bootstrap/css/style.css @@ -80,6 +80,10 @@ div.container-fluid { box-sizing: border-box; } +.container { + width:80%; +} + .sidebar , .content { margin-top:10px; } diff --git a/userpage/__pycache__/admin.cpython-36.pyc b/userpage/__pycache__/admin.cpython-36.pyc index 2c3399eb7fb6352e80f4cebb2eeeffa7a6bc2a4d..7a66c044b4ed58314ea581142fbd974f37b66a39 100644 GIT binary patch delta 292 zcmZY1yH3L}6oBD4ZJfkyxVGgY2G-1UfsK`+s>Id>Ik5{CB$jN`jJyJsS72ad;{|vL zw(}-1;Ugp#27mgG<>Qa!mF6c!!9LmZ;%%Kj5#}Gs_+hx{iNR%57BHL}y;OJdTr{eM z{=Jn3QZ9s%)&k`#?zn-0YFEn1t6B>Qw9!>q0NTm=hC4_)sVWWGlGn1*`W8~xDd)mJ zxoWNB*M>KCGQt|nES{}_NR*+qWe h|J4|45@6xjIFJ!D@zZ#Agtw5)wQAkJE&mc9{{Uj|O633m delta 236 zcmZ3)wvUz5n3tF9)T7x^NfSBegfKHOFgO5lu>g=rWr$)-VTfW%VU1!=VF_l?WV^)^ zP?VpRnUm_6lAD=#i>0(UwdfW{PJVJ?NoIcDEw;q6#FE4!KTYN$HlY3@b`ZfaIhN6i zjTgk^ojjLuqX5Y0B0&%#1SB+BCfhPfDL~{wf_xx?A4qTkaWNB+;9xA`pFD%f&juuV pi!~rWGq0owp#jVS>AJ;XlbfGXnv-hB2+|7D&%?;UEX2eI!~l@~FZ=)i diff --git a/userpage/__pycache__/models.cpython-36.pyc b/userpage/__pycache__/models.cpython-36.pyc index b6836361937f489d31284a7f1993664b7ed1e735..456c375e5439af828fe52bfa9372d8ed0953cc97 100644 GIT binary patch delta 1331 zcmb7@%}>-o6u>)eVY}V#(uG|>P(VbaqALh7Ucm635J2Q3B#p_YYzq`&YhDW&F3W+V zUYN6q@#aAj@DA8^Cd@Gud!7-VQWuBQ;(#iE!i?k=?bZ~LaM8fG8Iy`LaMh@cFn$E zHrV>SV5Gy?EO;yKhGVcW?iKkVi%IS`#(y$1ml6aal#5#%8^CaAFwn94(t?0ADMU!p zIMVL%RdI|p@R#BsYvy0Y3#^f=(nMnhSA_8e=TR{3IvaKvvuqn2-{M-|zr;UC?^u=}$h)_*w9g=1A#@>T3>hNz zUrn^YP=L%rGvPcRt?DeD;X^1-JAu`PYkUo%Fqz5X(dp2G3Nl`11~rlT%y2q!wiTN% zA`}KB7qA_F{FBtpGu0kz=lj(IrK_liZUkQ7HSA`vZznN+`b5eTTqooZVG48VL4Ff& z%UX4Oh|$aq!WjWZ?$Rl~f;fs#lTdr-|AOnq-Q@9caJ_Fzu^eMb{z@5Q8GfiV_toQc znG4Ys)7=joZxh&Va@KQ;K`x*71IXuR_+-4J=Y7&kc11L)lbY*c5-Pw%$BR zC&d!h6~M9ZC2aW)sWO#ma61-5+bJ2Rd+GiSb!y&E+b9LH>bds_?4 z1GCN8mUzLcGoI;LFO^!aXIB;1NphPIKJZ)IWl25^>K)GLF{QaMg}M{zw)pF*L~jd5~CG18?he-;)`~^48!P# z(%&#dM+?EkC$bR?R#1D?er7XU1xp-cuZU0j9xDnz^ZZhg!eY1D8ZN*%TDheQ998#c-$aj-P$_S)gDGS%ypBe(oilkAKAqeI;fpUMKBo9xrxuO zOMJ}kvq^C;ceQ*9ZQvr{FlX^q!S^H`^J&r)M5BSz1ZTuyZe;f?eIC(>q;&$Fk%3?^ z>ciIlyN7f5^Kr`3?Sane9^P}~7-K!+Req@~)z0vzJctu}C-j534!jwHhs_M)e<_+$ zWtwtX{K${zFOc^lf*3TXrcl3SGOQ4+609M(ed$pM-*kg<@=;YFim-%`IIE4A-|?St zxp6hC!=N6c1tuu!8o@s|ZyvoQXjgrk6_`Qlt1$n@T3M%Jt|moDa^d|)yctJHwh0`I zBJFi_Cx#zHaU*E*B-e3xN%rxx25d*^0f^VuaPMWRq$4P*&R|n~u$D(D2W$}BBKRZi zkSN$CXAzB33`K>iSg@z?3QF}L%M6J_XVP*C MR>AJKikYJR6LOKvmjD0& diff --git a/userpage/__pycache__/views.cpython-36.pyc b/userpage/__pycache__/views.cpython-36.pyc index c34e16ba1a94e2839a2420826e70990fb85f613a..3af1a701443e56d6899b2777f8cadf1ae16be298 100644 GIT binary patch delta 803 zcmYk3&ubGw6vyYyCi^qHrfHirAuXak7!cH^A*HrWM3Y*qt+oY!K$YlL=@yze*+Rix ziUbi4fx=w%;K^G>a`K`e{tX^_@*)(E;ve99+Z>YRedf*gz4?Zjca;B>H;T4xe%IbV zeEHc(b9g4t^7{uX0rL!3-{In`Z(?p?Xs*%aq3S34dz&=RK~)L0K=saam^ccw{;GP( z4g-e!X!VC&vjgkQPkF-u!|ss|2ezAw+{qdG&XMCI+-m-)2VOi-T&oLS+D&vI)c13N zeuHhMLc>)9<8dZ1PVHa(y~hH@%Y>$D2MX#+|8K`45AO2F!$A+r&&s>XIAnWGWe6ZA zU&Xf6cztQPwl06iKEi_R#!C}L##joYJ%wP30}f9^nmgQtB&6l9_&F%{6m~<>I;_eQ{mS`8R0~{;P|>0sM09$vd(IfYcn51w z0YN_pL&dm`(Y}o8a~1-Qfw_RA`XgT(g`s1-yVhYrjEL%q{ATRSidh;>VdsczXIW^w zPGIk7haeL2t$7Kq$uDLe*5prf-m0Rvs1fRN!pg#;oUtaMCO54M)=iS92}|x)|?a74j5y<${Unom5jOr_h@8*>|eW8mr5NQ6BxPph@p z!tz$DNp=}JvqD%Hi%6&tHW1qw?K$}%Q5Z9MlB;0y1eo}7uJRb@AU1mM64NkA0~V_U Qdg18o>5v8o@Xwz84=Wg_m;e9( delta 783 zcmYk3&ubGw6vyYyZuZw?(=<)frbO^Z4+aD=Z9}c56|JpQt&|=VQEKZH=|*gwY@vr) zdI;jhLSZg~di5ZpNN?g_;6cHIpx(R+QWfvMx2ez_-e=x?-@G^bW?olbRs5ka4D8(} z*FV4UOB|NWL4IvvMzhG5UX!c0ae%%+bEUt<6DQ98Uq@l8xY~(wZKhsmcW-v0t~LXP z>vWFuGHAm*i@T$OX1Ke@eBW%IyZHoxrW&@hiPBTzFRG8HJ8ADP2Y+sQej025}~eF$~)(cQ|AF~(GhFhQuB zyWWUskeg!My!57E*8K5K9GOD3%2knqf_zYE_Ws?|{()mxFm@Xd^ySbTv~y^!QB?1+ z1n|C@1bmC%X4|iJf5)!fHq$l{)m`)6-|%!+vZk*-nX|!2?*OJ0WmslOD04b&y4#?N z=237Q&X{*W1?J3`pdr#0Ch;V7-W(ETm@=otAWWKD;;5J=d5Cbq7*X3CCif(vK2bqNc2j>pA!2>nF^DH|IgEh*TCD3K3*`4>= J{}zA4v43b)t0w>e diff --git a/userpage/admin.py b/userpage/admin.py index 2cc5dab..6c82e51 100644 --- a/userpage/admin.py +++ b/userpage/admin.py @@ -3,7 +3,7 @@ # Register your models here. class ProfileAdmin(admin.ModelAdmin): - list_display = ('user','location','avatar') + list_display = ('user','address','avatar','invite_code','mobile','wechat','weibo','facebook','twitter','instagram') admin.site.register(Profile,ProfileAdmin) diff --git a/userpage/migrations/0008_auto_20180305_1717.py b/userpage/migrations/0008_auto_20180305_1717.py new file mode 100644 index 0000000..a4ed89e --- /dev/null +++ b/userpage/migrations/0008_auto_20180305_1717.py @@ -0,0 +1,67 @@ +# Generated by Django 2.0.2 on 2018-03-05 09:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('userpage', '0007_point'), + ] + + operations = [ + migrations.RemoveField( + model_name='profile', + name='location', + ), + migrations.AddField( + model_name='profile', + name='address', + field=models.TextField(blank=True, max_length=500), + ), + migrations.AddField( + model_name='profile', + name='facebook', + field=models.CharField(blank=True, max_length=128), + ), + migrations.AddField( + model_name='profile', + name='instagram', + field=models.CharField(blank=True, max_length=128), + ), + migrations.AddField( + model_name='profile', + name='invite_code', + field=models.CharField(default='null', max_length=30), + ), + migrations.AddField( + model_name='profile', + name='mobile', + field=models.CharField(blank=True, max_length=128), + ), + migrations.AddField( + model_name='profile', + name='twitter', + field=models.CharField(blank=True, max_length=128), + ), + migrations.AddField( + model_name='profile', + name='wechat', + field=models.CharField(blank=True, max_length=128), + ), + migrations.AddField( + model_name='profile', + name='weibo', + field=models.CharField(blank=True, max_length=128), + ), + migrations.AlterField( + model_name='point', + name='event', + field=models.CharField(choices=[('publish', '发布文章'), ('comment', '发表评论'), ('commented', '文章被评论'), ('register', '新用户注册')], max_length=16), + ), + migrations.AlterField( + model_name='profile', + name='point', + field=models.IntegerField(default=0), + ), + ] diff --git a/userpage/migrations/__pycache__/0008_auto_20180305_1717.cpython-36.pyc b/userpage/migrations/__pycache__/0008_auto_20180305_1717.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5e6661399a6d84aaffa40ee74988d6cfc7ad0929 GIT binary patch literal 1271 zcmbtUOKTKC5T3`*?#%42##i*}8mps?2tr$J#xc#G9a~ z2ZIRWO;Aq}K?M(rKc%mdnB4W^$?BP1Uzn2vQ~k|X)!kKJb+LN}Xeb#<^ zN`z0*D-MwX4fIHh^|l@xZ9~`2X<&ePR|6CES@VwBHlcJyYglU(t2GSi#w_H1#?nN{ za-0H2B2cd3vzfptdc_W1(@<;cptTJ+80u{kOS2Zxa$qeQgv*4>Sedn<0ya2{2DpnV zM)6hR9pY<$@%4514LQFNMqtw)>ug>pe#<)i)^+%8|KMF1h3z?i2oA#$XoMx$3;TZV z?@}G3|fMXbz!w#g99YzQR!S9>L~5LK;H91ly0lln(}%nOEOvM@pOhoDD5Z> za=~-;mEvCF$0$p=t@r>Og}BPTlHe3#bs|5xL4EQUyao!d8P)E2+Mp`orBarrt zA7Cd-%`tiuwK`PA50R#`H~GV}u4iT3D6(b{ebp_MCuGk!nHcwJ4Q=66(jm2946 z8FE>k$Dr$H(waxsNu^bkVc{I+)$}_N6Wwn$n!Ehy@$$zzD^Kr#dHq~gf;5gPWawFa zv9$X3?&_OQ(iwOVzHOvgMf~c^*8{iBF=T>v9(dn+DWo-YzKw=U4TD=W@^T)?cPhNAz^Y!pr@(s^-dEr;h4(95m$sL8!Skf+d2|o@ z5fZL>-p#%rsm`b`z#b-mNx&!rgC@%AWsK7~JXebKx^-4soPAWb5cU~_odn!j#x zlg{0==l8SJJJy<*ZcVn1dlOR=Q{%l`T>UMSM&ddd+bow#x}ld1Wet7gKgS(|`S~uF n8YSt#te=GGICOHoa$$1kulfpfjIxpTi9-34N