From 7a0ac1d5c2ceceee70626f6a753141c69e93abff Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 12 Oct 2020 20:59:11 -0700
Subject: [PATCH] Revert "Merge pull request #2482 from
 AreYouRlyScared/fix-2386"

This reverts commit a967dbc6fc74206561ee05f5e4f07d064e8128a0, reversing
changes made to 289de72acaa4429cd4e4a710f84d6645abceb705.
---
 resources/scripts/routers/AuthenticationRouter.tsx | 3 +--
 resources/scripts/routers/DashboardRouter.tsx      | 3 +--
 resources/scripts/routers/ServerRouter.tsx         | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/resources/scripts/routers/AuthenticationRouter.tsx b/resources/scripts/routers/AuthenticationRouter.tsx
index baa662a85..57d1422ca 100644
--- a/resources/scripts/routers/AuthenticationRouter.tsx
+++ b/resources/scripts/routers/AuthenticationRouter.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import ReactGA from 'react-ga';
-import { Route, RouteComponentProps, Switch, Redirect } from 'react-router-dom';
+import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 import LoginContainer from '@/components/auth/LoginContainer';
 import ForgotPasswordContainer from '@/components/auth/ForgotPasswordContainer';
 import ResetPasswordContainer from '@/components/auth/ResetPasswordContainer';
@@ -15,7 +15,6 @@ export default ({ location, history, match }: RouteComponentProps) => {
     return (
         <div className={'pt-8 xl:pt-32'}>
             <Switch location={location}>
-                <Redirect from="/:url*(/+)" to={location.pathname.slice(0, -1)} />
                 <Route path={`${match.path}/login`} component={LoginContainer} exact/>
                 <Route path={`${match.path}/login/checkpoint`} component={LoginCheckpointContainer}/>
                 <Route path={`${match.path}/password`} component={ForgotPasswordContainer} exact/>
diff --git a/resources/scripts/routers/DashboardRouter.tsx b/resources/scripts/routers/DashboardRouter.tsx
index f68bda865..7a895a7e4 100644
--- a/resources/scripts/routers/DashboardRouter.tsx
+++ b/resources/scripts/routers/DashboardRouter.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import ReactGA from 'react-ga';
-import { NavLink, Route, RouteComponentProps, Switch, Redirect } from 'react-router-dom';
+import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import AccountOverviewContainer from '@/components/dashboard/AccountOverviewContainer';
 import NavigationBar from '@/components/NavigationBar';
 import DashboardContainer from '@/components/dashboard/DashboardContainer';
@@ -27,7 +27,6 @@ export default ({ location }: RouteComponentProps) => {
             }
             <TransitionRouter>
                 <Switch location={location}>
-                    <Redirect from="/:url*(/+)" to={location.pathname.slice(0, -1)} />
                     <Route path={'/'} component={DashboardContainer} exact />
                     <Route path={'/account'} component={AccountOverviewContainer} exact/>
                     <Route path={'/account/api'} component={AccountApiContainer} exact/>
diff --git a/resources/scripts/routers/ServerRouter.tsx b/resources/scripts/routers/ServerRouter.tsx
index e35113dca..a90ff652b 100644
--- a/resources/scripts/routers/ServerRouter.tsx
+++ b/resources/scripts/routers/ServerRouter.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import ReactGA from 'react-ga';
-import { NavLink, Route, RouteComponentProps, Switch, Redirect } from 'react-router-dom';
+import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import NavigationBar from '@/components/NavigationBar';
 import ServerConsole from '@/components/server/ServerConsole';
 import TransitionRouter from '@/TransitionRouter';
@@ -123,7 +123,6 @@ const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>)
                         <>
                             <TransitionRouter>
                                 <Switch location={location}>
-                                    <Redirect from="/:url*(/+)" to={location.pathname.slice(0, -1)} />
                                     <Route path={`${match.path}`} component={ServerConsole} exact/>
                                     <Route
                                         path={`${match.path}/files`}