Skip to content

Simplify routing layout(s) #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BboyAkers merged 4 commits into from
Dec 17, 2024
Merged

Simplify routing layout(s) #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef1c371
created auth layout for public auth routes
BboyAkers Dec 16, 2024
e98f42d
added protected routes for dashboard routes
BboyAkers Dec 16, 2024
063f107
simplified App.js layouts and routing
BboyAkers Dec 17, 2024
5df7c0e
removed dead code
BboyAkers Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions src/components/auth/AuthLayout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { Outlet } from 'react-router';
import { Col, Container, Row } from 'reactstrap';

function AuthLayout({ children }) {
return (
<Container fluid="xs" className="h-100">
<Row xs="1" sm="2" className="h-100">
<Col className="p-5 auth-studio-info d-none d-sm-flex justify-content-center align-items-center">
<div className="auth-studio-info-container">
<h1 className="auth-title">HarperDB Studio</h1>
<span className="mb-4 auth-subtitle d-inline-block">Manage all your HarperDB instances.</span>
<ul className="auth-info-list-items">
<li>
<h3 className="item-title">Manage All Instances</h3>
<span className="item-subtitle">Set access, cluster, monitor, and more.</span>
</li>
<li>
<h3 className="item-title">Embedded API Server</h3>
<span className="item-subtitle">HarperDB components give you unlimited application flexibility.</span>
</li>
<li>
<h3 className="item-title">Fully Managed Cloud & 5G Instances</h3>
<span className="item-subtitle">Go from zero to code in minutes.</span>
</li>
<li>
<h3 className="item-title">Deploy Anywhere</h3>
<div className="mt-3">
<a
href="https://hub.docker.com/r/harperdb/harperdb"
target="_blank"
rel="noreferrer"
className="deploy-subitem"
>
Docker
</a>
<a
href="https://www.npmjs.com/package/harperdb"
target="_blank"
rel="noreferrer"
className="deploy-subitem"
>
npm
</a>
<a
href="https://docs.harperdb.io/docs/deployments/install-harperdb"
target="_blank"
rel="noreferrer"
className="deploy-subitem"
>
all options
</a>
</div>
</li>
</ul>
</div>
</Col>
<Col className="p-5 d-flex justify-content-center align-items-center auth-form-container">
<Outlet />
</Col>
</Row>
</Container>
);
}

