Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/airaen0129/LikeLion_GASILI_P…
Browse files Browse the repository at this point in the history 
…roject into dev
  • Loading branch information
@leejaeyeong
leejaeyeong committed Aug 9, 2019
2 parents 9f5ff6e + 3171bee commit e26191a
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 55 deletions.
69 changes: 48 additions & 21 deletions accounts/templates/accounts/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,57 @@
<div class="containerleft">
</div>
<div class="containerbody">
<div class="container" style="margin:0,25px,25px,25px; width:100%;">
<section id="recently">
<div class="col">

<section class="login-block">
<div class="bodycontainer">
<div class="row">
<div style="border-radius: 5px; border:1px dashed rgb(91,155,213); width:100%; ">
{% if error %}
{{ error }}
<br>
<br>
{% endif %}
<div class="col login-sec">
<h2 class="text-center">Sign In</h2>

<div class="container">
<section id="recently">
<div class="col">
<div class="row">
<div style="border-radius: 5px; border:2px dashed rgb(255, 118, 99); width:100%; ">
{% if error %}
{{ error }}
<br>
<br>
{% endif %}
<form method="POST" action="{% url 'login'%}">
{% csrf_token %}
<div class="row" style="height:50px;"></div>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" >아이디(ID): </label>
<div class="col-5">
<input class="form-control" placeholder="id" name="username" type="text" value="">
</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" >비밀번호(Password): </label>
<div class="col-5">
<input class="form-control" placeholder="passward"name="password" type="password" value="">
</div>
</div>
<br>

<div class="text-center" style="margin:30px 0 50px 0;">
<input class="btn btn-primary" style="width:200px; height:40px; background:#DE6262; border:1.5px solid #DE6262; font-family: 'Gugi', cursive; font-size:20px;" type="submit" value="Sign In">
</div>
</form>
</div>
</div>
</div>
</section>
</div>
</div>
</div>

<h1>Sign in</h1>

</section>

<form method="POST" action="{% url 'login'%}">
{% csrf_token %}
<br>아이디(ID): <input name="username" type="text" value=""><br>
<br>비밀번호(Password): <input name="password" type="password" value=""><br>
<br><input class="btn btn-primary" type="submit" value="Sign in">
</form>
</div>
</div>
</div>
</section>
</div>

</div>
<div class="containerright"></div>

Expand Down
2 changes: 1 addition & 1 deletion accounts/templates/accounts/signup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h2 class="text-center">Sign Up</h2>
</div>
<br>
<div class="text-center" style="margin:30px 0 50px 0;">
<input class="btn btn-primary" style="width:200px; height:40px; background:#DE6262; border:1.5px solid #DE6262; font-family: 'Gugi', cursive; font-size:20px;" type="submit" value="Sign Up!">
<input class="btn btn-primary" style="width:200px; height:40px; background:#DE6262; border:1.5px solid #DE6262; font-family: 'Gugi', cursive; font-size:20px;" type="submit" value="Sign Up">
</div>
</form>
</div>
Expand Down
140 changes: 108 additions & 32 deletions accounts/templates/accounts/update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,120 @@
<div class="containerleft">
</div>
<div class="containerbody">
<div class="container" style="margin:0,25px,25px,25px; width:100%;">
<section id="recently">
<div class="col">

<section class="login-block">
<div class="bodycontainer">
<div class="row">
<div style="border-radius: 5px; border:1px dashed rgb(91,155,213); width:100%; ">
<div class="col login-sec">
<h2 class="text-center">My Page</h2>

<div class="container">
<section id="recently">
<div class="col">
<div class="row">
<div style="border-radius: 5px; border:2px dashed rgb(255, 118, 99); width:100%; ">
{% if error %}
{{ error }}
<br>
<br>
{% endif %}
<form method="POST" action="{% url 'update'%}">

