add userpage

gothack329 · Feb 24, 2018 · c0b156e · c0b156e
1 parent fc9bce6
commit c0b156e
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 6 deletions.
diff --git a/article/__pycache__/urls.cpython-36.pyc b/article/__pycache__/urls.cpython-36.pyc
diff --git a/article/__pycache__/views.cpython-36.pyc b/article/__pycache__/views.cpython-36.pyc
diff --git 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
@@ -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
diff --git a/edconline/__pycache__/urls.cpython-36.pyc b/edconline/__pycache__/urls.cpython-36.pyc
diff --git 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
@@ -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
@@ -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
diff --git a/userpage/__pycache__/__init__.cpython-36.pyc b/userpage/__pycache__/__init__.cpython-36.pyc
diff --git a/userpage/__pycache__/admin.cpython-36.pyc b/userpage/__pycache__/admin.cpython-36.pyc
diff --git a/userpage/__pycache__/models.cpython-36.pyc b/userpage/__pycache__/models.cpython-36.pyc
diff --git a/userpage/__pycache__/urls.cpython-36.pyc b/userpage/__pycache__/urls.cpython-36.pyc
diff --git a/userpage/__pycache__/views.cpython-36.pyc b/userpage/__pycache__/views.cpython-36.pyc
diff --git a/userpage/admin.py 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
@@ -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
diff --git a/userpage/migrations/__pycache__/__init__.cpython-36.pyc b/userpage/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/userpage/models.py 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
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/userpage/urls.py 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
@@ -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)
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.contrib import admin

		# Register your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.db import models

		# Create your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.test import TestCase

		# Create your tests here.