routing fixes

Author: TurtIeSocks

src/components/ReactRouter.jsx

@@ -1,21 +1,16 @@
 import React from 'react'
 import { Route, Routes } from 'react-router-dom'
-import useConfig from '@hooks/useConfig'
 
 import Auth from './layout/auth/Auth'
 import Login from './layout/auth/Login'
 import Errors from './Errors'
 import ClearStorage from './ClearStorage'
 
 export default function ReactRouter({ serverSettings, getServerSettings }) {
-  const { location, zoom } = useConfig(serverSettings)
-
   const authRoute = (
     <Auth
       serverSettings={serverSettings}
       getServerSettings={getServerSettings}
-      location={location}
-      zoom={zoom}
     />
   )
 

src/components/layout/auth/Auth.jsx

@@ -1,12 +1,15 @@
 import React from 'react'
 import { Navigate, useParams } from 'react-router-dom'
 
+import useConfig from '@hooks/useConfig'
+
 import Container from '../../Container'
 import Login from './Login'
 import WebhookQuery from '../../WebhookQuery'
 
-export default function Auth({ serverSettings, getServerSettings, location, zoom }) {
+export default function Auth({ serverSettings, getServerSettings }) {
   const params = useParams()
+  const { location, zoom } = useConfig(serverSettings, params)
 
   if (serverSettings.error) {
     return (

src/hooks/useConfig.js

@@ -1,16 +1,14 @@
 import extend from 'extend'
-import { useParams } from 'react-router-dom'
 import * as Sentry from '@sentry/react'
 
 import Utility from '@services/Utility'
 import { useStore, useStatic } from '@hooks/useStore'
 
-export default function useConfig(serverSettings) {
+export default function useConfig(serverSettings, params) {
   Utility.analytics('User', serverSettings.user ? `${serverSettings.user.username} (${serverSettings.user.id})` : 'Not Logged In', 'Permissions', true)
 
   document.title = serverSettings.config?.map?.headerTitle
 
-  const params = useParams()
   const setUserSettings = useStore(state => state.setUserSettings)
   const setSettings = useStore(state => state.setSettings)
   const setFilters = useStore(state => state.setFilters)