From 2f2414d8bb869bb4cea0cf8e0178356f6410321e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Fri, 21 Mar 2025 16:44:43 +0400 Subject: [PATCH] Split project structure, routing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- apps/console/src/App.css | 1 + apps/console/src/App.tsx | 338 +----------------- apps/console/src/layouts/AuthLayout.tsx | 8 +- .../{ => authentication}/ConfirmEmailPage.tsx | 0 .../ConfirmInvitationPage.tsx | 0 .../pages/authentication/ErrorBoundary.tsx | 15 + .../ForgotPasswordPage.tsx | 0 .../pages/{ => authentication}/LoginPage.tsx | 0 .../{ => authentication}/RegisterPage.tsx | 0 .../ResetPasswordPage.tsx | 0 .../src/pages/authentication/Routes.tsx | 76 ++++ .../ConfirmEmailPageMutation.graphql.ts | 0 .../CreateOrganizationPage.tsx | 0 .../src/pages/organizations/ErrorBoundary.tsx | 11 + .../pages/{ => organizations}/HomePage.tsx | 0 .../organizations/NoOrganizationLayout.tsx | 90 +++++ .../organizations/OrganizationLayout.tsx} | 144 ++++---- .../src/pages/organizations/Routes.tsx | 259 ++++++++++++++ .../{ => organizations}/SettingsPage.tsx | 0 ...nPageCreateOrganizationMutation.graphql.ts | 0 ...eateOrganizationPageViewerQuery.graphql.ts | 0 ...BreadcrumbControlOverviewQuery.graphql.ts} | 24 +- ...eadcrumbFrameworkOverviewQuery.graphql.ts} | 24 +- ...tBreadcrumbPeopleOverviewQuery.graphql.ts} | 24 +- ...tBreadcrumbPolicyOverviewQuery.graphql.ts} | 24 +- ...tBreadcrumbVendorOverviewQuery.graphql.ts} | 24 +- ...izationLayoutOrganizationQuery.graphql.ts} | 24 +- .../SettingsPageInviteUserMutation.graphql.ts | 0 .../SettingsPageQuery.graphql.ts | 0 .../SettingsPageRemoveUserMutation.graphql.ts | 0 ...sPageUpdateOrganizationMutation.graphql.ts | 0 .../frameworks}/CreateFrameworkPage.tsx | 0 .../frameworks}/FrameworkListPage.tsx | 0 .../frameworks}/FrameworkOverviewPage.tsx | 0 .../frameworks}/UpdateFrameworkPage.tsx | 0 ...workPageCreateFrameworkMutation.graphql.ts | 0 ...ListPageImportFrameworkMutation.graphql.ts | 0 .../FrameworkListPageQuery.graphql.ts | 0 .../FrameworkOverviewPageQuery.graphql.ts | 0 .../UpdateFrameworkPageQuery.graphql.ts | 0 ...workPageUpdateFrameworkMutation.graphql.ts | 0 .../controls}/ControlOverviewPage.tsx | 0 .../controls}/CreateControlPage.tsx | 0 .../controls}/UpdateControlPage.tsx | 0 ...lOverviewPageAssignTaskMutation.graphql.ts | 0 ...lOverviewPageCreateTaskMutation.graphql.ts | 0 ...rviewPageDeleteEvidenceMutation.graphql.ts | 0 ...lOverviewPageDeleteTaskMutation.graphql.ts | 0 ...viewPageGetEvidenceFileUrlQuery.graphql.ts | 0 ...olOverviewPageOrganizationQuery.graphql.ts | 0 .../ControlOverviewPageQuery.graphql.ts | 0 ...verviewPageUnassignTaskMutation.graphql.ts | 0 ...wPageUpdateControlStateMutation.graphql.ts | 0 ...viewPageUpdateTaskStateMutation.graphql.ts | 0 ...rviewPageUploadEvidenceMutation.graphql.ts | 0 ...ontrolPageCreateControlMutation.graphql.ts | 0 .../UpdateControlPageQuery.graphql.ts | 0 ...ontrolPageUpdateControlMutation.graphql.ts | 0 .../people}/CreatePeoplePage.tsx | 0 .../people}/PeopleListPage.tsx | 0 .../people}/PeopleOverviewPage.tsx | 0 ...ePeoplePageCreatePeopleMutation.graphql.ts | 0 ...pleListPageDeletePeopleMutation.graphql.ts | 0 .../PeopleListPagePaginationQuery.graphql.ts | 0 .../PeopleListPageQuery.graphql.ts | 0 .../PeopleListPage_peoples.graphql.ts | 0 .../PeopleOverviewPageQuery.graphql.ts | 0 ...verviewPageUpdatePeopleMutation.graphql.ts | 0 .../policies}/CreatePolicyPage.tsx | 0 .../policies}/PolicyListPage.tsx | 0 .../policies}/PolicyOverviewPage.tsx | 1 - .../policies}/UpdatePolicyPage.tsx | 0 .../CreatePolicyPageMutation.graphql.ts | 0 .../CreatePolicyPageQuery.graphql.ts | 0 .../PolicyListPageQuery.graphql.ts | 0 ...olicyOverviewPageDeleteMutation.graphql.ts | 0 .../PolicyOverviewPageQuery.graphql.ts | 0 .../UpdatePolicyPageMutation.graphql.ts | 0 .../UpdatePolicyPageQuery.graphql.ts | 0 .../vendors}/VendorListPage.tsx | 0 .../vendors}/VendorOverviewPage.tsx | 0 ...dorListPageCreateVendorMutation.graphql.ts | 0 ...dorListPageDeleteVendorMutation.graphql.ts | 0 .../VendorListPagePaginationQuery.graphql.ts | 0 .../VendorListPageQuery.graphql.ts | 0 .../VendorListPage_vendors.graphql.ts | 0 .../VendorOverviewPageQuery.graphql.ts | 0 ...verviewPageUpdateVendorMutation.graphql.ts | 0 88 files changed, 616 insertions(+), 471 deletions(-) rename apps/console/src/pages/{ => authentication}/ConfirmEmailPage.tsx (100%) rename apps/console/src/pages/{ => authentication}/ConfirmInvitationPage.tsx (100%) create mode 100644 apps/console/src/pages/authentication/ErrorBoundary.tsx rename apps/console/src/pages/{ => authentication}/ForgotPasswordPage.tsx (100%) rename apps/console/src/pages/{ => authentication}/LoginPage.tsx (100%) rename apps/console/src/pages/{ => authentication}/RegisterPage.tsx (100%) rename apps/console/src/pages/{ => authentication}/ResetPasswordPage.tsx (100%) create mode 100644 apps/console/src/pages/authentication/Routes.tsx rename apps/console/src/pages/{ => authentication}/__generated__/ConfirmEmailPageMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations}/CreateOrganizationPage.tsx (100%) create mode 100644 apps/console/src/pages/organizations/ErrorBoundary.tsx rename apps/console/src/pages/{ => organizations}/HomePage.tsx (100%) create mode 100644 apps/console/src/pages/organizations/NoOrganizationLayout.tsx rename apps/console/src/{layouts/ConsoleLayout.tsx => pages/organizations/OrganizationLayout.tsx} (78%) create mode 100644 apps/console/src/pages/organizations/Routes.tsx rename apps/console/src/pages/{ => organizations}/SettingsPage.tsx (100%) rename apps/console/src/pages/{ => organizations}/__generated__/CreateOrganizationPageCreateOrganizationMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations}/__generated__/CreateOrganizationPageViewerQuery.graphql.ts (100%) rename apps/console/src/{layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts => pages/organizations/__generated__/OrganizationLayoutBreadcrumbControlOverviewQuery.graphql.ts} (69%) rename apps/console/src/{layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts => pages/organizations/__generated__/OrganizationLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts} (68%) rename apps/console/src/{layouts/__generated__/ConsoleLayoutBreadcrumbPeopleOverviewQuery.graphql.ts => pages/organizations/__generated__/OrganizationLayoutBreadcrumbPeopleOverviewQuery.graphql.ts} (69%) rename apps/console/src/{layouts/__generated__/ConsoleLayoutBreadcrumbPolicyOverviewQuery.graphql.ts => pages/organizations/__generated__/OrganizationLayoutBreadcrumbPolicyOverviewQuery.graphql.ts} (69%) rename apps/console/src/{layouts/__generated__/ConsoleLayoutBreadcrumbVendorOverviewQuery.graphql.ts => pages/organizations/__generated__/OrganizationLayoutBreadcrumbVendorOverviewQuery.graphql.ts} (69%) rename apps/console/src/{layouts/__generated__/ConsoleLayoutOrganizationQuery.graphql.ts => pages/organizations/__generated__/OrganizationLayoutOrganizationQuery.graphql.ts} (71%) rename apps/console/src/pages/{ => organizations}/__generated__/SettingsPageInviteUserMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations}/__generated__/SettingsPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations}/__generated__/SettingsPageRemoveUserMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations}/__generated__/SettingsPageUpdateOrganizationMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks}/CreateFrameworkPage.tsx (100%) rename apps/console/src/pages/{ => organizations/frameworks}/FrameworkListPage.tsx (100%) rename apps/console/src/pages/{ => organizations/frameworks}/FrameworkOverviewPage.tsx (100%) rename apps/console/src/pages/{ => organizations/frameworks}/UpdateFrameworkPage.tsx (100%) rename apps/console/src/pages/{ => organizations/frameworks}/__generated__/CreateFrameworkPageCreateFrameworkMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks}/__generated__/FrameworkListPageImportFrameworkMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks}/__generated__/FrameworkListPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks}/__generated__/FrameworkOverviewPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks}/__generated__/UpdateFrameworkPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks}/__generated__/UpdateFrameworkPageUpdateFrameworkMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/ControlOverviewPage.tsx (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/CreateControlPage.tsx (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/UpdateControlPage.tsx (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageAssignTaskMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageCreateTaskMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageDeleteEvidenceMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageDeleteTaskMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageGetEvidenceFileUrlQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageOrganizationQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageUnassignTaskMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageUpdateControlStateMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageUpdateTaskStateMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/ControlOverviewPageUploadEvidenceMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/CreateControlPageCreateControlMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/UpdateControlPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/frameworks/controls}/__generated__/UpdateControlPageUpdateControlMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/people}/CreatePeoplePage.tsx (100%) rename apps/console/src/pages/{ => organizations/people}/PeopleListPage.tsx (100%) rename apps/console/src/pages/{ => organizations/people}/PeopleOverviewPage.tsx (100%) rename apps/console/src/pages/{ => organizations/people}/__generated__/CreatePeoplePageCreatePeopleMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/people}/__generated__/PeopleListPageDeletePeopleMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/people}/__generated__/PeopleListPagePaginationQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/people}/__generated__/PeopleListPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/people}/__generated__/PeopleListPage_peoples.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/people}/__generated__/PeopleOverviewPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/people}/__generated__/PeopleOverviewPageUpdatePeopleMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/policies}/CreatePolicyPage.tsx (100%) rename apps/console/src/pages/{ => organizations/policies}/PolicyListPage.tsx (100%) rename apps/console/src/pages/{ => organizations/policies}/PolicyOverviewPage.tsx (99%) rename apps/console/src/pages/{ => organizations/policies}/UpdatePolicyPage.tsx (100%) rename apps/console/src/pages/{ => organizations/policies}/__generated__/CreatePolicyPageMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/policies}/__generated__/CreatePolicyPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/policies}/__generated__/PolicyListPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/policies}/__generated__/PolicyOverviewPageDeleteMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/policies}/__generated__/PolicyOverviewPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/policies}/__generated__/UpdatePolicyPageMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/policies}/__generated__/UpdatePolicyPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/vendors}/VendorListPage.tsx (100%) rename apps/console/src/pages/{ => organizations/vendors}/VendorOverviewPage.tsx (100%) rename apps/console/src/pages/{ => organizations/vendors}/__generated__/VendorListPageCreateVendorMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/vendors}/__generated__/VendorListPageDeleteVendorMutation.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/vendors}/__generated__/VendorListPagePaginationQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/vendors}/__generated__/VendorListPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/vendors}/__generated__/VendorListPage_vendors.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/vendors}/__generated__/VendorOverviewPageQuery.graphql.ts (100%) rename apps/console/src/pages/{ => organizations/vendors}/__generated__/VendorOverviewPageUpdateVendorMutation.graphql.ts (100%) diff --git a/apps/console/src/App.css b/apps/console/src/App.css index 845cb0ecb..06f04ff63 100644 --- a/apps/console/src/App.css +++ b/apps/console/src/App.css @@ -1,5 +1,6 @@ @import "tailwindcss"; @import "./styles/colors.css"; +@import "./styles/policy-content.css"; @plugin 'tailwindcss-animate'; @plugin "@tailwindcss/typography"; diff --git a/apps/console/src/App.tsx b/apps/console/src/App.tsx index 30b083065..986e7a945 100644 --- a/apps/console/src/App.tsx +++ b/apps/console/src/App.tsx @@ -8,28 +8,10 @@ import { BrowserRouter, Route, Routes, useLocation } from "react-router"; import "./App.css"; import "./styles/policy-content.css"; import ErrorBoundary from "./components/ErrorBoundary"; -import ConsoleLayout from "./layouts/ConsoleLayout"; import AuthLayout from "./layouts/AuthLayout"; import { RelayEnvironment } from "./RelayEnvironment"; -import VisitorErrorBoundary from "./components/VisitorErrorBoundary"; -import { FrameworkListPageSkeleton } from "./pages/FrameworkListPage"; -import { ControlOverviewPageSkeleton } from "./pages/ControlOverviewPage"; -import { CreateControlPageSkeleton } from "./pages/CreateControlPage"; -import { UpdateFrameworkPageSkeleton } from "./pages/UpdateFrameworkPage"; -import { UpdateControlPageSkeleton } from "./pages/UpdateControlPage"; -import { CreateFrameworkPageSkeleton } from "./pages/CreateFrameworkPage"; -import { CreateOrganizationPageSkeleton } from "./pages/CreateOrganizationPage"; -import { CreatePeoplePageSkeleton } from "./pages/CreatePeoplePage"; -import { CreatePolicyPageSkeleton } from "./pages/CreatePolicyPage"; -import { FrameworkOverviewPageSkeleton } from "./pages/FrameworkOverviewPage"; -import { PeopleListPageSkeleton } from "./pages/PeopleListPage"; -import { PeopleOverviewPageSkeleton } from "./pages/PeopleOverviewPage"; -import { PolicyListPageSkeleton } from "./pages/PolicyListPage"; -import { PolicyOverviewPageSkeleton } from "./pages/PolicyOverviewPage"; -import { UpdatePolicyPageSkeleton } from "./pages/UpdatePolicyPage"; -import { VendorListPageSkeleton } from "./pages/VendorListPage"; -import { VendorOverviewPageSkeleton } from "./pages/VendorOverviewPage"; -import { SettingsPageSkeleton } from "./pages/SettingsPage"; +import { AuthenticationRoutes } from "./pages/authentication/Routes"; +import { OrganizationsRoutes } from "./pages/organizations/Routes"; posthog.init(process.env.POSTHOG_KEY!, { api_host: process.env.POSTHOG_HOST, @@ -44,39 +26,7 @@ posthog.init(process.env.POSTHOG_KEY!, { const OrganizationSelectionPage = lazy( () => import("./pages/OrganizationSelectionPage") ); -const HomePage = lazy(() => import("./pages/HomePage")); const NotFoundPage = lazy(() => import("./pages/NotFoundPage")); -const PeopleListPage = lazy(() => import("./pages/PeopleListPage")); -const VendorListPage = lazy(() => import("./pages/VendorListPage")); -const FrameworkListPage = lazy(() => import("./pages/FrameworkListPage")); -const VendorOverviewPage = lazy(() => import("./pages/VendorOverviewPage")); -const SettingsPage = lazy(() => import("./pages/SettingsPage")); -const CreatePeoplePage = lazy(() => import("./pages/CreatePeoplePage")); -const FrameworkOverviewPage = lazy( - () => import("./pages/FrameworkOverviewPage") -); -const ControlOverviewPage = lazy(() => import("./pages/ControlOverviewPage")); -const PeopleOverviewPage = lazy(() => import("./pages/PeopleOverviewPage")); -const LoginPage = lazy(() => import("./pages/LoginPage")); -const RegisterPage = lazy(() => import("./pages/RegisterPage")); -const ConfirmEmailPage = lazy(() => import("./pages/ConfirmEmailPage")); -const ConfirmInvitationPage = lazy( - () => import("./pages/ConfirmInvitationPage") -); -const CreateOrganizationPage = lazy( - () => import("./pages/CreateOrganizationPage") -); -const CreateFrameworkPage = lazy(() => import("./pages/CreateFrameworkPage")); -const CreateControlPage = lazy(() => import("./pages/CreateControlPage")); -const UpdateFrameworkPage = lazy(() => import("./pages/UpdateFrameworkPage")); -const UpdateControlPage = lazy(() => import("./pages/UpdateControlPage")); -const ForgotPasswordPage = lazy(() => import("./pages/ForgotPasswordPage")); -const ResetPasswordPage = lazy(() => import("./pages/ResetPasswordPage")); -// Policy pages -const PolicyListPage = lazy(() => import("./pages/PolicyListPage")); -const PolicyOverviewPage = lazy(() => import("./pages/PolicyOverviewPage")); -const CreatePolicyPage = lazy(() => import("./pages/CreatePolicyPage")); -const UpdatePolicyPage = lazy(() => import("./pages/UpdatePolicyPage")); function App() { return ( @@ -98,267 +48,18 @@ function App() { } /> - }> - }> - - - - - } - /> - - - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - } - > - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - {/* Policy Routes */} - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - }> - - - - - } - /> - - + } + /> - {/* Authentication Routes - Accessible without login */} - }> - - - - - - } - /> - - - - - - } - /> - - - - - - } - /> - - - - - - } - /> - - - - - - } - /> - - - - - - } - /> - + + + + } + /> {children}; } -function VisitorErrorBoundaryWithLocation({ - children, -}: { - children: React.ReactNode; -}) { - const location = useLocation(); - return ( - - {children} - - ); -} - const container = document.getElementById("root"); const root = createRoot(container!); root.render(); diff --git a/apps/console/src/layouts/AuthLayout.tsx b/apps/console/src/layouts/AuthLayout.tsx index 8324187d4..ad8204e1f 100644 --- a/apps/console/src/layouts/AuthLayout.tsx +++ b/apps/console/src/layouts/AuthLayout.tsx @@ -1,15 +1,13 @@ -import { Outlet } from "react-router"; import { Toaster } from "@/components/ui/toaster"; +import { ReactNode } from "react"; -export default function AuthLayout() { +export default function AuthLayout({ children }: { children: ReactNode }) { return (
-
- -
+
{children}
diff --git a/apps/console/src/pages/ConfirmEmailPage.tsx b/apps/console/src/pages/authentication/ConfirmEmailPage.tsx similarity index 100% rename from apps/console/src/pages/ConfirmEmailPage.tsx rename to apps/console/src/pages/authentication/ConfirmEmailPage.tsx diff --git a/apps/console/src/pages/ConfirmInvitationPage.tsx b/apps/console/src/pages/authentication/ConfirmInvitationPage.tsx similarity index 100% rename from apps/console/src/pages/ConfirmInvitationPage.tsx rename to apps/console/src/pages/authentication/ConfirmInvitationPage.tsx diff --git a/apps/console/src/pages/authentication/ErrorBoundary.tsx b/apps/console/src/pages/authentication/ErrorBoundary.tsx new file mode 100644 index 000000000..83e539d1f --- /dev/null +++ b/apps/console/src/pages/authentication/ErrorBoundary.tsx @@ -0,0 +1,15 @@ +import VisitorErrorBoundary from "@/components/VisitorErrorBoundary"; +import { useLocation } from "react-router"; + +export function VisitorErrorBoundaryWithLocation({ + children, +}: { + children: React.ReactNode; +}) { + const location = useLocation(); + return ( + + {children} + + ); +} diff --git a/apps/console/src/pages/ForgotPasswordPage.tsx b/apps/console/src/pages/authentication/ForgotPasswordPage.tsx similarity index 100% rename from apps/console/src/pages/ForgotPasswordPage.tsx rename to apps/console/src/pages/authentication/ForgotPasswordPage.tsx diff --git a/apps/console/src/pages/LoginPage.tsx b/apps/console/src/pages/authentication/LoginPage.tsx similarity index 100% rename from apps/console/src/pages/LoginPage.tsx rename to apps/console/src/pages/authentication/LoginPage.tsx diff --git a/apps/console/src/pages/RegisterPage.tsx b/apps/console/src/pages/authentication/RegisterPage.tsx similarity index 100% rename from apps/console/src/pages/RegisterPage.tsx rename to apps/console/src/pages/authentication/RegisterPage.tsx diff --git a/apps/console/src/pages/ResetPasswordPage.tsx b/apps/console/src/pages/authentication/ResetPasswordPage.tsx similarity index 100% rename from apps/console/src/pages/ResetPasswordPage.tsx rename to apps/console/src/pages/authentication/ResetPasswordPage.tsx diff --git a/apps/console/src/pages/authentication/Routes.tsx b/apps/console/src/pages/authentication/Routes.tsx new file mode 100644 index 000000000..e9cbb7a14 --- /dev/null +++ b/apps/console/src/pages/authentication/Routes.tsx @@ -0,0 +1,76 @@ +import { Suspense } from "react"; +import { Route, Routes } from "react-router"; +import ConfirmEmailPage from "./ConfirmEmailPage"; +import ConfirmInvitationPage from "./ConfirmInvitationPage"; +import ForgotPasswordPage from "./ForgotPasswordPage"; +import LoginPage from "./LoginPage"; +import RegisterPage from "./RegisterPage"; +import ResetPasswordPage from "./ResetPasswordPage"; +import { VisitorErrorBoundaryWithLocation } from "./ErrorBoundary"; + +export function AuthenticationRoutes() { + return ( + + + + + + + } + /> + + + + + + } + /> + + + + + + } + /> + + + + + + } + /> + + + + + + } + /> + + + + + + } + /> + + ); +} diff --git a/apps/console/src/pages/__generated__/ConfirmEmailPageMutation.graphql.ts b/apps/console/src/pages/authentication/__generated__/ConfirmEmailPageMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ConfirmEmailPageMutation.graphql.ts rename to apps/console/src/pages/authentication/__generated__/ConfirmEmailPageMutation.graphql.ts diff --git a/apps/console/src/pages/CreateOrganizationPage.tsx b/apps/console/src/pages/organizations/CreateOrganizationPage.tsx similarity index 100% rename from apps/console/src/pages/CreateOrganizationPage.tsx rename to apps/console/src/pages/organizations/CreateOrganizationPage.tsx diff --git a/apps/console/src/pages/organizations/ErrorBoundary.tsx b/apps/console/src/pages/organizations/ErrorBoundary.tsx new file mode 100644 index 000000000..d3abcaef5 --- /dev/null +++ b/apps/console/src/pages/organizations/ErrorBoundary.tsx @@ -0,0 +1,11 @@ +import ErrorBoundary from "@/components/ErrorBoundary"; +import { useLocation } from "react-router"; + +export function ErrorBoundaryWithLocation({ + children, +}: { + children: React.ReactNode; +}) { + const location = useLocation(); + return {children}; +} diff --git a/apps/console/src/pages/HomePage.tsx b/apps/console/src/pages/organizations/HomePage.tsx similarity index 100% rename from apps/console/src/pages/HomePage.tsx rename to apps/console/src/pages/organizations/HomePage.tsx diff --git a/apps/console/src/pages/organizations/NoOrganizationLayout.tsx b/apps/console/src/pages/organizations/NoOrganizationLayout.tsx new file mode 100644 index 000000000..cfd61e545 --- /dev/null +++ b/apps/console/src/pages/organizations/NoOrganizationLayout.tsx @@ -0,0 +1,90 @@ +import { NavLink, Outlet, Route, Routes, To } from "react-router"; +import { AppSidebar } from "@/components/AppSidebar"; +import { ReactNode, Suspense } from "react"; +import { + Breadcrumb, + BreadcrumbItem, + BreadcrumbLink, + BreadcrumbList, + BreadcrumbPage, + BreadcrumbSeparator, +} from "@/components/ui/breadcrumb"; +import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"; +import { Toaster } from "@/components/ui/toaster"; +import { cn } from "@/lib/utils"; + +const BreadCrumbNavLink = ({ + to, + children, + className, +}: { + to: To; + children?: ReactNode; + className?: string; +}) => { + return ( + + + {({ isActive }) => ( + + {children} + + )} + + + ); +}; + +function BreadcrumbHome() { + return ( + + + + Home + + + + + ); +} + +export default function NoOrganizationLayout() { + return ( + + + + + +
+
+ + }> + + + + Create Organization + + + } + /> + + +
+
+ +
+
+ + + + ); +} diff --git a/apps/console/src/layouts/ConsoleLayout.tsx b/apps/console/src/pages/organizations/OrganizationLayout.tsx similarity index 78% rename from apps/console/src/layouts/ConsoleLayout.tsx rename to apps/console/src/pages/organizations/OrganizationLayout.tsx index 07678863b..dd2b8a2fd 100644 --- a/apps/console/src/layouts/ConsoleLayout.tsx +++ b/apps/console/src/pages/organizations/OrganizationLayout.tsx @@ -12,13 +12,13 @@ import { import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"; import { Toaster } from "@/components/ui/toaster"; import { graphql, useLazyLoadQuery } from "react-relay"; -import { ConsoleLayoutBreadcrumbFrameworkOverviewQuery } from "./__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql"; -import { ConsoleLayoutBreadcrumbPeopleOverviewQuery } from "./__generated__/ConsoleLayoutBreadcrumbPeopleOverviewQuery.graphql"; -import { ConsoleLayoutBreadcrumbVendorOverviewQuery } from "./__generated__/ConsoleLayoutBreadcrumbVendorOverviewQuery.graphql"; -import { ConsoleLayoutBreadcrumbControlOverviewQuery } from "./__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql"; -import { ConsoleLayoutOrganizationQuery } from "./__generated__/ConsoleLayoutOrganizationQuery.graphql"; -import { ConsoleLayoutBreadcrumbPolicyOverviewQuery } from "./__generated__/ConsoleLayoutBreadcrumbPolicyOverviewQuery.graphql"; import { cn } from "@/lib/utils"; +import { OrganizationLayoutOrganizationQuery } from "./__generated__/OrganizationLayoutOrganizationQuery.graphql"; +import { OrganizationLayoutBreadcrumbControlOverviewQuery } from "./__generated__/OrganizationLayoutBreadcrumbControlOverviewQuery.graphql"; +import { OrganizationLayoutBreadcrumbFrameworkOverviewQuery } from "./__generated__/OrganizationLayoutBreadcrumbFrameworkOverviewQuery.graphql"; +import { OrganizationLayoutBreadcrumbPeopleOverviewQuery } from "./__generated__/OrganizationLayoutBreadcrumbPeopleOverviewQuery.graphql"; +import { OrganizationLayoutBreadcrumbPolicyOverviewQuery } from "./__generated__/OrganizationLayoutBreadcrumbPolicyOverviewQuery.graphql"; +import { OrganizationLayoutBreadcrumbVendorOverviewQuery } from "./__generated__/OrganizationLayoutBreadcrumbVendorOverviewQuery.graphql"; const BreadCrumbNavLink = ({ to, @@ -64,9 +64,9 @@ function BreadcrumbHome() { function BreadCrumbOrganization() { const { organizationId } = useParams(); - const data = useLazyLoadQuery( + const data = useLazyLoadQuery( graphql` - query ConsoleLayoutOrganizationQuery($organizationId: ID!) { + query OrganizationLayoutOrganizationQuery($organizationId: ID!) { organization: node(id: $organizationId) { ... on Organization { name @@ -120,19 +120,22 @@ function BreadcrumbCreateFramework() { function BreadcrumbFrameworkOverview() { const { organizationId, frameworkId } = useParams(); - const data = useLazyLoadQuery( - graphql` - query ConsoleLayoutBreadcrumbFrameworkOverviewQuery($frameworkId: ID!) { - framework: node(id: $frameworkId) { - id - ... on Framework { - name + const data = + useLazyLoadQuery( + graphql` + query OrganizationLayoutBreadcrumbFrameworkOverviewQuery( + $frameworkId: ID! + ) { + framework: node(id: $frameworkId) { + id + ... on Framework { + name + } } } - } - `, - { frameworkId: frameworkId! } - ); + `, + { frameworkId: frameworkId! } + ); return ( <> @@ -177,20 +180,21 @@ function BreadcrumbVendorList() { function BreadcrumbVendorOverview() { const { organizationId, vendorId } = useParams(); - const data = useLazyLoadQuery( - graphql` - query ConsoleLayoutBreadcrumbVendorOverviewQuery($vendorId: ID!) { - vendor: node(id: $vendorId) { - id - ... on Vendor { - name + const data = + useLazyLoadQuery( + graphql` + query OrganizationLayoutBreadcrumbVendorOverviewQuery($vendorId: ID!) { + vendor: node(id: $vendorId) { + id + ... on Vendor { + name + } } } - } - `, - { vendorId: vendorId! }, - { fetchPolicy: "store-or-network" } - ); + `, + { vendorId: vendorId! }, + { fetchPolicy: "store-or-network" } + ); return ( <> @@ -235,20 +239,21 @@ function BreadcrumbCreatePeople() { function BreadcrumbPeopleOverview() { const { organizationId, peopleId } = useParams(); - const data = useLazyLoadQuery( - graphql` - query ConsoleLayoutBreadcrumbPeopleOverviewQuery($peopleId: ID!) { - people: node(id: $peopleId) { - id - ... on People { - fullName + const data = + useLazyLoadQuery( + graphql` + query OrganizationLayoutBreadcrumbPeopleOverviewQuery($peopleId: ID!) { + people: node(id: $peopleId) { + id + ... on People { + fullName + } } } - } - `, - { peopleId: peopleId! }, - { fetchPolicy: "store-or-network" } - ); + `, + { peopleId: peopleId! }, + { fetchPolicy: "store-or-network" } + ); return ( <> @@ -267,19 +272,22 @@ function BreadcrumbPeopleOverview() { function BreadcrumbControlOverview() { const { organizationId, frameworkId, controlId } = useParams(); - const data = useLazyLoadQuery( - graphql` - query ConsoleLayoutBreadcrumbControlOverviewQuery($controlId: ID!) { - control: node(id: $controlId) { - id - ... on Control { - name + const data = + useLazyLoadQuery( + graphql` + query OrganizationLayoutBreadcrumbControlOverviewQuery( + $controlId: ID! + ) { + control: node(id: $controlId) { + id + ... on Control { + name + } } } - } - `, - { controlId: controlId! } - ); + `, + { controlId: controlId! } + ); return ( <> @@ -346,20 +354,21 @@ function BreadcrumbCreatePolicy() { function BreadcrumbPolicyOverview() { const { organizationId, policyId } = useParams(); - const data = useLazyLoadQuery( - graphql` - query ConsoleLayoutBreadcrumbPolicyOverviewQuery($policyId: ID!) { - policy: node(id: $policyId) { - id - ... on Policy { - name + const data = + useLazyLoadQuery( + graphql` + query OrganizationLayoutBreadcrumbPolicyOverviewQuery($policyId: ID!) { + policy: node(id: $policyId) { + id + ... on Policy { + name + } } } - } - `, - { policyId: policyId! }, - { fetchPolicy: "store-or-network" } - ); + `, + { policyId: policyId! }, + { fetchPolicy: "store-or-network" } + ); return ( <> @@ -387,7 +396,7 @@ function BreadcrumbUpdatePolicy() { ); } -export default function ConsoleLayout() { +export default function OrganizationLayout() { return ( @@ -398,7 +407,6 @@ export default function ConsoleLayout() {
diff --git a/apps/console/src/pages/organizations/Routes.tsx b/apps/console/src/pages/organizations/Routes.tsx new file mode 100644 index 000000000..954dac4d8 --- /dev/null +++ b/apps/console/src/pages/organizations/Routes.tsx @@ -0,0 +1,259 @@ +import { lazy, Suspense } from "react"; +import { Route, Routes } from "react-router"; +import { CreateOrganizationPageSkeleton } from "./CreateOrganizationPage"; +import { ControlOverviewPageSkeleton } from "./frameworks/controls/ControlOverviewPage"; +import { CreateControlPageSkeleton } from "./frameworks/controls/CreateControlPage"; +import { UpdateControlPageSkeleton } from "./frameworks/controls/UpdateControlPage"; +import { CreateFrameworkPageSkeleton } from "./frameworks/CreateFrameworkPage"; +import { FrameworkListPageSkeleton } from "./frameworks/FrameworkListPage"; +import { FrameworkOverviewPageSkeleton } from "./frameworks/FrameworkOverviewPage"; +import { UpdateFrameworkPageSkeleton } from "./frameworks/UpdateFrameworkPage"; +import "./HomePage"; +import { CreatePeoplePageSkeleton } from "./people/CreatePeoplePage"; +import { PeopleListPageSkeleton } from "./people/PeopleListPage"; +import { PeopleOverviewPageSkeleton } from "./people/PeopleOverviewPage"; +import { CreatePolicyPageSkeleton } from "./policies/CreatePolicyPage"; +import { PolicyListPageSkeleton } from "./policies/PolicyListPage"; +import { PolicyOverviewPageSkeleton } from "./policies/PolicyOverviewPage"; +import { UpdatePolicyPageSkeleton } from "./policies/UpdatePolicyPage"; +import { SettingsPageSkeleton } from "./SettingsPage"; +import { VendorListPageSkeleton } from "./vendors/VendorListPage"; +import { VendorOverviewPageSkeleton } from "./vendors/VendorOverviewPage"; +import { ErrorBoundaryWithLocation } from "./ErrorBoundary"; +import OrganizationLayout from "./OrganizationLayout"; +import NoOrganizationLayout from "./NoOrganizationLayout"; + +const CreateOrganizationPage = lazy(() => import("./CreateOrganizationPage")); +const ControlOverviewPage = lazy( + () => import("./frameworks/controls/ControlOverviewPage") +); +const CreateControlPage = lazy( + () => import("./frameworks/controls/CreateControlPage") +); +const UpdateControlPage = lazy( + () => import("./frameworks/controls/UpdateControlPage") +); +const CreateFrameworkPage = lazy( + () => import("./frameworks/CreateFrameworkPage") +); +const FrameworkListPage = lazy(() => import("./frameworks/FrameworkListPage")); +const FrameworkOverviewPage = lazy( + () => import("./frameworks/FrameworkOverviewPage") +); +const UpdateFrameworkPage = lazy( + () => import("./frameworks/UpdateFrameworkPage") +); +const HomePage = lazy(() => import("./HomePage")); +const CreatePeoplePage = lazy(() => import("./people/CreatePeoplePage")); +const PeopleListPage = lazy(() => import("./people/PeopleListPage")); +const PeopleOverviewPage = lazy(() => import("./people/PeopleOverviewPage")); +const CreatePolicyPage = lazy(() => import("./policies/CreatePolicyPage")); +const PolicyListPage = lazy(() => import("./policies/PolicyListPage")); +const PolicyOverviewPage = lazy(() => import("./policies/PolicyOverviewPage")); +const UpdatePolicyPage = lazy(() => import("./policies/UpdatePolicyPage")); +const SettingsPage = lazy(() => import("./SettingsPage")); +const VendorListPage = lazy(() => import("./vendors/VendorListPage")); +const VendorOverviewPage = lazy(() => import("./vendors/VendorOverviewPage")); + +export function OrganizationsRoutes() { + return ( + + }> + + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + {/* Policy Routes */} + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + }> + + + + + } + /> + + + }> + }> + + + + + } + /> + + + ); +} diff --git a/apps/console/src/pages/SettingsPage.tsx b/apps/console/src/pages/organizations/SettingsPage.tsx similarity index 100% rename from apps/console/src/pages/SettingsPage.tsx rename to apps/console/src/pages/organizations/SettingsPage.tsx diff --git a/apps/console/src/pages/__generated__/CreateOrganizationPageCreateOrganizationMutation.graphql.ts b/apps/console/src/pages/organizations/__generated__/CreateOrganizationPageCreateOrganizationMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/CreateOrganizationPageCreateOrganizationMutation.graphql.ts rename to apps/console/src/pages/organizations/__generated__/CreateOrganizationPageCreateOrganizationMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/CreateOrganizationPageViewerQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/CreateOrganizationPageViewerQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/CreateOrganizationPageViewerQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/CreateOrganizationPageViewerQuery.graphql.ts diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbControlOverviewQuery.graphql.ts similarity index 69% rename from apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbControlOverviewQuery.graphql.ts index ea8718a55..32bef6b46 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts +++ b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbControlOverviewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<00ec8864c54512b021bdfa0f7b53cd43>> + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -9,18 +9,18 @@ // @ts-nocheck import { ConcreteRequest } from 'relay-runtime'; -export type ConsoleLayoutBreadcrumbControlOverviewQuery$variables = { +export type OrganizationLayoutBreadcrumbControlOverviewQuery$variables = { controlId: string; }; -export type ConsoleLayoutBreadcrumbControlOverviewQuery$data = { +export type OrganizationLayoutBreadcrumbControlOverviewQuery$data = { readonly control: { readonly id: string; readonly name?: string; }; }; -export type ConsoleLayoutBreadcrumbControlOverviewQuery = { - response: ConsoleLayoutBreadcrumbControlOverviewQuery$data; - variables: ConsoleLayoutBreadcrumbControlOverviewQuery$variables; +export type OrganizationLayoutBreadcrumbControlOverviewQuery = { + response: OrganizationLayoutBreadcrumbControlOverviewQuery$data; + variables: OrganizationLayoutBreadcrumbControlOverviewQuery$variables; }; const node: ConcreteRequest = (function(){ @@ -64,7 +64,7 @@ return { "argumentDefinitions": (v0/*: any*/), "kind": "Fragment", "metadata": null, - "name": "ConsoleLayoutBreadcrumbControlOverviewQuery", + "name": "OrganizationLayoutBreadcrumbControlOverviewQuery", "selections": [ { "alias": "control", @@ -87,7 +87,7 @@ return { "operation": { "argumentDefinitions": (v0/*: any*/), "kind": "Operation", - "name": "ConsoleLayoutBreadcrumbControlOverviewQuery", + "name": "OrganizationLayoutBreadcrumbControlOverviewQuery", "selections": [ { "alias": "control", @@ -112,16 +112,16 @@ return { ] }, "params": { - "cacheID": "7ff42b211b319b1a413258ef2242b6e3", + "cacheID": "2fa16d62f29015853c425704e3de3fd4", "id": null, "metadata": {}, - "name": "ConsoleLayoutBreadcrumbControlOverviewQuery", + "name": "OrganizationLayoutBreadcrumbControlOverviewQuery", "operationKind": "query", - "text": "query ConsoleLayoutBreadcrumbControlOverviewQuery(\n $controlId: ID!\n) {\n control: node(id: $controlId) {\n __typename\n id\n ... on Control {\n name\n }\n }\n}\n" + "text": "query OrganizationLayoutBreadcrumbControlOverviewQuery(\n $controlId: ID!\n) {\n control: node(id: $controlId) {\n __typename\n id\n ... on Control {\n name\n }\n }\n}\n" } }; })(); -(node as any).hash = "089c9c977bce592f440e3503f62aee3a"; +(node as any).hash = "202e114f9b94e9c0bf805b0ae8f69fcd"; export default node; diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts similarity index 68% rename from apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts index d6dd941f0..14dab6cf3 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts +++ b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<1706f11580339ff248a8fa9b53862829>> + * @generated SignedSource<<733d7a1785075f67a2b120aec123d3d3>> * @lightSyntaxTransform * @nogrep */ @@ -9,18 +9,18 @@ // @ts-nocheck import { ConcreteRequest } from 'relay-runtime'; -export type ConsoleLayoutBreadcrumbFrameworkOverviewQuery$variables = { +export type OrganizationLayoutBreadcrumbFrameworkOverviewQuery$variables = { frameworkId: string; }; -export type ConsoleLayoutBreadcrumbFrameworkOverviewQuery$data = { +export type OrganizationLayoutBreadcrumbFrameworkOverviewQuery$data = { readonly framework: { readonly id: string; readonly name?: string; }; }; -export type ConsoleLayoutBreadcrumbFrameworkOverviewQuery = { - response: ConsoleLayoutBreadcrumbFrameworkOverviewQuery$data; - variables: ConsoleLayoutBreadcrumbFrameworkOverviewQuery$variables; +export type OrganizationLayoutBreadcrumbFrameworkOverviewQuery = { + response: OrganizationLayoutBreadcrumbFrameworkOverviewQuery$data; + variables: OrganizationLayoutBreadcrumbFrameworkOverviewQuery$variables; }; const node: ConcreteRequest = (function(){ @@ -64,7 +64,7 @@ return { "argumentDefinitions": (v0/*: any*/), "kind": "Fragment", "metadata": null, - "name": "ConsoleLayoutBreadcrumbFrameworkOverviewQuery", + "name": "OrganizationLayoutBreadcrumbFrameworkOverviewQuery", "selections": [ { "alias": "framework", @@ -87,7 +87,7 @@ return { "operation": { "argumentDefinitions": (v0/*: any*/), "kind": "Operation", - "name": "ConsoleLayoutBreadcrumbFrameworkOverviewQuery", + "name": "OrganizationLayoutBreadcrumbFrameworkOverviewQuery", "selections": [ { "alias": "framework", @@ -112,16 +112,16 @@ return { ] }, "params": { - "cacheID": "287decd67859fe4c2248b6d6b0a3d56d", + "cacheID": "75003c9ef679845e901b7ecd8c591da7", "id": null, "metadata": {}, - "name": "ConsoleLayoutBreadcrumbFrameworkOverviewQuery", + "name": "OrganizationLayoutBreadcrumbFrameworkOverviewQuery", "operationKind": "query", - "text": "query ConsoleLayoutBreadcrumbFrameworkOverviewQuery(\n $frameworkId: ID!\n) {\n framework: node(id: $frameworkId) {\n __typename\n id\n ... on Framework {\n name\n }\n }\n}\n" + "text": "query OrganizationLayoutBreadcrumbFrameworkOverviewQuery(\n $frameworkId: ID!\n) {\n framework: node(id: $frameworkId) {\n __typename\n id\n ... on Framework {\n name\n }\n }\n}\n" } }; })(); -(node as any).hash = "a4c4f857eb13cf154a01f70874f0fd58"; +(node as any).hash = "c8da93cc3207000e73285e126d12a882"; export default node; diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbPeopleOverviewQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbPeopleOverviewQuery.graphql.ts similarity index 69% rename from apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbPeopleOverviewQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbPeopleOverviewQuery.graphql.ts index bdcfb1de3..2db3a03d6 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbPeopleOverviewQuery.graphql.ts +++ b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbPeopleOverviewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<6f086aeafe55fd91abdf75b5832f76e8>> + * @generated SignedSource<<2a843b85994d7b675c2e0504ea8c687e>> * @lightSyntaxTransform * @nogrep */ @@ -9,18 +9,18 @@ // @ts-nocheck import { ConcreteRequest } from 'relay-runtime'; -export type ConsoleLayoutBreadcrumbPeopleOverviewQuery$variables = { +export type OrganizationLayoutBreadcrumbPeopleOverviewQuery$variables = { peopleId: string; }; -export type ConsoleLayoutBreadcrumbPeopleOverviewQuery$data = { +export type OrganizationLayoutBreadcrumbPeopleOverviewQuery$data = { readonly people: { readonly fullName?: string; readonly id: string; }; }; -export type ConsoleLayoutBreadcrumbPeopleOverviewQuery = { - response: ConsoleLayoutBreadcrumbPeopleOverviewQuery$data; - variables: ConsoleLayoutBreadcrumbPeopleOverviewQuery$variables; +export type OrganizationLayoutBreadcrumbPeopleOverviewQuery = { + response: OrganizationLayoutBreadcrumbPeopleOverviewQuery$data; + variables: OrganizationLayoutBreadcrumbPeopleOverviewQuery$variables; }; const node: ConcreteRequest = (function(){ @@ -64,7 +64,7 @@ return { "argumentDefinitions": (v0/*: any*/), "kind": "Fragment", "metadata": null, - "name": "ConsoleLayoutBreadcrumbPeopleOverviewQuery", + "name": "OrganizationLayoutBreadcrumbPeopleOverviewQuery", "selections": [ { "alias": "people", @@ -87,7 +87,7 @@ return { "operation": { "argumentDefinitions": (v0/*: any*/), "kind": "Operation", - "name": "ConsoleLayoutBreadcrumbPeopleOverviewQuery", + "name": "OrganizationLayoutBreadcrumbPeopleOverviewQuery", "selections": [ { "alias": "people", @@ -112,16 +112,16 @@ return { ] }, "params": { - "cacheID": "ae4480910071c40c530fabf42d140afd", + "cacheID": "3f43dd20847240f85b9e4f7e1d2ae1e6", "id": null, "metadata": {}, - "name": "ConsoleLayoutBreadcrumbPeopleOverviewQuery", + "name": "OrganizationLayoutBreadcrumbPeopleOverviewQuery", "operationKind": "query", - "text": "query ConsoleLayoutBreadcrumbPeopleOverviewQuery(\n $peopleId: ID!\n) {\n people: node(id: $peopleId) {\n __typename\n id\n ... on People {\n fullName\n }\n }\n}\n" + "text": "query OrganizationLayoutBreadcrumbPeopleOverviewQuery(\n $peopleId: ID!\n) {\n people: node(id: $peopleId) {\n __typename\n id\n ... on People {\n fullName\n }\n }\n}\n" } }; })(); -(node as any).hash = "ffd8d5be8b9b8a930c956c8d292715d8"; +(node as any).hash = "715ffb6eaef0bdeec2c1a42e17d37ba9"; export default node; diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbPolicyOverviewQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbPolicyOverviewQuery.graphql.ts similarity index 69% rename from apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbPolicyOverviewQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbPolicyOverviewQuery.graphql.ts index 2412c717a..26381cee3 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbPolicyOverviewQuery.graphql.ts +++ b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbPolicyOverviewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<03812f2d66d34ef3636bc7890059f4cf>> + * @generated SignedSource<<02beff12353573ba1a8701513b4e9a7e>> * @lightSyntaxTransform * @nogrep */ @@ -9,18 +9,18 @@ // @ts-nocheck import { ConcreteRequest } from 'relay-runtime'; -export type ConsoleLayoutBreadcrumbPolicyOverviewQuery$variables = { +export type OrganizationLayoutBreadcrumbPolicyOverviewQuery$variables = { policyId: string; }; -export type ConsoleLayoutBreadcrumbPolicyOverviewQuery$data = { +export type OrganizationLayoutBreadcrumbPolicyOverviewQuery$data = { readonly policy: { readonly id: string; readonly name?: string; }; }; -export type ConsoleLayoutBreadcrumbPolicyOverviewQuery = { - response: ConsoleLayoutBreadcrumbPolicyOverviewQuery$data; - variables: ConsoleLayoutBreadcrumbPolicyOverviewQuery$variables; +export type OrganizationLayoutBreadcrumbPolicyOverviewQuery = { + response: OrganizationLayoutBreadcrumbPolicyOverviewQuery$data; + variables: OrganizationLayoutBreadcrumbPolicyOverviewQuery$variables; }; const node: ConcreteRequest = (function(){ @@ -64,7 +64,7 @@ return { "argumentDefinitions": (v0/*: any*/), "kind": "Fragment", "metadata": null, - "name": "ConsoleLayoutBreadcrumbPolicyOverviewQuery", + "name": "OrganizationLayoutBreadcrumbPolicyOverviewQuery", "selections": [ { "alias": "policy", @@ -87,7 +87,7 @@ return { "operation": { "argumentDefinitions": (v0/*: any*/), "kind": "Operation", - "name": "ConsoleLayoutBreadcrumbPolicyOverviewQuery", + "name": "OrganizationLayoutBreadcrumbPolicyOverviewQuery", "selections": [ { "alias": "policy", @@ -112,16 +112,16 @@ return { ] }, "params": { - "cacheID": "2c38760f04efaf9b41d6b2abb17c2074", + "cacheID": "a7bbb574545c752bde0eba468ec494d7", "id": null, "metadata": {}, - "name": "ConsoleLayoutBreadcrumbPolicyOverviewQuery", + "name": "OrganizationLayoutBreadcrumbPolicyOverviewQuery", "operationKind": "query", - "text": "query ConsoleLayoutBreadcrumbPolicyOverviewQuery(\n $policyId: ID!\n) {\n policy: node(id: $policyId) {\n __typename\n id\n ... on Policy {\n name\n }\n }\n}\n" + "text": "query OrganizationLayoutBreadcrumbPolicyOverviewQuery(\n $policyId: ID!\n) {\n policy: node(id: $policyId) {\n __typename\n id\n ... on Policy {\n name\n }\n }\n}\n" } }; })(); -(node as any).hash = "f2a356a6aa9b98ca13dde3b82e2e868a"; +(node as any).hash = "90b9df71a590d79f4e083aa117ad7302"; export default node; diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbVendorOverviewQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbVendorOverviewQuery.graphql.ts similarity index 69% rename from apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbVendorOverviewQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbVendorOverviewQuery.graphql.ts index 908cb44c3..effd55b9a 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbVendorOverviewQuery.graphql.ts +++ b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutBreadcrumbVendorOverviewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<266ca8730d2832be4d4c96d325c3e4ab>> + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -9,18 +9,18 @@ // @ts-nocheck import { ConcreteRequest } from 'relay-runtime'; -export type ConsoleLayoutBreadcrumbVendorOverviewQuery$variables = { +export type OrganizationLayoutBreadcrumbVendorOverviewQuery$variables = { vendorId: string; }; -export type ConsoleLayoutBreadcrumbVendorOverviewQuery$data = { +export type OrganizationLayoutBreadcrumbVendorOverviewQuery$data = { readonly vendor: { readonly id: string; readonly name?: string; }; }; -export type ConsoleLayoutBreadcrumbVendorOverviewQuery = { - response: ConsoleLayoutBreadcrumbVendorOverviewQuery$data; - variables: ConsoleLayoutBreadcrumbVendorOverviewQuery$variables; +export type OrganizationLayoutBreadcrumbVendorOverviewQuery = { + response: OrganizationLayoutBreadcrumbVendorOverviewQuery$data; + variables: OrganizationLayoutBreadcrumbVendorOverviewQuery$variables; }; const node: ConcreteRequest = (function(){ @@ -64,7 +64,7 @@ return { "argumentDefinitions": (v0/*: any*/), "kind": "Fragment", "metadata": null, - "name": "ConsoleLayoutBreadcrumbVendorOverviewQuery", + "name": "OrganizationLayoutBreadcrumbVendorOverviewQuery", "selections": [ { "alias": "vendor", @@ -87,7 +87,7 @@ return { "operation": { "argumentDefinitions": (v0/*: any*/), "kind": "Operation", - "name": "ConsoleLayoutBreadcrumbVendorOverviewQuery", + "name": "OrganizationLayoutBreadcrumbVendorOverviewQuery", "selections": [ { "alias": "vendor", @@ -112,16 +112,16 @@ return { ] }, "params": { - "cacheID": "d0b39b21eec610e1162705b7e2799468", + "cacheID": "cdf321fbd087d345096d8af142d99608", "id": null, "metadata": {}, - "name": "ConsoleLayoutBreadcrumbVendorOverviewQuery", + "name": "OrganizationLayoutBreadcrumbVendorOverviewQuery", "operationKind": "query", - "text": "query ConsoleLayoutBreadcrumbVendorOverviewQuery(\n $vendorId: ID!\n) {\n vendor: node(id: $vendorId) {\n __typename\n id\n ... on Vendor {\n name\n }\n }\n}\n" + "text": "query OrganizationLayoutBreadcrumbVendorOverviewQuery(\n $vendorId: ID!\n) {\n vendor: node(id: $vendorId) {\n __typename\n id\n ... on Vendor {\n name\n }\n }\n}\n" } }; })(); -(node as any).hash = "20bb1420f2d13cf7974591da5e6b654f"; +(node as any).hash = "41b87834c3e5625381d8434930cf29db"; export default node; diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutOrganizationQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutOrganizationQuery.graphql.ts similarity index 71% rename from apps/console/src/layouts/__generated__/ConsoleLayoutOrganizationQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/OrganizationLayoutOrganizationQuery.graphql.ts index 433df9c72..a49380a3b 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutOrganizationQuery.graphql.ts +++ b/apps/console/src/pages/organizations/__generated__/OrganizationLayoutOrganizationQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<93800eee21fa3f30cc45da37370359fd>> + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -9,17 +9,17 @@ // @ts-nocheck import { ConcreteRequest } from 'relay-runtime'; -export type ConsoleLayoutOrganizationQuery$variables = { +export type OrganizationLayoutOrganizationQuery$variables = { organizationId: string; }; -export type ConsoleLayoutOrganizationQuery$data = { +export type OrganizationLayoutOrganizationQuery$data = { readonly organization: { readonly name?: string; }; }; -export type ConsoleLayoutOrganizationQuery = { - response: ConsoleLayoutOrganizationQuery$data; - variables: ConsoleLayoutOrganizationQuery$variables; +export type OrganizationLayoutOrganizationQuery = { + response: OrganizationLayoutOrganizationQuery$data; + variables: OrganizationLayoutOrganizationQuery$variables; }; const node: ConcreteRequest = (function(){ @@ -56,7 +56,7 @@ return { "argumentDefinitions": (v0/*: any*/), "kind": "Fragment", "metadata": null, - "name": "ConsoleLayoutOrganizationQuery", + "name": "OrganizationLayoutOrganizationQuery", "selections": [ { "alias": "organization", @@ -78,7 +78,7 @@ return { "operation": { "argumentDefinitions": (v0/*: any*/), "kind": "Operation", - "name": "ConsoleLayoutOrganizationQuery", + "name": "OrganizationLayoutOrganizationQuery", "selections": [ { "alias": "organization", @@ -109,16 +109,16 @@ return { ] }, "params": { - "cacheID": "e275faa366380b1b423251e6a06ab743", + "cacheID": "f4716079c4ca6a1012c7044a3328af01", "id": null, "metadata": {}, - "name": "ConsoleLayoutOrganizationQuery", + "name": "OrganizationLayoutOrganizationQuery", "operationKind": "query", - "text": "query ConsoleLayoutOrganizationQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n name\n }\n id\n }\n}\n" + "text": "query OrganizationLayoutOrganizationQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n name\n }\n id\n }\n}\n" } }; })(); -(node as any).hash = "3310c40eb8f1e3874139c934fb08cbb1"; +(node as any).hash = "878d0ca4790ce128c108f29135074919"; export default node; diff --git a/apps/console/src/pages/__generated__/SettingsPageInviteUserMutation.graphql.ts b/apps/console/src/pages/organizations/__generated__/SettingsPageInviteUserMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/SettingsPageInviteUserMutation.graphql.ts rename to apps/console/src/pages/organizations/__generated__/SettingsPageInviteUserMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/SettingsPageQuery.graphql.ts b/apps/console/src/pages/organizations/__generated__/SettingsPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/SettingsPageQuery.graphql.ts rename to apps/console/src/pages/organizations/__generated__/SettingsPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/SettingsPageRemoveUserMutation.graphql.ts b/apps/console/src/pages/organizations/__generated__/SettingsPageRemoveUserMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/SettingsPageRemoveUserMutation.graphql.ts rename to apps/console/src/pages/organizations/__generated__/SettingsPageRemoveUserMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/SettingsPageUpdateOrganizationMutation.graphql.ts b/apps/console/src/pages/organizations/__generated__/SettingsPageUpdateOrganizationMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/SettingsPageUpdateOrganizationMutation.graphql.ts rename to apps/console/src/pages/organizations/__generated__/SettingsPageUpdateOrganizationMutation.graphql.ts diff --git a/apps/console/src/pages/CreateFrameworkPage.tsx b/apps/console/src/pages/organizations/frameworks/CreateFrameworkPage.tsx similarity index 100% rename from apps/console/src/pages/CreateFrameworkPage.tsx rename to apps/console/src/pages/organizations/frameworks/CreateFrameworkPage.tsx diff --git a/apps/console/src/pages/FrameworkListPage.tsx b/apps/console/src/pages/organizations/frameworks/FrameworkListPage.tsx similarity index 100% rename from apps/console/src/pages/FrameworkListPage.tsx rename to apps/console/src/pages/organizations/frameworks/FrameworkListPage.tsx diff --git a/apps/console/src/pages/FrameworkOverviewPage.tsx b/apps/console/src/pages/organizations/frameworks/FrameworkOverviewPage.tsx similarity index 100% rename from apps/console/src/pages/FrameworkOverviewPage.tsx rename to apps/console/src/pages/organizations/frameworks/FrameworkOverviewPage.tsx diff --git a/apps/console/src/pages/UpdateFrameworkPage.tsx b/apps/console/src/pages/organizations/frameworks/UpdateFrameworkPage.tsx similarity index 100% rename from apps/console/src/pages/UpdateFrameworkPage.tsx rename to apps/console/src/pages/organizations/frameworks/UpdateFrameworkPage.tsx diff --git a/apps/console/src/pages/__generated__/CreateFrameworkPageCreateFrameworkMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/__generated__/CreateFrameworkPageCreateFrameworkMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/CreateFrameworkPageCreateFrameworkMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/__generated__/CreateFrameworkPageCreateFrameworkMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/FrameworkListPageImportFrameworkMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkListPageImportFrameworkMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/FrameworkListPageImportFrameworkMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/__generated__/FrameworkListPageImportFrameworkMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/FrameworkListPageQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkListPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/FrameworkListPageQuery.graphql.ts rename to apps/console/src/pages/organizations/frameworks/__generated__/FrameworkListPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/FrameworkOverviewPageQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkOverviewPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/FrameworkOverviewPageQuery.graphql.ts rename to apps/console/src/pages/organizations/frameworks/__generated__/FrameworkOverviewPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/UpdateFrameworkPageQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/__generated__/UpdateFrameworkPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/UpdateFrameworkPageQuery.graphql.ts rename to apps/console/src/pages/organizations/frameworks/__generated__/UpdateFrameworkPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/UpdateFrameworkPageUpdateFrameworkMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/__generated__/UpdateFrameworkPageUpdateFrameworkMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/UpdateFrameworkPageUpdateFrameworkMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/__generated__/UpdateFrameworkPageUpdateFrameworkMutation.graphql.ts diff --git a/apps/console/src/pages/ControlOverviewPage.tsx b/apps/console/src/pages/organizations/frameworks/controls/ControlOverviewPage.tsx similarity index 100% rename from apps/console/src/pages/ControlOverviewPage.tsx rename to apps/console/src/pages/organizations/frameworks/controls/ControlOverviewPage.tsx diff --git a/apps/console/src/pages/CreateControlPage.tsx b/apps/console/src/pages/organizations/frameworks/controls/CreateControlPage.tsx similarity index 100% rename from apps/console/src/pages/CreateControlPage.tsx rename to apps/console/src/pages/organizations/frameworks/controls/CreateControlPage.tsx diff --git a/apps/console/src/pages/UpdateControlPage.tsx b/apps/console/src/pages/organizations/frameworks/controls/UpdateControlPage.tsx similarity index 100% rename from apps/console/src/pages/UpdateControlPage.tsx rename to apps/console/src/pages/organizations/frameworks/controls/UpdateControlPage.tsx diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageAssignTaskMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageAssignTaskMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageAssignTaskMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageAssignTaskMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageCreateTaskMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageCreateTaskMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageCreateTaskMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageCreateTaskMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageDeleteEvidenceMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageDeleteEvidenceMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageDeleteEvidenceMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageDeleteEvidenceMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageDeleteTaskMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageDeleteTaskMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageDeleteTaskMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageDeleteTaskMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageGetEvidenceFileUrlQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageGetEvidenceFileUrlQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageGetEvidenceFileUrlQuery.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageGetEvidenceFileUrlQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageOrganizationQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageOrganizationQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageOrganizationQuery.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageOrganizationQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageQuery.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageUnassignTaskMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUnassignTaskMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageUnassignTaskMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUnassignTaskMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageUpdateControlStateMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUpdateControlStateMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageUpdateControlStateMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUpdateControlStateMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageUpdateTaskStateMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUpdateTaskStateMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageUpdateTaskStateMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUpdateTaskStateMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageUploadEvidenceMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUploadEvidenceMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/ControlOverviewPageUploadEvidenceMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOverviewPageUploadEvidenceMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/CreateControlPageCreateControlMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/CreateControlPageCreateControlMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/CreateControlPageCreateControlMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/CreateControlPageCreateControlMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/UpdateControlPageQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/UpdateControlPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/UpdateControlPageQuery.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/UpdateControlPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/UpdateControlPageUpdateControlMutation.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/UpdateControlPageUpdateControlMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/UpdateControlPageUpdateControlMutation.graphql.ts rename to apps/console/src/pages/organizations/frameworks/controls/__generated__/UpdateControlPageUpdateControlMutation.graphql.ts diff --git a/apps/console/src/pages/CreatePeoplePage.tsx b/apps/console/src/pages/organizations/people/CreatePeoplePage.tsx similarity index 100% rename from apps/console/src/pages/CreatePeoplePage.tsx rename to apps/console/src/pages/organizations/people/CreatePeoplePage.tsx diff --git a/apps/console/src/pages/PeopleListPage.tsx b/apps/console/src/pages/organizations/people/PeopleListPage.tsx similarity index 100% rename from apps/console/src/pages/PeopleListPage.tsx rename to apps/console/src/pages/organizations/people/PeopleListPage.tsx diff --git a/apps/console/src/pages/PeopleOverviewPage.tsx b/apps/console/src/pages/organizations/people/PeopleOverviewPage.tsx similarity index 100% rename from apps/console/src/pages/PeopleOverviewPage.tsx rename to apps/console/src/pages/organizations/people/PeopleOverviewPage.tsx diff --git a/apps/console/src/pages/__generated__/CreatePeoplePageCreatePeopleMutation.graphql.ts b/apps/console/src/pages/organizations/people/__generated__/CreatePeoplePageCreatePeopleMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/CreatePeoplePageCreatePeopleMutation.graphql.ts rename to apps/console/src/pages/organizations/people/__generated__/CreatePeoplePageCreatePeopleMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/PeopleListPageDeletePeopleMutation.graphql.ts b/apps/console/src/pages/organizations/people/__generated__/PeopleListPageDeletePeopleMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PeopleListPageDeletePeopleMutation.graphql.ts rename to apps/console/src/pages/organizations/people/__generated__/PeopleListPageDeletePeopleMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/PeopleListPagePaginationQuery.graphql.ts b/apps/console/src/pages/organizations/people/__generated__/PeopleListPagePaginationQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PeopleListPagePaginationQuery.graphql.ts rename to apps/console/src/pages/organizations/people/__generated__/PeopleListPagePaginationQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/PeopleListPageQuery.graphql.ts b/apps/console/src/pages/organizations/people/__generated__/PeopleListPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PeopleListPageQuery.graphql.ts rename to apps/console/src/pages/organizations/people/__generated__/PeopleListPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/PeopleListPage_peoples.graphql.ts b/apps/console/src/pages/organizations/people/__generated__/PeopleListPage_peoples.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PeopleListPage_peoples.graphql.ts rename to apps/console/src/pages/organizations/people/__generated__/PeopleListPage_peoples.graphql.ts diff --git a/apps/console/src/pages/__generated__/PeopleOverviewPageQuery.graphql.ts b/apps/console/src/pages/organizations/people/__generated__/PeopleOverviewPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PeopleOverviewPageQuery.graphql.ts rename to apps/console/src/pages/organizations/people/__generated__/PeopleOverviewPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/PeopleOverviewPageUpdatePeopleMutation.graphql.ts b/apps/console/src/pages/organizations/people/__generated__/PeopleOverviewPageUpdatePeopleMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PeopleOverviewPageUpdatePeopleMutation.graphql.ts rename to apps/console/src/pages/organizations/people/__generated__/PeopleOverviewPageUpdatePeopleMutation.graphql.ts diff --git a/apps/console/src/pages/CreatePolicyPage.tsx b/apps/console/src/pages/organizations/policies/CreatePolicyPage.tsx similarity index 100% rename from apps/console/src/pages/CreatePolicyPage.tsx rename to apps/console/src/pages/organizations/policies/CreatePolicyPage.tsx diff --git a/apps/console/src/pages/PolicyListPage.tsx b/apps/console/src/pages/organizations/policies/PolicyListPage.tsx similarity index 100% rename from apps/console/src/pages/PolicyListPage.tsx rename to apps/console/src/pages/organizations/policies/PolicyListPage.tsx diff --git a/apps/console/src/pages/PolicyOverviewPage.tsx b/apps/console/src/pages/organizations/policies/PolicyOverviewPage.tsx similarity index 99% rename from apps/console/src/pages/PolicyOverviewPage.tsx rename to apps/console/src/pages/organizations/policies/PolicyOverviewPage.tsx index c5eefe494..8e02b5cb6 100644 --- a/apps/console/src/pages/PolicyOverviewPage.tsx +++ b/apps/console/src/pages/organizations/policies/PolicyOverviewPage.tsx @@ -15,7 +15,6 @@ import { Badge } from "@/components/ui/badge"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import type { PolicyOverviewPageQuery as PolicyOverviewPageQueryType } from "./__generated__/PolicyOverviewPageQuery.graphql"; import type { PolicyOverviewPageDeleteMutation } from "./__generated__/PolicyOverviewPageDeleteMutation.graphql"; -import "../styles/policy-content.css"; import { useToast } from "@/hooks/use-toast"; import { PageTemplate, PageTemplateSkeleton } from "@/components/PageTemplate"; diff --git a/apps/console/src/pages/UpdatePolicyPage.tsx b/apps/console/src/pages/organizations/policies/UpdatePolicyPage.tsx similarity index 100% rename from apps/console/src/pages/UpdatePolicyPage.tsx rename to apps/console/src/pages/organizations/policies/UpdatePolicyPage.tsx diff --git a/apps/console/src/pages/__generated__/CreatePolicyPageMutation.graphql.ts b/apps/console/src/pages/organizations/policies/__generated__/CreatePolicyPageMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/CreatePolicyPageMutation.graphql.ts rename to apps/console/src/pages/organizations/policies/__generated__/CreatePolicyPageMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/CreatePolicyPageQuery.graphql.ts b/apps/console/src/pages/organizations/policies/__generated__/CreatePolicyPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/CreatePolicyPageQuery.graphql.ts rename to apps/console/src/pages/organizations/policies/__generated__/CreatePolicyPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/PolicyListPageQuery.graphql.ts b/apps/console/src/pages/organizations/policies/__generated__/PolicyListPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PolicyListPageQuery.graphql.ts rename to apps/console/src/pages/organizations/policies/__generated__/PolicyListPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/PolicyOverviewPageDeleteMutation.graphql.ts b/apps/console/src/pages/organizations/policies/__generated__/PolicyOverviewPageDeleteMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PolicyOverviewPageDeleteMutation.graphql.ts rename to apps/console/src/pages/organizations/policies/__generated__/PolicyOverviewPageDeleteMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/PolicyOverviewPageQuery.graphql.ts b/apps/console/src/pages/organizations/policies/__generated__/PolicyOverviewPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/PolicyOverviewPageQuery.graphql.ts rename to apps/console/src/pages/organizations/policies/__generated__/PolicyOverviewPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/UpdatePolicyPageMutation.graphql.ts b/apps/console/src/pages/organizations/policies/__generated__/UpdatePolicyPageMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/UpdatePolicyPageMutation.graphql.ts rename to apps/console/src/pages/organizations/policies/__generated__/UpdatePolicyPageMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/UpdatePolicyPageQuery.graphql.ts b/apps/console/src/pages/organizations/policies/__generated__/UpdatePolicyPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/UpdatePolicyPageQuery.graphql.ts rename to apps/console/src/pages/organizations/policies/__generated__/UpdatePolicyPageQuery.graphql.ts diff --git a/apps/console/src/pages/VendorListPage.tsx b/apps/console/src/pages/organizations/vendors/VendorListPage.tsx similarity index 100% rename from apps/console/src/pages/VendorListPage.tsx rename to apps/console/src/pages/organizations/vendors/VendorListPage.tsx diff --git a/apps/console/src/pages/VendorOverviewPage.tsx b/apps/console/src/pages/organizations/vendors/VendorOverviewPage.tsx similarity index 100% rename from apps/console/src/pages/VendorOverviewPage.tsx rename to apps/console/src/pages/organizations/vendors/VendorOverviewPage.tsx diff --git a/apps/console/src/pages/__generated__/VendorListPageCreateVendorMutation.graphql.ts b/apps/console/src/pages/organizations/vendors/__generated__/VendorListPageCreateVendorMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/VendorListPageCreateVendorMutation.graphql.ts rename to apps/console/src/pages/organizations/vendors/__generated__/VendorListPageCreateVendorMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/VendorListPageDeleteVendorMutation.graphql.ts b/apps/console/src/pages/organizations/vendors/__generated__/VendorListPageDeleteVendorMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/VendorListPageDeleteVendorMutation.graphql.ts rename to apps/console/src/pages/organizations/vendors/__generated__/VendorListPageDeleteVendorMutation.graphql.ts diff --git a/apps/console/src/pages/__generated__/VendorListPagePaginationQuery.graphql.ts b/apps/console/src/pages/organizations/vendors/__generated__/VendorListPagePaginationQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/VendorListPagePaginationQuery.graphql.ts rename to apps/console/src/pages/organizations/vendors/__generated__/VendorListPagePaginationQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/VendorListPageQuery.graphql.ts b/apps/console/src/pages/organizations/vendors/__generated__/VendorListPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/VendorListPageQuery.graphql.ts rename to apps/console/src/pages/organizations/vendors/__generated__/VendorListPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/VendorListPage_vendors.graphql.ts b/apps/console/src/pages/organizations/vendors/__generated__/VendorListPage_vendors.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/VendorListPage_vendors.graphql.ts rename to apps/console/src/pages/organizations/vendors/__generated__/VendorListPage_vendors.graphql.ts diff --git a/apps/console/src/pages/__generated__/VendorOverviewPageQuery.graphql.ts b/apps/console/src/pages/organizations/vendors/__generated__/VendorOverviewPageQuery.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/VendorOverviewPageQuery.graphql.ts rename to apps/console/src/pages/organizations/vendors/__generated__/VendorOverviewPageQuery.graphql.ts diff --git a/apps/console/src/pages/__generated__/VendorOverviewPageUpdateVendorMutation.graphql.ts b/apps/console/src/pages/organizations/vendors/__generated__/VendorOverviewPageUpdateVendorMutation.graphql.ts similarity index 100% rename from apps/console/src/pages/__generated__/VendorOverviewPageUpdateVendorMutation.graphql.ts rename to apps/console/src/pages/organizations/vendors/__generated__/VendorOverviewPageUpdateVendorMutation.graphql.ts