{% if error %}
{{ error }}
<br>
<br>
{% endif %}
{% csrf_token %}
<div class="row" style="height:50px;"></div>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" style="color:#DE6262;">아이디(ID): </label>
<div class="col-5">
<label class="col col-form-label textfont">{{ user.username }}</label>
</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" style="color:#DE6262;">성별(Gender): </label>
<div class="col-5">
<label class="col col-form-label textfont">{% if user.gender == "W" %} 여성(Woman) {% else %} 남성(Man) {% endif %}</label>
</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" style="color:#DE6262;">성(Last Name): </label>
<div class="col-5">
<label class="col col-form-label textfont">{{ user.last_name }}</label>
</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" style="color:#DE6262;">이름(First Name): </label>
<div class="col-5">
<label class="col col-form-label textfont">{{ user.first_name }}</label>
</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" style="color:#DE6262;">생년월일(birthdate): </label>
<div class="col-5">
<label class="col col-form-label textfont">{{ user.birthdate | date:'c'}}</label>
</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" style="color:#DE6262;">비밀번호(Password): </label>
<div class="col-5">
<label class="col col-form-label textfont"> <input name="changingPassword" type="button" class="btn btn-primary" style="width:200px; height:30px; background:#DE6262; border:1.5px solid #DE6262; font-family: 'Gugi', cursive; font-size:15px;" value="비밀번호 바꾸기"
onclick="showPopup();"></label>

</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" style="color:#DE6262;">닉네임(Nickname): </label>
<div class="col-5">
<label class="col col-form-label textfont">{{ user.nickname }}</label>
</div>
</div>
<br>
<br><input class="btn btn-primary" type="submit" value="Update!">
</form>

<script language="javascript">
function showPopup() { window.open("{%url 'changePassword'%}", "a", "width=400, height=300, left=100, top=50"); }
</script>

<h1>Update!</h1>
<form method="POST" action="{% url 'update'%}">

{% csrf_token %}
<br>아이디(ID): {{ user.username }}<br>

<br>성별(Gender): {% if user.gender == "W" %} 여성(Woman) {% else %} 남성(Man) {% endif %}<br>
<br>성(Last Name): {{ user.last_name }}<br>
<br>이름(First Name): {{ user.first_name }}<br>
<br>생년월일(birthdate): {{ user.birthdate | date:'c'}}<br>
<br>
비밀번호(Password): <input name="changingPassword" type="button" value="비밀번호 바꾸기"
onclick="showPopup();"><br>
<br>닉네임(Nickname): <input name="nickName" type="text" value="{{ user.nickname }}"><br>
<br><input class="btn btn-primary" type="submit" value="Update!">
</form>
<form method="POST" action="{% url 'login'%}">
{% csrf_token %}
<div class="row" style="height:50px;"></div>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" >아이디(ID): </label>
<div class="col-5">
<input class="form-control" placeholder="id" name="username" type="text" value="">
</div>
</div>
<br>
<div class="form-group row">
<label class="col-sm-4 col-form-label textfont" >비밀번호(Password): </label>
<div class="col-5">
<input class="form-control" placeholder="passward"name="password" type="password" value="">
</div>
</div>
<br>

<div class="text-center" style="margin:30px 0 50px 0;">
<input class="btn btn-primary" style="width:200px; height:40px; background:#DE6262; border:1.5px solid #DE6262; font-family: 'Gugi', cursive; font-size:20px;" type="submit" value="Sign In">
</div>
</form>
</div>
</div>
</div>
</section>
</div>
</div>
</div>

<script language="javascript">
function showPopup() { window.open("{%url 'changePassword'%}", "a", "width=400, height=300, left=100, top=50"); }
</script>

</section>

</div>
</div>
</div>
</section>
</div>

</div>
<div class="containerright"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion gasili/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
<li class="nav-item">
<a class="nav-link" href="#" style="padding:0;">Service</a>

<a class="nav-link" href="{% url 'servicecenter' %}">Service</a>
<!--<a class="nav-link" href="{% url 'servicecenter' %}">Service</a>-->
</li>
{% if user.is_authenticated %}
<li class="nav-item">
Expand Down

0 comments on commit e26191a

Please sign in to comment.