Merge branch 'feature/basic_login' into 'master'

Feature/basic login & logout

See merge request !9

app/assets/stylesheets/custom.scss

@@ -14,7 +14,7 @@ $light-gray: #777;
 /* universal */
 
 body {
-  padding-top: 90px;
+  padding-top: 60px;
 }
 
 section {

app/controllers/application_controller.rb

@@ -6,7 +6,11 @@ class ApplicationController < ActionController::Base
   protected
  
   def configure_permitted_parameters
-    added_attrs = [:username, :email, :password, :password_confirmation]
+    added_attrs = [:username, :email, :password, :password_confirmation, :remember_me]
     devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
   end
+
+  def after_sign_in_path_for(resource)
+    stored_location_for(resource) || root_path
+  end
 end

app/views/layouts/_header.html.erb

@@ -5,11 +5,11 @@
       <ul class="nav navbar-nav navbar-right">
         <ul class="list">
           <% if user_signed_in? %>
-            Logged in as <strong><%= current_user.email %></strong>.
+            Logged in as <strong><%= current_user.email %></strong>
             <li class="list-inline-item"></li><%= link_to "My Page", "#" %></li>
-            <li class="list-inline-item"></li><%= link_to "Logout", "#" %></li>
+            <li class="list-inline-item"></li><%= link_to "Logout", destroy_user_session_path, method: :delete %></li>
           <% else %>
-            <li class="list-inline-item"><%= link_to "Login", "#" %></li>
+            <li class="list-inline-item"><%= link_to "Login", new_user_session_path %></li>
             <li class="list-inline-item"><%= link_to "Register", new_user_registration_path %></li>
           <% end %>
           <li class="list-inline-item"><%= link_to "Favorite", "#" %></li>

app/views/users/sessions/new.html.erb

+<h1>Login</h1>
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+  <div class="form-group">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "current-password", class: "form-control" %>
+  </div>
+
+  <% if devise_mapping.rememberable? %>
+    <div class="form-group">
+      <%= f.check_box :remember_me %>
+      <%= f.label :remember_me %>
+    </div>
+  <% end %>
+
+  <div class="actions">
+    <%= f.submit "Log in", class: "btn btn-primary" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>

app/views/users/shared/_links.html.erb

@@ -3,11 +3,11 @@
 <% end %>
 
 <%- if devise_mapping.registerable? && controller_name != "registrations" %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= link_to "Register", new_registration_path(resource_name) %><br />
 <% end %>
 
 <%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to "Forgot password?", new_password_path(resource_name) %><br />
 <% end %>
 
 <%- if devise_mapping.confirmable? && controller_name != "confirmations" %>