From c0b156ed2b1cb234b2000bc68450e740ab5a736a Mon Sep 17 00:00:00 2001
From: gothack329 <gothack.329@gmail.com>
Date: Sat, 24 Feb 2018 15:13:44 +0800
Subject: [PATCH] add userpage

---
 article/__pycache__/urls.cpython-36.pyc       | Bin 280 -> 347 bytes
 article/__pycache__/views.cpython-36.pyc      | Bin 552 -> 847 bytes
 article/urls.py                               |   5 +++--
 article/views.py                              |   9 ++++++++-
 edconline/__pycache__/settings.cpython-36.pyc | Bin 3601 -> 3659 bytes
 edconline/__pycache__/urls.cpython-36.pyc     | Bin 1192 -> 1252 bytes
 edconline/settings.py                         |   4 ++++
 edconline/urls.py                             |   8 +++++---
 templates/base.html                           |  12 ++++++++++++
 userpage/__init__.py                          |   0
 userpage/__pycache__/__init__.cpython-36.pyc  | Bin 0 -> 133 bytes
 userpage/__pycache__/admin.cpython-36.pyc     | Bin 0 -> 174 bytes
 userpage/__pycache__/models.cpython-36.pyc    | Bin 0 -> 171 bytes
 userpage/__pycache__/urls.cpython-36.pyc      | Bin 0 -> 320 bytes
 userpage/__pycache__/views.cpython-36.pyc     | Bin 0 -> 582 bytes
 userpage/admin.py                             |   3 +++
 userpage/apps.py                              |   5 +++++
 userpage/migrations/__init__.py               |   0
 .../__pycache__/__init__.cpython-36.pyc       | Bin 0 -> 144 bytes
 userpage/models.py                            |   3 +++
 userpage/tests.py                             |   3 +++
 userpage/urls.py                              |   7 +++++++
 userpage/views.py                             |  10 ++++++++++
 23 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 templates/base.html
 create mode 100644 userpage/__init__.py
 create mode 100644 userpage/__pycache__/__init__.cpython-36.pyc
 create mode 100644 userpage/__pycache__/admin.cpython-36.pyc
 create mode 100644 userpage/__pycache__/models.cpython-36.pyc
 create mode 100644 userpage/__pycache__/urls.cpython-36.pyc
 create mode 100644 userpage/__pycache__/views.cpython-36.pyc
 create mode 100644 userpage/admin.py
 create mode 100644 userpage/apps.py
 create mode 100644 userpage/migrations/__init__.py
 create mode 100644 userpage/migrations/__pycache__/__init__.cpython-36.pyc
 create mode 100644 userpage/models.py
 create mode 100644 userpage/tests.py
 create mode 100644 userpage/urls.py
 create mode 100644 userpage/views.py

