basic login

b1a0794b · Nguyen Hoang Mai Phuong · 952a378c · b1a0794b · b1a0794b · b1a0794b
Commit b1a0794b authored Jun 16, 2021 by Nguyen Hoang Mai Phuong
17 changed files
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -12,4 +12,5 @@
 *
 *= require_tree .
 *= require_self
+ *= require bootstrap  
 */
--- a/app/assets/stylesheets/custom.scss
+++ b/app/assets/stylesheets/custom.scss
--- a/app/assets/stylesheets/sessions.scss
+++ b/app/assets/stylesheets/sessions.scss
+// Place all the styles related to the Sessions controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
+class SessionsController < ApplicationController
+  def new
+  end
+  def create
+    user = User.find_by(email: params[:session][:email].downcase)
+    if user && user.authenticate(params[:session][:password])
+      helpers.log_in user
+      redirect_to user
+    else
+      flash.now[:danger] = 'Invalid email/password combination'
+      render 'new'
+    end
+  end
+  def destroy
+  end
+end
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
+module SessionsHelper
+  def log_in(user)
+    session[:user_id] = user.id
+  end
+  # Returns the current logged-in user (if any).
+  def current_user
+    if session[:user_id]
+      @current_user ||= User.find_by(id: session[:user_id])
+    end
+  end
+  def logged_in?
+    !current_user.nil?
+  end
+end
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -7,6 +7,8 @@ import Rails from "@rails/ujs"
 import Turbolinks from "turbolinks"
 import * as ActiveStorage from "@rails/activestorage"
 import "channels"
+require("jquery")
+import "bootstrap"
 Rails.start()
 Turbolinks.start()

--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,8 +8,24 @@
      <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
        <li><%= link_to "Home",root_path %></li>
        <li><%= link_to "Help", help_path  %></li>
-        <li><%= link_to "About", about_path %></li>
+        <% if logged_in? %>
-        <li><%= link_to "Log in", '#'  %></li>
+          <li><%= link_to "Users", '#' %></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Account
+            </a>
+            <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+              <li><%= link_to "Profile", current_user %></li>
+              <li><%= link_to "Settings", '#' %></li>
+              <li><hr class="dropdown-divider"></li>
+              <li>
+                <%= link_to "Log out", logout_path, method: :delete %>
+              </li> 
+            </ul>
+          </li>
+        <% else %>
+        <li><%= link_to "Log in", login_path %></li>
+        <% end %>
      </ul>
    </div>
  </div>

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,6 +2,7 @@
  <head>
    <title><%= full_title(yield(:title)) %></title>
    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
    <%= csrf_meta_tags %>
    <%= csp_meta_tag %>
    <%= stylesheet_link_tag 'application', media: 'all',

--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
+<% provide(:title, "Log in") %>
+<h1>Log in</h1>
+<div class="row">
+  <div class="col-md-6 offset-md-3">
+  <%= form_with(url: login_path, scope: :session, local: true) do |f| %>
+    <%= f.label :email %>
+    <%= f.email_field :email, class: 'form-control' %>
+    <%= f.label :password %>
+    <%= f.password_field :password, class: 'form-control' %>
+    <%= f.submit "Log in", class: "btn btn-primary" %>
+  <% end %>
+  <p>New user? <%= link_to "Sign up now!", signup_path %></p>
+  </div>
+</div>
\ No newline at end of file
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -76,5 +76,5 @@ Rails.application.configure do
  # Force all access to the app over SSL, use Strict-Transport-Security,
  # and use secure cookies.
-  config.force_ssl = true
 end
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -97,6 +97,8 @@ Rails.application.configure do
  # Do not dump schema after migrations.
  config.active_record.dump_schema_after_migration = false
+  config.force_ssl = true
  # Inserts middleware to perform automatic connection switching.
  # The `database_selector` hash is used to pass options to the DatabaseSelector
  # middleware. The `delay` is used to determine how long to wait after a write

--- a/config/routes.rb
+++ b/config/routes.rb
 Rails.application.routes.draw do
+  get 'sessions/new'
  root 'static_pages#home'
  get  '/home',   to: 'static_pages#home'
  get  '/help',   to: 'static_pages#help'
  get  '/about',   to: 'static_pages#about'
  get  '/contact',  to: 'static_pages#contact'
  get  '/signup',  to: 'users#new'
+  get  '/login',  to: 'sessions#new'
+  post  '/login',  to: 'sessions#create' 
+  delete '/logout',  to: 'sessions#destroy'
  resources :users
-end
+  end
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
 const { environment } = require('@rails/webpacker')
+const webpack = require('webpack')
+environment.plugins.prepend('Provide',
+  new webpack.ProvidePlugin({
+    $: 'jquery/src/jquery',
+    jQuery: 'jquery/src/jquery'
+  })
+)
 module.exports = environment
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
    "@rails/activestorage": "^6.0.0",
    "@rails/ujs": "^6.0.0",
    "@rails/webpacker": "5.4.0",
-    "bootstrap": "^5.0.1",
+    "bootstrap": "5.0.1",
+    "jquery": "^3.6.0",
    "turbolinks": "^5.2.0",
    "webpack": "^4.46.0",
    "webpack-cli": "^3.3.12"

--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
+require "test_helper"
+class SessionsControllerTest < ActionDispatch::IntegrationTest
+  test "should get new" do
+    get login_path
+    get sessions_new_url
+    assert_response :success
+  end
+end
--- a/test/integration/users_login_test.rb
+++ b/test/integration/users_login_test.rb
+require "test_helper"
+class UsersLoginTest < ActionDispatch::IntegrationTest
+  test "login with invalid information" do
+    get login_path
+    assert_template 'sessions/new'
+    post login_path, params: { session: { email: "", password: "" } }
+    assert_template 'sessions/new'
+    assert_not flash.empty?
+    get root_path
+    assert flash.empty?
+  end
+end
--- a/yarn.lock
+++ b/yarn.lock
@@ -1491,7 +1491,7 @@ boolbase@^1.0.0, boolbase@~1.0.0:
  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-bootstrap@^5.0.1:
+bootstrap@5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.1.tgz#e7939d599119dc818a90478a2a299bdaff037e09"
  integrity sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==
@@ -3738,6 +3738,11 @@ jest-worker@^26.5.0:
    merge-stream "^2.0.0"
    supports-color "^7.0.0"
+jquery@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 js-tokens@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"