Showing
17 changed files
with
36 additions
and
72 deletions
1 | +{% extends 'layout.html' %} | ||
2 | + | ||
3 | +{% block content %} | ||
4 | + | ||
5 | + <div class="col-md-8 col-md-offset-2"> | ||
6 | + <div class="panel panel-default"> | ||
7 | + <div class="panel-heading"> | ||
8 | + {{ request.user.username }} 님 안녕하세요. | ||
9 | + <button type="submit" class="btn right" onclick="location.href='/logout/';">로그아웃</button> | ||
10 | + </div> | ||
11 | + </div> | ||
12 | + </div> | ||
13 | +{% endblock %} |
... | @@ -25,24 +25,35 @@ | ... | @@ -25,24 +25,35 @@ |
25 | 25 | ||
26 | <div class="form-group"> | 26 | <div class="form-group"> |
27 | <div class="col-md-12"> | 27 | <div class="col-md-12"> |
28 | - <label for="password"><span style="color:green;">비밀번호</span><h6 style="display:inline;"> - 비밀번호는 6자리 이상으로 설정되어야 합니다.</h6></label> | 28 | + <label for="password"><span style="color:green;">비밀번호</span><h6 style="display:inline;"> - 비밀번호는 8자리 이상으로 설정되어야 합니다.</h6></label> |
29 | <input id="password" type="password" class="form-control" name="password" required> | 29 | <input id="password" type="password" class="form-control" name="password" required> |
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
32 | + | ||
33 | + <div class="form-group"> | ||
32 | 34 | ||
33 | - <div class="form-group"> | ||
34 | <div class="col-md-12"> | 35 | <div class="col-md-12"> |
36 | + | ||
35 | <label for="first_name"><span style="color:green;">성</span></label> | 37 | <label for="first_name"><span style="color:green;">성</span></label> |
38 | + | ||
36 | <input id="first_name" type="first_name" class="form-control" name="first_name" required> | 39 | <input id="first_name" type="first_name" class="form-control" name="first_name" required> |
40 | + | ||
37 | </div> | 41 | </div> |
42 | + | ||
38 | </div> | 43 | </div> |
44 | + | ||
39 | <div class="form-group"> | 45 | <div class="form-group"> |
46 | + | ||
40 | <div class="col-md-12"> | 47 | <div class="col-md-12"> |
48 | + | ||
41 | <label for="last_name"><span style="color:green;">이름</span></label> | 49 | <label for="last_name"><span style="color:green;">이름</span></label> |
50 | + | ||
42 | <input id="last_name" type="last_name" class="form-control" name="last_name" required> | 51 | <input id="last_name" type="last_name" class="form-control" name="last_name" required> |
52 | + | ||
43 | </div> | 53 | </div> |
44 | - </div> | ||
45 | 54 | ||
55 | + </div> | ||
56 | + | ||
46 | <div class="form-group"> | 57 | <div class="form-group"> |
47 | <div class="col-md-12"> | 58 | <div class="col-md-12"> |
48 | <button type="submit" class="btn btn-success">회원가입</button> | 59 | <button type="submit" class="btn btn-success">회원가입</button> |
... | @@ -60,4 +71,4 @@ | ... | @@ -60,4 +71,4 @@ |
60 | </div> | 71 | </div> |
61 | </div> | 72 | </div> |
62 | 73 | ||
63 | -{% endblock %} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
74 | +{% endblock %} | ... | ... |
... | @@ -10,7 +10,7 @@ import hashlib | ... | @@ -10,7 +10,7 @@ import hashlib |
10 | import django | 10 | import django |
11 | 11 | ||
12 | 12 | ||
13 | -def index(request): | 13 | +def main(request): |
14 | if request.user.is_authenticated: | 14 | if request.user.is_authenticated: |
15 | return render(request, "main.html") | 15 | return render(request, "main.html") |
16 | else: | 16 | else: |
... | @@ -36,7 +36,7 @@ def login(request): | ... | @@ -36,7 +36,7 @@ def login(request): |
36 | cog = cognito.Cognito() | 36 | cog = cognito.Cognito() |
37 | cog.sign_in_admin(username=un, password=hashcode) | 37 | cog.sign_in_admin(username=un, password=hashcode) |
38 | 38 | ||
39 | - return redirect('/') | 39 | + return redirect('/main') |
40 | else: | 40 | else: |
41 | return render(request, "login.html", { | 41 | return render(request, "login.html", { |
42 | "message": "check id and password" | 42 | "message": "check id and password" |
... | @@ -47,9 +47,7 @@ def login(request): | ... | @@ -47,9 +47,7 @@ def login(request): |
47 | def logout(request): | 47 | def logout(request): |
48 | if request.user.is_authenticated: | 48 | if request.user.is_authenticated: |
49 | django.contrib.auth.logout(request) | 49 | django.contrib.auth.logout(request) |
50 | - | 50 | + return redirect("/main") |
51 | - return redirect("/") | ||
52 | - | ||
53 | def register(request): | 51 | def register(request): |
54 | Cog = cognito.Cognito() | 52 | Cog = cognito.Cognito() |
55 | if request.method == "POST": | 53 | if request.method == "POST": |
... | @@ -94,7 +92,7 @@ def register(request): | ... | @@ -94,7 +92,7 @@ def register(request): |
94 | 92 | ||
95 | Cog.confirm_sign_up(username=request.POST['username']); | 93 | Cog.confirm_sign_up(username=request.POST['username']); |
96 | 94 | ||
97 | - return redirect('/') | 95 | + return redirect('/main') |
98 | else: | 96 | else: |
99 | return render(request, 'register.html', { | 97 | return render(request, 'register.html', { |
100 | "message": 'erroe!' | 98 | "message": 'erroe!' | ... | ... |
... | @@ -20,8 +20,8 @@ from django.conf.urls.static import static | ... | @@ -20,8 +20,8 @@ from django.conf.urls.static import static |
20 | from django.conf.urls import include, url | 20 | from django.conf.urls import include, url |
21 | urlpatterns = [ | 21 | urlpatterns = [ |
22 | url(r'^admin/', admin.site.urls), | 22 | url(r'^admin/', admin.site.urls), |
23 | - # url('',views.home, name='home'), | 23 | + url('main/',blog.views.main, name='main'), |
24 | - url('login/', blog.views.login, name='login'), | 24 | + url(r'^login/', blog.views.login, name='login'), |
25 | - url('logout/', blog.views.logout, name='logout'), | 25 | + url(r'^logout/', blog.views.logout, name='logout'), |
26 | - url('register/', blog.views.register, name='register'), | 26 | + url(r'^register/', blog.views.register, name='register'), |
27 | ]+ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) | 27 | ]+ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) | ... | ... |
File mode changed
No preview for this file type
No preview for this file type
A_Team_Khuloud/khuloud/login/apps.py
deleted
100644 → 0
No preview for this file type
File mode changed
No preview for this file type
No preview for this file type
1 | -from django.shortcuts import render,redirect | ||
2 | -from django.contrib.auth.models import User | ||
3 | -from django.contrib import auth | ||
4 | - | ||
5 | - | ||
6 | -def signup(request): | ||
7 | - if request.method=="POST": | ||
8 | - if request.POST["password1"]==request.POST["password2"]: | ||
9 | - user=User.objects.create_user( | ||
10 | - username1=request.POST["username"], | ||
11 | - password=request.POST["password1"] | ||
12 | - ) | ||
13 | - auth.login(request,user) | ||
14 | - return redirect('login') | ||
15 | - return render(request,'signup.html') | ||
16 | - return render(request,'signup.html') | ||
17 | -def login(request): | ||
18 | - if request.method=="POST": | ||
19 | - username=request.POST['username'] | ||
20 | - password=request.POST['password'] | ||
21 | - user=auth.authenticate(request,username=username,password=password) | ||
22 | - if user is not None: | ||
23 | - auth.login(request,user) | ||
24 | - return redirect('home') | ||
25 | - else: | ||
26 | - return render(request,'login.html',{'error':'error!'}) | ||
27 | - else: | ||
28 | - return render(request,'login.html') | ||
29 | - | ||
30 | -def logout(request): | ||
31 | - auth.logout(request) | ||
32 | - return redirect('home') | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
No preview for this file type
-
Please register or login to post a comment