export default AuthLayout;
118 changes: 26 additions & 92 deletions src/components/layouts/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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'));
Expand Down Expand Up @@ -138,103 +138,37 @@ function App() {
</Suspense>
{fetchingUser ? (
<div className="vh-100">
<Loader header="signing in" spinner />
<Loader header="Signing in..." spinner />
</div>
) : loggedIn ? (
<main id="app-container">
<ErrorBoundary FallbackComponent={ErrorFallback}>
<Suspense
fallback={
<div className="auth-centered-container">
<Loader header=" " spinner />
</div>
}
>
{/* can we put instance routes in here, each in a suspense tag (since they're lazily loaded) */}
) : (
<main id={loggedIn ? 'app-container' : ''} className={!loggedIn ? 'auth-container' : ''}>

@BboyAkers BboyAkers Dec 17, 2024 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the most ideal and it works! My objective was to simplify the layout/routing and reduce the amount of used buttttt if ya'll have any better suggestions please let me know! 🙂

<ErrorBoundary FallbackComponent={loggedIn ? ErrorFallback : ErrorFallbackAuth}>
<Suspense fallback={<Loader header="Loading..." spinner />}>
<Routes>
<Route element={isMaintenance ? <Maintenance /> : <UpdatePassword />} path="/update-password" />
<Route element={isMaintenance ? <Maintenance /> : <Profile />} path="/profile/*" />
<Route element={isMaintenance ? <Maintenance /> : <ValidatedRoute auth={auth} />}>
<Route element={<Instance />} path="/o/:customer_id/i/:compute_stack_id/*" />
<Route element={<Instances />} path="/o/:customer_id/instances/:action?/:purchaseStep?" />
<Route element={<Organization />} path="/o/:customer_id/*" />
</Route>
<Route element={isMaintenance ? <Maintenance /> : <Organizations />} path="/:list?/:action?" />
<Route element={<Navigate to="/" replace />} />
{loggedIn ? (
<>
<Route element={isMaintenance ? <Maintenance /> : <UpdatePassword />} path="/update-password" />
<Route element={isMaintenance ? <Maintenance /> : <Profile />} path="/profile/*" />
<Route element={isMaintenance ? <Maintenance /> : <ValidatedRoute auth={auth} />}>
<Route element={<Instance />} path="/o/:customer_id/i/:compute_stack_id/*" />
<Route element={<Instances />} path="/o/:customer_id/instances/:action?/:purchaseStep?" />
<Route element={<Organization />} path="/o/:customer_id/*" />
</Route>
<Route element={isMaintenance ? <Maintenance /> : <Organizations />} path="/:list?/:action?" />
<Route element={<Navigate to="/" replace />} />
</>
) : (
<Route element={<AuthLayout />}>
<Route element={<SignIn />} path="/" />
<Route element={config.maintenance ? <Maintenance /> : <SignUp />} path="/sign-up" />
<Route element={isMaintenance ? <Maintenance /> : <ResetPassword />} path="/reset-password" />
<Route path="*" element={<Navigate to={`/?redirect=${pathname}${search}`} replace />} />
</Route>
)}
</Routes>
</Suspense>
</ErrorBoundary>
</main>
) : (
<main className="auth-container">
<ErrorBoundary FallbackComponent={ErrorFallbackAuth}>
<Suspense fallback={<Loader header=" " spinner />}>
<Container fluid="xs" className="h-100">
<Row xs="1" sm="2" className="h-100">
<Col className="p-5 auth-studio-info d-none d-sm-flex justify-content-center align-items-center">
<div className="auth-studio-info-container">
<h1 className="auth-title">HarperDB Studio</h1>
<span className="mb-4 auth-subtitle d-inline-block">Manage all your HarperDB instances.</span>
<ul className="auth-info-list-items">
<li>
<h3 className="item-title">Manage All Instances</h3>
<span className="item-subtitle">Set access, cluster, monitor, and more.</span>
</li>
<li>
<h3 className="item-title">Embedded API Server</h3>
<span className="item-subtitle">
HarperDB components give you unlimited application flexibility.
</span>
</li>
<li>
<h3 className="item-title">Fully Managed Cloud & 5G Instances</h3>
<span className="item-subtitle">Go from zero to code in minutes.</span>
</li>
<li>
<h3 className="item-title">Deploy Anywhere</h3>
<div className="mt-3">
<a
href="https://hub.docker.com/r/harperdb/harperdb"
target="_blank"
rel="noreferrer"
className="deploy-subitem"
>
Docker
</a>
<a
href="https://www.npmjs.com/package/harperdb"
target="_blank"
rel="noreferrer"
className="deploy-subitem"
>
npm
</a>
<a
href="https://docs.harperdb.io/docs/deployments/install-harperdb"
target="_blank"
rel="noreferrer"
className="deploy-subitem"
>
all options
</a>
</div>
</li>
</ul>
</div>
</Col>
<Col className="p-5 d-flex justify-content-center align-items-center auth-form-container">
<Routes>
<Route element={<SignIn />} path="/" />
<Route element={config.maintenance ? <Maintenance /> : <SignUp />} path="/sign-up" />
<Route element={isMaintenance ? <Maintenance /> : <ResetPassword />} path="/reset-password" />
<Route path="*" element={<Navigate to={`/?redirect=${pathname}${search}`} replace />} />
</Routes>
</Col>
</Row>
</Container>
</Suspense>
</ErrorBoundary>
</main>
)}
<div id="app-bg-color" />
<div className="version">
Expand Down