From f19bd32e52496df68906e52d74716fbeb9a83d67 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 30 Apr 2022 11:31:04 -0500
Subject: [PATCH] /admin --> /soapbox/admin

---
 app/soapbox/components/sidebar-navigation.tsx        |  2 +-
 app/soapbox/components/thumb_navigation.tsx          |  2 +-
 app/soapbox/features/admin/components/admin-tabs.tsx | 12 ++++++------
 .../admin/components/latest_accounts_panel.tsx       |  2 +-
 app/soapbox/features/admin/index.tsx                 |  6 +++---
 app/soapbox/features/admin/tabs/dashboard.tsx        |  2 +-
 app/soapbox/features/ui/index.tsx                    | 12 ++++++------
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx
index 9809d99c1..16b305b33 100644
--- a/app/soapbox/components/sidebar-navigation.tsx
+++ b/app/soapbox/components/sidebar-navigation.tsx
@@ -73,7 +73,7 @@ const SidebarNavigation = () => {
 
       if (account.staff) {
         menu.push({
-          to: '/admin',
+          to: '/soapbox/admin',
           icon: require('@tabler/icons/icons/dashboard.svg'),
           text: <FormattedMessage id='tabs_bar.dashboard' defaultMessage='Dashboard' />,
           count: dashboardCount,
diff --git a/app/soapbox/components/thumb_navigation.tsx b/app/soapbox/components/thumb_navigation.tsx
index d9953fb05..21de09300 100644
--- a/app/soapbox/components/thumb_navigation.tsx
+++ b/app/soapbox/components/thumb_navigation.tsx
@@ -61,7 +61,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
         <ThumbNavigationLink
           src={require('@tabler/icons/icons/dashboard.svg')}
           text={<FormattedMessage id='navigation.dashboard' defaultMessage='Dashboard' />}
-          to='/admin'
+          to='/soapbox/admin'
           count={dashboardCount}
         />
       )}
diff --git a/app/soapbox/features/admin/components/admin-tabs.tsx b/app/soapbox/features/admin/components/admin-tabs.tsx
index 4602cd0aa..debba46a0 100644
--- a/app/soapbox/features/admin/components/admin-tabs.tsx
+++ b/app/soapbox/features/admin/components/admin-tabs.tsx
@@ -19,18 +19,18 @@ const AdminTabs: React.FC = () => {
   const reportsCount = useAppSelector(state => state.admin.openReports.count());
 
   const tabs = [{
-    name: '/admin',
+    name: '/soapbox/admin',
     text: intl.formatMessage(messages.dashboard),
-    to: '/admin',
+    to: '/soapbox/admin',
   }, {
-    name: '/admin/reports',
+    name: '/soapbox/admin/reports',
     text: intl.formatMessage(messages.reports),
-    to: '/admin/reports',
+    to: '/soapbox/admin/reports',
     count: reportsCount,
   }, {
-    name: '/admin/approval',
+    name: '/soapbox/admin/approval',
     text: intl.formatMessage(messages.waitlist),
-    to: '/admin/approval',
+    to: '/soapbox/admin/approval',
     count: approvalCount,
   }];
 
diff --git a/app/soapbox/features/admin/components/latest_accounts_panel.tsx b/app/soapbox/features/admin/components/latest_accounts_panel.tsx
index 26b383713..62636c366 100644
--- a/app/soapbox/features/admin/components/latest_accounts_panel.tsx
+++ b/app/soapbox/features/admin/components/latest_accounts_panel.tsx
@@ -46,7 +46,7 @@ const LatestAccountsPanel: React.FC<ILatestAccountsPanel> = ({ limit = 5 }) => {
   }
 
   const handleAction = () => {
-    history.push('/admin/users');
+    history.push('/soapbox/admin/users');
   };
 
   return (
diff --git a/app/soapbox/features/admin/index.tsx b/app/soapbox/features/admin/index.tsx
index dae7fc2e7..84f72eda8 100644
--- a/app/soapbox/features/admin/index.tsx
+++ b/app/soapbox/features/admin/index.tsx
@@ -26,9 +26,9 @@ const Admin: React.FC = () => {
       <AdminTabs />
 
       <Switch>
-        <Route path='/admin' exact component={Dashboard} />
-        <Route path='/admin/reports' exact component={Reports} />
-        <Route path='/admin/approval' exact component={Waitlist} />
+        <Route path='/soapbox/admin' exact component={Dashboard} />
+        <Route path='/soapbox/admin/reports' exact component={Reports} />
+        <Route path='/soapbox/admin/approval' exact component={Waitlist} />
       </Switch>
     </Column>
   );
diff --git a/app/soapbox/features/admin/tabs/dashboard.tsx b/app/soapbox/features/admin/tabs/dashboard.tsx
index 248885b21..86810d3c5 100644
--- a/app/soapbox/features/admin/tabs/dashboard.tsx
+++ b/app/soapbox/features/admin/tabs/dashboard.tsx
@@ -77,7 +77,7 @@ const Dashboard: React.FC = () => {
           </div>
         )}
         {isNumber(userCount) && (
-          <Link className='dashcounter' to='/admin/users'>
+          <Link className='dashcounter' to='/soapbox/admin/users'>
             <Text align='center' size='2xl' weight='medium'>
               <FormattedNumber value={userCount} />
             </Text>
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 99fe59b12..e144c9b01 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -227,7 +227,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       <Redirect from='/home' to='/' />
 
       {/* Mastodon rendered pages */}
-      <Redirect from='/admin/dashboard' to='/admin' exact />
+      <Redirect from='/admin' to='/soapbox/admin' />
       <Redirect from='/terms' to='/about' />
       <Redirect from='/settings/preferences' to='/settings' />
       <Redirect from='/settings/two_factor_authentication_methods' to='/settings/mfa' />
@@ -302,11 +302,11 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       {/* <WrappedRoute path='/backups' page={DefaultPage} component={Backups} content={children} /> */}
       <WrappedRoute path='/soapbox/config' adminOnly page={DefaultPage} component={SoapboxConfig} content={children} />
 
-      <WrappedRoute path='/admin' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
-      <WrappedRoute path='/admin/approval' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
-      <WrappedRoute path='/admin/reports' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
-      <WrappedRoute path='/admin/log' staffOnly page={AdminPage} component={ModerationLog} content={children} exact />
-      <WrappedRoute path='/admin/users' staffOnly page={AdminPage} component={UserIndex} content={children} exact />
+      <WrappedRoute path='/soapbox/admin' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
+      <WrappedRoute path='/soapbox/admin/approval' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
+      <WrappedRoute path='/soapbox/admin/reports' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
+      <WrappedRoute path='/soapbox/admin/log' staffOnly page={AdminPage} component={ModerationLog} content={children} exact />
+      <WrappedRoute path='/soapbox/admin/users' staffOnly page={AdminPage} component={UserIndex} content={children} exact />
       <WrappedRoute path='/info' page={EmptyPage} component={ServerInfo} content={children} />
 
       <WrappedRoute path='/developers/apps/create' developerOnly page={DefaultPage} component={CreateApp} content={children} />