From af96f78a4903ecef9a677fb43410c3c64b76fe43 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 9 May 2022 12:56:08 -0500
Subject: [PATCH] routes: change /static/contact to /contact;
 /user_upgrades/new to /upgrade.

---
 app/views/layouts/default.html.erb | 2 +-
 config/routes.rb                   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 680e90318..70ab34390 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -181,7 +181,7 @@
 
   <footer id="page-footer" class="text-sm flex-initial">
     <span class="page-footer-app-name"><%= Danbooru.config.app_name %></span>
-    / <%= link_to "Rules", terms_of_service_path %>
+    / <%= link_to "Terms", terms_of_service_path %>
     / <%= link_to "Privacy", privacy_policy_path %>
     / <%= link_to "2257", usc_2257_path %>
     / <%= link_to "Upgrade", new_user_upgrade_path %>
diff --git a/config/routes.rb b/config/routes.rb
index a4afb723d..d5498456f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -270,6 +270,8 @@ Rails.application.routes.draw do
       get :custom_style
     end
   end
+  get "/upgrade", to: "user_upgrades#new", as: "new_user_upgrade"
+  get "/user_upgrades/new", to: redirect("/upgrade")
   resources :user_upgrades, only: [:new, :create, :show, :index] do
     get :receipt, on: :member
     get :payment, on: :member
@@ -333,14 +335,16 @@ Rails.application.routes.draw do
   get "/terms_of_service" => "static#terms_of_service", :as => "terms_of_service"
   get "/404" => "static#not_found", :as => "not_found"
   get "/2257" => "static#2257", :as => "usc_2257"
+  get "/contact" => "static#contact", :as => "contact"
+
   get "/static/keyboard_shortcuts" => "static#keyboard_shortcuts", :as => "keyboard_shortcuts"
   get "/static/bookmarklet" => "static#bookmarklet", :as => "bookmarklet"
   get "/static/site_map" => "static#site_map", :as => "site_map"
   get "/static/colors" => "static#colors", :as => "colors"
-  get "/static/contact" => "static#contact", :as => "contact"
   get "/static/dtext_help" => "static#dtext_help", :as => "dtext_help"
   get "/static/terms_of_service", to: redirect("/terms_of_service")
-  get "/user_upgrade/new", to: redirect("/user_upgrades/new")
+  get "/static/contact", to: redirect("/contact")
+  get "/user_upgrade/new", to: redirect("/upgrade")
   get "/delayed_jobs", to: redirect("/jobs")
 
   get "/mock/recommender/recommend/:user_id" => "mock_services#recommender_recommend", as: "mock_recommender_recommend"