diff --git a/article/__pycache__/urls.cpython-36.pyc b/article/__pycache__/urls.cpython-36.pyc
index 5866c2fa265e375d3eae1ded9aac0bb414dce6ce..19f5bf5e6ec2747339a3eee47ea0890075307f3a 100644
GIT binary patch
delta 257
zcmX|*u};J=42GSgX?vxI#8aS(;RdEVoe)UOENod&gsr=vq*Q4R5DNn{LpNT5x8MbM
zfig1PTi{9vTmP@mmTmc6e#@8B`Mf$g9Ly&G{ILEbXF6x~muv_qJOp8cm{@ullu^tI
zGoJ-*v;b15N#EtKk|}2@u)y+7ZKNr2b`4Fn=S$FtQCkeIWyrdvP20WrYd<)8>_>P$
zTDvx_Y)tOf(~ZNk#h4={>-@CS+CW#$Y<N0e#OcYX*-W{;57gNW#e&Q6U>AL7Q=-`R
T9}w$lt{%QF>XNAzoT?JPg4;Xy

delta 197
zcmcc3G=r($n3tE!@>PFSD+2?=V<3hDW+2M}h>Hz?L<&O+V-7<uV-zDJh|QG4l*=5&
z3}!Ruu!JzAGN-VlvNkiNGe)tcum&?|vb_ZAV$fu~#hRFso0$h>uoNVgWB_SKty>I!
zn(VjuQnC{B(kJd$(2L?tEGo%N&PmlP%S<gVzQqpZ-r_DT$^q&sNiE7NUdd3z1vIgU
TYce0BBNrQx$-~IQ$iWN%a8xfn

diff --git a/article/__pycache__/views.cpython-36.pyc b/article/__pycache__/views.cpython-36.pyc
index 22efdc055d2675b8a799eb778600004209dd6a37..bbc28bf12d91ac05f80025632b127031715dfa35 100644
GIT binary patch
delta 395
zcmZ3%a-L1un3tDJihp7hCldq1V+JGu<TE$`adE;#<v@`XjuwU}-W1LhE+Ea9!X3<@
z$+NM7g|VI^BR@B_ATd3a1EdzDiGi_*4@f41*+2$}W(HzsATH(s5+w{Nj5Um649$!{
zQ<(g!WFzxS)r(RUa`N-DGxO3F5=#^ki%K$+b5a#li}f@ai$J<HnToi9)GaQkRD5Pi
z5zw%D1`x?m#0!#ROGzzB%*+7^z+55#WE1Za8K_Ij@=HJt$<M>>kRpDNwLEHI5=4Mq
wzyj2n3X*}@F9>A&Y4T5=&X~*wa!Zlm<Zp~>0w5>yFbXirF!Hc)uy8N~00gN;u>b%7

delta 101
zcmX@lwt_|3n3tD}{Y8J26(a+~V+JI^1Y|n^adE&z<v^BT22GBQ9W0E}?1@DsnaMe+
l93Ux>8V1H9J|O9*$vb%iQ}Se4W+fhw91o)aqYNVt3jm6T5GDWs

diff --git a/article/urls.py b/article/urls.py
index 410360e..110bc25 100644
--- a/article/urls.py
+++ b/article/urls.py
@@ -1,7 +1,8 @@
 from django.contrib import admin
 from django.urls import path
-from article.views import *
+from . import views 
 
 urlpatterns = [
-    path(r'', article),
+    path('', views.homepage),
+    path('<int:article_id>/', views.detail, name='detail'),
 ]
diff --git a/article/views.py b/article/views.py
index 8c64542..6b9be83 100644
--- a/article/views.py
+++ b/article/views.py
@@ -5,5 +5,12 @@
 
 # Create your views here.
 
-def article(request):
+def homepage(request):
     return HttpResponse('<p>Test</p>') 
+
+
+def detail(request, article_id):
+    return HttpResponse("You're looking at article %s." % article_id)
+
+def vote(request, article_id):
+    return HttpResponse("You're voting on article %s." % article_id)
diff --git a/edconline/__pycache__/settings.cpython-36.pyc b/edconline/__pycache__/settings.cpython-36.pyc
index 7de9b2e81916327ca077e23dfd0891ad4df063c0..5a52d6758bd4117db0221bfcdf220fc51de440bf 100644
GIT binary patch
delta 411
zcmYk0%Su8~6o${<?)0Rd@}AdjmT9GxX7{2f1tAF1(Ha!ee>~`*n>NkCX%+<L)JJF%
zK1OfQ)JNzA+89V{@%{WiEY@0`=vOqJ(=_|Dt3v~~q70OOrAdD*X&!Xq7j3u=C)weF
z7e4qAz!ZXpjT{J(6JbMvKm<|5FpU{Q)EQ=b!eFFfjwUdVxXv29F{xXzU~(+>c%6|8
z2`tIU1d>Bd4RyKB3_)(JVD&{I57N2^8MDo59Bb09o6^-dd66a`HpmY_0m+mkh%ALh
zhq5N8@F?X>USkx&Ci3#tEo@^4yV%1%4rCTM>^Uhacf=&q;AJIsRLw9&v7a@nx5i!n
zie>mXsZUM)@xE&GUo9=c9^TcWO4eqp+N$65i|U7k&Gdg9dFJ_cl`AKe(rK}DUMOFm
jl`hNOq^7f%?wc0poOM67LX5k{I2*N%Te<j4sztD0urFT2

delta 317
zcmYk0J5Iwu5Qe>*6-0?QVCUh)al*p{a0m|*!Xr@7KubY41rpNlSayY!1At@>kjN61
z4?scZE6{NaDsI6l1!AP{*EiCPX1<)c;|`@P&Ab`C8JhO3{VS>bS~2a<-Mi<oOeGjF
zQAG`PG+>3xR7R6@v_cI6HrjB|K{pf;!&)XnMiT2(!3H)17V~%|Sc02yY-K!Rw2B_K
z)npGli`-qL7qL)~fj;(LH8L>>OzbCY^2l+Z^iV0EaH?WJH5^eLf*J}-(S%Q}ze9e)
z$;L5;>a`P$aEddW;{s#V3tVP8wbhQJ=z!mA-c=4Z=J|VJD%ex%6mRpm_)%cp+|oxZ
UeUJfrNk65V{>U39QomyV0y6<iu>b%7

diff --git a/edconline/__pycache__/urls.cpython-36.pyc b/edconline/__pycache__/urls.cpython-36.pyc
index 1203b6ca6614583cabf9f784054731c60754a02b..31f684be81daad1d6e1f8d1c36710666a88dcef9 100644
GIT binary patch
delta 232
zcmZ3%`Giy1n3tF975~JjFct=e#|%h-1ITs&;^Gw(mEF@)7*kksxTCmJnX-7A85kK-
z*`PE>7B863lEMa*<ICc2W=dsAVF${?*c_>>DV)uWU~w)Wn;XjJ0kU~P>~z*BffSZt
z22H+=d!8`KRB@ITrxq0?rl;yx@xqvTrA0Z#nu3!TF-LPoaX>{U|6%S^k^{Ptg^`C*
VfRO`8a)2Nc5HfPG@BsNB2mrpRF}MH#

delta 150
zcmaFDxq?&Kn3tDpne>Dx2^I#1#|%h-9msY7;^HY2mEHAHnX<T>85kK-*`PE>77v)u
zlEMa*<IUo0W=dsAVF$_s*%KE?aiz0F@u#o^GidT`yzqpHNmF3*1?K3<rYya3Qb1E#
Z7<m{47&(9>2O|d)5HfPG@Bn!{i~vCb8Q=f_

diff --git a/edconline/settings.py b/edconline/settings.py
index f32c498..7244d1b 100644
--- a/edconline/settings.py
+++ b/edconline/settings.py
@@ -44,6 +44,7 @@
     'tinymce',
 
     'article',
+    'userpage',
 ]
 
 MIDDLEWARE = [
@@ -132,6 +133,9 @@
 
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR,'/static/')
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'static'),
+)
 
 
 TINYMCE_DEFAULT_CONFIG = {
diff --git a/edconline/urls.py b/edconline/urls.py
index d62a637..e9c52f4 100644
--- a/edconline/urls.py
+++ b/edconline/urls.py
@@ -18,6 +18,7 @@
 import xadmin
 from xadmin.plugins import xversion
 import article
+import userpage
 import tinymce
 
 admin.autodiscover()
@@ -28,7 +29,8 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path(r'xadmin/', xadmin.site.urls),
-    path(r'tinymce/', include('tinymce.urls')),
-    path(r'article/', include('article.urls')),
+    path('xadmin/', xadmin.site.urls),
+    path('tinymce/', include('tinymce.urls')),
+    path('article/', include('article.urls')),
+    path('userpage/', include('userpage.urls')),
 ]
diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000..2506cea
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+{% load staticfiles %}
+
+<html>
+		<head>
+				<title>{% if title %}{{title}} - {% endif %}物志</title>
+			{% block header %}		
+			{% endblock %}		
+		</head>
+		<body>
+		</body>
+</html>
diff --git a/userpage/__init__.py b/userpage/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/userpage/__pycache__/__init__.cpython-36.pyc b/userpage/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..69a37ed5124cd812be28d72233026a2e002347ea
GIT binary patch
literal 133
zcmXr!<>flSKQW2{2p)q77+?f49Dul(1xTbY1T$zd`mJOr0tq9CUq<?&#i>Qb`o)<=
znWe@0!I>qg#rml!$@zIXnR%)Dr9jDo#Pn4C`1s7c%#!$cy@JYH95%W6DWy57b|ABg
HftUdRvZ5b{

literal 0
HcmV?d00001

diff --git a/userpage/__pycache__/admin.cpython-36.pyc b/userpage/__pycache__/admin.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..25f7d53d733fb15e04d3d035a5de49daaa645ad9
GIT binary patch
literal 174
zcmXr!<>flSKQYRlfq~&M5W@izkmUfx#R5Pgg&~D8has0Sijk2ag(;Xplldi3ltGj6
z7HeWkZf2gJCQ}q&N>*ZCdcIzAeqKpYW>OKzfRzkI%s>iE{L<GCElw>e)-TR1$}BC`
x56&z}E!Iy>0jkf*%uCfT1xgkqrl;zIP1Gx>yv1RYo1apelWNBZG@}@Z82~))D$xJ{

literal 0
HcmV?d00001

diff --git a/userpage/__pycache__/models.cpython-36.pyc b/userpage/__pycache__/models.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9efa415f7a255fa8177d4d5bc2706909f013277f
GIT binary patch
literal 171
zcmXr!<>flSKQYRZfq~&M5W@izkmUfx#R5Pgg&~D8has0Sijk2ag(;Xplldi3ltGj6
z7F%w9N@`BApC;2S&Xlagy!3p%l%yh%=9LUZEI<lO{4&rFElw>e)-TR1$}BC`56&z}
tE!Iy>NzTv9$;?aDF9k{#B&Mh8Lrl{vsJz8t17w%xq}nk84Jig<1^~!#Dir_#

literal 0
HcmV?d00001

diff --git a/userpage/__pycache__/urls.cpython-36.pyc b/userpage/__pycache__/urls.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b41651102f5a65e674204d0a7417bfe33f0f6463
GIT binary patch
literal 320
zcmX|5K~BRk5VYes4bWD6BbWHVt*R<sz@_4n3kvKib!9t|oq*sE9C!mKzLYDcet{Fa
zsA5;U8qL}>bF*4q*4H1+rx4<s=D#$dTbi_?1p=fKUN%xP&RphIqX;X=UG8<Gr9cH5
z^|62g7VoN)%>v53s4h<QUsQ6|EqEIU<U>0iPV&q?TYO1x>#YsrW=a?zEbPo&9(s>M
z+abRXt;f5noY!z{L)X_&eHf#Cj2TJHS7&mHE=9$Rh@3qZe^;W(Zp0YUmxxO~@cOCE
sJ((qwY_wA{dplw>2qf)nK*LGc-mq*vyw2s;_b@r!aqh(0OG&MM0e=-!%K!iX

literal 0
HcmV?d00001

diff --git a/userpage/__pycache__/views.cpython-36.pyc b/userpage/__pycache__/views.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..614354ae1340b728332ffb847d787f594c1e57f6
GIT binary patch
literal 582
zcmYjPO^?$s5Vg}ZN!zqrA;bZ3=mnu%ngdsakoLl9g}Mt8mQWSdv#r67gYEDoZtw^A
z8T=(*_q2auPt0VCR7>+Re&g|bW99jLK7F_RBR+7(ZrI66Fn@*N-yldPxn_n7&M8lH
zVn$+QQjre(ksg~&WF{B6DMVo=Vq&IZI@D6^n~53bW10PCqLle1tBPB^l~p`u4q6GW
zN@Dpsgl+@Av#p2t@N~BUsT}M=HI9o7eD1-AbK3^^7GiM)rqfM;nE$6TZ5zBYE+kwx
zy$;t(2XG$69^8v<gWbBL(2nM$Mc)y|IfgG00?z!CKVrW)`b{o=JbrKcXAV}{+E1$8
zubQyxJ-F3Vzpl8WRvaRC_x55=wXKqWnVVzjuCCuA;cKs)>V18w0{9x_&bC^$P}AwI
z*+czB!B@ZTzQ^KV4G>k3p}{40XP949^SG2Bn|5#4{$O3$^}#zj5NAjFfG;^Xaw*Yg
vM>-sz%8ikA89`1!3T{F$B_NT(^a(7Gi^U6LWv}5S{wvH=SIL+B2`|%s4?CAE

literal 0
HcmV?d00001

diff --git a/userpage/admin.py b/userpage/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/userpage/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/userpage/apps.py b/userpage/apps.py
new file mode 100644
index 0000000..0774fd0
--- /dev/null
+++ b/userpage/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class UserpageConfig(AppConfig):
+    name = 'userpage'
diff --git a/userpage/migrations/__init__.py b/userpage/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/userpage/migrations/__pycache__/__init__.cpython-36.pyc b/userpage/migrations/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b0a53936f67cb5e1ad75c1c8888dc75404b250c6
GIT binary patch
literal 144
zcmXr!<>flSKQW2{2p)q77+?f49Dul(1xTbY1T$zd`mJOr0tq9CU$*+8#i>Qb`o)<=
znWe@0!I>qg#rml!$@zIXnR%)Dr9jDo#Pn4C+|2Z%#FEVXykh<M_{_Y_lK6PNg34PQ
SHo5sJr8%i~AY+Sxm;nG%a3lTz

literal 0
HcmV?d00001

diff --git a/userpage/models.py b/userpage/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/userpage/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/userpage/tests.py b/userpage/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/userpage/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/userpage/urls.py b/userpage/urls.py
new file mode 100644
index 0000000..37bfa4a
--- /dev/null
+++ b/userpage/urls.py
@@ -0,0 +1,7 @@
+from django.contrib import admin
+from django.urls import path
+from . import views 
+
+urlpatterns = [
+    path('<int:user_id>/', views.homepage, name='homepage'),
+]
diff --git a/userpage/views.py b/userpage/views.py
new file mode 100644
index 0000000..e621997
--- /dev/null
+++ b/userpage/views.py
@@ -0,0 +1,10 @@
+from django.shortcuts import render
+from django.http import HttpResponse,HttpResponseRedirect
+from django.template import RequestContext,Template,Context,loader,defaultfilters
+from django.shortcuts import render_to_response
+
+# Create your views here.
+
+def homepage(request, user_id):
+    return HttpResponse("You're looking at user %s." % user_id)
+