Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def create

redirect_to friends_path, :notice => "Signed in!"
end

def destroy
session[:user_id] = nil
redirect_to root_url, :notice => "Signed out!"
Expand Down
5 changes: 0 additions & 5 deletions app/views/contributions/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@
<%= f.text_field :payment, class: "form-control", id: "name", placeholder: "입금자명", required: true %>
<%= f.text_field :contact, class: "form-control pull-right", id: "phone", placeholder: "연락 가능한 전화번호", required: true %>
</div>
<!-- <p>작성한 전화번호로 입금 및 배송 확인 문자가 전송됩니다</p> -->
</div>
<!-- <p class="pull-right">입금계좌 : 신한 110-383-537755 (김민혁)</p> -->
<div class="clearfix"></div>
</div>

<div class="celebration-message">
<h3 class=>축하 메시지</h3>
<!-- <%= f.label :message, "축하 메시지" %> -->
<%= f.text_area :message, class: "form-control", rows: 4, placeholder: "작성한 메시지는 롤링페이퍼 형태로 함께 전달됩니다" %>
</div>

Expand All @@ -46,8 +43,6 @@
</div>

<div class="gift-container col-md-4">
<!-- <h3 class="page-header">선물 소개</h3> -->

<div class="text-center form-group">
<%= image_tag @fund.gift.image, size: "304x304" %>
</div>
Expand Down
9 changes: 0 additions & 9 deletions app/views/gifts/_gift.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,5 @@
<%= number_to_currency gift.price, unit: '₩ ', precision: 0 %>
</p>
</div>
<!-- <div class="gift-feeling">
<div class="btn-group btn-group-justified" role="group" aria-label="Justified button group">
<a href="#" class="btn btn-default" role="button" style="
border-radius: 0;
">Good</a>
<a href="#" class="btn btn-default" role="button">Bad</a>
<a href="#" class="btn btn-default" role="button">Pick</a>
</div>
</div> -->
</div>
</div>
7 changes: 1 addition & 6 deletions app/views/gifts/recommendation.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<div class="recommendation-header">
<span class="glyphicon glyphicon-gift" aria-hidden="true"></span>
<h2>선물이 추천되었습니다!</h2>
Expand All @@ -19,15 +18,11 @@
<%= paginate @gifts %>
</div>


<!-- Button trigger modal -->

<!-- Modal -->
<div class="modal fade" id="new-fund" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog new-fund-modal">
<div class="modal-content">
<div class="modal-body" id="new-fund-body">

</div>
</div>
</div>
Expand Down