π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
refactor: Admin App with better layouts and Meta Information (#7200)
sriram veeraghanta8cc23bc4a522
diff --git a/admin/app/ai/form.tsx b/admin/app/(all)/(dashboard)/ai/form.tsxsimilarity index 99%rename from admin/app/ai/form.tsxrename to admin/app/(all)/(dashboard)/ai/form.tsxindex 47ab9480ea..8b7d036ad2 100644--- a/admin/app/ai/form.tsx+++ b/admin/app/(all)/(dashboard)/ai/form.tsx@@ -5,7 +5,7 @@ import { Lightbulb } from "lucide-react";import { IFormattedInstanceConfiguration, TInstanceAIConfigurationKeys } from "@plane/types";import { Button, TOAST_TYPE, setToast } from "@plane/ui";// components-import { ControllerInput, TControllerInputFormField } from "@/components/common";+import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";// hooksimport { useInstance } from "@/hooks/store";diff --git a/admin/app/ai/layout.tsx b/admin/app/(all)/(dashboard)/ai/layout.tsxsimilarity index 53%rename from admin/app/ai/layout.tsxrename to admin/app/(all)/(dashboard)/ai/layout.tsxindex d461a626aa..42f3796496 100644--- a/admin/app/ai/layout.tsx+++ b/admin/app/(all)/(dashboard)/ai/layout.tsx@@ -1,11 +1,10 @@import { ReactNode } from "react";import { Metadata } from "next";-import { AdminLayout } from "@/layouts/admin-layout";export const metadata: Metadata = {- title: "Artificial Intelligence Settings - Plane Web",+ title: "Artificial Intelligence Settings - God Mode",};export default function AILayout({ children }: { children: ReactNode }) {- return <AdminLayout>{children}</AdminLayout>;+ return <>{children}</>;}diff --git a/admin/app/ai/page.tsx b/admin/app/(all)/(dashboard)/ai/page.tsxsimilarity index 100%rename from admin/app/ai/page.tsxrename to admin/app/(all)/(dashboard)/ai/page.tsxdiff --git a/admin/app/authentication/github/form.tsx b/admin/app/(all)/(dashboard)/authentication/github/form.tsxsimilarity index 95%rename from admin/app/authentication/github/form.tsxrename to admin/app/(all)/(dashboard)/authentication/github/form.tsxindex 0c6d81ae6a..6e5f2a9038 100644--- a/admin/app/authentication/github/form.tsx+++ b/admin/app/(all)/(dashboard)/authentication/github/form.tsx@@ -10,14 +10,10 @@ import { IFormattedInstanceConfiguration, TInstanceGithubAuthenticationConfiguraimport { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";import { cn } from "@plane/utils";// components-import {- CodeBlock,- ConfirmDiscardModal,- ControllerInput,- CopyField,- TControllerInputFormField,- TCopyField,-} from "@/components/common";+import { CodeBlock } from "@/components/common/code-block";+import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";+import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";+import { CopyField, TCopyField } from "@/components/common/copy-field";// hooksimport { useInstance } from "@/hooks/store";diff --git a/admin/app/(all)/(dashboard)/authentication/github/layout.tsx b/admin/app/(all)/(dashboard)/authentication/github/layout.tsxnew file mode 100644index 0000000000..373f9340af--- /dev/null+++ b/admin/app/(all)/(dashboard)/authentication/github/layout.tsx@@ -0,0 +1,10 @@+import { ReactNode } from "react";+import { Metadata } from "next";++export const metadata: Metadata = {+ title: "GitHub Authentication - God Mode",+};++export default function GitHubAuthenticationLayout({ children }: { children: ReactNode }) {+ return <>{children}</>;+}diff --git a/admin/app/authentication/github/page.tsx b/admin/app/(all)/(dashboard)/authentication/github/page.tsxsimilarity index 90%rename from admin/app/authentication/github/page.tsxrename to admin/app/(all)/(dashboard)/authentication/github/page.tsxindex 986a5ebd24..75cb84e4af 100644--- a/admin/app/authentication/github/page.tsx+++ b/admin/app/(all)/(dashboard)/authentication/github/page.tsx@@ -9,8 +9,7 @@ import useSWR from "swr";import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";import { resolveGeneralTheme } from "@plane/utils";// components-import { AuthenticationMethodCard } from "@/components/authentication";-import { PageHeader } from "@/components/common";+import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";// hooksimport { useInstance } from "@/hooks/store";// icons@@ -61,9 +60,11 @@ const InstanceGithubAuthenticationPage = observer(() => {setIsSubmitting(false);});};++ const isGithubEnabled = enableGithubConfig === "1";+return (<>- <PageHeader title="GitHub Authentication - Plane Web" /><div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col"><div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0"><AuthenticationMethodCard@@ -79,11 +80,9 @@ const InstanceGithubAuthenticationPage = observer(() => {}config={<ToggleSwitch- value={Boolean(parseInt(enableGithubConfig))}+ value={isGithubEnabled}onChange={() => {- Boolean(parseInt(enableGithubConfig)) === true- ? updateConfig("IS_GITHUB_ENABLED", "0")- : updateConfig("IS_GITHUB_ENABLED", "1");+ updateConfig("IS_GITHUB_ENABLED", isGithubEnabled ? "0" : "1");}}size="sm"disabled={isSubmitting || !formattedConfig}diff --git a/admin/app/authentication/gitlab/form.tsx b/admin/app/(all)/(dashboard)/authentication/gitlab/form.tsxsimilarity index 95%rename from admin/app/authentication/gitlab/form.tsxrename to admin/app/(all)/(dashboard)/authentication/gitlab/form.tsxindex f64158744a..888b2533c2 100644--- a/admin/app/authentication/gitlab/form.tsx+++ b/admin/app/(all)/(dashboard)/authentication/gitlab/form.tsx@@ -8,14 +8,10 @@ import { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfiguraimport { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";import { cn } from "@plane/utils";// components-import {- CodeBlock,- ConfirmDiscardModal,- ControllerInput,- CopyField,- TControllerInputFormField,- TCopyField,-} from "@/components/common";+import { CodeBlock } from "@/components/common/code-block";+import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";+import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";+import { CopyField, TCopyField } from "@/components/common/copy-field";// hooksimport { useInstance } from "@/hooks/store";diff --git a/admin/app/(all)/(dashboard)/authentication/gitlab/layout.tsx b/admin/app/(all)/(dashboard)/authentication/gitlab/layout.tsxnew file mode 100644index 0000000000..fc89e9752f--- /dev/null+++ b/admin/app/(all)/(dashboard)/authentication/gitlab/layout.tsx@@ -0,0 +1,10 @@+import { ReactNode } from "react";+import { Metadata } from "next";++export const metadata: Metadata = {+ title: "GitLab Authentication - God Mode",+};++export default function GitlabAuthenticationLayout({ children }: { children: ReactNode }) {+ return <>{children}</>;+}diff --git a/admin/app/authentication/gitlab/page.tsx b/admin/app/(all)/(dashboard)/authentication/gitlab/page.tsxsimilarity index 96%rename from admin/app/authentication/gitlab/page.tsxrename to admin/app/(all)/(dashboard)/authentication/gitlab/page.tsxindex 7a4d8248ef..cdcfcd61bb 100644--- a/admin/app/authentication/gitlab/page.tsx+++ b/admin/app/(all)/(dashboard)/authentication/gitlab/page.tsx@@ -6,8 +6,7 @@ import Image from "next/image";import useSWR from "swr";import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";// components-import { AuthenticationMethodCard } from "@/components/authentication";-import { PageHeader } from "@/components/common";+import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";// hooksimport { useInstance } from "@/hooks/store";// icons@@ -57,7 +56,6 @@ const InstanceGitlabAuthenticationPage = observer(() => {};return (<>- <PageHeader title="GitLab Authentication - Plane Web" /><div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col"><div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0"><AuthenticationMethodCarddiff --git a/admin/app/authentication/google/form.tsx b/admin/app/(all)/(dashboard)/authentication/google/form.tsxsimilarity index 95%rename from admin/app/authentication/google/form.tsxrename to admin/app/(all)/(dashboard)/authentication/google/form.tsxindex 10decdcb05..f136df308e 100644--- a/admin/app/authentication/google/form.tsx+++ b/admin/app/(all)/(dashboard)/authentication/google/form.tsx@@ -9,14 +9,10 @@ import { IFormattedInstanceConfiguration, TInstanceGoogleAuthenticationConfiguraimport { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";import { cn } from "@plane/utils";// components-import {- CodeBlock,- ConfirmDiscardModal,- ControllerInput,- CopyField,- TControllerInputFormField,- TCopyField,-} from "@/components/common";+import { CodeBlock } from "@/components/common/code-block";+import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";+import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";+import { CopyField, TCopyField } from "@/components/common/copy-field";// hooksimport { useInstance } from "@/hooks/store";diff --git a/admin/app/(all)/(dashboard)/authentication/google/layout.tsx b/admin/app/(all)/(dashboard)/authentication/google/layout.tsxnew file mode 100644index 0000000000..5b3786b5fa--- /dev/null+++ b/admin/app/(all)/(dashboard)/authentication/google/layout.tsx@@ -0,0 +1,10 @@+import { ReactNode } from "react";+import { Metadata } from "next";++export const metadata: Metadata = {+ title: "Google Authentication - God Mode",+};++export default function GoogleAuthenticationLayout({ children }: { children: ReactNode }) {+ return <>{children}</>;+}diff --git a/admin/app/authentication/google/page.tsx b/admin/app/(all)/(dashboard)/authentication/google/page.tsxsimilarity index 96%rename from admin/app/authentication/google/page.tsxrename to admin/app/(all)/(dashboard)/authentication/google/page.tsxindex 992c7a8a7a..6ac4ea09b9 100644--- a/admin/app/authentication/google/page.tsx+++ b/admin/app/(all)/(dashboard)/authentication/google/page.tsx@@ -6,8 +6,7 @@ import Image from "next/image";import useSWR from "swr";import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";// components-import { AuthenticationMethodCard } from "@/components/authentication";-import { PageHeader } from "@/components/common";+import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";// hooksimport { useInstance } from "@/hooks/store";// icons@@ -57,7 +56,6 @@ const InstanceGoogleAuthenticationPage = observer(() => {};return (<>- <PageHeader title="Google Authentication - Plane Web" /><div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col"><div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0"><AuthenticationMethodCarddiff --git a/admin/app/authentication/layout.tsx b/admin/app/(all)/(dashboard)/authentication/layout.tsxsimilarity index 70%rename from admin/app/authentication/layout.tsxrename to admin/app/(all)/(dashboard)/authentication/layout.tsxindex c5b70030d7..69753d9608 100644--- a/admin/app/authentication/layout.tsx+++ b/admin/app/(all)/(dashboard)/authentication/layout.tsx@@ -1,11 +1,10 @@import { ReactNode } from "react";import { Metadata } from "next";-import { AdminLayout } from "@/layouts/admin-layout";export const metadata: Metadata = {title: "Authentication Settings - Plane Web",};export default function AuthenticationLayout({ children }: { children: ReactNode }) {- return <AdminLayout>{children}</AdminLayout>;+ return <>{children}</>;}diff --git a/admin/app/authentication/page.tsx b/admin/app/(all)/(dashboard)/authentication/page.tsxsimilarity index 100%rename from admin/app/authentication/page.tsxrename to admin/app/(all)/(dashboard)/authentication/page.tsxdiff --git a/admin/app/email/email-config-form.tsx b/admin/app/(all)/(dashboard)/email/email-config-form.tsxsimilarity index 99%rename from admin/app/email/email-config-form.tsxrename to admin/app/(all)/(dashboard)/email/email-config-form.tsxindex 73a1af1744..de7f33f5d8 100644--- a/admin/app/email/email-config-form.tsx+++ b/admin/app/(all)/(dashboard)/email/email-config-form.tsx@@ -7,7 +7,7 @@ import { IFormattedInstanceConfiguration, TInstanceEmailConfigurationKeys } from// uiimport { Button, CustomSelect, TOAST_TYPE, setToast } from "@plane/ui";// components-import { ControllerInput, TControllerInputFormField } from "@/components/common";+import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";// hooksimport { useInstance } from "@/hooks/store";// local componentsdiff --git a/admin/app/email/layout.tsx b/admin/app/(all)/(dashboard)/email/layout.tsxsimilarity index 62%rename from admin/app/email/layout.tsxrename to admin/app/(all)/(dashboard)/email/layout.tsxindex 2084af1ea4..cb32129510 100644--- a/admin/app/email/layout.tsx+++ b/admin/app/(all)/(dashboard)/email/layout.tsx@@ -1,15 +1,14 @@import { ReactNode } from "react";import { Metadata } from "next";-import { AdminLayout } from "@/layouts/admin-layout";interface EmailLayoutProps {children: ReactNode;}export const metadata: Metadata = {- title: "Email Settings - Plane Web",+ title: "Email Settings - God Mode",};export default function EmailLayout({ children }: EmailLayoutProps) {- return <AdminLayout>{children}</AdminLayout>;+ return <>{children}</>;}diff --git a/admin/app/email/page.tsx b/admin/app/(all)/(dashboard)/email/page.tsxsimilarity index 100%rename from admin/app/email/page.tsxrename to admin/app/(all)/(dashboard)/email/page.tsxdiff --git a/admin/app/email/test-email-modal.tsx b/admin/app/(all)/(dashboard)/email/test-email-modal.tsxsimilarity index 100%rename from admin/app/email/test-email-modal.tsxrename to admin/app/(all)/(dashboard)/email/test-email-modal.tsxdiff --git a/admin/app/general/form.tsx b/admin/app/(all)/(dashboard)/general/form.tsxsimilarity index 98%rename from admin/app/general/form.tsxrename to admin/app/(all)/(dashboard)/general/form.tsxindex 4fbd705356..0700c4d0d5 100644--- a/admin/app/general/form.tsx+++ b/admin/app/(all)/(dashboard)/general/form.tsx@@ -8,7 +8,7 @@ import { IInstance, IInstanceAdmin } from "@plane/types";// uiimport { Button, Input, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";// components-import { ControllerInput } from "@/components/common";+import { ControllerInput } from "@/components/common/controller-input";import { useInstance } from "@/hooks/store";import { IntercomConfig } from "./intercom";// hooksdiff --git a/admin/app/general/intercom.tsx b/admin/app/(all)/(dashboard)/general/intercom.tsxsimilarity index 100%rename from admin/app/general/intercom.tsxrename to admin/app/(all)/(dashboard)/general/intercom.tsxdiff --git a/admin/app/general/layout.tsx b/admin/app/(all)/(dashboard)/general/layout.tsxsimilarity index 57%rename from admin/app/general/layout.tsxrename to admin/app/(all)/(dashboard)/general/layout.tsxindex 374257daad..af30005105 100644--- a/admin/app/general/layout.tsx+++ b/admin/app/(all)/(dashboard)/general/layout.tsx@@ -1,11 +1,10 @@import { ReactNode } from "react";import { Metadata } from "next";-import { AdminLayout } from "@/layouts/admin-layout";export const metadata: Metadata = {- title: "General Settings - Plane Web",+ title: "General Settings - God Mode",};export default function GeneralLayout({ children }: { children: ReactNode }) {- return <AdminLayout>{children}</AdminLayout>;+ return <>{children}</>;}diff --git a/admin/app/general/page.tsx b/admin/app/(all)/(dashboard)/general/page.tsxsimilarity index 100%rename from admin/app/general/page.tsxrename to admin/app/(all)/(dashboard)/general/page.tsxdiff --git a/admin/core/components/auth-header.tsx b/admin/app/(all)/(dashboard)/header.tsxsimilarity index 77%rename from admin/core/components/auth-header.tsxrename to admin/app/(all)/(dashboard)/header.tsxindex b97dd7c9ea..92bf102103 100644--- a/admin/core/components/auth-header.tsx+++ b/admin/app/(all)/(dashboard)/header.tsx@@ -3,16 +3,27 @@import { FC } from "react";import { observer } from "mobx-react";import { usePathname } from "next/navigation";-// mobx-// ui-import { Settings } from "lucide-react";+import { Menu, Settings } from "lucide-react";// iconsimport { Breadcrumbs } from "@plane/ui";// components-import { SidebarHamburgerToggle } from "@/components/admin-sidebar";-import { BreadcrumbLink } from "@/components/common";+import { BreadcrumbLink } from "@/components/common/breadcrumb-link";+// hooks+import { useTheme } from "@/hooks/store";-export const InstanceHeader: FC = observer(() => {+export const HamburgerToggle: FC = observer(() => {+ const { isSidebarCollapsed, toggleSidebar } = useTheme();+ return (+ <div+ className="w-7 h-7 rounded flex justify-center items-center bg-custom-background-80 transition-all hover:bg-custom-background-90 cursor-pointer group md:hidden"+ onClick={() => toggleSidebar(!isSidebarCollapsed)}+ >+ <Menu size={14} className="text-custom-text-200 group-hover:text-custom-text-100 transition-all" />+ </div>+ );+});++export const AdminHeader: FC = observer(() => {const pathName = usePathname();const getHeaderTitle = (pathName: string) => {@@ -63,7 +74,7 @@ export const InstanceHeader: FC = observer(() => {return (<div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 border-b border-custom-sidebar-border-200 bg-custom-sidebar-background-100 p-4"><div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">- <SidebarHamburgerToggle />+ <HamburgerToggle />{breadcrumbItems.length >= 0 && (<div><Breadcrumbs>diff --git a/admin/app/image/form.tsx b/admin/app/(all)/(dashboard)/image/form.tsxsimilarity index 97%rename from admin/app/image/form.tsxrename to admin/app/(all)/(dashboard)/image/form.tsxindex 61d2875eda..be77983ec9 100644--- a/admin/app/image/form.tsx+++ b/admin/app/(all)/(dashboard)/image/form.tsx@@ -4,7 +4,7 @@ import { useForm } from "react-hook-form";import { IFormattedInstanceConfiguration, TInstanceImageConfigurationKeys } from "@plane/types";import { Button, TOAST_TYPE, setToast } from "@plane/ui";// components-import { ControllerInput } from "@/components/common";+import { ControllerInput } from "@/components/common/controller-input";// hooksimport { useInstance } from "@/hooks/store";diff --git a/admin/app/image/layout.tsx b/admin/app/(all)/(dashboard)/image/layout.tsxsimilarity index 62%rename from admin/app/image/layout.tsxrename to admin/app/(all)/(dashboard)/image/layout.tsxindex 32233e0783..7ec0ff54b7 100644--- a/admin/app/image/layout.tsx+++ b/admin/app/(all)/(dashboard)/image/layout.tsx@@ -1,15 +1,14 @@import { ReactNode } from "react";import { Metadata } from "next";-import { AdminLayout } from "@/layouts/admin-layout";interface ImageLayoutProps {children: ReactNode;}export const metadata: Metadata = {- title: "Images Settings - Plane Web",+ title: "Images Settings - God Mode",};export default function ImageLayout({ children }: ImageLayoutProps) {- return <AdminLayout>{children}</AdminLayout>;+ return <>{children}</>;}diff --git a/admin/app/image/page.tsx b/admin/app/(all)/(dashboard)/image/page.tsxsimilarity index 100%rename from admin/app/image/page.tsxrename to admin/app/(all)/(dashboard)/image/page.tsxdiff --git a/admin/core/layouts/admin-layout.tsx b/admin/app/(all)/(dashboard)/layout.tsxsimilarity index 52%rename from admin/core/layouts/admin-layout.tsxrename to admin/app/(all)/(dashboard)/layout.tsxindex 88f71aa3c4..1796237837 100644--- a/admin/core/layouts/admin-layout.tsx+++ b/admin/app/(all)/(dashboard)/layout.tsx@@ -1,20 +1,22 @@"use client";+import { FC, ReactNode, useEffect } from "react";import { observer } from "mobx-react";import { useRouter } from "next/navigation";// components-import { InstanceSidebar } from "@/components/admin-sidebar";-import { InstanceHeader } from "@/components/auth-header";-import { LogoSpinner } from "@/components/common";+import { LogoSpinner } from "@/components/common/logo-spinner";import { NewUserPopup } from "@/components/new-user-popup";// hooksimport { useUser } from "@/hooks/store";+// local components+import { AdminHeader } from "./header";+import { AdminSidebar } from "./sidebar";type TAdminLayout = {children: ReactNode;};-export const AdminLayout: FC<TAdminLayout> = observer((props) => {+const AdminLayout: FC<TAdminLayout> = (props) => {const { children } = props;// routerconst router = useRouter();@@ -35,14 +37,20 @@ export const AdminLayout: FC<TAdminLayout> = observer((props) => {);}- return (- <div className="relative flex h-screen w-screen overflow-hidden">- <InstanceSidebar />- <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">- <InstanceHeader />- <div className="h-full w-full overflow-hidden">{children}</div>- </main>- <NewUserPopup />- </div>- );-});+ if (isUserLoggedIn) {+ return (+ <div className="relative flex h-screen w-screen overflow-hidden">+ <AdminSidebar />+ <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">+ <AdminHeader />+ <div className="h-full w-full overflow-hidden">{children}</div>+ </main>+ <NewUserPopup />+ </div>+ );+ }++ return <></>;+};++export default observer(AdminLayout);diff --git a/admin/core/components/admin-sidebar/sidebar-dropdown.tsx b/admin/app/(all)/(dashboard)/sidebar-dropdown.tsxsimilarity index 99%rename from admin/core/components/admin-sidebar/sidebar-dropdown.tsxrename to admin/app/(all)/(dashboard)/sidebar-dropdown.tsxindex 0cde7f5519..cdce94f011 100644--- a/admin/core/components/admin-sidebar/sidebar-dropdown.tsx+++ b/admin/app/(all)/(dashboard)/sidebar-dropdown.tsx@@ -16,7 +16,7 @@ import { useTheme, useUser } from "@/hooks/store";// service initializationconst authService = new AuthService();-export const SidebarDropdown = observer(() => {+export const AdminSidebarDropdown = observer(() => {// store hooksconst { isSidebarCollapsed } = useTheme();const { currentUser, signOut } = useUser();diff --git a/admin/core/components/admin-sidebar/help-section.tsx b/admin/app/(all)/(dashboard)/sidebar-help-section.tsxsimilarity index 98%rename from admin/core/components/admin-sidebar/help-section.tsxrename to admin/app/(all)/(dashboard)/sidebar-help-section.tsxindex d776477497..cedc735a91 100644--- a/admin/core/components/admin-sidebar/help-section.tsx+++ b/admin/app/(all)/(dashboard)/sidebar-help-section.tsx@@ -33,7 +33,7 @@ const helpOptions = [},];-export const HelpSection: FC = observer(() => {+export const AdminSidebarHelpSection: FC = observer(() => {// statesconst [isNeedHelpOpen, setIsNeedHelpOpen] = useState(false);// storediff --git a/admin/core/components/admin-sidebar/sidebar-menu.tsx b/admin/app/(all)/(dashboard)/sidebar-menu.tsxsimilarity index 98%rename from admin/core/components/admin-sidebar/sidebar-menu.tsxrename to admin/app/(all)/(dashboard)/sidebar-menu.tsxindex 618551ae65..e536a51454 100644--- a/admin/core/components/admin-sidebar/sidebar-menu.tsx+++ b/admin/app/(all)/(dashboard)/sidebar-menu.tsx@@ -49,7 +49,7 @@ const INSTANCE_ADMIN_LINKS = [},];-export const SidebarMenu = observer(() => {+export const AdminSidebarMenu = observer(() => {// store hooksconst { isSidebarCollapsed, toggleSidebar } = useTheme();// routerdiff --git a/admin/core/components/admin-sidebar/root.tsx b/admin/app/(all)/(dashboard)/sidebar.tsxsimilarity index 81%rename from admin/core/components/admin-sidebar/root.tsxrename to admin/app/(all)/(dashboard)/sidebar.tsxindex 05dde0d8ab..09dab86eef 100644--- a/admin/core/components/admin-sidebar/root.tsx+++ b/admin/app/(all)/(dashboard)/sidebar.tsx@@ -4,12 +4,14 @@ import { FC, useEffect, useRef } from "react";import { observer } from "mobx-react";// plane helpersimport { useOutsideClickDetector } from "@plane/hooks";-// components-import { HelpSection, SidebarMenu, SidebarDropdown } from "@/components/admin-sidebar";// hooksimport { useTheme } from "@/hooks/store";+// components+import { AdminSidebarDropdown } from "./sidebar-dropdown";+import { AdminSidebarHelpSection } from "./sidebar-help-section";+import { AdminSidebarMenu } from "./sidebar-menu";-export const InstanceSidebar: FC = observer(() => {+export const AdminSidebar: FC = observer(() => {// storeconst { isSidebarCollapsed, toggleSidebar } = useTheme();@@ -47,9 +49,9 @@ export const InstanceSidebar: FC = observer(() => {`}><div ref={ref} className="flex h-full w-full flex-1 flex-col">- <SidebarDropdown />- <SidebarMenu />- <HelpSection />+ <AdminSidebarDropdown />+ <AdminSidebarMenu />+ <AdminSidebarHelpSection /></div></div>);diff --git a/admin/app/workspace/create/form.tsx b/admin/app/(all)/(dashboard)/workspace/create/form.tsxsimilarity index 100%rename from admin/app/workspace/create/form.tsxrename to admin/app/(all)/(dashboard)/workspace/create/form.tsxdiff --git a/admin/app/workspace/create/page.tsx b/admin/app/(all)/(dashboard)/workspace/create/page.tsxsimilarity index 100%rename from admin/app/workspace/create/page.tsxrename to admin/app/(all)/(dashboard)/workspace/create/page.tsxdiff --git a/admin/app/workspace/layout.tsx b/admin/app/(all)/(dashboard)/workspace/layout.tsxsimilarity index 56%rename from admin/app/workspace/layout.tsxrename to admin/app/(all)/(dashboard)/workspace/layout.tsxindex 9f2a63c67d..78b0f3c403 100644--- a/admin/app/workspace/layout.tsx+++ b/admin/app/(all)/(dashboard)/workspace/layout.tsx@@ -1,12 +1,10 @@import { ReactNode } from "react";import { Metadata } from "next";-// layouts-import { AdminLayout } from "@/layouts/admin-layout";export const metadata: Metadata = {- title: "Workspace Management - Plane Web",+ title: "Workspace Management - God Mode",};export default function WorkspaceManagementLayout({ children }: { children: ReactNode }) {- return <AdminLayout>{children}</AdminLayout>;+ return <>{children}</>;}diff --git a/admin/app/workspace/page.tsx b/admin/app/(all)/(dashboard)/workspace/page.tsxsimilarity index 98%rename from admin/app/workspace/page.tsxrename to admin/app/(all)/(dashboard)/workspace/page.tsxindex 3ca34b69e3..b8f79db04a 100644--- a/admin/app/workspace/page.tsx+++ b/admin/app/(all)/(dashboard)/workspace/page.tsx@@ -10,7 +10,7 @@ import { TInstanceConfigurationKeys } from "@plane/types";import { Button, getButtonStyling, Loader, setPromiseToast, ToggleSwitch } from "@plane/ui";import { cn } from "@plane/utils";// components-import { WorkspaceListItem } from "@/components/workspace";+import { WorkspaceListItem } from "@/components/workspace/list-item";// hooksimport { useInstance, useWorkspace } from "@/hooks/store";diff --git a/admin/core/components/authentication/auth-banner.tsx b/admin/app/(all)/(home)/auth-banner.tsxsimilarity index 100%rename from admin/core/components/authentication/auth-banner.tsxrename to admin/app/(all)/(home)/auth-banner.tsxdiff --git a/admin/core/lib/auth-helpers.tsx b/admin/app/(all)/(home)/auth-helpers.tsxsimilarity index 93%rename from admin/core/lib/auth-helpers.tsxrename to admin/app/(all)/(home)/auth-helpers.tsxindex f9882b5e51..7613548b96 100644--- a/admin/core/lib/auth-helpers.tsx+++ b/admin/app/(all)/(home)/auth-helpers.tsx@@ -7,13 +7,11 @@ import { SUPPORT_EMAIL, EAdminAuthErrorCodes, TAdminAuthErrorInfo } from "@planeimport { TGetBaseAuthenticationModeProps, TInstanceAuthenticationModes } from "@plane/types";import { resolveGeneralTheme } from "@plane/utils";// components-import {- EmailCodesConfiguration,- GithubConfiguration,- GitlabConfiguration,- GoogleConfiguration,- PasswordLoginConfiguration,-} from "@/components/authentication";+import { EmailCodesConfiguration } from "@/components/authentication/email-config-switch";+import { GithubConfiguration } from "@/components/authentication/github-config";+import { GitlabConfiguration } from "@/components/authentication/gitlab-config";+import { GoogleConfiguration } from "@/components/authentication/google-config";+import { PasswordLoginConfiguration } from "@/components/authentication/password-config-switch";// imagesimport githubLightModeImage from "@/public/logos/github-black.png";import githubDarkModeImage from "@/public/logos/github-white.png";diff --git a/admin/core/layouts/default-layout.tsx b/admin/app/(all)/(home)/layout.tsxsimilarity index 65%rename from admin/core/layouts/default-layout.tsxrename to admin/app/(all)/(home)/layout.tsxindex 1be40ea129..19cab04cb0 100644--- a/admin/core/layouts/default-layout.tsx+++ b/admin/app/(all)/(home)/layout.tsx@@ -1,26 +1,18 @@"use client";-import { FC, ReactNode } from "react";import Image from "next/image";import Link from "next/link";import { useTheme } from "next-themes";-// logo/ images+// logo assetsimport PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";import PlaneBackgroundPattern from "public/auth/background-pattern.svg";import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";-type TDefaultLayout = {- children: ReactNode;- withoutBackground?: boolean;-};--export const DefaultLayout: FC<TDefaultLayout> = (props) => {- const { children, withoutBackground = false } = props;- // hooks+export default function RootLayout({ children }: { children: React.ReactNode }) {const { resolvedTheme } = useTheme();- const patternBackground = resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern;+ const patternBackground = resolvedTheme === "light" ? PlaneBackgroundPattern : PlaneBackgroundPatternDark;const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;return (@@ -33,13 +25,11 @@ export const DefaultLayout: FC<TDefaultLayout> = (props) => {</Link></div></div>- {!withoutBackground && (- <div className="absolute inset-0 z-0">- <Image src={patternBackground} className="w-screen h-full object-cover" alt="Plane background pattern" />- </div>- )}+ <div className="absolute inset-0 z-0">+ <Image src={patternBackground} className="w-screen h-full object-cover" alt="Plane background pattern" />+ </div><div className="relative z-10 flex-grow">{children}</div></div></div>);-};+}diff --git a/admin/app/(all)/(home)/page.tsx b/admin/app/(all)/(home)/page.tsxnew file mode 100644index 0000000000..80ea40ee61--- /dev/null+++ b/admin/app/(all)/(home)/page.tsx@@ -0,0 +1,62 @@+"use client";++import { observer } from "mobx-react";+// components+import { InstanceFailureView } from "@/components/instance/failure";+import { InstanceLoading } from "@/components/instance/loading";+import { InstanceSetupForm } from "@/components/instance/setup-form";+// hooks+import { useInstance } from "@/hooks/store";+// components+import { InstanceSignInForm } from "./sign-in-form";++const HomePage = () => {+ // store hooks+ const { instance, error } = useInstance();++ // if instance is not fetched, show loading+ if (!instance && !error) {+ return (+ <div className="relative h-full w-full overflow-y-auto px-6 py-10 mx-auto flex justify-center items-center">+ <InstanceLoading />+ </div>+ );+ }++ // if instance fetch fails, show failure view+ if (error) {+ return (+ <div className="relative h-full w-full overflow-y-auto px-6 py-10 mx-auto flex justify-center items-center">+ <InstanceFailureView />+ </div>+ );+ }++ // if instance is fetched and setup is not done, show setup form+ if (instance && !instance?.is_setup_done) {+ return (+ <div className="relative h-full w-full overflow-y-auto px-6 py-10 mx-auto flex justify-center items-center">+ <InstanceSetupForm />+ </div>+ );+ }++ // if instance is fetched and setup is done, show sign in form+ return (+ <div className="flex-grow container mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 py-10 lg:pt-28 transition-all">+ <div className="relative flex flex-col space-y-6">+ <div className="text-center space-y-1">+ <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">+ Manage your Plane instance+ </h3>+ <p className="font-medium text-onboarding-text-400">+ Configure instance-wide settings to secure your instance+ </p>+ </div>+ <InstanceSignInForm />+ </div>+ </div>+ );+};++export default observer(HomePage);diff --git a/admin/app/(all)/(home)/sign-in-form.tsx b/admin/app/(all)/(home)/sign-in-form.tsxnew file mode 100644index 0000000000..12b250a93b--- /dev/null+++ b/admin/app/(all)/(home)/sign-in-form.tsx@@ -0,0 +1,178 @@+"use client";++import { FC, useEffect, useMemo, useState } from "react";+import { useSearchParams } from "next/navigation";+import { Eye, EyeOff } from "lucide-react";+// plane internal packages+import { API_BASE_URL, EAdminAuthErrorCodes, TAdminAuthErrorInfo } from "@plane/constants";+import { AuthService } from "@plane/services";+import { Button, Input, Spinner } from "@plane/ui";+// components+import { Banner } from "@/components/common/banner";+// local components+import { AuthBanner } from "./auth-banner";+import { authErrorHandler } from "./auth-helpers";++// service initialization+const authService = new AuthService();++// error codes+enum EErrorCodes {+ INSTANCE_NOT_CONFIGURED = "INSTANCE_NOT_CONFIGURED",+ REQUIRED_EMAIL_PASSWORD = "REQUIRED_EMAIL_PASSWORD",+ INVALID_EMAIL = "INVALID_EMAIL",+ USER_DOES_NOT_EXIST = "USER_DOES_NOT_EXIST",+ AUTHENTICATION_FAILED = "AUTHENTICATION_FAILED",+}++type TError = {+ type: EErrorCodes | undefined;+ message: string | undefined;+};++// form data+type TFormData = {+ email: string;+ password: string;+};++const defaultFromData: TFormData = {+ email: "",+ password: "",+};++export const InstanceSignInForm: FC = () => {+ // search params+ const searchParams = useSearchParams();+ const emailParam = searchParams.get("email") || undefined;+ const errorCode = searchParams.get("error_code") || undefined;+ const errorMessage = searchParams.get("error_message") || undefined;+ // state+ const [showPassword, setShowPassword] = useState(false);+ const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);+ const [formData, setFormData] = useState<TFormData>(defaultFromData);+ const [isSubmitting, setIsSubmitting] = useState(false);+ const [errorInfo, setErrorInfo] = useState<TAdminAuthErrorInfo | undefined>(undefined);++ const handleFormChange = (key: keyof TFormData, value: string | boolean) =>+ setFormData((prev) => ({ ...prev, [key]: value }));++ useEffect(() => {+ if (csrfToken === undefined)+ authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));+ }, [csrfToken]);++ useEffect(() => {+ if (emailParam) setFormData((prev) => ({ ...prev, email: emailParam }));+ }, [emailParam]);++ // derived values+ const errorData: TError = useMemo(() => {+ if (errorCode && errorMessage) {+ switch (errorCode) {+ case EErrorCodes.INSTANCE_NOT_CONFIGURED:+ return { type: EErrorCodes.INSTANCE_NOT_CONFIGURED, message: errorMessage };+ case EErrorCodes.REQUIRED_EMAIL_PASSWORD:+ return { type: EErrorCodes.REQUIRED_EMAIL_PASSWORD, message: errorMessage };+ case EErrorCodes.INVALID_EMAIL:+ return { type: EErrorCodes.INVALID_EMAIL, message: errorMessage };+ case EErrorCodes.USER_DOES_NOT_EXIST:+ return { type: EErrorCodes.USER_DOES_NOT_EXIST, message: errorMessage };+ case EErrorCodes.AUTHENTICATION_FAILED:+ return { type: EErrorCodes.AUTHENTICATION_FAILED, message: errorMessage };+ default:+ return { type: undefined, message: undefined };+ }+ } else return { type: undefined, message: undefined };+ }, [errorCode, errorMessage]);++ const isButtonDisabled = useMemo(+ () => (!isSubmitting && formData.email && formData.password ? false : true),+ [formData.email, formData.password, isSubmitting]+ );++ useEffect(() => {+ if (errorCode) {+ const errorDetail = authErrorHandler(errorCode?.toString() as EAdminAuthErrorCodes);+ if (errorDetail) {+ setErrorInfo(errorDetail);+ }+ }+ }, [errorCode]);++ return (+ <form+ className="space-y-4"+ method="POST"+ action={`${API_BASE_URL}/api/instances/admins/sign-in/`}+ onSubmit={() => setIsSubmitting(true)}+ onError={() => setIsSubmitting(false)}+ >+ {errorData.type && errorData?.message ? (+ <Banner type="error" message={errorData?.message} />+ ) : (+ <>{errorInfo && <AuthBanner bannerData={errorInfo} handleBannerData={(value) => setErrorInfo(value)} />}</>+ )}+ <input type="hidden" name="csrfmiddlewaretoken" value={csrfToken} />++ <div className="w-full space-y-1">+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">+ Email <span className="text-red-500">*</span>+ </label>+ <Input+ className="w-full border border-onboarding-border-100 !bg-onboarding-background-200 placeholder:text-onboarding-text-400"+ id="email"+ name="email"+ type="email"+ inputSize="md"+ placeholder="[email protected]"+ value={formData.email}+ onChange={(e) => handleFormChange("email", e.target.value)}+ autoComplete="on"+ autoFocus+ />+ </div>++ <div className="w-full space-y-1">+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="password">+ Password <span className="text-red-500">*</span>+ </label>+ <div className="relative">+ <Input+ className="w-full border border-onboarding-border-100 !bg-onboarding-background-200 placeholder:text-onboarding-text-400"+ id="password"+ name="password"+ type={showPassword ? "text" : "password"}+ inputSize="md"+ placeholder="Enter your password"+ value={formData.password}+ onChange={(e) => handleFormChange("password", e.target.value)}+ autoComplete="on"+ />+ {showPassword ? (+ <button+ type="button"+ className="absolute right-3 top-3.5 flex items-center justify-center text-custom-text-400"+ onClick={() => setShowPassword(false)}+ >+ <EyeOff className="h-4 w-4" />+ </button>+ ) : (+ <button+ type="button"+ className="absolute right-3 top-3.5 flex items-center justify-center text-custom-text-400"+ onClick={() => setShowPassword(true)}+ >+ <Eye className="h-4 w-4" />+ </button>+ )}+ </div>+ </div>+ <div className="py-2">+ <Button type="submit" size="lg" className="w-full" disabled={isButtonDisabled}>+ {isSubmitting ? <Spinner height="20px" width="20px" /> : "Sign in"}+ </Button>+ </div>+ </form>+ );+};diff --git a/admin/app/(all)/instance.provider.tsx b/admin/app/(all)/instance.provider.tsxnew file mode 100644index 0000000000..ac8fa74e82--- /dev/null+++ b/admin/app/(all)/instance.provider.tsx@@ -0,0 +1,23 @@+import { FC, ReactNode } from "react";+import { observer } from "mobx-react";+import useSWR from "swr";+// hooks+import { useInstance } from "@/hooks/store";++type InstanceProviderProps = {+ children: ReactNode;+};++export const InstanceProvider: FC<InstanceProviderProps> = observer((props) => {+ const { children } = props;+ // store hooks+ const { fetchInstanceInfo } = useInstance();+ // fetching instance details+ useSWR("INSTANCE_DETAILS", () => fetchInstanceInfo(), {+ revalidateOnFocus: false,+ revalidateIfStale: false,+ errorRetryCount: 0,+ });++ return <>{children}</>;+});diff --git a/admin/app/(all)/layout.tsx b/admin/app/(all)/layout.tsxnew file mode 100644index 0000000000..ddfba732a9--- /dev/null+++ b/admin/app/(all)/layout.tsx@@ -0,0 +1,33 @@+"use client";++import { ThemeProvider } from "next-themes";+import { SWRConfig } from "swr";+// providers+import { InstanceProvider } from "./instance.provider";+import { StoreProvider } from "./store.provider";+import { ToastWithTheme } from "./toast";+import { UserProvider } from "./user.provider";++const DEFAULT_SWR_CONFIG = {+ refreshWhenHidden: false,+ revalidateIfStale: false,+ revalidateOnFocus: false,+ revalidateOnMount: true,+ refreshInterval: 600000,+ errorRetryCount: 3,+};++export default function InstanceLayout({ children }: { children: React.ReactNode }) {+ return (+ <ThemeProvider themes={["light", "dark"]} defaultTheme="system" enableSystem>+ <ToastWithTheme />+ <SWRConfig value={DEFAULT_SWR_CONFIG}>+ <StoreProvider>+ <InstanceProvider>+ <UserProvider>{children}</UserProvider>+ </InstanceProvider>+ </StoreProvider>+ </SWRConfig>+ </ThemeProvider>+ );+}diff --git a/admin/core/lib/store-provider.tsx b/admin/app/(all)/store.provider.tsxsimilarity index 100%rename from admin/core/lib/store-provider.tsxrename to admin/app/(all)/store.provider.tsxdiff --git a/admin/app/(all)/toast.tsx b/admin/app/(all)/toast.tsxnew file mode 100644index 0000000000..7d7938a9b1--- /dev/null+++ b/admin/app/(all)/toast.tsx@@ -0,0 +1,10 @@+"use client";++import { useTheme } from "next-themes";+import { Toast } from "@plane/ui";+import { resolveGeneralTheme } from "@plane/utils";++export const ToastWithTheme = () => {+ const { resolvedTheme } = useTheme();+ return <Toast theme={resolveGeneralTheme(resolvedTheme)} />;+};diff --git a/admin/core/lib/user-provider.tsx b/admin/app/(all)/user.provider.tsxsimilarity index 99%rename from admin/core/lib/user-provider.tsxrename to admin/app/(all)/user.provider.tsxindex 17d7026279..3a50823dcb 100644--- a/admin/core/lib/user-provider.tsx+++ b/admin/app/(all)/user.provider.tsx@@ -19,6 +19,7 @@ export const UserProvider: FC<IUserProvider> = observer(({ children }) => {useSWR("CURRENT_USER", () => fetchCurrentUser(), {shouldRetryOnError: false,});+useSWR("INSTANCE_ADMINS", () => fetchInstanceAdmins());useEffect(() => {diff --git a/admin/app/layout.tsx b/admin/app/layout.tsxindex b10e9186c3..e735723695 100644--- a/admin/app/layout.tsx+++ b/admin/app/layout.tsx@@ -1,22 +1,25 @@-"use client";-import { ReactNode } from "react";-import { ThemeProvider, useTheme } from "next-themes";-import { SWRConfig } from "swr";+import { Metadata } from "next";// plane imports-import { ADMIN_BASE_PATH, DEFAULT_SWR_CONFIG } from "@plane/constants";-import { Toast } from "@plane/ui";-import { resolveGeneralTheme } from "@plane/utils";-// lib-import { InstanceProvider } from "@/lib/instance-provider";-import { StoreProvider } from "@/lib/store-provider";-import { UserProvider } from "@/lib/user-provider";+import { ADMIN_BASE_PATH } from "@plane/constants";// stylesimport "@/styles/globals.css";-const ToastWithTheme = () => {- const { resolvedTheme } = useTheme();- return <Toast theme={resolveGeneralTheme(resolvedTheme)} />;+export const metadata: Metadata = {+ title: "Plane | Simple, extensible, open-source project management tool.",+ description:+ "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",+ openGraph: {+ title: "Plane | Simple, extensible, open-source project management tool.",+ description:+ "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",+ url: "https://plane.so/",+ },+ keywords:+ "software development, customer feedback, software, accelerate, code management, release management, project management, work items tracking, agile, scrum, kanban, collaboration",+ twitter: {+ site: "@planepowers",+ },};export default function RootLayout({ children }: { children: ReactNode }) {@@ -30,18 +33,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {<link rel="manifest" href={`${ASSET_PREFIX}/site.webmanifest.json`} /><link rel="shortcut icon" href={`${ASSET_PREFIX}/favicon/favicon.ico`} /></head>- <body className={`antialiased`}>- <ThemeProvider themes={["light", "dark"]} defaultTheme="system" enableSystem>- <ToastWithTheme />- <SWRConfig value={DEFAULT_SWR_CONFIG}>- <StoreProvider>- <InstanceProvider>- <UserProvider>{children}</UserProvider>- </InstanceProvider>- </StoreProvider>- </SWRConfig>- </ThemeProvider>- </body>+ <body className={`antialiased`}>{children}</body></html>);}diff --git a/admin/app/page.tsx b/admin/app/page.tsxdeleted file mode 100644index 1a274025a0..0000000000--- a/admin/app/page.tsx+++ /dev/null@@ -1,30 +0,0 @@-import { Metadata } from "next";-// components-import { InstanceSignInForm } from "@/components/login";-// layouts-import { DefaultLayout } from "@/layouts/default-layout";--export const metadata: Metadata = {- title: "Plane | Simple, extensible, open-source project management tool.",- description:- "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",- openGraph: {- title: "Plane | Simple, extensible, open-source project management tool.",- description:- "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",- url: "https://plane.so/",- },- keywords:- "software development, customer feedback, software, accelerate, code management, release management, project management, work items tracking, agile, scrum, kanban, collaboration",- twitter: {- site: "@planepowers",- },-};--export default async function LoginPage() {- return (- <DefaultLayout>- <InstanceSignInForm />- </DefaultLayout>- );-}diff --git a/admin/ce/components/authentication/authentication-modes.tsx b/admin/ce/components/authentication/authentication-modes.tsxindex 3c7ec111a3..c900167029 100644--- a/admin/ce/components/authentication/authentication-modes.tsx+++ b/admin/ce/components/authentication/authentication-modes.tsx@@ -1,19 +1,28 @@import { observer } from "mobx-react";import Image from "next/image";import { useTheme } from "next-themes";+import { KeyRound, Mails } from "lucide-react";// typesimport {TGetBaseAuthenticationModeProps,TInstanceAuthenticationMethodKeys,TInstanceAuthenticationModes,} from "@plane/types";+import { resolveGeneralTheme } from "@plane/utils";// components-import { AuthenticationMethodCard } from "@/components/authentication";-// helpers-import { getBaseAuthenticationModes } from "@/lib/auth-helpers";+import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";+import { EmailCodesConfiguration } from "@/components/authentication/email-config-switch";+import { GithubConfiguration } from "@/components/authentication/github-config";+import { GitlabConfiguration } from "@/components/authentication/gitlab-config";+import { GoogleConfiguration } from "@/components/authentication/google-config";+import { PasswordLoginConfiguration } from "@/components/authentication/password-config-switch";// plane admin componentsimport { UpgradeButton } from "@/plane-admin/components/common";-// images+// assets+import githubLightModeImage from "@/public/logos/github-black.png";+import githubDarkModeImage from "@/public/logos/github-white.png";+import GitlabLogo from "@/public/logos/gitlab-logo.svg";+import GoogleLogo from "@/public/logos/google-logo.svg";import OIDCLogo from "@/public/logos/oidc-logo.svg";import SAMLLogo from "@/public/logos/saml-logo.svg";@@ -28,7 +37,49 @@ export const getAuthenticationModes: (props: TGetBaseAuthenticationModeProps) =>updateConfig,resolvedTheme,}) => [- ...getBaseAuthenticationModes({ disabled, updateConfig, resolvedTheme }),+ {+ key: "unique-codes",+ name: "Unique codes",+ description:+ "Log in or sign up for Plane using codes sent via email. You need to have set up SMTP to use this method.",+ icon: <Mails className="h-6 w-6 p-0.5 text-custom-text-300/80" />,+ config: <EmailCodesConfiguration disabled={disabled} updateConfig={updateConfig} />,+ },+ {+ key: "passwords-login",+ name: "Passwords",+ description: "Allow members to create accounts with passwords and use it with their email addresses to sign in.",+ icon: <KeyRound className="h-6 w-6 p-0.5 text-custom-text-300/80" />,+ config: <PasswordLoginConfiguration disabled={disabled} updateConfig={updateConfig} />,+ },+ {+ key: "google",+ name: "Google",+ description: "Allow members to log in or sign up for Plane with their Google accounts.",+ icon: <Image src={GoogleLogo} height={20} width={20} alt="Google Logo" />,+ config: <GoogleConfiguration disabled={disabled} updateConfig={updateConfig} />,+ },+ {+ key: "github",+ name: "GitHub",+ description: "Allow members to log in or sign up for Plane with their GitHub accounts.",+ icon: (+ <Image+ src={resolveGeneralTheme(resolvedTheme) === "dark" ? githubDarkModeImage : githubLightModeImage}+ height={20}+ width={20}+ alt="GitHub Logo"+ />+ ),+ config: <GithubConfiguration disabled={disabled} updateConfig={updateConfig} />,+ },+ {+ key: "gitlab",+ name: "GitLab",+ description: "Allow members to log in or sign up to plane with their GitLab accounts.",+ icon: <Image src={GitlabLogo} height={20} width={20} alt="GitLab Logo" />,+ config: <GitlabConfiguration disabled={disabled} updateConfig={updateConfig} />,+ },{key: "oidc",name: "OIDC",diff --git a/admin/core/components/admin-sidebar/index.ts b/admin/core/components/admin-sidebar/index.tsdeleted file mode 100644index e800fe3c5c..0000000000--- a/admin/core/components/admin-sidebar/index.ts+++ /dev/null@@ -1,5 +0,0 @@-export * from "./root";-export * from "./help-section";-export * from "./sidebar-menu";-export * from "./sidebar-dropdown";-export * from "./sidebar-menu-hamburger-toogle";diff --git a/admin/core/components/admin-sidebar/sidebar-menu-hamburger-toogle.tsx b/admin/core/components/admin-sidebar/sidebar-menu-hamburger-toogle.tsxdeleted file mode 100644index 337d9baaf3..0000000000--- a/admin/core/components/admin-sidebar/sidebar-menu-hamburger-toogle.tsx+++ /dev/null@@ -1,20 +0,0 @@-"use client";--import { FC } from "react";-import { observer } from "mobx-react";-// hooks-import { Menu } from "lucide-react";-import { useTheme } from "@/hooks/store";-// icons--export const SidebarHamburgerToggle: FC = observer(() => {- const { isSidebarCollapsed, toggleSidebar } = useTheme();- return (- <div- className="w-7 h-7 rounded flex justify-center items-center bg-custom-background-80 transition-all hover:bg-custom-background-90 cursor-pointer group md:hidden"- onClick={() => toggleSidebar(!isSidebarCollapsed)}- >- <Menu size={14} className="text-custom-text-200 group-hover:text-custom-text-100 transition-all" />- </div>- );-});diff --git a/admin/core/components/authentication/index.ts b/admin/core/components/authentication/index.tsdeleted file mode 100644index d189a727ba..0000000000--- a/admin/core/components/authentication/index.ts+++ /dev/null@@ -1,7 +0,0 @@-export * from "./auth-banner";-export * from "./email-config-switch";-export * from "./password-config-switch";-export * from "./authentication-method-card";-export * from "./gitlab-config";-export * from "./github-config";-export * from "./google-config";diff --git a/admin/core/components/common/index.ts b/admin/core/components/common/index.tsdeleted file mode 100644index 4d664b0a4a..0000000000--- a/admin/core/components/common/index.ts+++ /dev/null@@ -1,10 +0,0 @@-export * from "./breadcrumb-link";-export * from "./confirm-discard-modal";-export * from "./controller-input";-export * from "./copy-field";-export * from "./password-strength-meter";-export * from "./banner";-export * from "./empty-state";-export * from "./logo-spinner";-export * from "./page-header";-export * from "./code-block";diff --git a/admin/core/components/instance/instance-failure-view.tsx b/admin/core/components/instance/failure.tsxsimilarity index 100%rename from admin/core/components/instance/instance-failure-view.tsxrename to admin/core/components/instance/failure.tsxdiff --git a/admin/core/components/instance/index.ts b/admin/core/components/instance/index.tsdeleted file mode 100644index 56d1933f41..0000000000--- a/admin/core/components/instance/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export * from "./instance-not-ready";-export * from "./instance-failure-view";-export * from "./setup-form";diff --git a/admin/core/components/instance/loading.tsx b/admin/core/components/instance/loading.tsxnew file mode 100644index 0000000000..a21319d9ee--- /dev/null+++ b/admin/core/components/instance/loading.tsx@@ -0,0 +1,21 @@+import Image from "next/image";+import { useTheme } from "next-themes";+// assets+import LogoSpinnerDark from "@/public/images/logo-spinner-dark.gif";+import LogoSpinnerLight from "@/public/images/logo-spinner-light.gif";++export const InstanceLoading = () => {+ const { resolvedTheme } = useTheme();+ const logoSrc = resolvedTheme === "dark" ? LogoSpinnerDark : LogoSpinnerLight;++ return (+ <div className="h-full w-full relative container px-5 mx-auto flex justify-center items-center">+ <div className="w-auto max-w-2xl relative space-y-8 py-10">+ <div className="relative flex flex-col justify-center items-center space-y-4">+ <Image src={logoSrc} alt="logo" className="w-[82px] h-[82px] mr-2" priority={false} />+ <h3 className="font-medium text-2xl text-white ">Fetching instance details...</h3>+ </div>+ </div>+ </div>+ );+};diff --git a/admin/core/components/instance/setup-form.tsx b/admin/core/components/instance/setup-form.tsxindex fcc5c6c83d..4e771e91be 100644--- a/admin/core/components/instance/setup-form.tsx+++ b/admin/core/components/instance/setup-form.tsx@@ -10,7 +10,8 @@ import { AuthService } from "@plane/services";import { Button, Checkbox, Input, Spinner } from "@plane/ui";import { getPasswordStrength } from "@plane/utils";// components-import { Banner, PasswordStrengthMeter } from "@/components/common";+import { Banner } from "@/components/common/banner";+import { PasswordStrengthMeter } from "@/components/common/password-strength-meter";// service initializationconst authService = new AuthService();diff --git a/admin/core/components/login/index.ts b/admin/core/components/login/index.tsdeleted file mode 100644index bdeb387f3f..0000000000--- a/admin/core/components/login/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./sign-in-form";diff --git a/admin/core/components/login/sign-in-form.tsx b/admin/core/components/login/sign-in-form.tsxdeleted file mode 100644index 553ffe6c56..0000000000--- a/admin/core/components/login/sign-in-form.tsx+++ /dev/null@@ -1,194 +0,0 @@-"use client";--import { FC, useEffect, useMemo, useState } from "react";-import { useSearchParams } from "next/navigation";-import { Eye, EyeOff } from "lucide-react";-// plane internal packages-import { API_BASE_URL, EAdminAuthErrorCodes, TAdminAuthErrorInfo } from "@plane/constants";-import { AuthService } from "@plane/services";-import { Button, Input, Spinner } from "@plane/ui";-// components-import { Banner } from "@/components/common";-// helpers-import { authErrorHandler } from "@/lib/auth-helpers";-// local components-import { AuthBanner } from "../authentication";--// service initialization-const authService = new AuthService();--// error codes-enum EErrorCodes {- INSTANCE_NOT_CONFIGURED = "INSTANCE_NOT_CONFIGURED",- REQUIRED_EMAIL_PASSWORD = "REQUIRED_EMAIL_PASSWORD",- INVALID_EMAIL = "INVALID_EMAIL",- USER_DOES_NOT_EXIST = "USER_DOES_NOT_EXIST",- AUTHENTICATION_FAILED = "AUTHENTICATION_FAILED",-}--type TError = {- type: EErrorCodes | undefined;- message: string | undefined;-};--// form data-type TFormData = {- email: string;- password: string;-};--const defaultFromData: TFormData = {- email: "",- password: "",-};--export const InstanceSignInForm: FC = (props) => {- const {} = props;- // search params- const searchParams = useSearchParams();- const emailParam = searchParams.get("email") || undefined;- const errorCode = searchParams.get("error_code") || undefined;- const errorMessage = searchParams.get("error_message") || undefined;- // state- const [showPassword, setShowPassword] = useState(false);- const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);- const [formData, setFormData] = useState<TFormData>(defaultFromData);- const [isSubmitting, setIsSubmitting] = useState(false);- const [errorInfo, setErrorInfo] = useState<TAdminAuthErrorInfo | undefined>(undefined);-- const handleFormChange = (key: keyof TFormData, value: string | boolean) =>- setFormData((prev) => ({ ...prev, [key]: value }));-- useEffect(() => {- if (csrfToken === undefined)- authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));- }, [csrfToken]);-- useEffect(() => {- if (emailParam) setFormData((prev) => ({ ...prev, email: emailParam }));- }, [emailParam]);-- // derived values- const errorData: TError = useMemo(() => {- if (errorCode && errorMessage) {- switch (errorCode) {- case EErrorCodes.INSTANCE_NOT_CONFIGURED:- return { type: EErrorCodes.INVALID_EMAIL, message: errorMessage };- case EErrorCodes.REQUIRED_EMAIL_PASSWORD:- return { type: EErrorCodes.REQUIRED_EMAIL_PASSWORD, message: errorMessage };- case EErrorCodes.INVALID_EMAIL:- return { type: EErrorCodes.INVALID_EMAIL, message: errorMessage };- case EErrorCodes.USER_DOES_NOT_EXIST:- return { type: EErrorCodes.USER_DOES_NOT_EXIST, message: errorMessage };- case EErrorCodes.AUTHENTICATION_FAILED:- return { type: EErrorCodes.AUTHENTICATION_FAILED, message: errorMessage };- default:- return { type: undefined, message: undefined };- }- } else return { type: undefined, message: undefined };- }, [errorCode, errorMessage]);-- const isButtonDisabled = useMemo(- () => (!isSubmitting && formData.email && formData.password ? false : true),- [formData.email, formData.password, isSubmitting]- );-- useEffect(() => {- if (errorCode) {- const errorDetail = authErrorHandler(errorCode?.toString() as EAdminAuthErrorCodes);- if (errorDetail) {- setErrorInfo(errorDetail);- }- }- }, [errorCode]);-- return (- <div className="flex-grow container mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 py-10 lg:pt-28 transition-all">- <div className="relative flex flex-col space-y-6">- <div className="text-center space-y-1">- <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">- Manage your Plane instance- </h3>- <p className="font-medium text-onboarding-text-400">- Configure instance-wide settings to secure your instance- </p>- </div>-- {errorData.type && errorData?.message ? (- <Banner type="error" message={errorData?.message} />- ) : (- <>{errorInfo && <AuthBanner bannerData={errorInfo} handleBannerData={(value) => setErrorInfo(value)} />}</>- )}-- <form- className="space-y-4"- method="POST"- action={`${API_BASE_URL}/api/instances/admins/sign-in/`}- onSubmit={() => setIsSubmitting(true)}- onError={() => setIsSubmitting(false)}- >- <input type="hidden" name="csrfmiddlewaretoken" value={csrfToken} />-- <div className="w-full space-y-1">- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">- Email <span className="text-red-500">*</span>- </label>- <Input- className="w-full border border-onboarding-border-100 !bg-onboarding-background-200 placeholder:text-onboarding-text-400"- id="email"- name="email"- type="email"- inputSize="md"- placeholder="[email protected]"- value={formData.email}- onChange={(e) => handleFormChange("email", e.target.value)}- autoComplete="on"- autoFocus- />- </div>-- <div className="w-full space-y-1">- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="password">- Password <span className="text-red-500">*</span>- </label>- <div className="relative">- <Input- className="w-full border border-onboarding-border-100 !bg-onboarding-background-200 placeholder:text-onboarding-text-400"- id="password"- name="password"- type={showPassword ? "text" : "password"}- inputSize="md"- placeholder="Enter your password"- value={formData.password}- onChange={(e) => handleFormChange("password", e.target.value)}- autoComplete="on"- />- {showPassword ? (- <button- type="button"- className="absolute right-3 top-3.5 flex items-center justify-center text-custom-text-400"- onClick={() => setShowPassword(false)}- >- <EyeOff className="h-4 w-4" />- </button>- ) : (- <button- type="button"- className="absolute right-3 top-3.5 flex items-center justify-center text-custom-text-400"- onClick={() => setShowPassword(true)}- >- <Eye className="h-4 w-4" />- </button>- )}- </div>- </div>- <div className="py-2">- <Button type="submit" size="lg" className="w-full" disabled={isButtonDisabled}>- {isSubmitting ? <Spinner height="20px" width="20px" /> : "Sign in"}- </Button>- </div>- </form>- </div>- </div>- );-};diff --git a/admin/core/components/workspace/index.ts b/admin/core/components/workspace/index.tsdeleted file mode 100644index 24950c4f20..0000000000--- a/admin/core/components/workspace/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./list-item";diff --git a/admin/core/hooks/store/use-instance.tsx b/admin/core/hooks/store/use-instance.tsxindex cf2edc39fa..67ac3bca88 100644--- a/admin/core/hooks/store/use-instance.tsx+++ b/admin/core/hooks/store/use-instance.tsx@@ -1,6 +1,6 @@import { useContext } from "react";// store-import { StoreContext } from "@/lib/store-provider";+import { StoreContext } from "@/app/(all)/store.provider";import { IInstanceStore } from "@/store/instance.store";export const useInstance = (): IInstanceStore => {diff --git a/admin/core/hooks/store/use-theme.tsx b/admin/core/hooks/store/use-theme.tsxindex bad89cfeeb..0f07149b1d 100644--- a/admin/core/hooks/store/use-theme.tsx+++ b/admin/core/hooks/store/use-theme.tsx@@ -1,6 +1,6 @@import { useContext } from "react";// store-import { StoreContext } from "@/lib/store-provider";+import { StoreContext } from "@/app/(all)/store.provider";import { IThemeStore } from "@/store/theme.store";export const useTheme = (): IThemeStore => {diff --git a/admin/core/hooks/store/use-user.tsx b/admin/core/hooks/store/use-user.tsxindex 8230031447..eaf02862e2 100644--- a/admin/core/hooks/store/use-user.tsx+++ b/admin/core/hooks/store/use-user.tsx@@ -1,6 +1,6 @@import { useContext } from "react";// store-import { StoreContext } from "@/lib/store-provider";+import { StoreContext } from "@/app/(all)/store.provider";import { IUserStore } from "@/store/user.store";export const useUser = (): IUserStore => {diff --git a/admin/core/hooks/store/use-workspace.tsx b/admin/core/hooks/store/use-workspace.tsxindex e3bde92d53..2203ec948c 100644--- a/admin/core/hooks/store/use-workspace.tsx+++ b/admin/core/hooks/store/use-workspace.tsx@@ -1,6 +1,6 @@import { useContext } from "react";// store-import { StoreContext } from "@/lib/store-provider";+import { StoreContext } from "@/app/(all)/store.provider";import { IWorkspaceStore } from "@/store/workspace.store";export const useWorkspace = (): IWorkspaceStore => {diff --git a/admin/core/lib/instance-provider.tsx b/admin/core/lib/instance-provider.tsxdeleted file mode 100644index d021e3b83a..0000000000--- a/admin/core/lib/instance-provider.tsx+++ /dev/null@@ -1,55 +0,0 @@-import { FC, ReactNode } from "react";-import { observer } from "mobx-react";-import useSWR from "swr";-// components-import { LogoSpinner } from "@/components/common";-import { InstanceSetupForm, InstanceFailureView } from "@/components/instance";-// hooks-import { useInstance } from "@/hooks/store";-// layout-import { DefaultLayout } from "@/layouts/default-layout";--type InstanceProviderProps = {- children: ReactNode;-};--export const InstanceProvider: FC<InstanceProviderProps> = observer((props) => {- const { children } = props;- // store hooks- const { instance, error, fetchInstanceInfo } = useInstance();- // fetching instance details- useSWR("INSTANCE_DETAILS", () => fetchInstanceInfo(), {- revalidateOnFocus: false,- revalidateIfStale: false,- errorRetryCount: 0,- });-- if (!instance && !error)- return (- <div className="flex h-screen min-h-[500px] w-full justify-center items-center">- <LogoSpinner />- </div>- );-- if (error) {- return (- <DefaultLayout>- <div className="relative h-full w-full overflow-y-auto px-6 py-10 mx-auto flex justify-center items-center">- <InstanceFailureView />- </div>- </DefaultLayout>- );- }-- if (!instance?.is_setup_done) {- return (- <DefaultLayout>- <div className="relative h-full w-full overflow-y-auto px-6 py-10 mx-auto flex justify-center items-center">- <InstanceSetupForm />- </div>- </DefaultLayout>- );- }-- return <>{children}</>;-});diff --git a/admin/core/store/instance.store.ts b/admin/core/store/instance.store.tsindex 33954fe73a..1f690f7080 100644--- a/admin/core/store/instance.store.ts+++ b/admin/core/store/instance.store.ts@@ -100,7 +100,7 @@ export class InstanceStore implements IInstanceStore {if (this.instance === undefined && !instanceInfo?.instance?.workspaces_exist)this.store.theme.toggleNewUserPopup();runInAction(() => {- console.log("instanceInfo: ", instanceInfo);+ // console.log("instanceInfo: ", instanceInfo);this.isLoading = false;this.instance = instanceInfo.instance;this.config = instanceInfo.config;diff --git a/admin/tsconfig.json b/admin/tsconfig.jsonindex df72d07b40..d85abf2cc9 100644--- a/admin/tsconfig.json+++ b/admin/tsconfig.json@@ -8,6 +8,7 @@],"baseUrl": ".","paths": {+ "@/app/*": ["app/*"],"@/*": ["core/*"],"@/public/*": ["public/*"],"@/plane-admin/*": ["ce/*"],diff --git a/apps/space/next-env.d.ts b/apps/space/next-env.d.tsnew file mode 100644index 0000000000..40c3d68096--- /dev/null+++ b/apps/space/next-env.d.ts@@ -0,0 +1,5 @@+/// <reference types="next" />+/// <reference types="next/image-types/global" />++// NOTE: This file should not be edited+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.diff --git a/packages/eslint-config/next.js b/packages/eslint-config/next.jsindex 543cd131a4..a2da660105 100644--- a/packages/eslint-config/next.js+++ b/packages/eslint-config/next.js@@ -52,7 +52,7 @@ module.exports = {},],"import/order": [- "error",+ "warn",{groups: ["builtin", "external", "internal", "parent", "sibling"],pathGroups: [@@ -80,6 +80,11 @@ module.exports = {pattern: "@/**",group: "internal",},+ {+ pattern: "public/**",+ group: "internal",+ position: "after",+ },],pathGroupsExcludedImportTypes: ["builtin", "internal", "react"],alphabetize: {diff --git a/packages/services/src/api.service.ts b/packages/services/src/api.service.tsindex 619a0d4ec1..e2b74993e2 100644--- a/packages/services/src/api.service.ts+++ b/packages/services/src/api.service.ts@@ -1,6 +1,4 @@-/* eslint-disable @typescript-eslint/no-explicit-any */import axios, { AxiosInstance, AxiosRequestConfig } from "axios";-import { IndexedDBService } from "./indexedDB.service";/*** Abstract base class for making HTTP requests using axios@@ -20,38 +18,6 @@ export abstract class APIService {baseURL,withCredentials: true,});-- this.setupInterceptors();- }-- /**- * Sets up axios interceptors for handling responses- * Currently handles 401 unauthorized responses by redirecting to login- * @private- */- private setupInterceptors() {- this.axiosInstance.interceptors.response.use(- (response) => response,- (error) => {- if (error.response && error.response.status === 401) {- const currentPath = window.location.pathname;- let prefix = "/";- let updatedPath = currentPath;-- // Check for special path prefixes- if (currentPath.startsWith("/god-mode")) {- prefix = "/god-mode";- updatedPath = currentPath.replace("/god-mode", "");- } else if (currentPath.startsWith("/spaces")) {- prefix = "/spaces";- updatedPath = currentPath.replace("/spaces", "");- }-- window.location.replace(`${prefix}${updatedPath ? `?next_path=${updatedPath}` : ""}`);- }- return Promise.reject(error);- }- );}/**diff --git a/packages/services/src/user/user.service.ts b/packages/services/src/user/user.service.tsindex c302b1d4f1..3392976625 100644--- a/packages/services/src/user/user.service.ts+++ b/packages/services/src/user/user.service.ts@@ -20,11 +20,10 @@ export class UserService extends APIService {/*** Retrieves the current user details- * @returns {Promise<IUser>} Promise resolving to the current user details\- * @remarks This method uses the validateStatus: null option to bypass interceptors for unauthorized errors.+ * @returns {Promise<IUser>} Promise resolving to the current user details*/async me(): Promise<IUser> {- return this.get("/api/users/me/", { validateStatus: null })+ return this.get("/api/users/me/").then((response) => response?.data).catch((error) => {throw error?.response;@@ -76,10 +75,9 @@ export class UserService extends APIService {* Retrieves the current instance admin details* @returns {Promise<IUser>} Promise resolving to the current instance admin details* @throws {Error} If the API request fails- * @remarks This method uses the validateStatus: null option to bypass interceptors for unauthorized errors.*/async adminDetails(): Promise<IUser> {- return this.get("/api/instances/admins/me/", { validateStatus: null })+ return this.get("/api/instances/admins/me/").then((response) => response?.data).catch((error) => {throw error?.response?.data;