diff --git a/apps/admin/app/(all)/(dashboard)/layout.tsx b/apps/admin/app/(all)/(dashboard)/layout.tsx index 694e71746c..8b771dc796 100644 --- a/apps/admin/app/(all)/(dashboard)/layout.tsx +++ b/apps/admin/app/(all)/(dashboard)/layout.tsx @@ -11,7 +11,7 @@ import { Outlet } from "react-router"; // components import { AdminHeader } from "@/components/common/header"; import { LogoSpinner } from "@/components/common/logo-spinner"; -import { NewUserPopup } from "@/components/new-user-popup"; +import { NewUserPopup } from "@/components/common/new-user-popup"; // hooks import { useUser } from "@/hooks/store"; // local components diff --git a/apps/admin/app/(all)/(home)/sign-in-form.tsx b/apps/admin/app/(all)/(home)/sign-in-form.tsx index 83cb45cb5e..14b96f8711 100644 --- a/apps/admin/app/(all)/(home)/sign-in-form.tsx +++ b/apps/admin/app/(all)/(home)/sign-in-form.tsx @@ -16,7 +16,7 @@ import { Input, Spinner } from "@plane/ui"; // components import { Banner } from "@/components/common/banner"; // local components -import { FormHeader } from "../../../core/components/instance/form-header"; +import { FormHeader } from "@/components/instance/form-header"; import { AuthBanner } from "./auth-banner"; import { AuthHeader } from "./auth-header"; import { authErrorHandler } from "./auth-helpers"; diff --git a/apps/admin/ce/store/root.store.ts b/apps/admin/ce/store/root.store.ts deleted file mode 100644 index 891cd99c43..0000000000 --- a/apps/admin/ce/store/root.store.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -import { enableStaticRendering } from "mobx-react"; -// stores -import { CoreRootStore } from "@/store/root.store"; - -enableStaticRendering(typeof window === "undefined"); - -export class RootStore extends CoreRootStore { - constructor() { - super(); - } - - hydrate(initialData: any) { - super.hydrate(initialData); - } - - resetOnSignOut() { - super.resetOnSignOut(); - } -} diff --git a/apps/admin/core/components/authentication/authentication-method-card.tsx b/apps/admin/components/authentication/authentication-method-card.tsx similarity index 100% rename from apps/admin/core/components/authentication/authentication-method-card.tsx rename to apps/admin/components/authentication/authentication-method-card.tsx diff --git a/apps/admin/core/components/authentication/email-config-switch.tsx b/apps/admin/components/authentication/email-config-switch.tsx similarity index 100% rename from apps/admin/core/components/authentication/email-config-switch.tsx rename to apps/admin/components/authentication/email-config-switch.tsx diff --git a/apps/admin/core/components/authentication/gitea-config.tsx b/apps/admin/components/authentication/gitea-config.tsx similarity index 100% rename from apps/admin/core/components/authentication/gitea-config.tsx rename to apps/admin/components/authentication/gitea-config.tsx diff --git a/apps/admin/core/components/authentication/github-config.tsx b/apps/admin/components/authentication/github-config.tsx similarity index 100% rename from apps/admin/core/components/authentication/github-config.tsx rename to apps/admin/components/authentication/github-config.tsx diff --git a/apps/admin/core/components/authentication/gitlab-config.tsx b/apps/admin/components/authentication/gitlab-config.tsx similarity index 100% rename from apps/admin/core/components/authentication/gitlab-config.tsx rename to apps/admin/components/authentication/gitlab-config.tsx diff --git a/apps/admin/core/components/authentication/google-config.tsx b/apps/admin/components/authentication/google-config.tsx similarity index 100% rename from apps/admin/core/components/authentication/google-config.tsx rename to apps/admin/components/authentication/google-config.tsx diff --git a/apps/admin/core/components/authentication/password-config-switch.tsx b/apps/admin/components/authentication/password-config-switch.tsx similarity index 100% rename from apps/admin/core/components/authentication/password-config-switch.tsx rename to apps/admin/components/authentication/password-config-switch.tsx diff --git a/apps/admin/core/components/common/banner.tsx b/apps/admin/components/common/banner.tsx similarity index 100% rename from apps/admin/core/components/common/banner.tsx rename to apps/admin/components/common/banner.tsx diff --git a/apps/admin/core/components/common/breadcrumb-link.tsx b/apps/admin/components/common/breadcrumb-link.tsx similarity index 100% rename from apps/admin/core/components/common/breadcrumb-link.tsx rename to apps/admin/components/common/breadcrumb-link.tsx diff --git a/apps/admin/core/components/common/code-block.tsx b/apps/admin/components/common/code-block.tsx similarity index 100% rename from apps/admin/core/components/common/code-block.tsx rename to apps/admin/components/common/code-block.tsx diff --git a/apps/admin/core/components/common/confirm-discard-modal.tsx b/apps/admin/components/common/confirm-discard-modal.tsx similarity index 100% rename from apps/admin/core/components/common/confirm-discard-modal.tsx rename to apps/admin/components/common/confirm-discard-modal.tsx diff --git a/apps/admin/core/components/common/controller-input.tsx b/apps/admin/components/common/controller-input.tsx similarity index 100% rename from apps/admin/core/components/common/controller-input.tsx rename to apps/admin/components/common/controller-input.tsx diff --git a/apps/admin/core/components/common/controller-switch.tsx b/apps/admin/components/common/controller-switch.tsx similarity index 100% rename from apps/admin/core/components/common/controller-switch.tsx rename to apps/admin/components/common/controller-switch.tsx diff --git a/apps/admin/core/components/common/copy-field.tsx b/apps/admin/components/common/copy-field.tsx similarity index 100% rename from apps/admin/core/components/common/copy-field.tsx rename to apps/admin/components/common/copy-field.tsx diff --git a/apps/admin/core/components/common/empty-state.tsx b/apps/admin/components/common/empty-state.tsx similarity index 100% rename from apps/admin/core/components/common/empty-state.tsx rename to apps/admin/components/common/empty-state.tsx diff --git a/apps/admin/core/components/common/header/core.ts b/apps/admin/components/common/header/core.ts similarity index 100% rename from apps/admin/core/components/common/header/core.ts rename to apps/admin/components/common/header/core.ts diff --git a/apps/admin/core/components/common/header/extended.ts b/apps/admin/components/common/header/extended.ts similarity index 100% rename from apps/admin/core/components/common/header/extended.ts rename to apps/admin/components/common/header/extended.ts diff --git a/apps/admin/core/components/common/header/index.tsx b/apps/admin/components/common/header/index.tsx similarity index 97% rename from apps/admin/core/components/common/header/index.tsx rename to apps/admin/components/common/header/index.tsx index e4e8031092..403e078c5e 100644 --- a/apps/admin/core/components/common/header/index.tsx +++ b/apps/admin/components/common/header/index.tsx @@ -10,7 +10,7 @@ import { Menu, Settings } from "lucide-react"; // icons import { Breadcrumbs } from "@plane/ui"; // components -import { BreadcrumbLink } from "@/components/common/breadcrumb-link"; +import { BreadcrumbLink } from "../breadcrumb-link"; // hooks import { useTheme } from "@/hooks/store"; // local imports diff --git a/apps/admin/core/components/common/logo-spinner.tsx b/apps/admin/components/common/logo-spinner.tsx similarity index 100% rename from apps/admin/core/components/common/logo-spinner.tsx rename to apps/admin/components/common/logo-spinner.tsx diff --git a/apps/admin/core/components/new-user-popup.tsx b/apps/admin/components/common/new-user-popup.tsx similarity index 100% rename from apps/admin/core/components/new-user-popup.tsx rename to apps/admin/components/common/new-user-popup.tsx diff --git a/apps/admin/core/components/common/page-header.tsx b/apps/admin/components/common/page-header.tsx similarity index 100% rename from apps/admin/core/components/common/page-header.tsx rename to apps/admin/components/common/page-header.tsx diff --git a/apps/admin/core/components/common/page-wrapper.tsx b/apps/admin/components/common/page-wrapper.tsx similarity index 100% rename from apps/admin/core/components/common/page-wrapper.tsx rename to apps/admin/components/common/page-wrapper.tsx diff --git a/apps/admin/core/components/instance/failure.tsx b/apps/admin/components/instance/failure.tsx similarity index 100% rename from apps/admin/core/components/instance/failure.tsx rename to apps/admin/components/instance/failure.tsx diff --git a/apps/admin/core/components/instance/form-header.tsx b/apps/admin/components/instance/form-header.tsx similarity index 100% rename from apps/admin/core/components/instance/form-header.tsx rename to apps/admin/components/instance/form-header.tsx diff --git a/apps/admin/core/components/instance/instance-not-ready.tsx b/apps/admin/components/instance/instance-not-ready.tsx similarity index 100% rename from apps/admin/core/components/instance/instance-not-ready.tsx rename to apps/admin/components/instance/instance-not-ready.tsx diff --git a/apps/admin/core/components/instance/loading.tsx b/apps/admin/components/instance/loading.tsx similarity index 100% rename from apps/admin/core/components/instance/loading.tsx rename to apps/admin/components/instance/loading.tsx diff --git a/apps/admin/core/components/instance/setup-form.tsx b/apps/admin/components/instance/setup-form.tsx similarity index 99% rename from apps/admin/core/components/instance/setup-form.tsx rename to apps/admin/components/instance/setup-form.tsx index 10eb238cab..e500a55e17 100644 --- a/apps/admin/core/components/instance/setup-form.tsx +++ b/apps/admin/components/instance/setup-form.tsx @@ -16,8 +16,8 @@ import { Checkbox, Input, PasswordStrengthIndicator, Spinner } from "@plane/ui"; import { getPasswordStrength } from "@plane/utils"; // components import { AuthHeader } from "@/app/(all)/(home)/auth-header"; -import { Banner } from "@/components/common/banner"; -import { FormHeader } from "@/components/instance/form-header"; +import { Banner } from "../common/banner"; +import { FormHeader } from "./form-header"; // service initialization const authService = new AuthService(); diff --git a/apps/admin/core/components/workspace/list-item.tsx b/apps/admin/components/workspace/list-item.tsx similarity index 100% rename from apps/admin/core/components/workspace/list-item.tsx rename to apps/admin/components/workspace/list-item.tsx diff --git a/apps/admin/ee/store/root.store.ts b/apps/admin/ee/store/root.store.ts deleted file mode 100644 index 0f36aac3dd..0000000000 --- a/apps/admin/ee/store/root.store.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -export * from "ce/store/root.store"; diff --git a/apps/admin/core/helpers/authentication.ts b/apps/admin/helpers/authentication.ts similarity index 100% rename from apps/admin/core/helpers/authentication.ts rename to apps/admin/helpers/authentication.ts diff --git a/apps/admin/core/hooks/oauth/core.tsx b/apps/admin/hooks/oauth/core.tsx similarity index 100% rename from apps/admin/core/hooks/oauth/core.tsx rename to apps/admin/hooks/oauth/core.tsx diff --git a/apps/admin/core/hooks/oauth/index.ts b/apps/admin/hooks/oauth/index.ts similarity index 100% rename from apps/admin/core/hooks/oauth/index.ts rename to apps/admin/hooks/oauth/index.ts diff --git a/apps/admin/core/hooks/oauth/types.ts b/apps/admin/hooks/oauth/types.ts similarity index 100% rename from apps/admin/core/hooks/oauth/types.ts rename to apps/admin/hooks/oauth/types.ts diff --git a/apps/admin/core/hooks/store/index.ts b/apps/admin/hooks/store/index.ts similarity index 100% rename from apps/admin/core/hooks/store/index.ts rename to apps/admin/hooks/store/index.ts diff --git a/apps/admin/core/hooks/store/use-instance.tsx b/apps/admin/hooks/store/use-instance.tsx similarity index 100% rename from apps/admin/core/hooks/store/use-instance.tsx rename to apps/admin/hooks/store/use-instance.tsx diff --git a/apps/admin/core/hooks/store/use-theme.tsx b/apps/admin/hooks/store/use-theme.tsx similarity index 100% rename from apps/admin/core/hooks/store/use-theme.tsx rename to apps/admin/hooks/store/use-theme.tsx diff --git a/apps/admin/core/hooks/store/use-user.tsx b/apps/admin/hooks/store/use-user.tsx similarity index 100% rename from apps/admin/core/hooks/store/use-user.tsx rename to apps/admin/hooks/store/use-user.tsx diff --git a/apps/admin/core/hooks/store/use-workspace.tsx b/apps/admin/hooks/store/use-workspace.tsx similarity index 100% rename from apps/admin/core/hooks/store/use-workspace.tsx rename to apps/admin/hooks/store/use-workspace.tsx diff --git a/apps/admin/core/hooks/use-sidebar-menu/core.ts b/apps/admin/hooks/use-sidebar-menu/core.ts similarity index 100% rename from apps/admin/core/hooks/use-sidebar-menu/core.ts rename to apps/admin/hooks/use-sidebar-menu/core.ts diff --git a/apps/admin/core/hooks/use-sidebar-menu/index.ts b/apps/admin/hooks/use-sidebar-menu/index.ts similarity index 100% rename from apps/admin/core/hooks/use-sidebar-menu/index.ts rename to apps/admin/hooks/use-sidebar-menu/index.ts diff --git a/apps/admin/core/hooks/use-sidebar-menu/types.ts b/apps/admin/hooks/use-sidebar-menu/types.ts similarity index 100% rename from apps/admin/core/hooks/use-sidebar-menu/types.ts rename to apps/admin/hooks/use-sidebar-menu/types.ts diff --git a/apps/admin/core/lib/b-progress/AppProgressBar.tsx b/apps/admin/lib/b-progress/AppProgressBar.tsx similarity index 100% rename from apps/admin/core/lib/b-progress/AppProgressBar.tsx rename to apps/admin/lib/b-progress/AppProgressBar.tsx diff --git a/apps/admin/core/lib/b-progress/index.tsx b/apps/admin/lib/b-progress/index.tsx similarity index 100% rename from apps/admin/core/lib/b-progress/index.tsx rename to apps/admin/lib/b-progress/index.tsx diff --git a/apps/admin/core/providers/core.tsx b/apps/admin/providers/core.tsx similarity index 100% rename from apps/admin/core/providers/core.tsx rename to apps/admin/providers/core.tsx diff --git a/apps/admin/core/providers/extended.tsx b/apps/admin/providers/extended.tsx similarity index 100% rename from apps/admin/core/providers/extended.tsx rename to apps/admin/providers/extended.tsx diff --git a/apps/admin/core/providers/index.tsx b/apps/admin/providers/index.tsx similarity index 100% rename from apps/admin/core/providers/index.tsx rename to apps/admin/providers/index.tsx diff --git a/apps/admin/core/providers/instance.provider.tsx b/apps/admin/providers/instance.provider.tsx similarity index 100% rename from apps/admin/core/providers/instance.provider.tsx rename to apps/admin/providers/instance.provider.tsx diff --git a/apps/admin/core/providers/store.provider.tsx b/apps/admin/providers/store.provider.tsx similarity index 95% rename from apps/admin/core/providers/store.provider.tsx rename to apps/admin/providers/store.provider.tsx index 9e3c9864c3..9ddb53b6b9 100644 --- a/apps/admin/core/providers/store.provider.tsx +++ b/apps/admin/providers/store.provider.tsx @@ -6,7 +6,7 @@ import { createContext } from "react"; // plane admin store -import { RootStore } from "@/plane-admin/store/root.store"; +import { RootStore } from "../store/root.store"; let rootStore = new RootStore(); diff --git a/apps/admin/core/providers/toast.tsx b/apps/admin/providers/toast.tsx similarity index 100% rename from apps/admin/core/providers/toast.tsx rename to apps/admin/providers/toast.tsx diff --git a/apps/admin/core/providers/user.provider.tsx b/apps/admin/providers/user.provider.tsx similarity index 100% rename from apps/admin/core/providers/user.provider.tsx rename to apps/admin/providers/user.provider.tsx diff --git a/apps/admin/core/store/instance.store.ts b/apps/admin/store/instance.store.ts similarity index 98% rename from apps/admin/core/store/instance.store.ts rename to apps/admin/store/instance.store.ts index 69b048093c..ed92beae11 100644 --- a/apps/admin/core/store/instance.store.ts +++ b/apps/admin/store/instance.store.ts @@ -19,7 +19,7 @@ import type { IInstanceConfig, } from "@plane/types"; // root store -import type { CoreRootStore } from "@/store/root.store"; +import type { RootStore } from "@/store/root.store"; export interface IInstanceStore { // issues @@ -53,7 +53,7 @@ export class InstanceStore implements IInstanceStore { // service instanceService; - constructor(private store: CoreRootStore) { + constructor(private store: RootStore) { makeObservable(this, { // observable isLoading: observable.ref, diff --git a/apps/admin/core/store/root.store.ts b/apps/admin/store/root.store.ts similarity index 97% rename from apps/admin/core/store/root.store.ts rename to apps/admin/store/root.store.ts index b833405552..42f0a63e5b 100644 --- a/apps/admin/core/store/root.store.ts +++ b/apps/admin/store/root.store.ts @@ -17,7 +17,7 @@ import { WorkspaceStore } from "./workspace.store"; enableStaticRendering(typeof window === "undefined"); -export abstract class CoreRootStore { +export class RootStore { theme: IThemeStore; instance: IInstanceStore; user: IUserStore; diff --git a/apps/admin/core/store/theme.store.ts b/apps/admin/store/theme.store.ts similarity index 94% rename from apps/admin/core/store/theme.store.ts rename to apps/admin/store/theme.store.ts index d8c5e170e1..bb663804fe 100644 --- a/apps/admin/core/store/theme.store.ts +++ b/apps/admin/store/theme.store.ts @@ -6,7 +6,7 @@ import { action, observable, makeObservable } from "mobx"; // root store -import type { CoreRootStore } from "@/store/root.store"; +import type { RootStore } from "./root.store"; type TTheme = "dark" | "light"; export interface IThemeStore { @@ -27,7 +27,7 @@ export class ThemeStore implements IThemeStore { isSidebarCollapsed: boolean | undefined = undefined; theme: string | undefined = undefined; - constructor(private store: CoreRootStore) { + constructor(private store: RootStore) { makeObservable(this, { // observables isNewUserPopup: observable.ref, diff --git a/apps/admin/core/store/user.store.ts b/apps/admin/store/user.store.ts similarity index 96% rename from apps/admin/core/store/user.store.ts rename to apps/admin/store/user.store.ts index 833ffb8801..c218eec0fa 100644 --- a/apps/admin/core/store/user.store.ts +++ b/apps/admin/store/user.store.ts @@ -11,7 +11,7 @@ import { EUserStatus } from "@plane/constants"; import { AuthService, UserService } from "@plane/services"; import type { IUser } from "@plane/types"; // root store -import type { CoreRootStore } from "@/store/root.store"; +import type { RootStore } from "@/store/root.store"; export interface IUserStore { // observables @@ -36,7 +36,7 @@ export class UserStore implements IUserStore { userService; authService; - constructor(private store: CoreRootStore) { + constructor(private store: RootStore) { makeObservable(this, { // observables isLoading: observable.ref, diff --git a/apps/admin/core/store/workspace.store.ts b/apps/admin/store/workspace.store.ts similarity index 97% rename from apps/admin/core/store/workspace.store.ts rename to apps/admin/store/workspace.store.ts index 610384aa42..7dbfaa1af9 100644 --- a/apps/admin/core/store/workspace.store.ts +++ b/apps/admin/store/workspace.store.ts @@ -10,7 +10,7 @@ import { action, observable, runInAction, makeObservable, computed } from "mobx" import { InstanceWorkspaceService } from "@plane/services"; import type { IWorkspace, TLoader, TPaginationInfo } from "@plane/types"; // root store -import type { CoreRootStore } from "@/store/root.store"; +import type { RootStore } from "@/store/root.store"; export interface IWorkspaceStore { // observables @@ -37,7 +37,7 @@ export class WorkspaceStore implements IWorkspaceStore { // services instanceWorkspaceService; - constructor(private store: CoreRootStore) { + constructor(private store: RootStore) { makeObservable(this, { // observables loader: observable, diff --git a/apps/admin/tsconfig.json b/apps/admin/tsconfig.json index 90dedb762e..2d04cbe81f 100644 --- a/apps/admin/tsconfig.json +++ b/apps/admin/tsconfig.json @@ -9,12 +9,7 @@ "types": ["vite/client"], "paths": { "package.json": ["./package.json"], - "ce/*": ["./ce/*"], - "@/app/*": ["./app/*"], - "@/*": ["./core/*"], - "@/plane-admin/*": ["./ce/*"], - "@/ce/*": ["./ce/*"], - "@/styles/*": ["./styles/*"] + "@/*": ["./*"] } }, "include": ["**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*"], diff --git a/apps/admin/core/utils/public-asset.ts b/apps/admin/utils/public-asset.ts similarity index 100% rename from apps/admin/core/utils/public-asset.ts rename to apps/admin/utils/public-asset.ts diff --git a/apps/api/plane/utils/csv_utils.py b/apps/api/plane/utils/csv_utils.py index 104318e161..26c6e89375 100644 --- a/apps/api/plane/utils/csv_utils.py +++ b/apps/api/plane/utils/csv_utils.py @@ -1,5 +1,8 @@ -# CSV utility functions for safe export +# Copyright (c) 2023-present Plane Software, Inc. and contributors +# SPDX-License-Identifier: AGPL-3.0-only +# See the LICENSE file for details. +# CSV utility functions for safe export # Characters that trigger formula evaluation in spreadsheet applications _CSV_FORMULA_TRIGGERS = frozenset(("=", "+", "-", "@", "\t", "\r", "\n"))