StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some issues with navigating in the router and bad animations

Browse source
This commit is contained in:
Dane Everitt 2019-06-28 22:17:29 -07:00
parent 3db7698170
commit 8ac8a370f8
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
7 changed files with 73 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/scripts/components/App.tsx
View file

@ -1,12 +1,11 @@
import * as React from 'react';
import { hot } from 'react-hot-loader/root';
import { BrowserRouter as Router, Route } from 'react-router-dom';
import AuthenticationRouter from '@/routers/AuthenticationRouter';
import ServerOverviewContainer from '@/components/ServerOverviewContainer';
import { BrowserRouter, BrowserRouter as Router, Route, Switch } from 'react-router-dom';
import { StoreProvider } from 'easy-peasy';
import { store } from '@/state';
import TransitionRouter from '@/TransitionRouter';
import DashboardRouter from '@/routers/DashboardRouter';
import ServerRouter from '@/routers/ServerRouter';
import AuthenticationRouter from '@/routers/AuthenticationRouter';
interface WindowWithUser extends Window {
PterodactylUser?: {
@ -40,10 +39,13 @@ const App = () => {
<StoreProvider store={store}>
<Router basename={'/'}>
<div className={'mx-auto w-auto'}>
<TransitionRouter basename={'/'}>
<Route path="/" component={DashboardRouter}/>
<Route path="/auth" component={AuthenticationRouter}/>
</TransitionRouter>
<BrowserRouter basename={'/'}>
<Switch>
<Route path="/" component={DashboardRouter}/>
<Route path="/auth" component={AuthenticationRouter}/>
<Route path="/server/:id/" component={ServerRouter}/>
</Switch>
</BrowserRouter>
</div>
</Router>
</StoreProvider>