diff --git a/src/components/auth/AuthLayout.jsx b/src/components/auth/AuthLayout.jsx new file mode 100644 index 000000000..5516514b2 --- /dev/null +++ b/src/components/auth/AuthLayout.jsx @@ -0,0 +1,65 @@ +import { Outlet } from 'react-router'; +import { Col, Container, Row } from 'reactstrap'; + +function AuthLayout({ children }) { + return ( + + + +
+

HarperDB Studio

+ Manage all your HarperDB instances. +
    +
  • +

    Manage All Instances

    + Set access, cluster, monitor, and more. +
  • +
  • +

    Embedded API Server

    + HarperDB components give you unlimited application flexibility. +
  • +
  • +

    Fully Managed Cloud & 5G Instances

    + Go from zero to code in minutes. +
  • +
  • +

    Deploy Anywhere

    + +
  • +
+
+ + + + +
+
+ ); +} + +export default AuthLayout; diff --git a/src/components/layouts/App.js b/src/components/layouts/App.js index 3125720cb..749717fed 100644 --- a/src/components/layouts/App.js +++ b/src/components/layouts/App.js @@ -8,7 +8,6 @@ import useInterval from 'use-interval'; import { positions, useAlert } from 'react-alert'; import { ErrorBoundary } from 'react-error-boundary'; import queryString from 'query-string'; -import { Col, Container, Row } from 'reactstrap'; import appState from '../../functions/state/appState'; import usePersistedUser from '../../functions/state/persistedUser'; @@ -28,6 +27,7 @@ import init from '../../functions/app/init'; import refreshUser from '../../functions/app/refreshUser'; import changeFavIcon from '../../functions/app/changeFavIcon'; import getAkamaiRegions from '../../functions/api/lms/getAkamaiRegions'; +import AuthLayout from '../auth/AuthLayout'; const TopNav = lazy(() => import(/* webpackChunkName: "topnav" */ '../TopNav')); const SignUp = lazy(() => import(/* webpackChunkName: "signUp" */ '../auth/SignUp')); @@ -138,103 +138,37 @@ function App() { {fetchingUser ? (
- +
- ) : loggedIn ? ( -
- - - - - } - > - {/* can we put instance routes in here, each in a suspense tag (since they're lazily loaded) */} + ) : ( +
+ + }> - : } path="/update-password" /> - : } path="/profile/*" /> - : }> - } path="/o/:customer_id/i/:compute_stack_id/*" /> - } path="/o/:customer_id/instances/:action?/:purchaseStep?" /> - } path="/o/:customer_id/*" /> - - : } path="/:list?/:action?" /> - } /> + {loggedIn ? ( + <> + : } path="/update-password" /> + : } path="/profile/*" /> + : }> + } path="/o/:customer_id/i/:compute_stack_id/*" /> + } path="/o/:customer_id/instances/:action?/:purchaseStep?" /> + } path="/o/:customer_id/*" /> + + : } path="/:list?/:action?" /> + } /> + + ) : ( + }> + } path="/" /> + : } path="/sign-up" /> + : } path="/reset-password" /> + } /> + + )}
- ) : ( -
- - }> - - - -
-

HarperDB Studio

- Manage all your HarperDB instances. -
    -
  • -

    Manage All Instances

    - Set access, cluster, monitor, and more. -
  • -
  • -

    Embedded API Server

    - - HarperDB components give you unlimited application flexibility. - -
  • -
  • -

    Fully Managed Cloud & 5G Instances

    - Go from zero to code in minutes. -
  • -
  • -

    Deploy Anywhere

    - -
  • -
-
- - - - } path="/" /> - : } path="/sign-up" /> - : } path="/reset-password" /> - } /> - - -
-
-
-
-
)}