Skip to content
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.

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

remove hosting page #978

Merged
merged 2 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 1 addition & 16 deletions src/app/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,9 @@ import {
ForgotPassVerifyPage,
GetStartedPage,
HomePage,
HostingPage,
ImpersonatePage,
LoginPage,
LogoutPage,
NewUserToOnboarding,
NotFoundPage,
OpDetailLayout,
OpDetailPage,
Expand Down Expand Up @@ -525,11 +523,7 @@ export const appRoutes: RouteObject[] = [
children: [
{
index: true,
element: (
<NewUserToOnboarding>
<EnvironmentsPage />
</NewUserToOnboarding>
),
element: <EnvironmentsPage />,
},

{
Expand Down Expand Up @@ -723,15 +717,6 @@ export const appRoutes: RouteObject[] = [
element: <OtpResetVerifyPage />,
},

{
path: routes.HOSTING_PATH,
element: (
<AuthRequired>
<HostingPage />
</AuthRequired>
),
},

{
path: routes.PLANS_PATH,
element: (
Expand Down
26 changes: 2 additions & 24 deletions src/ui/layouts/auth-required.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
import { selectBillingDetail, selectHasPaymentMethod } from "@app/billing";
import { FETCH_REQUIRED_DATA } from "@app/bootup";
import { createLog } from "@app/debug";
import { fetchEnvironments, selectEnvironmentsAsList } from "@app/deploy";
import {
useDispatch,
useLoader,
useLoaderSuccess,
useSelector,
} from "@app/react";
import { useDispatch, useSelector } from "@app/react";
import { setRedirectPath } from "@app/redirect-path";
import {
homeUrl,
hostingUrl,
loginUrl,
logoutUrl,
plansUrl,
Expand All @@ -22,7 +15,7 @@ import { schema } from "@app/schema";
import { selectAccessToken } from "@app/token";
import { selectCurrentUser, selectIsUserVerified } from "@app/users";
import { useEffect } from "react";
import { Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
import { Navigate, Outlet, useLocation } from "react-router-dom";
import { Loading } from "../shared";

const log = createLog("auth-required");
Expand All @@ -34,21 +27,6 @@ const denyList = [
verifyEmailRequestUrl(),
];

export const NewUserToOnboarding = ({
children,
}: { children?: React.ReactNode }) => {
const navigate = useNavigate();
const loader = useLoader(fetchEnvironments);
const envs = useSelector(selectEnvironmentsAsList);
useLoaderSuccess(loader, () => {
if (envs.length === 0) {
navigate(hostingUrl());
}
});

return children ? children : <Outlet />;
};

export const VerifyEmailRequired = ({
children,
}: { children?: React.ReactNode }) => {
Expand Down
222 changes: 0 additions & 222 deletions src/ui/pages/hosting.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/ui/pages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ export * from "./forgot-pass";
export * from "./billing-method";
export * from "./impersonate";
export * from "./plans";
export * from "./hosting";
export * from "./sso";
export * from "./activity";
export * from "./deployments";
Expand Down
4 changes: 2 additions & 2 deletions src/ui/pages/verify-email.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ describe("Verify email page", () => {
render(<App />);

await screen.findByRole("heading", {
level: 1,
name: /Choose an Option/,
level: 2,
name: /Environments/,
});
});
});
Expand Down
Loading