-
00년 00월 00일
user의 일기
+
+
00년 00월 00일
+
{{randomDiary.creator}}님의 일기
+
-
{{user.id}}님의 오늘의 Todo
+
{{randomDiary.creator}}님의 오늘의 Todo
+
+ {% for todo in randomDiary.todos %}
+ - {{todo}}
+ {% endfor %}
+
Q. 오늘 하루 중 가장 마음에 들었던 일은?
+
{{randomDiary.content}}
diff --git a/diaryProject/diaryApp/templates/index.html b/diaryProject/diaryApp/templates/index.html
index a062c85..3ea81be 100644
--- a/diaryProject/diaryApp/templates/index.html
+++ b/diaryProject/diaryApp/templates/index.html
@@ -13,8 +13,8 @@
diff --git a/diaryProject/diaryApp/templates/registration/login.html b/diaryProject/diaryApp/templates/registration/login.html
new file mode 100644
index 0000000..6cecd54
--- /dev/null
+++ b/diaryProject/diaryApp/templates/registration/login.html
@@ -0,0 +1,32 @@
+{% load static %}
+
+
+
+
+
+
+
+
Login
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/diaryProject/diaryApp/templates/registration/signup.html b/diaryProject/diaryApp/templates/registration/signup.html
new file mode 100644
index 0000000..a5892cf
--- /dev/null
+++ b/diaryProject/diaryApp/templates/registration/signup.html
@@ -0,0 +1,43 @@
+{% load static %}
+
+
+
+
+
+
+
+
+
+
+
Document
+
+
+
+
+
+
+
+
+
+
+ {% csrf_token %}
+ {% if error %}
+ {{error}}
+ {% endif %}
+ Login
+
+
+
+
\ No newline at end of file
diff --git a/diaryProject/diaryApp/views.py b/diaryProject/diaryApp/views.py
index 0162cfa..7930ec7 100644
--- a/diaryProject/diaryApp/views.py
+++ b/diaryProject/diaryApp/views.py
@@ -4,37 +4,9 @@
from .models import Diary
from django.views.decorators.csrf import csrf_exempt
from django.http import JsonResponse
+from random import randint
# Create your views here.
-def signup(request):
- if request.method == "POST":
- username = request.POST["username"]
- password = request.POST["password"]
- found_user = User.objects.filter(username=username)
- if len(found_user):
- error = "이미 존재하는 아이디입니다."
- return render(request, "registration/signup.html", {"error": error})
- new_user = User.objects.create_user(username=username, password=password)
- auth.login(request, new_user)
- return redirect("index")
-
- return render(request, "registration/signup.html")
-
-
-def login(request):
- if request.method == "POST":
- username=request.POST['username']
- password = request.POST['password']
- user = auth.authenticate(request, username=username, password=password)
- if user is not None:
- auth.login(request, user)
- return redirect("index")
- error = "아이디 혹은 비밀번호가 틀립니다."
- return render(request, "registration/login.html", {"error": error})
-
- return render(request, "registration/login.html")
-
-
def logout(request):
auth.logout(request)
@@ -44,7 +16,11 @@ def index(request):
return render(request, 'index.html')
def fishing(request):
- return render(request, 'fishing.html')
+ user = request.user
+ diaryList = Diary.objects.exclude(creator=user.id)
+ rand = randint(0, len(diaryList)-1)
+ randomDiary = diaryList[rand]
+ return render(request, 'fishing.html', {'randomDiary': randomDiary})
def background(request):
return render(request, 'background.html')
-
- 
+ 
+
-
+ 
+