diff --git a/resources/assets/styles/components/animations.css b/resources/assets/styles/components/animations.css index 97c1ced7c..d472d1267 100644 --- a/resources/assets/styles/components/animations.css +++ b/resources/assets/styles/components/animations.css @@ -5,7 +5,7 @@ .fade-enter-active { @apply .opacity-100; - transition: opacity 150ms; + transition: opacity 250ms; } .fade-exit { @@ -14,7 +14,7 @@ .fade-exit-active { @apply .opacity-0; - transition: opacity 150ms; + transition: opacity 250ms; } /** @todo fix this, hides footer stuff */ diff --git a/resources/scripts/TransitionRouter.tsx b/resources/scripts/TransitionRouter.tsx index cf738e17a..630e44023 100644 --- a/resources/scripts/TransitionRouter.tsx +++ b/resources/scripts/TransitionRouter.tsx @@ -1,38 +1,32 @@ import React from 'react'; import { Route, Switch } from 'react-router'; import { CSSTransition, TransitionGroup } from 'react-transition-group'; -import { BrowserRouter } from 'react-router-dom'; type Props = Readonly<{ - basename: string; children: React.ReactNode; }>; -export default ({ basename, children }: Props) => ( - - ( - - -
- - {children} - -
-

- © 2015 - 2019  - - Pterodactyl Software - -

-
-
-
-
- )} - /> -
+export default ({ children }: Props) => ( + ( + + +
+ {children} +
+

+ © 2015 - 2019  + + Pterodactyl Software + +

+
+
+
+
+ )} + /> ); diff --git a/resources/scripts/components/App.tsx b/resources/scripts/components/App.tsx index 986f47d14..d0935f3b4 100644 --- a/resources/scripts/components/App.tsx +++ b/resources/scripts/components/App.tsx @@ -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 = () => {
- - - - + + + + + + +
diff --git a/resources/scripts/components/dashboard/DashboardContainer.tsx b/resources/scripts/components/dashboard/DashboardContainer.tsx index 00e762f5d..4aecf9ea8 100644 --- a/resources/scripts/components/dashboard/DashboardContainer.tsx +++ b/resources/scripts/components/dashboard/DashboardContainer.tsx @@ -5,10 +5,11 @@ import { faMicrochip } from '@fortawesome/free-solid-svg-icons/faMicrochip'; import { faMemory } from '@fortawesome/free-solid-svg-icons/faMemory'; import { faHdd } from '@fortawesome/free-solid-svg-icons/faHdd'; import { faEthernet } from '@fortawesome/free-solid-svg-icons/faEthernet'; +import { Link } from 'react-router-dom'; export default () => (
-
+
@@ -47,7 +48,7 @@ export default () => (

of 16 GB

- +
diff --git a/resources/scripts/components/server/ServerConsole.tsx b/resources/scripts/components/server/ServerConsole.tsx new file mode 100644 index 000000000..ae409fd00 --- /dev/null +++ b/resources/scripts/components/server/ServerConsole.tsx @@ -0,0 +1,5 @@ +import React from 'react'; + +export default () => ( + null +); diff --git a/resources/scripts/routers/DashboardRouter.tsx b/resources/scripts/routers/DashboardRouter.tsx index 62e3ee147..699521157 100644 --- a/resources/scripts/routers/DashboardRouter.tsx +++ b/resources/scripts/routers/DashboardRouter.tsx @@ -1,17 +1,22 @@ import * as React from 'react'; -import { Route, RouteComponentProps } from 'react-router-dom'; +import { Route, RouteComponentProps, Switch } from 'react-router-dom'; import DesignElementsContainer from '@/components/dashboard/DesignElementsContainer'; import AccountOverviewContainer from '@/components/dashboard/AccountOverviewContainer'; import NavigationBar from '@/components/NavigationBar'; import DashboardContainer from '@/components/dashboard/DashboardContainer'; +import TransitionRouter from '@/TransitionRouter'; -export default ({ match }: RouteComponentProps) => ( +export default ({ location }: RouteComponentProps) => (
-
- - - -
+ +
+ + + + + +
+
); diff --git a/resources/scripts/routers/ServerRouter.tsx b/resources/scripts/routers/ServerRouter.tsx new file mode 100644 index 000000000..d7124c176 --- /dev/null +++ b/resources/scripts/routers/ServerRouter.tsx @@ -0,0 +1,18 @@ +import * as React from 'react'; +import { Route, RouteComponentProps, Switch } from 'react-router-dom'; +import NavigationBar from '@/components/NavigationBar'; +import ServerConsole from '@/components/server/ServerConsole'; +import TransitionRouter from '@/TransitionRouter'; + +export default ({ location }: RouteComponentProps) => ( +
+ + +
+ + + +
+
+
+);