login: add /login & /logout routes, rename 'sign in' to 'login'.

* Replace /session/new with /login and /session/sign_out with /logout.
* Rename 'sign in' to 'login'.

This changes are to make urls cleaner and terminology more consistent.
This commit is contained in:
evazion
2019-12-14 15:20:11 -06:00
parent 7f08300f56
commit 48e0569832
10 changed files with 15 additions and 13 deletions

View File

@@ -17,7 +17,7 @@ class UsersController < ApplicationController
@user = CurrentUser.user @user = CurrentUser.user
if @user.is_anonymous? if @user.is_anonymous?
redirect_to new_session_path redirect_to login_path(url: settings_path)
else else
params[:action] = "edit" params[:action] = "edit"
respond_with(@user, template: "users/edit") respond_with(@user, template: "users/edit")
@@ -54,7 +54,7 @@ class UsersController < ApplicationController
params[:action] = "show" params[:action] = "show"
respond_with(@user, methods: @user.full_attributes, template: "users/show") respond_with(@user, methods: @user.full_attributes, template: "users/show")
elsif request.format.html? elsif request.format.html?
redirect_to new_session_path redirect_to login_path(url: profile_path)
else else
raise ActiveRecord::RecordNotFound raise ActiveRecord::RecordNotFound
end end

View File

@@ -161,7 +161,7 @@
--bulk-update-request-approved-color: green; --bulk-update-request-approved-color: green;
--bulk-update-request-failed-color: red; --bulk-update-request-failed-color: red;
--sign-in-link-color: #E00; --login-link-color: #E00;
--footer-border: 1px solid #EEE; --footer-border: 1px solid #EEE;
--jquery-ui-widget-content-background: var(--body-background-color); --jquery-ui-widget-content-background: var(--body-background-color);
@@ -434,7 +434,7 @@ body[data-user-theme="dark"] {
--wiki-page-versions-diff-ins-background: var(--green-0); --wiki-page-versions-diff-ins-background: var(--green-0);
--low-post-count-color: var(--red-1); --low-post-count-color: var(--red-1);
--sign-in-link-color: var(--red-1); --login-link-color: var(--red-1);
--new-artist-color: var(--red-1); --new-artist-color: var(--red-1);
--remove-favorite-button: var(--red-1); --remove-favorite-button: var(--red-1);
--fetch-source-data-border: 1px solid var(--grey-4); --fetch-source-data-border: 1px solid var(--grey-4);

View File

@@ -41,9 +41,9 @@ header#top {
font-weight: bold; font-weight: bold;
} }
li#nav-sign-in a { li#nav-login a {
font-weight: bold; font-weight: bold;
color: var(--sign-in-link-color); color: var(--login-link-color);
} }
li.forum-updated a { li.forum-updated a {

View File

@@ -1,6 +1,6 @@
<menu id="main-menu" class="main"> <menu id="main-menu" class="main">
<% if CurrentUser.is_anonymous? %> <% if CurrentUser.is_anonymous? %>
<%= nav_link_to("Sign in", new_session_path) %> <%= nav_link_to("Login", login_path) %>
<% else %> <% else %>
<%= nav_link_to("My Account #{CurrentUser.dmail_count}", profile_path) %> <%= nav_link_to("My Account #{CurrentUser.dmail_count}", profile_path) %>
<% end %> <% end %>

View File

@@ -1,7 +1,7 @@
<div id="c-sessions"> <div id="c-sessions">
<div id="a-new"> <div id="a-new">
<section> <section>
<h1>Sign in</h1> <h1>Login</h1>
<%= simple_form_for(:session, url: session_path) do |f| %> <%= simple_form_for(:session, url: session_path) do |f| %>
<%= f.input :url, as: :hidden, input_html: { value: params[:url] } %> <%= f.input :url, as: :hidden, input_html: { value: params[:url] } %>
@@ -17,7 +17,7 @@
</div> </div>
<% content_for(:page_title) do %> <% content_for(:page_title) do %>
Sign in - <%= Danbooru.config.app_name %> Login - <%= Danbooru.config.app_name %>
<% end %> <% end %>
<%= render "secondary_links" %> <%= render "secondary_links" %>

View File

@@ -4,7 +4,7 @@
You do not have permission to visit this page. You do not have permission to visit this page.
<% if CurrentUser.is_anonymous? %> <% if CurrentUser.is_anonymous? %>
Try <%= link_to "logging in", new_session_path(url: request.fullpath) %> or Try <%= link_to "logging in", login_path(url: request.fullpath) %> or
<%= link_to "signing up", new_user_path %>. <%= link_to "signing up", new_user_path %>.
<% end %> <% end %>
</p> </p>

View File

@@ -118,7 +118,7 @@
<ul> <ul>
<li><h1>Profile</h1></li> <li><h1>Profile</h1></li>
<% if CurrentUser.is_anonymous? %> <% if CurrentUser.is_anonymous? %>
<li><%= link_to "Sign in", new_session_path %></li> <li><%= link_to "Login", login_path %></li>
<li><%= link_to "Sign up", new_user_path %></li> <li><%= link_to "Sign up", new_user_path %></li>
<% else %> <% else %>
<li><%= link_to "Profile", profile_path %></li> <li><%= link_to "Profile", profile_path %></li>

View File

@@ -101,7 +101,7 @@
<% if Danbooru.config.stripe_publishable_key %> <% if Danbooru.config.stripe_publishable_key %>
<% if CurrentUser.is_anonymous? %> <% if CurrentUser.is_anonymous? %>
<p><%= link_to "Sign up", new_user_path %> or <%= link_to "login", new_session_path(url: new_user_upgrade_path) %> first to upgrade your account.</p> <p><%= link_to "Sign up", new_user_path %> or <%= link_to "login", login_path(url: new_user_upgrade_path) %> first to upgrade your account.</p>
<% elsif CurrentUser.safe_mode? %> <% elsif CurrentUser.safe_mode? %>
<%= render "stripe_payment" %> <%= render "stripe_payment" %>
<% else %> <% else %>

View File

@@ -34,6 +34,6 @@
<% end %> <% end %>
<li>|</li> <li>|</li>
<%= subnav_link_to "Sign out", sign_out_session_path %> <%= subnav_link_to "Log out", logout_path %>
<% end %> <% end %>
<% end %> <% end %>

View File

@@ -385,6 +385,8 @@ Rails.application.routes.draw do
get "/user/show/:id" => redirect("/users/%{id}") get "/user/show/:id" => redirect("/users/%{id}")
get "/user/login" => redirect("/sessions/new") get "/user/login" => redirect("/sessions/new")
get "/user_record" => redirect {|params, req| "/user_feedbacks?search[user_id]=#{req.params[:user_id]}"} get "/user_record" => redirect {|params, req| "/user_feedbacks?search[user_id]=#{req.params[:user_id]}"}
get "/login", to: "sessions#new", as: :login
get "/logout", to: "sessions#sign_out", as: :logout
get "/profile", to: "users#profile", as: :profile get "/profile", to: "users#profile", as: :profile
get "/settings", to: "users#settings", as: :settings get "/settings", to: "users#settings", as: :settings