Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

feat: app dir migration (#4743)

sriram veeraghanta5d807db69e9b
diff --git a/packages/constants/src/auth.ts b/packages/constants/src/auth.ts
index c12b63d637..065b188cf2 100644
--- a/packages/constants/src/auth.ts
+++ b/packages/constants/src/auth.ts
@@ -1,5 +1,6 @@
import { ReactNode } from "react";
-import Link from "next/link";
+// import Link from "next/link";
+// import { EAuthenticationErrorCodes } from "@/helpers/authentication.helper";
export enum EPageTypes {
PUBLIC = "PUBLIC",
@@ -41,7 +42,7 @@ export enum EAuthErrorCodes {
// Password strength
INVALID_PASSWORD = "5020",
// Sign Up
- USER_ACCOUNT_DEACTIVATED = "5019",
+ // USER_ACCOUNT_DEACTIVATED = "5019",
USER_ALREADY_EXIST = "5030",
AUTHENTICATION_FAILED_SIGN_UP = "5035",
REQUIRED_EMAIL_PASSWORD_SIGN_UP = "5040",
@@ -91,281 +92,281 @@ export type TAuthErrorInfo = {
message: ReactNode;
};
-const errorCodeMessages: {
- [key in EAuthErrorCodes]: { title: string; message: (email?: string | undefined) => ReactNode };
-} = {
- // global
- [EAuthErrorCodes.INSTANCE_NOT_CONFIGURED]: {
- title: `Instance not configured`,
- message: () => `Instance not configured. Please contact your administrator.`,
- },
- [EAuthErrorCodes.SIGNUP_DISABLED]: {
- title: `Sign up disabled`,
- message: () => `Sign up disabled. Please contact your administrator.`,
- },
- [EAuthErrorCodes.INVALID_PASSWORD]: {
- title: `Invalid password`,
- message: () => `Invalid password. Please try again.`,
- },
- [EAuthErrorCodes.SMTP_NOT_CONFIGURED]: {
- title: `SMTP not configured`,
- message: () => `SMTP not configured. Please contact your administrator.`,
- },
+// const errorCodeMessages: {
+// [key in EAuthErrorCodes]: { title: string; message: (email?: string | undefined) => ReactNode };
+// } = {
+// // global
+// [EAuthErrorCodes.INSTANCE_NOT_CONFIGURED]: {
+// title: `Instance not configured`,
+// message: () => `Instance not configured. Please contact your administrator.`,
+// },
+// [EAuthErrorCodes.SIGNUP_DISABLED]: {
+// title: `Sign up disabled`,
+// message: () => `Sign up disabled. Please contact your administrator.`,
+// },
+// [EAuthErrorCodes.INVALID_PASSWORD]: {
+// title: `Invalid password`,
+// message: () => `Invalid password. Please try again.`,
+// },
+// [EAuthErrorCodes.SMTP_NOT_CONFIGURED]: {
+// title: `SMTP not configured`,
+// message: () => `SMTP not configured. Please contact your administrator.`,
+// },
// email check in both sign up and sign in
- [EAuthErrorCodes.INVALID_EMAIL]: {
- title: `Invalid email`,
- message: () => `Invalid email. Please try again.`,
- },
- [EAuthenticationErrorCodes.EMAIL_REQUIRED]: {
- title: `Email required`,
- message: () => `Email required. Please try again.`,
- },
+// [EAuthErrorCodes.INVALID_EMAIL]: {
+// title: `Invalid email`,
+// message: () => `Invalid email. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.EMAIL_REQUIRED]: {
+// title: `Email required`,
+// message: () => `Email required. Please try again.`,
+// },
- // sign up
- [EAuthenticationErrorCodes.USER_ALREADY_EXIST]: {
- title: `User already exists`,
- message: (email = undefined) => (
- <div>
- Your account is already registered.&nbsp;
- <Link
- className="underline underline-offset-4 font-medium hover:font-bold transition-all"
- href={`/sign-in${email ? `?email=${encodeURIComponent(email)}` : ``}`}
- >
- Sign In
- </Link>
- &nbsp;now.
- </div>
- ),
- },
- [EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_UP]: {
- title: `Email and password required`,
- message: () => `Email and password required. Please try again.`,
- },
- [EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_UP]: {
- title: `Authentication failed`,
- message: () => `Authentication failed. Please try again.`,
- },
- [EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_UP]: {
- title: `Invalid email`,
- message: () => `Invalid email. Please try again.`,
- },
- [EAuthenticationErrorCodes.MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED]: {
- title: `Email and code required`,
- message: () => `Email and code required. Please try again.`,
- },
- [EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_UP]: {
- title: `Invalid email`,
- message: () => `Invalid email. Please try again.`,
- },
+// // sign up
+// [EAuthenticationErrorCodes.USER_ALREADY_EXIST]: {
+// title: `User already exists`,
+// message: (email = undefined) => (
+// <div>
+// Your account is already registered.&nbsp;
+// <Link
+// className="underline underline-offset-4 font-medium hover:font-bold transition-all"
+// href={`/sign-in${email ? `?email=${encodeURIComponent(email)}` : ``}`}
+// >
+// Sign In
+// </Link>
+// &nbsp;now.
+// </div>
+// ),
+// },
+// [EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_UP]: {
+// title: `Email and password required`,
+// message: () => `Email and password required. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_UP]: {
+// title: `Authentication failed`,
+// message: () => `Authentication failed. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_UP]: {
+// title: `Invalid email`,
+// message: () => `Invalid email. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED]: {
+// title: `Email and code required`,
+// message: () => `Email and code required. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_UP]: {
+// title: `Invalid email`,
+// message: () => `Invalid email. Please try again.`,
+// },
- // sign in
- [EAuthenticationErrorCodes.USER_ACCOUNT_DEACTIVATED]: {
- title: `User account deactivated`,
- message: () => <div>Your account is deactivated. Contact [email protected].</div>,
- },
- [EAuthenticationErrorCodes.USER_DOES_NOT_EXIST]: {
- title: `User does not exist`,
- message: (email = undefined) => (
- <div>
- No account found.&nbsp;
- <Link
- className="underline underline-offset-4 font-medium hover:font-bold transition-all"
- href={`/${email ? `?email=${encodeURIComponent(email)}` : ``}`}
- >
- Create one
- </Link>
- &nbsp;to get started.
- </div>
- ),
- },
- [EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_IN]: {
- title: `Email and password required`,
- message: () => `Email and password required. Please try again.`,
- },
- [EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_IN]: {
- title: `Authentication failed`,
- message: () => `Authentication failed. Please try again.`,
- },
- [EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_IN]: {
- title: `Invalid email`,
- message: () => `Invalid email. Please try again.`,
- },
- [EAuthenticationErrorCodes.MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED]: {
- title: `Email and code required`,
- message: () => `Email and code required. Please try again.`,
- },
- [EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_IN]: {
- title: `Invalid email`,
- message: () => `Invalid email. Please try again.`,
- },
+// // sign in
+// [EAuthenticationErrorCodes.USER_ACCOUNT_DEACTIVATED]: {
+// title: `User account deactivated`,
+// message: () => <div>Your account is deactivated. Contact [email protected].</div>,
+// },
+// [EAuthenticationErrorCodes.USER_DOES_NOT_EXIST]: {
+// title: `User does not exist`,
+// message: (email = undefined) => (
+// <div>
+// No account found.&nbsp;
+// <Link
+// className="underline underline-offset-4 font-medium hover:font-bold transition-all"
+// href={`/${email ? `?email=${encodeURIComponent(email)}` : ``}`}
+// >
+// Create one
+// </Link>
+// &nbsp;to get started.
+// </div>
+// ),
+// },
+// [EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_IN]: {
+// title: `Email and password required`,
+// message: () => `Email and password required. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_IN]: {
+// title: `Authentication failed`,
+// message: () => `Authentication failed. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_IN]: {
+// title: `Invalid email`,
+// message: () => `Invalid email. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED]: {
+// title: `Email and code required`,
+// message: () => `Email and code required. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_IN]: {
+// title: `Invalid email`,
+// message: () => `Invalid email. Please try again.`,
+// },
- // Both Sign in and Sign up
- [EAuthenticationErrorCodes.INVALID_MAGIC_CODE]: {
- title: `Authentication failed`,
- message: () => `Invalid magic code. Please try again.`,
- },
- [EAuthenticationErrorCodes.EXPIRED_MAGIC_CODE]: {
- title: `Expired magic code`,
- message: () => `Expired magic code. Please try again.`,
- },
- [EAuthenticationErrorCodes.EMAIL_CODE_ATTEMPT_EXHAUSTED]: {
- title: `Expired magic code`,
- message: () => `Expired magic code. Please try again.`,
- },
+// // Both Sign in and Sign up
+// [EAuthenticationErrorCodes.INVALID_MAGIC_CODE]: {
+// title: `Authentication failed`,
+// message: () => `Invalid magic code. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.EXPIRED_MAGIC_CODE]: {
+// title: `Expired magic code`,
+// message: () => `Expired magic code. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.EMAIL_CODE_ATTEMPT_EXHAUSTED]: {
+// title: `Expired magic code`,
+// message: () => `Expired magic code. Please try again.`,
+// },
- // Oauth
- [EAuthenticationErrorCodes.GOOGLE_NOT_CONFIGURED]: {
- title: `Google not configured`,
- message: () => `Google not configured. Please contact your administrator.`,
- },
- [EAuthenticationErrorCodes.GITHUB_NOT_CONFIGURED]: {
- title: `GitHub not configured`,
- message: () => `GitHub not configured. Please contact your administrator.`,
- },
- [EAuthenticationErrorCodes.GOOGLE_OAUTH_PROVIDER_ERROR]: {
- title: `Google OAuth provider error`,
- message: () => `Google OAuth provider error. Please try again.`,
- },
- [EAuthenticationErrorCodes.GITHUB_OAUTH_PROVIDER_ERROR]: {
- title: `GitHub OAuth provider error`,
- message: () => `GitHub OAuth provider error. Please try again.`,
- },
+// // Oauth
+// [EAuthenticationErrorCodes.GOOGLE_NOT_CONFIGURED]: {
+// title: `Google not configured`,
+// message: () => `Google not configured. Please contact your administrator.`,
+// },
+// [EAuthenticationErrorCodes.GITHUB_NOT_CONFIGURED]: {
+// title: `GitHub not configured`,
+// message: () => `GitHub not configured. Please contact your administrator.`,
+// },
+// [EAuthenticationErrorCodes.GOOGLE_OAUTH_PROVIDER_ERROR]: {
+// title: `Google OAuth provider error`,
+// message: () => `Google OAuth provider error. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.GITHUB_OAUTH_PROVIDER_ERROR]: {
+// title: `GitHub OAuth provider error`,
+// message: () => `GitHub OAuth provider error. Please try again.`,
+// },
- // Reset Password
- [EAuthenticationErrorCodes.INVALID_PASSWORD_TOKEN]: {
- title: `Invalid password token`,
- message: () => `Invalid password token. Please try again.`,
- },
- [EAuthenticationErrorCodes.EXPIRED_PASSWORD_TOKEN]: {
- title: `Expired password token`,
- message: () => `Expired password token. Please try again.`,
- },
+// // Reset Password
+// [EAuthenticationErrorCodes.INVALID_PASSWORD_TOKEN]: {
+// title: `Invalid password token`,
+// message: () => `Invalid password token. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.EXPIRED_PASSWORD_TOKEN]: {
+// title: `Expired password token`,
+// message: () => `Expired password token. Please try again.`,
+// },
- // Change password
+// // Change password
- [EAuthenticationErrorCodes.MISSING_PASSWORD]: {
- title: `Password required`,
- message: () => `Password required. Please try again.`,
- },
- [EAuthenticationErrorCodes.INCORRECT_OLD_PASSWORD]: {
- title: `Incorrect old password`,
- message: () => `Incorrect old password. Please try again.`,
- },
- [EAuthenticationErrorCodes.INVALID_NEW_PASSWORD]: {
- title: `Invalid new password`,
- message: () => `Invalid new password. Please try again.`,
- },
+// [EAuthenticationErrorCodes.MISSING_PASSWORD]: {
+// title: `Password required`,
+// message: () => `Password required. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INCORRECT_OLD_PASSWORD]: {
+// title: `Incorrect old password`,
+// message: () => `Incorrect old password. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INVALID_NEW_PASSWORD]: {
+// title: `Invalid new password`,
+// message: () => `Invalid new password. Please try again.`,
+// },
- // set password
- [EAuthenticationErrorCodes.PASSWORD_ALREADY_SET]: {
- title: `Password already set`,
- message: () => `Password already set. Please try again.`,
- },
+// // set password
+// [EAuthenticationErrorCodes.PASSWORD_ALREADY_SET]: {
+// title: `Password already set`,
+// message: () => `Password already set. Please try again.`,
+// },
- // admin
- [EAuthenticationErrorCodes.ADMIN_ALREADY_EXIST]: {
- title: `Admin already exists`,
- message: () => `Admin already exists. Please try again.`,
- },
- [EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD_FIRST_NAME]: {
- title: `Email, password and first name required`,
- message: () => `Email, password and first name required. Please try again.`,
- },
- [EAuthenticationErrorCodes.INVALID_ADMIN_EMAIL]: {
- title: `Invalid admin email`,
- message: () => `Invalid admin email. Please try again.`,
- },
- [EAuthenticationErrorCodes.INVALID_ADMIN_PASSWORD]: {
- title: `Invalid admin password`,
- message: () => `Invalid admin password. Please try again.`,
- },
- [EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD]: {
- title: `Email and password required`,
- message: () => `Email and password required. Please try again.`,
- },
- [EAuthenticationErrorCodes.ADMIN_AUTHENTICATION_FAILED]: {
- title: `Authentication failed`,
- message: () => `Authentication failed. Please try again.`,
- },
- [EAuthenticationErrorCodes.ADMIN_USER_ALREADY_EXIST]: {
- title: `Admin user already exists`,
- message: () => (
- <div>
- Admin user already exists.&nbsp;
- <Link className="underline underline-offset-4 font-medium hover:font-bold transition-all" href={`/admin`}>
- Sign In
- </Link>
- &nbsp;now.
- </div>
- ),
- },
- [EAuthenticationErrorCodes.ADMIN_USER_DOES_NOT_EXIST]: {
- title: `Admin user does not exist`,
- message: () => (
- <div>
- Admin user does not exist.&nbsp;
- <Link className="underline underline-offset-4 font-medium hover:font-bold transition-all" href={`/admin`}>
- Sign In
- </Link>
- &nbsp;now.
- </div>
- ),
- },
-};
+// // admin
+// [EAuthenticationErrorCodes.ADMIN_ALREADY_EXIST]: {
+// title: `Admin already exists`,
+// message: () => `Admin already exists. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD_FIRST_NAME]: {
+// title: `Email, password and first name required`,
+// message: () => `Email, password and first name required. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INVALID_ADMIN_EMAIL]: {
+// title: `Invalid admin email`,
+// message: () => `Invalid admin email. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.INVALID_ADMIN_PASSWORD]: {
+// title: `Invalid admin password`,
+// message: () => `Invalid admin password. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD]: {
+// title: `Email and password required`,
+// message: () => `Email and password required. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.ADMIN_AUTHENTICATION_FAILED]: {
+// title: `Authentication failed`,
+// message: () => `Authentication failed. Please try again.`,
+// },
+// [EAuthenticationErrorCodes.ADMIN_USER_ALREADY_EXIST]: {
+// title: `Admin user already exists`,
+// message: () => (
+// <div>
+// Admin user already exists.&nbsp;
+// <Link className="underline underline-offset-4 font-medium hover:font-bold transition-all" href={`/admin`}>
+// Sign In
+// </Link>
+// &nbsp;now.
+// </div>
+// ),
+// },
+// [EAuthenticationErrorCodes.ADMIN_USER_DOES_NOT_EXIST]: {
+// title: `Admin user does not exist`,
+// message: () => (
+// <div>
+// Admin user does not exist.&nbsp;
+// <Link className="underline underline-offset-4 font-medium hover:font-bold transition-all" href={`/admin`}>
+// Sign In
+// </Link>
+// &nbsp;now.
+// </div>
+// ),
+// },
+// };
-export const authErrorHandler = (
- errorCode: EAuthenticationErrorCodes,
- email?: string | undefined
-): TAuthErrorInfo | undefined => {
- const bannerAlertErrorCodes = [
- EAuthenticationErrorCodes.INSTANCE_NOT_CONFIGURED,
- EAuthenticationErrorCodes.INVALID_EMAIL,
- EAuthenticationErrorCodes.EMAIL_REQUIRED,
- EAuthenticationErrorCodes.SIGNUP_DISABLED,
- EAuthenticationErrorCodes.INVALID_PASSWORD,
- EAuthenticationErrorCodes.SMTP_NOT_CONFIGURED,
- EAuthenticationErrorCodes.USER_ALREADY_EXIST,
- EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_UP,
- EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_UP,
- EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_UP,
- EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_UP,
- EAuthenticationErrorCodes.MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED,
- EAuthenticationErrorCodes.USER_DOES_NOT_EXIST,
- EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_IN,
- EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_IN,
- EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_IN,
- EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_IN,
- EAuthenticationErrorCodes.MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED,
- EAuthenticationErrorCodes.INVALID_MAGIC_CODE,
- EAuthenticationErrorCodes.EXPIRED_MAGIC_CODE,
- EAuthenticationErrorCodes.EMAIL_CODE_ATTEMPT_EXHAUSTED,
- EAuthenticationErrorCodes.GOOGLE_NOT_CONFIGURED,
- EAuthenticationErrorCodes.GITHUB_NOT_CONFIGURED,
- EAuthenticationErrorCodes.GOOGLE_OAUTH_PROVIDER_ERROR,
- EAuthenticationErrorCodes.GITHUB_OAUTH_PROVIDER_ERROR,
- EAuthenticationErrorCodes.INVALID_PASSWORD_TOKEN,
- EAuthenticationErrorCodes.EXPIRED_PASSWORD_TOKEN,
- EAuthenticationErrorCodes.INCORRECT_OLD_PASSWORD,
- EAuthenticationErrorCodes.INVALID_NEW_PASSWORD,
- EAuthenticationErrorCodes.PASSWORD_ALREADY_SET,
- EAuthenticationErrorCodes.ADMIN_ALREADY_EXIST,
- EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD_FIRST_NAME,
- EAuthenticationErrorCodes.INVALID_ADMIN_EMAIL,
- EAuthenticationErrorCodes.INVALID_ADMIN_PASSWORD,
- EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD,
- EAuthenticationErrorCodes.ADMIN_AUTHENTICATION_FAILED,
- EAuthenticationErrorCodes.ADMIN_USER_ALREADY_EXIST,
- EAuthenticationErrorCodes.ADMIN_USER_DOES_NOT_EXIST,
- ];
+// export const authErrorHandler = (
+// errorCode: EAuthenticationErrorCodes,
+// email?: string | undefined
+// ): TAuthErrorInfo | undefined => {
+// const bannerAlertErrorCodes = [
+// EAuthenticationErrorCodes.INSTANCE_NOT_CONFIGURED,
+// EAuthenticationErrorCodes.INVALID_EMAIL,
+// EAuthenticationErrorCodes.EMAIL_REQUIRED,
+// EAuthenticationErrorCodes.SIGNUP_DISABLED,
+// EAuthenticationErrorCodes.INVALID_PASSWORD,
+// EAuthenticationErrorCodes.SMTP_NOT_CONFIGURED,
+// EAuthenticationErrorCodes.USER_ALREADY_EXIST,
+// EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_UP,
+// EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_UP,
+// EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_UP,
+// EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_UP,
+// EAuthenticationErrorCodes.MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED,
+// EAuthenticationErrorCodes.USER_DOES_NOT_EXIST,
+// EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_IN,
+// EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_IN,
+// EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_IN,
+// EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_IN,
+// EAuthenticationErrorCodes.MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED,
+// // EAuthenticationErrorCodes.INVALID_MAGIC_CODE,
+// // EAuthenticationErrorCodes.EXPIRED_MAGIC_CODE,
+// // EAuthenticationErrorCodes.EMAIL_CODE_ATTEMPT_EXHAUSTED,
+// EAuthenticationErrorCodes.GOOGLE_NOT_CONFIGURED,
+// EAuthenticationErrorCodes.GITHUB_NOT_CONFIGURED,
+// EAuthenticationErrorCodes.GOOGLE_OAUTH_PROVIDER_ERROR,
+// EAuthenticationErrorCodes.GITHUB_OAUTH_PROVIDER_ERROR,
+// EAuthenticationErrorCodes.INVALID_PASSWORD_TOKEN,
+// EAuthenticationErrorCodes.EXPIRED_PASSWORD_TOKEN,
+// EAuthenticationErrorCodes.INCORRECT_OLD_PASSWORD,
+// EAuthenticationErrorCodes.INVALID_NEW_PASSWORD,
+// EAuthenticationErrorCodes.PASSWORD_ALREADY_SET,
+// EAuthenticationErrorCodes.ADMIN_ALREADY_EXIST,
+// EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD_FIRST_NAME,
+// EAuthenticationErrorCodes.INVALID_ADMIN_EMAIL,
+// EAuthenticationErrorCodes.INVALID_ADMIN_PASSWORD,
+// EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD,
+// EAuthenticationErrorCodes.ADMIN_AUTHENTICATION_FAILED,
+// EAuthenticationErrorCodes.ADMIN_USER_ALREADY_EXIST,
+// EAuthenticationErrorCodes.ADMIN_USER_DOES_NOT_EXIST,
+// ];
- if (bannerAlertErrorCodes.includes(errorCode))
- return {
- type: EErrorAlertType.BANNER_ALERT,
- code: errorCode,
- title: errorCodeMessages[errorCode]?.title || "Error",
- message: errorCodeMessages[errorCode]?.message(email) || "Something went wrong. Please try again.",
- };
+// if (bannerAlertErrorCodes.includes(errorCode))
+// return {
+// type: EErrorAlertType.BANNER_ALERT,
+// code: errorCode,
+// title: errorCodeMessages[errorCode]?.title || "Error",
+// message: errorCodeMessages[errorCode]?.message(email) || "Something went wrong. Please try again.",
+// };
- return undefined;
-};
+// return undefined;
+// };
diff --git a/packages/tailwind-config-custom/tailwind.config.js b/packages/tailwind-config-custom/tailwind.config.js
index 42e1760434..9fca24b0a5 100644
--- a/packages/tailwind-config-custom/tailwind.config.js
+++ b/packages/tailwind-config-custom/tailwind.config.js
@@ -8,6 +8,7 @@ module.exports = {
content: {
relative: true,
files: [
+ "./app/**/*.{js,ts,jsx,tsx}",
"./components/**/*.tsx",
"./constants/**/*.{js,ts,jsx,tsx}",
"./layouts/**/*.tsx",
diff --git a/packages/ui/src/sortable/sortable.stories.tsx b/packages/ui/src/sortable/sortable.stories.tsx
index 2d469b767f..6d40ddc2ee 100644
--- a/packages/ui/src/sortable/sortable.stories.tsx
+++ b/packages/ui/src/sortable/sortable.stories.tsx
@@ -1,5 +1,6 @@
import type { Meta, StoryObj } from "@storybook/react";
import React from "react";
+import { Draggable } from "./draggable";
import { Sortable } from "./sortable";
const meta: Meta<typeof Sortable> = {
@@ -12,7 +13,7 @@ type Story = StoryObj<typeof Sortable>;
const data = [
{ id: "1", name: "John Doe" },
- { id: "2", name: "Satish" },
+ { id: "2", name: "Jane Doe 2" },
{ id: "3", name: "Alice" },
{ id: "4", name: "Bob" },
{ id: "5", name: "Charlie" },
diff --git a/space/types/project.d.ts b/space/types/project.d.ts
new file mode 100644
index 0000000000..90c89ed80c
--- /dev/null
+++ b/space/types/project.d.ts
@@ -0,0 +1,42 @@
+import { TLogoProps } from "@plane/types";
+
+export type TWorkspaceDetails = {
+ name: string;
+ slug: string;
+ id: string;
+};
+
+export type TViewDetails = {
+ list: boolean;
+ gantt: boolean;
+ kanban: boolean;
+ calendar: boolean;
+ spreadsheet: boolean;
+};
+
+export type TProjectDetails = {
+ id: string;
+ identifier: string;
+ name: string;
+ cover_image: string | undefined;
+ logo_props: TLogoProps;
+ description: string;
+};
+
+export type TProjectSettings = {
+ id: string;
+ anchor: string;
+ comments: boolean;
+ reactions: boolean;
+ votes: boolean;
+ inbox: unknown;
+ workspace: string;
+ workspace_detail: TWorkspaceDetails;
+ project: string;
+ project_details: TProjectDetails;
+ views: TViewDetails;
+ created_by: string;
+ updated_by: string;
+ created_at: string;
+ updated_at: string;
+};
diff --git a/web/components/headers/workspace-active-cycles.tsx b/web/app/[workspaceSlug]/@header/active-cycles/header.tsx
similarity index 89%
rename from web/components/headers/workspace-active-cycles.tsx
rename to web/app/[workspaceSlug]/@header/active-cycles/header.tsx
index 5861cba60a..eb6e8633d8 100644
--- a/web/components/headers/workspace-active-cycles.tsx
+++ b/web/app/[workspaceSlug]/@header/active-cycles/header.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { observer } from "mobx-react";
// ui
import { Crown } from "lucide-react";
@@ -5,7 +7,7 @@ import { Breadcrumbs, ContrastIcon } from "@plane/ui";
import { BreadcrumbLink } from "@/components/common";
// icons
-export const WorkspaceActiveCycleHeader = observer(() => (
+const WorkspaceActiveCycleHeader = observer(() => (
<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 bg-custom-sidebar-background-100 p-4">
<div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
<div className="flex items-center gap-2">
@@ -25,3 +27,5 @@ export const WorkspaceActiveCycleHeader = observer(() => (
</div>
</div>
));
+
+export default WorkspaceActiveCycleHeader;
diff --git a/web/app/[workspaceSlug]/@header/active-cycles/page.tsx b/web/app/[workspaceSlug]/@header/active-cycles/page.tsx
new file mode 100644
index 0000000000..56083aab75
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/active-cycles/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "../../app-header-wrapper";
+import WorkspaceActiveCycleHeader from "./header";
+
+const WorkspaceActiveCycleHeaderPage = () => <AppHeaderWrapper header={<WorkspaceActiveCycleHeader />} />;
+
+export default WorkspaceActiveCycleHeaderPage;
diff --git a/web/components/headers/workspace-analytics.tsx b/web/app/[workspaceSlug]/@header/analytics/header.tsx
similarity index 89%
rename from web/components/headers/workspace-analytics.tsx
rename to web/app/[workspaceSlug]/@header/analytics/header.tsx
index 98ceccbca0..51254da58f 100644
--- a/web/components/headers/workspace-analytics.tsx
+++ b/web/app/[workspaceSlug]/@header/analytics/header.tsx
@@ -1,17 +1,22 @@
+"use client";
+
import { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useSearchParams } from "next/navigation";
+// icons
import { BarChart2, PanelRight } from "lucide-react";
// ui
import { Breadcrumbs } from "@plane/ui";
// components
import { BreadcrumbLink } from "@/components/common";
+// helpers
import { cn } from "@/helpers/common.helper";
+// hooks
import { useAppTheme } from "@/hooks/store";
-export const WorkspaceAnalyticsHeader = observer(() => {
- const router = useRouter();
- const { analytics_tab } = router.query;
+const WorkspaceAnalyticsHeader = observer(() => {
+ const searchParams = useSearchParams();
+ const analytics_tab = searchParams.get("analytics_tab");
// store hooks
const { workspaceAnalyticsSidebarCollapsed, toggleWorkspaceAnalyticsSidebar } = useAppTheme();
@@ -66,3 +71,5 @@ export const WorkspaceAnalyticsHeader = observer(() => {
</>
);
});
+
+export default WorkspaceAnalyticsHeader;
diff --git a/web/app/[workspaceSlug]/@header/analytics/page.tsx b/web/app/[workspaceSlug]/@header/analytics/page.tsx
new file mode 100644
index 0000000000..405057b053
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/analytics/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "../../app-header-wrapper";
+import WorkspaceAnalyticsHeader from "./header";
+
+const WorkspaceAnalyticsHeaderPage = () => <AppHeaderWrapper header={<WorkspaceAnalyticsHeader />} />;
+
+export default WorkspaceAnalyticsHeaderPage;
diff --git a/web/components/headers/workspace-dashboard.tsx b/web/app/[workspaceSlug]/@header/header.tsx
similarity index 96%
rename from web/components/headers/workspace-dashboard.tsx
rename to web/app/[workspaceSlug]/@header/header.tsx
index 880b444066..4afd12399e 100644
--- a/web/components/headers/workspace-dashboard.tsx
+++ b/web/app/[workspaceSlug]/@header/header.tsx
@@ -1,18 +1,21 @@
+"use client";
+
import Image from "next/image";
import { useTheme } from "next-themes";
import { Home, Zap } from "lucide-react";
// images
import githubBlackImage from "/public/logos/github-black.png";
import githubWhiteImage from "/public/logos/github-white.png";
-// hooks
-// components
+// ui
import { Breadcrumbs } from "@plane/ui";
+// components
import { BreadcrumbLink } from "@/components/common";
// constants
import { CHANGELOG_REDIRECTED, GITHUB_REDIRECTED } from "@/constants/event-tracker";
+// hooks
import { useEventTracker } from "@/hooks/store";
-export const WorkspaceDashboardHeader = () => {
+const WorkspaceDashboardHeader = () => {
// hooks
const { captureEvent } = useEventTracker();
const { resolvedTheme } = useTheme();
@@ -69,3 +72,5 @@ export const WorkspaceDashboardHeader = () => {
</>
);
};
+
+export default WorkspaceDashboardHeader;
diff --git a/web/app/[workspaceSlug]/@header/page.tsx b/web/app/[workspaceSlug]/@header/page.tsx
new file mode 100644
index 0000000000..4175c5f387
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "../app-header-wrapper";
+import WorkspaceDashboardHeader from "./header";
+
+const WorkspaceDashboardHeaderPage = () => <AppHeaderWrapper header={<WorkspaceDashboardHeader />} />;
+
+export default WorkspaceDashboardHeaderPage;
diff --git a/web/app/[workspaceSlug]/@header/profile/[userId]/activity/page.tsx b/web/app/[workspaceSlug]/@header/profile/[userId]/activity/page.tsx
new file mode 100644
index 0000000000..56d3a14683
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/profile/[userId]/activity/page.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import UserProfileHeader from "../header";
+
+const ProfileActivityHeader = () => <AppHeaderWrapper header={<UserProfileHeader type="Activity" />} />;
+
+export default ProfileActivityHeader;
diff --git a/web/app/[workspaceSlug]/@header/profile/[userId]/assigned/page.tsx b/web/app/[workspaceSlug]/@header/profile/[userId]/assigned/page.tsx
new file mode 100644
index 0000000000..a6253fca3c
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/profile/[userId]/assigned/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import UserProfileHeader from "../header";
+import ProfileIssuesMobileHeader from "../mobile-header";
+
+const ProfileAssignedHeader = () => (
+ <AppHeaderWrapper header={<UserProfileHeader type="Assigned" />} mobileHeader={<ProfileIssuesMobileHeader />} />
+);
+
+export default ProfileAssignedHeader;
diff --git a/web/app/[workspaceSlug]/@header/profile/[userId]/created/page.tsx b/web/app/[workspaceSlug]/@header/profile/[userId]/created/page.tsx
new file mode 100644
index 0000000000..e46ef7b25f
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/profile/[userId]/created/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import UserProfileHeader from "../header";
+import ProfileIssuesMobileHeader from "../mobile-header";
+
+const ProfileCreatedHeader = () => (
+ <AppHeaderWrapper header={<UserProfileHeader type="Created" />} mobileHeader={<ProfileIssuesMobileHeader />} />
+);
+
+export default ProfileCreatedHeader;
diff --git a/web/components/headers/user-profile.tsx b/web/app/[workspaceSlug]/@header/profile/[userId]/header.tsx
similarity index 93%
rename from web/components/headers/user-profile.tsx
rename to web/app/[workspaceSlug]/@header/profile/[userId]/header.tsx
index 4f1f446597..1f15e2c48f 100644
--- a/web/components/headers/user-profile.tsx
+++ b/web/app/[workspaceSlug]/@header/profile/[userId]/header.tsx
@@ -1,8 +1,10 @@
+"use client";
+
// ui
import { FC } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { ChevronDown, PanelRight } from "lucide-react";
import { Breadcrumbs, CustomMenu } from "@plane/ui";
import { BreadcrumbLink } from "@/components/common";
@@ -15,11 +17,10 @@ type TUserProfileHeader = {
type?: string | undefined;
};
-export const UserProfileHeader: FC<TUserProfileHeader> = observer((props) => {
+const UserProfileHeader: FC<TUserProfileHeader> = observer((props) => {
const { type = undefined } = props;
// router
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
// store hooks
const { toggleProfileSidebar, profileSidebarCollapsed } = useAppTheme();
const {
@@ -89,3 +90,5 @@ export const UserProfileHeader: FC<TUserProfileHeader> = observer((props) => {
</div>
);
});
+
+export default UserProfileHeader;
diff --git a/web/components/profile/profile-issues-mobile-header.tsx b/web/app/[workspaceSlug]/@header/profile/[userId]/mobile-header.tsx
similarity index 98%
rename from web/components/profile/profile-issues-mobile-header.tsx
rename to web/app/[workspaceSlug]/@header/profile/[userId]/mobile-header.tsx
index 6088d0194f..99f6e0c9c7 100644
--- a/web/components/profile/profile-issues-mobile-header.tsx
+++ b/web/app/[workspaceSlug]/@header/profile/[userId]/mobile-header.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { ChevronDown } from "lucide-react";
// types
@@ -18,8 +20,7 @@ import { useIssues, useLabel } from "@/hooks/store";
const ProfileIssuesMobileHeader = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
// store hook
const {
issuesFilter: { issueFilters, updateFilters },
diff --git a/web/app/[workspaceSlug]/@header/profile/[userId]/page.tsx b/web/app/[workspaceSlug]/@header/profile/[userId]/page.tsx
new file mode 100644
index 0000000000..df2b0d83e2
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/profile/[userId]/page.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import UserProfileHeader from "./header";
+
+const ProfileOverviewHeader = () => <AppHeaderWrapper header={<UserProfileHeader type="Summary" />} />;
+
+export default ProfileOverviewHeader;
diff --git a/web/app/[workspaceSlug]/@header/profile/[userId]/subscribed/page.tsx b/web/app/[workspaceSlug]/@header/profile/[userId]/subscribed/page.tsx
new file mode 100644
index 0000000000..75caa98c94
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/profile/[userId]/subscribed/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import UserProfileHeader from "../header";
+import ProfileIssuesMobileHeader from "../mobile-header";
+
+const ProfileSubscribedHeader = () => (
+ <AppHeaderWrapper header={<UserProfileHeader type="Subscribed" />} mobileHeader={<ProfileIssuesMobileHeader />} />
+);
+
+export default ProfileSubscribedHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/[...default-header]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/[...default-header]/page.tsx
new file mode 100644
index 0000000000..6e5cd0160d
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/[...default-header]/page.tsx
@@ -0,0 +1,2 @@
+import DefaultProjectArchivesHeader from "../page";
+export default DefaultProjectArchivesHeader;
\ No newline at end of file
diff --git a/web/components/headers/project-archives.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/header.tsx
similarity index 92%
rename from web/components/headers/project-archives.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/archives/header.tsx
index 5022414613..aba65352ec 100644
--- a/web/components/headers/project-archives.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/header.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams, usePathname, useRouter } from "next/navigation";
// ui
import { ArchiveIcon, Breadcrumbs, Tooltip } from "@plane/ui";
// components
@@ -12,11 +12,12 @@ import { EIssuesStoreType } from "@/constants/issue";
import { useIssues, useProject } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
-export const ProjectArchivesHeader: FC = observer(() => {
+const ProjectArchivesHeader: FC = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
- const activeTab = router.pathname.split("/").pop();
+ const { workspaceSlug, projectId } = useParams();
+ const pathname = usePathname();
+ const activeTab = pathname.split("/").pop();
// store hooks
const {
issuesFilter: { issueFilters },
@@ -93,3 +94,5 @@ export const ProjectArchivesHeader: FC = observer(() => {
</div>
);
});
+
+export default ProjectArchivesHeader;
diff --git a/web/components/headers/project-archived-issue-details.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/issues/[archivedIssueId]/header.tsx
similarity index 92%
rename from web/components/headers/project-archived-issue-details.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/archives/issues/[archivedIssueId]/header.tsx
index c874745a4b..75b8dce439 100644
--- a/web/components/headers/project-archived-issue-details.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/issues/[archivedIssueId]/header.tsx
@@ -1,27 +1,23 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
-// hooks
+// ui
import { ArchiveIcon, Breadcrumbs, LayersIcon } from "@plane/ui";
+// components
import { BreadcrumbLink, Logo } from "@/components/common";
+// constants
import { ISSUE_DETAILS } from "@/constants/fetch-keys";
+// hooks
import { useProject } from "@/hooks/store";
-// components
-// ui
-// types
-import { IssueArchiveService } from "@/services/issue";
-// constants
// services
-// helpers
-// components
+import { IssueArchiveService } from "@/services/issue";
const issueArchiveService = new IssueArchiveService();
-export const ProjectArchivedIssueDetailsHeader: FC = observer(() => {
+const ProjectArchivedIssueDetailsHeader: FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, archivedIssueId } = router.query;
+ const { workspaceSlug, projectId, archivedIssueId } = useParams();
// store hooks
const { currentProjectDetails } = useProject();
@@ -96,3 +92,5 @@ export const ProjectArchivedIssueDetailsHeader: FC = observer(() => {
</div>
);
});
+
+export default ProjectArchivedIssueDetailsHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/issues/[archivedIssueId]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/issues/[archivedIssueId]/page.tsx
new file mode 100644
index 0000000000..60fa754cef
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/issues/[archivedIssueId]/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectArchivedIssueDetailsHeader from "./header";
+
+const ProjectArchivedIssueDetailsHeaderPage = () => <AppHeaderWrapper header={<ProjectArchivedIssueDetailsHeader />} />;
+
+export default ProjectArchivedIssueDetailsHeaderPage;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/page.tsx
new file mode 100644
index 0000000000..aa1b031692
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/archives/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectArchivesHeader from "./header";
+
+const ProjectArchivesHeaderPage = () => <AppHeaderWrapper header={<ProjectArchivesHeader />} />;
+
+export default ProjectArchivesHeaderPage;
diff --git a/web/components/headers/cycle-issues.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/header.tsx
similarity index 96%
rename from web/components/headers/cycle-issues.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/header.tsx
index 4e9c37c9d0..3f70a647d8 100644
--- a/web/components/headers/cycle-issues.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/header.tsx
@@ -1,7 +1,7 @@
import { useCallback, useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// icons
import { ArrowRight, PanelRight } from "lucide-react";
// types
@@ -36,8 +36,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
const CycleDropdownOption: React.FC<{ cycleId: string }> = ({ cycleId }) => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { getCycleById } = useCycle();
// derived values
@@ -56,12 +55,12 @@ const CycleDropdownOption: React.FC<{ cycleId: string }> = ({ cycleId }) => {
);
};
-export const CycleIssuesHeader: React.FC = observer(() => {
+const CycleIssuesHeader: React.FC = observer(() => {
// states
const [analyticsModal, setAnalyticsModal] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query as {
+ const { workspaceSlug, projectId, cycleId } = useParams() as {
workspaceSlug: string;
projectId: string;
cycleId: string;
@@ -206,9 +205,8 @@ export const CycleIssuesHeader: React.FC = observer(() => {
{issuesCount && issuesCount > 0 ? (
<Tooltip
isMobile={isMobile}
- tooltipContent={`There are ${issuesCount} ${
- issuesCount > 1 ? "issues" : "issue"
- } in this cycle`}
+ tooltipContent={`There are ${issuesCount} ${issuesCount > 1 ? "issues" : "issue"
+ } in this cycle`}
position="bottom"
>
<span className="flex flex-shrink-0 cursor-default items-center justify-center rounded-xl bg-custom-primary-100/20 px-2 text-center text-xs font-semibold text-custom-primary-100">
@@ -303,3 +301,5 @@ export const CycleIssuesHeader: React.FC = observer(() => {
</>
);
});
+
+export default CycleIssuesHeader;
diff --git a/web/components/cycles/cycle-mobile-header.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/mobile-header.tsx
similarity index 97%
rename from web/components/cycles/cycle-mobile-header.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/mobile-header.tsx
index ce1b45a9bf..e68829774d 100644
--- a/web/components/cycles/cycle-mobile-header.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/mobile-header.tsx
@@ -1,5 +1,5 @@
import { useCallback, useState } from "react";
-import router from "next/router";
+import { useParams } from "next/navigation";
// icons
import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
// types
@@ -16,7 +16,7 @@ import { calculateTotalFilters } from "@/helpers/filter.helper";
// hooks
import { useIssues, useCycle, useProjectState, useLabel, useMember, useProject } from "@/hooks/store";
-export const CycleMobileHeader = () => {
+const CycleIssuesMobileHeader = () => {
const [analyticsModal, setAnalyticsModal] = useState(false);
const { getCycleById } = useCycle();
const layouts = [
@@ -25,7 +25,7 @@ export const CycleMobileHeader = () => {
{ key: "calendar", title: "Calendar", icon: Calendar },
];
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
const cycleDetails = cycleId ? getCycleById(cycleId.toString()) : undefined;
// store hooks
const { currentProjectDetails } = useProject();
@@ -202,3 +202,5 @@ export const CycleMobileHeader = () => {
</>
);
};
+
+export default CycleIssuesMobileHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/page.tsx
new file mode 100644
index 0000000000..6afb97002a
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/[cycleId]/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import CycleIssuesHeader from "./header";
+import CycleIssuesMobileHeader from "./mobile-header";
+
+const CycleIssuesHeaderPage = () => (
+ <AppHeaderWrapper header={<CycleIssuesHeader />} mobileHeader={<CycleIssuesMobileHeader />} />
+);
+
+export default CycleIssuesHeaderPage;
diff --git a/web/components/headers/cycles.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/header.tsx
similarity index 93%
rename from web/components/headers/cycles.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/header.tsx
index 76493bd510..1a0993d809 100644
--- a/web/components/headers/cycles.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/header.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// ui
import { Breadcrumbs, Button, ContrastIcon } from "@plane/ui";
// components
@@ -11,10 +11,10 @@ import { EUserProjectRoles } from "@/constants/project";
// hooks
import { useCommandPalette, useEventTracker, useProject, useUser } from "@/hooks/store";
-export const CyclesHeader: FC = observer(() => {
+const CyclesHeader: FC = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { toggleCreateCycleModal } = useCommandPalette();
const { setTrackElement } = useEventTracker();
@@ -72,3 +72,5 @@ export const CyclesHeader: FC = observer(() => {
</div>
);
});
+
+export default CyclesHeader;
diff --git a/web/components/cycles/cycles-list-mobile-header.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/mobile-header.tsx
similarity index 100%
rename from web/components/cycles/cycles-list-mobile-header.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/mobile-header.tsx
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/page.tsx
new file mode 100644
index 0000000000..457e9b3dcc
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/cycles/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import CyclesHeader from "./header";
+import CyclesListMobileHeader from "./mobile-header";
+
+const CyclesHeaderPage = () => (
+ <AppHeaderWrapper header={<CyclesHeader />} mobileHeader={<CyclesListMobileHeader />} />
+);
+
+export default CyclesHeaderPage;
diff --git a/web/components/headers/project-draft-issues.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/draft-issues/header.tsx
similarity index 96%
rename from web/components/headers/project-draft-issues.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/draft-issues/header.tsx
index f3e70d86b6..dc2a393bfb 100644
--- a/web/components/headers/project-draft-issues.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/draft-issues/header.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueLayouts } from "@plane/types";
// ui
@@ -16,10 +16,9 @@ import { calculateTotalFilters } from "@/helpers/filter.helper";
import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
-export const ProjectDraftIssueHeader: FC = observer(() => {
+const ProjectDraftIssueHeader: FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query as { workspaceSlug: string; projectId: string };
+ const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
// store hooks
const {
issuesFilter: { issueFilters, updateFilters },
@@ -168,3 +167,5 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
</div>
);
});
+
+export default ProjectDraftIssueHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/draft-issues/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/draft-issues/page.tsx
new file mode 100644
index 0000000000..a31440f48f
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/draft-issues/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectDraftIssueHeader from "./header";
+
+const ProjectDraftIssueHeaderPage = () => <AppHeaderWrapper header={<ProjectDraftIssueHeader />} />;
+
+export default ProjectDraftIssueHeaderPage;
diff --git a/web/components/headers/project-inbox.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/inbox/header.tsx
similarity index 93%
rename from web/components/headers/project-inbox.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/inbox/header.tsx
index ce76f3e406..b7fd70295a 100644
--- a/web/components/headers/project-inbox.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/inbox/header.tsx
@@ -1,6 +1,6 @@
import { FC, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { RefreshCcw } from "lucide-react";
// ui
import { Breadcrumbs, Button, LayersIcon } from "@plane/ui";
@@ -10,12 +10,11 @@ import { InboxIssueCreateEditModalRoot } from "@/components/inbox";
// hooks
import { useProject, useProjectInbox } from "@/hooks/store";
-export const ProjectInboxHeader: FC = observer(() => {
+const ProjectInboxHeader: FC = observer(() => {
// states
const [createIssueModal, setCreateIssueModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { currentProjectDetails } = useProject();
const { loader } = useProjectInbox();
@@ -77,3 +76,5 @@ export const ProjectInboxHeader: FC = observer(() => {
</div>
);
});
+
+export default ProjectInboxHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/inbox/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/inbox/page.tsx
new file mode 100644
index 0000000000..90d6166067
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/inbox/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectInboxHeader from "./header";
+
+const ProjectInboxHeaderPage = () => <AppHeaderWrapper header={<ProjectInboxHeader />} />;
+
+export default ProjectInboxHeaderPage;
diff --git a/web/components/headers/project-issue-details.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/[issueId]/header.tsx
similarity index 92%
rename from web/components/headers/project-issue-details.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/issues/[issueId]/header.tsx
index 890bd59e50..f8966e0017 100644
--- a/web/components/headers/project-issue-details.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/[issueId]/header.tsx
@@ -1,22 +1,20 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-// hooks
+import { useParams, useRouter } from "next/navigation";
import { PanelRight } from "lucide-react";
+// ui
import { Breadcrumbs, LayersIcon } from "@plane/ui";
+// components
import { BreadcrumbLink, Logo } from "@/components/common";
+// helpers
import { cn } from "@/helpers/common.helper";
+// hooks
import { useAppTheme, useIssueDetail, useProject } from "@/hooks/store";
-// ui
-// helpers
-// services
-// constants
-// components
-export const ProjectIssueDetailsHeader: FC = observer(() => {
+const ProjectIssueDetailsHeader: FC = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, issueId } = router.query;
+ const { workspaceSlug, projectId, issueId } = useParams();
// store hooks
const { currentProjectDetails } = useProject();
const { issueDetailSidebarCollapsed, toggleIssueDetailSidebar } = useAppTheme();
@@ -83,3 +81,5 @@ export const ProjectIssueDetailsHeader: FC = observer(() => {
</div>
);
});
+
+export default ProjectIssueDetailsHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/[issueId]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/[issueId]/page.tsx
new file mode 100644
index 0000000000..1c64134f0a
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/[issueId]/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectIssueDetailsHeader from "./header";
+
+const ProjectIssueDetailsHeaderPage = () => <AppHeaderWrapper header={<ProjectIssueDetailsHeader />} />;
+
+export default ProjectIssueDetailsHeaderPage;
diff --git a/web/components/headers/project-issues.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/header.tsx
similarity index 97%
rename from web/components/headers/project-issues.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/issues/header.tsx
index e3983d39c0..44bebde89f 100644
--- a/web/components/headers/project-issues.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/header.tsx
@@ -1,6 +1,6 @@
import { useCallback, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// icons
import { Briefcase, Circle, ExternalLink } from "lucide-react";
// types
@@ -30,12 +30,12 @@ import {
import { useIssues } from "@/hooks/store/use-issues";
import { usePlatformOS } from "@/hooks/use-platform-os";
-export const ProjectIssuesHeader: React.FC = observer(() => {
+const ProjectIssuesHeader: React.FC = observer(() => {
// states
const [analyticsModal, setAnalyticsModal] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug, projectId } = router.query as { workspaceSlug: string; projectId: string };
+ const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
// store hooks
const {
project: { projectMemberIds },
@@ -234,3 +234,5 @@ export const ProjectIssuesHeader: React.FC = observer(() => {
</>
);
});
+
+export default ProjectIssuesHeader;
diff --git a/web/components/issues/issues-mobile-header.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/mobile-header.tsx
similarity index 97%
rename from web/components/issues/issues-mobile-header.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/issues/mobile-header.tsx
index 956aa0d295..cab53f88f6 100644
--- a/web/components/issues/issues-mobile-header.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/mobile-header.tsx
@@ -1,6 +1,6 @@
import { useCallback, useState } from "react";
import { observer } from "mobx-react";
-import router from "next/router";
+import { useParams } from "next/navigation";
// icons
import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
// types
@@ -17,14 +17,14 @@ import { calculateTotalFilters } from "@/helpers/filter.helper";
// hooks
import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";
-export const IssuesMobileHeader = observer(() => {
+const ProjectIssuesMobileHeader = observer(() => {
const layouts = [
{ key: "list", title: "List", icon: List },
{ key: "kanban", title: "Kanban", icon: Kanban },
{ key: "calendar", title: "Calendar", icon: Calendar },
];
const [analyticsModal, setAnalyticsModal] = useState(false);
- const { workspaceSlug, projectId } = router.query as {
+ const { workspaceSlug, projectId } = useParams() as {
workspaceSlug: string;
projectId: string;
};
@@ -180,3 +180,5 @@ export const IssuesMobileHeader = observer(() => {
</>
);
});
+
+export default ProjectIssuesMobileHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/page.tsx
new file mode 100644
index 0000000000..7c4296d92e
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/issues/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectIssuesHeader from "./header";
+import ProjectIssuesMobileHeader from "./mobile-header";
+
+const ProjectIssuesHeaderPage = () => (
+ <AppHeaderWrapper header={<ProjectIssuesHeader />} mobileHeader={<ProjectIssuesMobileHeader />} />
+);
+
+export default ProjectIssuesHeaderPage;
diff --git a/web/components/headers/module-issues.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/header.tsx
similarity index 96%
rename from web/components/headers/module-issues.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/header.tsx
index a433bead50..474bcd713e 100644
--- a/web/components/headers/module-issues.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/header.tsx
@@ -1,7 +1,7 @@
import { useCallback, useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// icons
import { ArrowRight, PanelRight } from "lucide-react";
// types
@@ -37,8 +37,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
const ModuleDropdownOption: React.FC<{ moduleId: string }> = ({ moduleId }) => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { getModuleById } = useModule();
// derived values
@@ -59,12 +58,12 @@ const ModuleDropdownOption: React.FC<{ moduleId: string }> = ({ moduleId }) => {
);
};
-export const ModuleIssuesHeader: React.FC = observer(() => {
+const ModuleIssuesHeader: React.FC = observer(() => {
// states
const [analyticsModal, setAnalyticsModal] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
// hooks
const { isMobile } = usePlatformOS();
// store hooks
@@ -206,9 +205,8 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
{issuesCount && issuesCount > 0 ? (
<Tooltip
isMobile={isMobile}
- tooltipContent={`There are ${issuesCount} ${
- issuesCount > 1 ? "issues" : "issue"
- } in this module`}
+ tooltipContent={`There are ${issuesCount} ${issuesCount > 1 ? "issues" : "issue"
+ } in this module`}
position="bottom"
>
<span className="flex flex-shrink-0 cursor-default items-center justify-center rounded-xl bg-custom-primary-100/20 px-2 text-center text-xs font-semibold text-custom-primary-100">
@@ -310,3 +308,5 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
</>
);
});
+
+export default ModuleIssuesHeader;
diff --git a/web/components/modules/module-mobile-header.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/mobile-header.tsx
similarity index 97%
rename from web/components/modules/module-mobile-header.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/mobile-header.tsx
index ababa1ba15..db2e697e52 100644
--- a/web/components/modules/module-mobile-header.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/mobile-header.tsx
@@ -1,6 +1,6 @@
import { useCallback, useState } from "react";
import { observer } from "mobx-react";
-import router from "next/router";
+import { useParams } from "next/navigation";
// icons
import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
// types
@@ -17,7 +17,7 @@ import { calculateTotalFilters } from "@/helpers/filter.helper";
// hooks
import { useIssues, useLabel, useMember, useModule, useProject, useProjectState } from "@/hooks/store";
-export const ModuleMobileHeader = observer(() => {
+const ModuleIssuesMobileHeader = observer(() => {
const [analyticsModal, setAnalyticsModal] = useState(false);
const { currentProjectDetails } = useProject();
const { getModuleById } = useModule();
@@ -26,7 +26,7 @@ export const ModuleMobileHeader = observer(() => {
{ key: "kanban", title: "Kanban", icon: Kanban },
{ key: "calendar", title: "Calendar", icon: Calendar },
];
- const { workspaceSlug, projectId, moduleId } = router.query as {
+ const { workspaceSlug, projectId, moduleId } = useParams() as {
workspaceSlug: string;
projectId: string;
moduleId: string;
@@ -183,3 +183,5 @@ export const ModuleMobileHeader = observer(() => {
</div>
);
});
+
+export default ModuleIssuesMobileHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/page.tsx
new file mode 100644
index 0000000000..43ae996df9
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/[moduleId]/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ModuleIssuesHeader from "./header";
+import ModuleIssuesMobileHeader from "./mobile-header";
+
+const ModuleIssuesHeaderPage = () => (
+ <AppHeaderWrapper header={<ModuleIssuesHeader />} mobileHeader={<ModuleIssuesMobileHeader />} />
+);
+
+export default ModuleIssuesHeaderPage;
diff --git a/web/components/headers/modules-list.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/header.tsx
similarity index 93%
rename from web/components/headers/modules-list.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/modules/header.tsx
index 0e1fd53fc0..884bf1fb23 100644
--- a/web/components/headers/modules-list.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/header.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// ui
import { Breadcrumbs, Button, DiceIcon } from "@plane/ui";
// components
@@ -10,10 +10,10 @@ import { EUserProjectRoles } from "@/constants/project";
// hooks
import { useCommandPalette, useEventTracker, useProject, useUser } from "@/hooks/store";
-export const ModulesListHeader: React.FC = observer(() => {
+const ModulesListHeader: React.FC = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { toggleCreateModuleModal } = useCommandPalette();
const { setTrackElement } = useEventTracker();
@@ -72,3 +72,5 @@ export const ModulesListHeader: React.FC = observer(() => {
</div>
);
});
+
+export default ModulesListHeader;
diff --git a/web/components/modules/moduels-list-mobile-header.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/mobile-header.tsx
similarity index 100%
rename from web/components/modules/moduels-list-mobile-header.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/modules/mobile-header.tsx
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/page.tsx
new file mode 100644
index 0000000000..dce9e103fe
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/modules/page.tsx
@@ -0,0 +1,12 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ModulesListHeader from "./header";
+import ModulesListMobileHeader from "./mobile-header";
+
+const ModulesHeaderPage = () => (
+ <AppHeaderWrapper header={<ModulesListHeader />} mobileHeader={<ModulesListMobileHeader />} />
+);
+
+export default ModulesHeaderPage;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/[pageId]/header.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/[pageId]/header.tsx
new file mode 100644
index 0000000000..f242db9a00
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/[pageId]/header.tsx
@@ -0,0 +1,170 @@
+import { useState } from "react";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+import { FileText } from "lucide-react";
+// types
+import { TLogoProps } from "@plane/types";
+// ui
+import { Breadcrumbs, Button, EmojiIconPicker, EmojiIconPickerTypes, TOAST_TYPE, setToast } from "@plane/ui";
+// components
+import { BreadcrumbLink, Logo } from "@/components/common";
+// helper
+import { convertHexEmojiToDecimal } from "@/helpers/emoji.helper";
+// hooks
+import { usePage, useProject } from "@/hooks/store";
+import { usePlatformOS } from "@/hooks/use-platform-os";
+
+export interface IPagesHeaderProps {
+ showButton?: boolean;
+}
+
+const PageDetailsHeader = observer(() => {
+ // router
+ const { workspaceSlug, pageId } = useParams();
+ // state
+ const [isOpen, setIsOpen] = useState(false);
+ // store hooks
+ const { currentProjectDetails } = useProject();
+ const { isContentEditable, isSubmitting, name, logo_props, updatePageLogo } = usePage(pageId?.toString() ?? "");
+
+ const handlePageLogoUpdate = async (data: TLogoProps) => {
+ if (data) {
+ updatePageLogo(data)
+ .then(() => {
+ setToast({
+ type: TOAST_TYPE.SUCCESS,
+ title: "Success!",
+ message: "Logo Updated successfully.",
+ });
+ })
+ .catch(() => {
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: "Something went wrong. Please try again.",
+ });
+ });
+ }
+ };
+ // use platform
+ const { platform } = usePlatformOS();
+ // derived values
+ const isMac = platform === "MacOS";
+
+ 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 bg-custom-sidebar-background-100 p-4">
+ <div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
+ <div>
+ <Breadcrumbs>
+ <Breadcrumbs.BreadcrumbItem
+ type="text"
+ link={
+ <span>
+ <span className="hidden md:block">
+ <BreadcrumbLink
+ href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
+ label={currentProjectDetails?.name ?? "Project"}
+ icon={
+ currentProjectDetails && (
+ <span className="grid h-4 w-4 flex-shrink-0 place-items-center">
+ <Logo logo={currentProjectDetails?.logo_props} size={16} />
+ </span>
+ )
+ }
+ />
+ </span>
+ <span className="md:hidden">
+ <BreadcrumbLink
+ href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
+ label={"..."}
+ />
+ </span>
+ </span>
+ }
+ />
+
+ <Breadcrumbs.BreadcrumbItem
+ type="text"
+ link={
+ <BreadcrumbLink
+ href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/pages`}
+ label="Pages"
+ icon={<FileText className="h-4 w-4 text-custom-text-300" />}
+ />
+ }
+ />
+ <Breadcrumbs.BreadcrumbItem
+ type="text"
+ link={
+ <BreadcrumbLink
+ label={name ?? "Page"}
+ icon={
+ <EmojiIconPicker
+ isOpen={isOpen}
+ handleToggle={(val: boolean) => setIsOpen(val)}
+ className="flex items-center justify-center"
+ buttonClassName="flex items-center justify-center"
+ label={
+ <>
+ {logo_props?.in_use ? (
+ <Logo logo={logo_props} size={16} type="lucide" />
+ ) : (
+ <FileText className="h-4 w-4 text-custom-text-300" />
+ )}
+ </>
+ }
+ onChange={(val) => {
+ let logoValue = {};
+
+ if (val?.type === "emoji")
+ logoValue = {
+ value: convertHexEmojiToDecimal(val.value.unified),
+ url: val.value.imageUrl,
+ };
+ else if (val?.type === "icon") logoValue = val.value;
+
+ handlePageLogoUpdate({
+ in_use: val?.type,
+ [val?.type]: logoValue,
+ }).finally(() => setIsOpen(false));
+ }}
+ defaultIconColor={
+ logo_props?.in_use && logo_props.in_use === "icon" ? logo_props?.icon?.color : undefined
+ }
+ defaultOpen={
+ logo_props?.in_use && logo_props?.in_use === "emoji"
+ ? EmojiIconPickerTypes.EMOJI
+ : EmojiIconPickerTypes.ICON
+ }
+ />
+ }
+ />
+ }
+ />
+ </Breadcrumbs>
+ </div>
+ </div>
+ {isContentEditable && (
+ <Button
+ variant="primary"
+ size="sm"
+ onClick={() => {
+ // ctrl/cmd + s to save the changes
+ const event = new KeyboardEvent("keydown", {
+ key: "s",
+ ctrlKey: !isMac,
+ metaKey: isMac,
+ });
+ window.dispatchEvent(event);
+ }}
+ className="flex-shrink-0"
+ loading={isSubmitting === "submitting"}
+ >
+ {isSubmitting === "submitting" ? "Saving" : "Save changes"}
+ </Button>
+ )}
+ </div>
+ );
+});
+
+export default PageDetailsHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/[pageId]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/[pageId]/page.tsx
new file mode 100644
index 0000000000..6a426ea2ae
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/[pageId]/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import PageDetailsHeader from "./header";
+
+const PageDetailsHeaderPage = () => <AppHeaderWrapper header={<PageDetailsHeader />} />;
+
+export default PageDetailsHeaderPage;
diff --git a/web/components/headers/pages.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/header.tsx
similarity index 90%
rename from web/components/headers/pages.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/pages/header.tsx
index 893c4409df..bd35c875aa 100644
--- a/web/components/headers/pages.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/header.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useSearchParams } from "next/navigation";
import { FileText } from "lucide-react";
// ui
import { Breadcrumbs, Button } from "@plane/ui";
@@ -11,10 +11,11 @@ import { EUserProjectRoles } from "@/constants/project";
// hooks
import { useCommandPalette, useEventTracker, useProject, useUser } from "@/hooks/store";
-export const PagesHeader = observer(() => {
+const PagesHeader = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, type: pageType } = router.query;
+ const { workspaceSlug } = useParams();
+ const searchParams = useSearchParams();
+ const pageType = searchParams.get("type");
// store hooks
const { toggleCreatePageModal } = useCommandPalette();
const {
@@ -74,3 +75,5 @@ export const PagesHeader = observer(() => {
</div>
);
});
+
+export default PagesHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/page.tsx
new file mode 100644
index 0000000000..e59e271c7b
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/pages/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import PagesHeader from "./header";
+
+const PagesHeaderPage = () => <AppHeaderWrapper header={<PagesHeader />} />;
+
+export default PagesHeaderPage;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/[...default-header]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/[...default-header]/page.tsx
new file mode 100644
index 0000000000..c9c53de65e
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/[...default-header]/page.tsx
@@ -0,0 +1,2 @@
+import DefaultProjectSettingHeader from "../page";
+export default DefaultProjectSettingHeader;
\ No newline at end of file
diff --git a/web/components/headers/project-settings.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/header.tsx
similarity index 93%
rename from web/components/headers/project-settings.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/settings/header.tsx
index 2fe48969d4..351c20d81e 100644
--- a/web/components/headers/project-settings.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/header.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// ui
import { Settings } from "lucide-react";
import { Breadcrumbs, CustomMenu } from "@plane/ui";
@@ -11,10 +11,10 @@ import { EUserProjectRoles, PROJECT_SETTINGS_LINKS } from "@/constants/project";
// hooks
import { useProject, useUser } from "@/hooks/store";
-export const ProjectSettingHeader: FC = observer(() => {
+const ProjectSettingHeader: FC = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const {
membership: { currentProjectRole },
@@ -80,3 +80,5 @@ export const ProjectSettingHeader: FC = observer(() => {
</div>
);
});
+
+export default ProjectSettingHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/page.tsx
new file mode 100644
index 0000000000..3da6a809a9
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/settings/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectSettingHeader from "./header";
+
+const ProjectSettingHeaderPage = () => <AppHeaderWrapper header={<ProjectSettingHeader />} />;
+
+export default ProjectSettingHeaderPage;
diff --git a/web/components/headers/project-view-issues.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/[viewId]/header.tsx
similarity index 97%
rename from web/components/headers/project-view-issues.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/views/[viewId]/header.tsx
index 6270093a3f..da44f2b68c 100644
--- a/web/components/headers/project-view-issues.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/[viewId]/header.tsx
@@ -1,7 +1,7 @@
import { useCallback } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueLayouts } from "@plane/types";
// ui
@@ -28,10 +28,9 @@ import {
useUser,
} from "@/hooks/store";
-export const ProjectViewIssuesHeader: React.FC = observer(() => {
+const ProjectViewIssuesHeader: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, viewId } = router.query;
+ const { workspaceSlug, projectId, viewId } = useParams();
// store hooks
const {
issuesFilter: { issueFilters, updateFilters },
@@ -256,3 +255,5 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
</div>
);
});
+
+export default ProjectViewIssuesHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/views/[viewId]/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/[viewId]/page.tsx
new file mode 100644
index 0000000000..14f135d4e7
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/[viewId]/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectViewIssuesHeader from "./header";
+
+const ProjectViewIssuesHeaderPage = () => <AppHeaderWrapper header={<ProjectViewIssuesHeader />} />;
+
+export default ProjectViewIssuesHeaderPage;
diff --git a/web/components/headers/project-views.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/header.tsx
similarity index 93%
rename from web/components/headers/project-views.tsx
rename to web/app/[workspaceSlug]/@header/projects/[projectId]/views/header.tsx
index 7f1d1a725e..edbf406efd 100644
--- a/web/components/headers/project-views.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/header.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// ui
import { Breadcrumbs, PhotoFilterIcon, Button } from "@plane/ui";
// components
@@ -10,10 +10,9 @@ import { EUserProjectRoles } from "@/constants/project";
// hooks
import { useCommandPalette, useProject, useUser } from "@/hooks/store";
-export const ProjectViewsHeader: React.FC = observer(() => {
+const ProjectViewsHeader: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { toggleCreateViewModal } = useCommandPalette();
const {
@@ -69,3 +68,5 @@ export const ProjectViewsHeader: React.FC = observer(() => {
</>
);
});
+
+export default ProjectViewsHeader;
diff --git a/web/app/[workspaceSlug]/@header/projects/[projectId]/views/page.tsx b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/page.tsx
new file mode 100644
index 0000000000..e5f8ac92a8
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/[projectId]/views/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectViewsHeader from "./header";
+
+const ProjectViewsHeaderPage = () => <AppHeaderWrapper header={<ProjectViewsHeader />} />;
+
+export default ProjectViewsHeaderPage;
diff --git a/web/components/headers/projects.tsx b/web/app/[workspaceSlug]/@header/projects/header.tsx
similarity index 98%
rename from web/components/headers/projects.tsx
rename to web/app/[workspaceSlug]/@header/projects/header.tsx
index 7126b2697a..57b0a50cd1 100644
--- a/web/components/headers/projects.tsx
+++ b/web/app/[workspaceSlug]/@header/projects/header.tsx
@@ -18,7 +18,7 @@ import { calculateTotalFilters } from "@/helpers/filter.helper";
import { useAppRouter, useCommandPalette, useEventTracker, useMember, useProjectFilter, useUser } from "@/hooks/store";
import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
-export const ProjectsHeader = observer(() => {
+const ProjectsHeader = observer(() => {
// states
const [isSearchOpen, setIsSearchOpen] = useState(false);
// refs
@@ -181,3 +181,5 @@ export const ProjectsHeader = observer(() => {
</div>
);
});
+
+export default ProjectsHeader;
diff --git a/web/components/project/projects-mobile-header.tsx b/web/app/[workspaceSlug]/@header/projects/mobile-header.tsx
similarity index 100%
rename from web/components/project/projects-mobile-header.tsx
rename to web/app/[workspaceSlug]/@header/projects/mobile-header.tsx
diff --git a/web/app/[workspaceSlug]/@header/projects/page.tsx b/web/app/[workspaceSlug]/@header/projects/page.tsx
new file mode 100644
index 0000000000..64108a13cb
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/projects/page.tsx
@@ -0,0 +1,13 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "@/app/[workspaceSlug]/app-header-wrapper";
+import ProjectsHeader from "./header";
+import ProjectsMobileHeader from "./mobile-header";
+
+
+const ProjectsHeaderPage = () => (
+ <AppHeaderWrapper header={<ProjectsHeader />} mobileHeader={<ProjectsMobileHeader />} />
+);
+
+export default ProjectsHeaderPage;
diff --git a/web/app/[workspaceSlug]/@header/settings/[...default-header]/page.tsx b/web/app/[workspaceSlug]/@header/settings/[...default-header]/page.tsx
new file mode 100644
index 0000000000..9bb7092626
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/settings/[...default-header]/page.tsx
@@ -0,0 +1,2 @@
+import DefaultWorkspaceSettingsHeader from "../page";
+export default DefaultWorkspaceSettingsHeader;
\ No newline at end of file
diff --git a/web/components/headers/workspace-settings.tsx b/web/app/[workspaceSlug]/@header/settings/header.tsx
similarity index 91%
rename from web/components/headers/workspace-settings.tsx
rename to web/app/[workspaceSlug]/@header/settings/header.tsx
index 2d3e9649e1..111cbaef4d 100644
--- a/web/components/headers/workspace-settings.tsx
+++ b/web/app/[workspaceSlug]/@header/settings/header.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { FC } from "react";
import { observer } from "mobx-react";;
import { Settings } from "lucide-react";
@@ -8,7 +10,7 @@ import { BreadcrumbLink } from "@/components/common";
// hooks
import { useWorkspace } from "@/hooks/store";
-export const WorkspaceSettingHeader: FC = observer(() => {
+const WorkspaceSettingHeader: FC = observer(() => {
const { currentWorkspace } = useWorkspace();
return (
@@ -33,3 +35,5 @@ export const WorkspaceSettingHeader: FC = observer(() => {
</div>
);
});
+
+export default WorkspaceSettingHeader;
diff --git a/web/app/[workspaceSlug]/@header/settings/page.tsx b/web/app/[workspaceSlug]/@header/settings/page.tsx
new file mode 100644
index 0000000000..d7f4e2b538
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/settings/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "../../app-header-wrapper";
+import WorkspaceSettingHeader from "./header";
+
+const WorkspaceSettingHeaderPage = () => <AppHeaderWrapper header={<WorkspaceSettingHeader />} />;
+
+export default WorkspaceSettingHeaderPage;
diff --git a/web/app/[workspaceSlug]/@header/workspace-views/[...default-header]/page.tsx b/web/app/[workspaceSlug]/@header/workspace-views/[...default-header]/page.tsx
new file mode 100644
index 0000000000..a057def839
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/workspace-views/[...default-header]/page.tsx
@@ -0,0 +1,2 @@
+import DefaultWorkspaceViewsHeader from "../page";
+export default DefaultWorkspaceViewsHeader;
\ No newline at end of file
diff --git a/web/components/headers/global-issues.tsx b/web/app/[workspaceSlug]/@header/workspace-views/header.tsx
similarity index 96%
rename from web/components/headers/global-issues.tsx
rename to web/app/[workspaceSlug]/@header/workspace-views/header.tsx
index a6a35d16f6..091847d0a0 100644
--- a/web/components/headers/global-issues.tsx
+++ b/web/app/[workspaceSlug]/@header/workspace-views/header.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import { useCallback, useState } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
// ui
@@ -17,12 +19,11 @@ import { calculateTotalFilters } from "@/helpers/filter.helper";
// hooks
import { useLabel, useMember, useUser, useIssues } from "@/hooks/store";
-export const GlobalIssuesHeader: React.FC = observer(() => {
+const GlobalIssuesHeader: React.FC = observer(() => {
// states
const [createViewModal, setCreateViewModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, globalViewId } = router.query;
+ const { workspaceSlug, globalViewId } = useParams();
// store hooks
const {
issuesFilter: { filters, updateFilters },
@@ -143,3 +144,5 @@ export const GlobalIssuesHeader: React.FC = observer(() => {
</>
);
});
+
+export default GlobalIssuesHeader;
diff --git a/web/app/[workspaceSlug]/@header/workspace-views/page.tsx b/web/app/[workspaceSlug]/@header/workspace-views/page.tsx
new file mode 100644
index 0000000000..51b81df2b3
--- /dev/null
+++ b/web/app/[workspaceSlug]/@header/workspace-views/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+// components
+import AppHeaderWrapper from "../../app-header-wrapper";
+import GlobalIssuesHeader from "./header";
+
+const GlobalIssuesHeaderPage = () => <AppHeaderWrapper header={<GlobalIssuesHeader />} />;
+
+export default GlobalIssuesHeaderPage;
diff --git a/web/pages/[workspaceSlug]/active-cycles.tsx b/web/app/[workspaceSlug]/active-cycles/page.tsx
similarity index 50%
rename from web/pages/[workspaceSlug]/active-cycles.tsx
rename to web/app/[workspaceSlug]/active-cycles/page.tsx
index 86bb37fa04..3ead5226bf 100644
--- a/web/pages/[workspaceSlug]/active-cycles.tsx
+++ b/web/app/[workspaceSlug]/active-cycles/page.tsx
@@ -1,17 +1,13 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
// components
import { PageHead } from "@/components/core";
-import { WorkspaceActiveCycleHeader } from "@/components/headers";
import { WorkspaceActiveCyclesUpgrade } from "@/components/workspace";
-// layouts
-import { useWorkspace } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
// hooks
+import { useWorkspace } from "@/hooks/store";
-const WorkspaceActiveCyclesPage: NextPageWithLayout = observer(() => {
+const WorkspaceActiveCyclesPage = observer(() => {
const { currentWorkspace } = useWorkspace();
// derived values
const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Active Cycles` : undefined;
@@ -24,8 +20,4 @@ const WorkspaceActiveCyclesPage: NextPageWithLayout = observer(() => {
);
});
-WorkspaceActiveCyclesPage.getLayout = function getLayout(page: ReactElement) {
- return <AppLayout header={<WorkspaceActiveCycleHeader />}>{page}</AppLayout>;
-};
-
-export default WorkspaceActiveCyclesPage;
+export default WorkspaceActiveCyclesPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/analytics.tsx b/web/app/[workspaceSlug]/analytics/page.tsx
similarity index 76%
rename from web/pages/[workspaceSlug]/analytics.tsx
rename to web/app/[workspaceSlug]/analytics/page.tsx
index 499efc9170..2a4f9b9e93 100644
--- a/web/pages/[workspaceSlug]/analytics.tsx
+++ b/web/app/[workspaceSlug]/analytics/page.tsx
@@ -1,25 +1,22 @@
-import React, { Fragment, ReactElement } from "react";
+"use client";
+
+import React, { Fragment } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useSearchParams } from "next/navigation";
import { Tab } from "@headlessui/react";
// components
import { CustomAnalytics, ScopeAndDemand } from "@/components/analytics";
import { PageHead } from "@/components/core";
import { EmptyState } from "@/components/empty-state";
-import { WorkspaceAnalyticsHeader } from "@/components/headers";
// constants
import { ANALYTICS_TABS } from "@/constants/analytics";
import { EmptyStateType } from "@/constants/empty-state";
// hooks
-import { useCommandPalette, useEventTracker, useProject, useWorkspace } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
+import { useCommandPalette, useEventTracker, useProject, useWorkspace } from "@/hooks/store";;
-const AnalyticsPage: NextPageWithLayout = observer(() => {
- const router = useRouter();
- const { analytics_tab } = router.query;
+const AnalyticsPage = observer(() => {
+ const searchParams = useSearchParams();
+ const analytics_tab = searchParams.get("analytics_tab");
// store hooks
const { toggleCreateProjectModal } = useCommandPalette();
const { setTrackElement } = useEventTracker();
@@ -39,9 +36,8 @@ const AnalyticsPage: NextPageWithLayout = observer(() => {
<Tab key={tab.key} as={Fragment}>
{({ selected }) => (
<button
- className={`text-sm group relative flex items-center gap-1 h-[50px] px-3 cursor-pointer transition-all font-medium outline-none ${
- selected ? "text-custom-primary-100 " : "hover:text-custom-text-200"
- }`}
+ className={`text-sm group relative flex items-center gap-1 h-[50px] px-3 cursor-pointer transition-all font-medium outline-none ${selected ? "text-custom-primary-100 " : "hover:text-custom-text-200"
+ }`}
>
{tab.title}
<div
@@ -75,8 +71,4 @@ const AnalyticsPage: NextPageWithLayout = observer(() => {
);
});
-AnalyticsPage.getLayout = function getLayout(page: ReactElement) {
- return <AppLayout header={<WorkspaceAnalyticsHeader />}>{page}</AppLayout>;
-};
-
-export default AnalyticsPage;
+export default AnalyticsPage;
\ No newline at end of file
diff --git a/web/app/[workspaceSlug]/app-header-wrapper.tsx b/web/app/[workspaceSlug]/app-header-wrapper.tsx
new file mode 100644
index 0000000000..2ae3b81666
--- /dev/null
+++ b/web/app/[workspaceSlug]/app-header-wrapper.tsx
@@ -0,0 +1,26 @@
+"use client";
+
+import { ReactNode } from "react";
+// components
+import { SidebarHamburgerToggle } from "@/components/core";
+
+export interface IAppHeaderWrapper {
+ header: ReactNode;
+ mobileHeader?: ReactNode;
+}
+
+const AppHeaderWrapper = ({ header, mobileHeader }: IAppHeaderWrapper) => (
+ <>
+ <div className="z-[15]">
+ <div className="z-10 flex w-full items-center border-b border-custom-border-200">
+ <div className="block bg-custom-sidebar-background-100 py-4 pl-5 md:hidden">
+ <SidebarHamburgerToggle />
+ </div>
+ <div className="w-full">{header}</div>
+ </div>
+ {mobileHeader && mobileHeader}
+ </div>
+ </>
+);
+
+export default AppHeaderWrapper;
diff --git a/web/app/[workspaceSlug]/layout.tsx b/web/app/[workspaceSlug]/layout.tsx
new file mode 100644
index 0000000000..06fe6dd910
--- /dev/null
+++ b/web/app/[workspaceSlug]/layout.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import { CommandPalette } from "@/components/command-palette";
+import { WorkspaceAuthWrapper } from "@/layouts/auth-layout";
+import { AuthenticationWrapper } from "@/lib/wrappers";
+import AppSidebar from "./sidebar";
+
+export default function WorkspaceLayout({ header, children }: { header: React.ReactNode; children: React.ReactNode }) {
+ return (
+ <AuthenticationWrapper>
+ <CommandPalette />
+ <WorkspaceAuthWrapper>
+ <div className="relative flex h-screen w-full overflow-hidden">
+ <AppSidebar />
+ <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
+ {header}
+ <div className="h-full w-full overflow-hidden">
+ <div className="relative h-full w-full overflow-x-hidden overflow-y-scroll">{children}</div>
+ </div>
+ </main>
+ </div>
+ </WorkspaceAuthWrapper>
+ </AuthenticationWrapper>
+ );
+}
diff --git a/web/pages/[workspaceSlug]/index.tsx b/web/app/[workspaceSlug]/page.tsx
similarity index 53%
rename from web/pages/[workspaceSlug]/index.tsx
rename to web/app/[workspaceSlug]/page.tsx
index 19b8b1b7e0..5f8a4610ae 100644
--- a/web/pages/[workspaceSlug]/index.tsx
+++ b/web/app/[workspaceSlug]/page.tsx
@@ -1,17 +1,13 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-// layouts
// components
import { PageHead } from "@/components/core";
-import { WorkspaceDashboardHeader } from "@/components/headers/workspace-dashboard";
import { WorkspaceDashboardView } from "@/components/page-views";
-// types
// hooks
import { useWorkspace } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { NextPageWithLayout } from "@/lib/types";
-const WorkspacePage: NextPageWithLayout = observer(() => {
+const WorkspacePage = observer(() => {
const { currentWorkspace } = useWorkspace();
// derived values
const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Home` : undefined;
@@ -24,8 +20,4 @@ const WorkspacePage: NextPageWithLayout = observer(() => {
);
});
-WorkspacePage.getLayout = function getLayout(page: ReactElement) {
- return <AppLayout header={<WorkspaceDashboardHeader />}>{page}</AppLayout>;
-};
-
export default WorkspacePage;
diff --git a/web/pages/[workspaceSlug]/profile/[userId]/activity.tsx b/web/app/[workspaceSlug]/profile/[userId]/activity/page.tsx
similarity index 75%
rename from web/pages/[workspaceSlug]/profile/[userId]/activity.tsx
rename to web/app/[workspaceSlug]/profile/[userId]/activity/page.tsx
index 543ac48e88..8b5ba07e0c 100644
--- a/web/pages/[workspaceSlug]/profile/[userId]/activity.tsx
+++ b/web/app/[workspaceSlug]/profile/[userId]/activity/page.tsx
@@ -1,31 +1,27 @@
-import { ReactElement, useState } from "react";
+"use client";
+
+import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-// hooks
+import { useParams } from "next/navigation";
+// ui
import { Button } from "@plane/ui";
-import { UserProfileHeader } from "@/components/headers";
+// components
import { DownloadActivityButton, WorkspaceActivityListPage } from "@/components/profile";
+// constants
import { EUserWorkspaceRoles } from "@/constants/workspace";
+// hooks
import { useUser } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { ProfileAuthWrapper } from "@/layouts/user-profile-layout";
-// components
-// ui
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// constants
const PER_PAGE = 100;
-const ProfileActivityPage: NextPageWithLayout = observer(() => {
+const ProfileActivityPage = observer(() => {
// states
const [pageCount, setPageCount] = useState(1);
const [totalPages, setTotalPages] = useState(0);
const [resultsCount, setResultsCount] = useState(0);
// router
- const router = useRouter();
- const { userId } = router.query;
+
+ const { userId } = useParams();
// store hooks
const { data: currentUser } = useUser();
const {
@@ -73,12 +69,4 @@ const ProfileActivityPage: NextPageWithLayout = observer(() => {
);
});
-ProfileActivityPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<UserProfileHeader type="Activity" />}>
- <ProfileAuthWrapper>{page}</ProfileAuthWrapper>
- </AppLayout>
- );
-};
-
export default ProfileActivityPage;
diff --git a/web/app/[workspaceSlug]/profile/[userId]/assigned/page.tsx b/web/app/[workspaceSlug]/profile/[userId]/assigned/page.tsx
new file mode 100644
index 0000000000..0d64e8eec3
--- /dev/null
+++ b/web/app/[workspaceSlug]/profile/[userId]/assigned/page.tsx
@@ -0,0 +1,15 @@
+"use client";
+
+import React from "react";
+// components
+import { PageHead } from "@/components/core";
+import { ProfileIssuesPage } from "@/components/profile/profile-issues";
+
+const ProfileAssignedIssuesPage = () => (
+ <>
+ <PageHead title="Profile - Assigned" />
+ <ProfileIssuesPage type="assigned" />
+ </>
+);
+
+export default ProfileAssignedIssuesPage;
diff --git a/web/app/[workspaceSlug]/profile/[userId]/created/page.tsx b/web/app/[workspaceSlug]/profile/[userId]/created/page.tsx
new file mode 100644
index 0000000000..c8dab5e770
--- /dev/null
+++ b/web/app/[workspaceSlug]/profile/[userId]/created/page.tsx
@@ -0,0 +1,16 @@
+"use client";
+
+// store
+import { observer } from "mobx-react-lite";
+// components
+import { PageHead } from "@/components/core";
+import { ProfileIssuesPage } from "@/components/profile/profile-issues";
+
+const ProfileCreatedIssuesPage = () => (
+ <>
+ <PageHead title="Profile - Created" />
+ <ProfileIssuesPage type="created" />
+ </>
+);
+
+export default observer(ProfileCreatedIssuesPage);
diff --git a/web/layouts/user-profile-layout/layout.tsx b/web/app/[workspaceSlug]/profile/[userId]/layout.tsx
similarity index 58%
rename from web/layouts/user-profile-layout/layout.tsx
rename to web/app/[workspaceSlug]/profile/[userId]/layout.tsx
index c1ef8d40ee..5e92abf677 100644
--- a/web/layouts/user-profile-layout/layout.tsx
+++ b/web/app/[workspaceSlug]/profile/[userId]/layout.tsx
@@ -1,45 +1,51 @@
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
// components
-import { ProfileNavbar, ProfileSidebar } from "@/components/profile";
+import { ProfileSidebar } from "@/components/profile";
// constants
import { EUserWorkspaceRoles } from "@/constants/workspace";
// hooks
import { useUser } from "@/hooks/store";
+// local components
+import { ProfileNavbar } from "./navbar";
type Props = {
children: React.ReactNode;
- className?: string;
- showProfileIssuesFilter?: boolean;
};
const AUTHORIZED_ROLES = [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.VIEWER];
-export const ProfileAuthWrapper: React.FC<Props> = observer((props) => {
- const { children, className, showProfileIssuesFilter } = props;
+const ProfileAuthWrapper: React.FC<Props> = observer((props) => {
+ const { children } = props;
// router
- const router = useRouter();
+ const pathname = usePathname();
// store hooks
const {
membership: { currentWorkspaceRole },
} = useUser();
// derived values
const isAuthorized = currentWorkspaceRole && AUTHORIZED_ROLES.includes(currentWorkspaceRole);
- const isAuthorizedPath = router.pathname.includes("assigned" || "created" || "subscribed");
+ const isAuthorizedPath =
+ pathname.includes("assigned") || pathname.includes("created") || pathname.includes("subscribed");
+ const isIssuesTab = pathname.includes("assigned") || pathname.includes("created") || pathname.includes("subscribed");
return (
<div className="h-full w-full flex md:overflow-hidden">
<div className="flex w-full flex-col md:h-full md:overflow-hidden">
- <ProfileNavbar isAuthorized={!!isAuthorized} showProfileIssuesFilter={showProfileIssuesFilter} />
+ <ProfileNavbar isAuthorized={!!isAuthorized} showProfileIssuesFilter={isIssuesTab} />
{isAuthorized || !isAuthorizedPath ? (
- <div className={`w-full overflow-hidden md:h-full ${className}`}>{children}</div>
+ <div className={`w-full overflow-hidden md:h-full`}>{children}</div>
) : (
<div className="grid h-full w-full place-items-center text-custom-text-200">
You do not have the permission to access this page.
</div>
)}
</div>
- <ProfileSidebar />
+ <ProfileSidebar />
</div>
);
});
+
+export default ProfileAuthWrapper;
diff --git a/web/components/profile/navbar.tsx b/web/app/[workspaceSlug]/profile/[userId]/navbar.tsx
similarity index 85%
rename from web/components/profile/navbar.tsx
rename to web/app/[workspaceSlug]/profile/[userId]/navbar.tsx
index 6aace8e354..25e9744fea 100644
--- a/web/components/profile/navbar.tsx
+++ b/web/app/[workspaceSlug]/profile/[userId]/navbar.tsx
@@ -1,7 +1,7 @@
import React from "react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
// components
import { ProfileIssuesFilter } from "@/components/profile";
@@ -16,8 +16,8 @@ type Props = {
export const ProfileNavbar: React.FC<Props> = (props) => {
const { isAuthorized, showProfileIssuesFilter } = props;
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
+ const pathname = usePathname();
const tabsList = isAuthorized ? [...PROFILE_VIEWER_TAB, ...PROFILE_ADMINS_TAB] : PROFILE_VIEWER_TAB;
@@ -28,7 +28,7 @@ export const ProfileNavbar: React.FC<Props> = (props) => {
<Link key={tab.route} href={`/${workspaceSlug}/profile/${userId}/${tab.route}`}>
<span
className={`flex whitespace-nowrap border-b-2 p-4 text-sm font-medium outline-none ${
- router.pathname === tab.selected
+ pathname === `/${workspaceSlug}/profile/${userId}${tab.selected}`
? "border-custom-primary-100 text-custom-primary-100"
: "border-transparent"
}`}
diff --git a/web/pages/[workspaceSlug]/profile/[userId]/index.tsx b/web/app/[workspaceSlug]/profile/[userId]/page.tsx
similarity index 70%
rename from web/pages/[workspaceSlug]/profile/[userId]/index.tsx
rename to web/app/[workspaceSlug]/profile/[userId]/page.tsx
index 66e820f90d..3c9243c732 100644
--- a/web/pages/[workspaceSlug]/profile/[userId]/index.tsx
+++ b/web/app/[workspaceSlug]/profile/[userId]/page.tsx
@@ -1,12 +1,11 @@
-import { ReactElement } from "react";
-import { useRouter } from "next/router";
+"use client";
+
+import { useParams } from "next/navigation";
import useSWR from "swr";
+// types
import { IUserStateDistribution, TStateGroups } from "@plane/types";
-// services
-// layouts
// components
import { PageHead } from "@/components/core";
-import { UserProfileHeader } from "@/components/headers";
import {
ProfileActivity,
ProfilePriorityDistribution,
@@ -14,21 +13,17 @@ import {
ProfileStats,
ProfileWorkload,
} from "@/components/profile";
-// types
// constants
import { USER_PROFILE_DATA } from "@/constants/fetch-keys";
import { GROUP_CHOICES } from "@/constants/project";
-import { AppLayout } from "@/layouts/app-layout";
-import { ProfileAuthWrapper } from "@/layouts/user-profile-layout";
-import { NextPageWithLayout } from "@/lib/types";
+// services
import { UserService } from "@/services/user.service";
// services
const userService = new UserService();
-const ProfileOverviewPage: NextPageWithLayout = () => {
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+const ProfileOverviewPage = () => {
+ const { workspaceSlug, userId } = useParams();
const { data: userProfile } = useSWR(
workspaceSlug && userId ? USER_PROFILE_DATA(workspaceSlug.toString(), userId.toString()) : null,
@@ -58,12 +53,4 @@ const ProfileOverviewPage: NextPageWithLayout = () => {
);
};
-ProfileOverviewPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<UserProfileHeader type="Summary" />}>
- <ProfileAuthWrapper>{page}</ProfileAuthWrapper>
- </AppLayout>
- );
-};
-
-export default ProfileOverviewPage;
+export default ProfileOverviewPage;
\ No newline at end of file
diff --git a/web/app/[workspaceSlug]/profile/[userId]/subscribed/page.tsx b/web/app/[workspaceSlug]/profile/[userId]/subscribed/page.tsx
new file mode 100644
index 0000000000..1fe1522980
--- /dev/null
+++ b/web/app/[workspaceSlug]/profile/[userId]/subscribed/page.tsx
@@ -0,0 +1,16 @@
+"use client";
+
+// store
+import { observer } from "mobx-react-lite";
+// components
+import { PageHead } from "@/components/core";
+import { ProfileIssuesPage } from "@/components/profile/profile-issues";
+
+const ProfileSubscribedIssuesPage = () => (
+ <>
+ <PageHead title="Profile - Subscribed" />
+ <ProfileIssuesPage type="subscribed" />
+ </>
+);
+
+export default observer(ProfileSubscribedIssuesPage);
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/archives/cycles/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/archives/cycles/page.tsx
similarity index 52%
rename from web/pages/[workspaceSlug]/projects/[projectId]/archives/cycles/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/archives/cycles/page.tsx
index bcc406fa08..7bc67af5b5 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/archives/cycles/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/archives/cycles/page.tsx
@@ -1,21 +1,16 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { PageHead } from "@/components/core";
import { ArchivedCycleLayoutRoot, ArchivedCyclesHeader } from "@/components/cycles";
-import { ProjectArchivesHeader } from "@/components/headers";
// hooks
import { useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectArchivedCyclesPage: NextPageWithLayout = observer(() => {
+const ProjectArchivedCyclesPage = observer(() => {
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// store hooks
const { getProjectById } = useProject();
// derived values
@@ -33,12 +28,4 @@ const ProjectArchivedCyclesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectArchivedCyclesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectArchivesHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
-export default ProjectArchivedCyclesPage;
+export default ProjectArchivedCyclesPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/archives/issues/[archivedIssueId].tsx b/web/app/[workspaceSlug]/projects/[projectId]/archives/issues/[archivedIssueId]/page.tsx
similarity index 87%
rename from web/pages/[workspaceSlug]/projects/[projectId]/archives/issues/[archivedIssueId].tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/archives/issues/[archivedIssueId]/page.tsx
index 8abb90e286..a5bf781810 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/archives/issues/[archivedIssueId].tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/archives/issues/[archivedIssueId]/page.tsx
@@ -1,6 +1,8 @@
-import { useState, ReactElement } from "react";
+"use client";
+
+import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import useSWR from "swr";
// icons
import { ArchiveRestoreIcon } from "lucide-react";
@@ -8,22 +10,17 @@ import { ArchiveRestoreIcon } from "lucide-react";
import { ArchiveIcon, Button, Loader, TOAST_TYPE, setToast } from "@plane/ui";
// components
import { PageHead } from "@/components/core";
-import { ProjectArchivedIssueDetailsHeader } from "@/components/headers";
import { IssueDetailRoot } from "@/components/issues";
// constants
import { EIssuesStoreType } from "@/constants/issue";
import { EUserProjectRoles } from "@/constants/project";
// hooks
import { useIssueDetail, useIssues, useProject, useUser } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ArchivedIssueDetailsPage: NextPageWithLayout = observer(() => {
+const ArchivedIssueDetailsPage = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, archivedIssueId } = router.query;
+ const { workspaceSlug, projectId, archivedIssueId } = useParams();
// states
const [isRestoring, setIsRestoring] = useState(false);
// hooks
@@ -137,12 +134,4 @@ const ArchivedIssueDetailsPage: NextPageWithLayout = observer(() => {
);
});
-ArchivedIssueDetailsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectArchivedIssueDetailsHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
-export default ArchivedIssueDetailsPage;
+export default ArchivedIssueDetailsPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/archives/issues/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/archives/issues/page.tsx
similarity index 52%
rename from web/pages/[workspaceSlug]/projects/[projectId]/archives/issues/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/archives/issues/page.tsx
index b2c08e0a3e..b2298d540c 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/archives/issues/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/archives/issues/page.tsx
@@ -1,21 +1,16 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { PageHead } from "@/components/core";
-import { ProjectArchivesHeader } from "@/components/headers";
import { ArchivedIssueLayoutRoot, ArchivedIssuesHeader } from "@/components/issues";
// hooks
import { useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectArchivedIssuesPage: NextPageWithLayout = observer(() => {
+const ProjectArchivedIssuesPage = observer(() => {
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// store hooks
const { getProjectById } = useProject();
// derived values
@@ -33,12 +28,4 @@ const ProjectArchivedIssuesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectArchivedIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectArchivesHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
-export default ProjectArchivedIssuesPage;
+export default ProjectArchivedIssuesPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/archives/modules/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/archives/modules/page.tsx
similarity index 56%
rename from web/pages/[workspaceSlug]/projects/[projectId]/archives/modules/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/archives/modules/page.tsx
index 1e346098e6..5c1d55d3e4 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/archives/modules/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/archives/modules/page.tsx
@@ -1,21 +1,16 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { PageHead } from "@/components/core";
-import { ProjectArchivesHeader } from "@/components/headers";
import { ArchivedModuleLayoutRoot, ArchivedModulesHeader } from "@/components/modules";
// hooks
import { useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectArchivedModulesPage: NextPageWithLayout = observer(() => {
+const ProjectArchivedModulesPage = observer(() => {
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// store hooks
const { getProjectById } = useProject();
// derived values
@@ -33,12 +28,4 @@ const ProjectArchivedModulesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectArchivedModulesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectArchivesHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default ProjectArchivedModulesPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx b/web/app/[workspaceSlug]/projects/[projectId]/cycles/[cycleId]/page.tsx
similarity index 80%
rename from web/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/cycles/[cycleId]/page.tsx
index 6bde8da41a..d94d30ec56 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/cycles/[cycleId]/page.tsx
@@ -1,29 +1,23 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import useSWR from "swr";
-// hooks
+// components
import { EmptyState } from "@/components/common";
import { PageHead } from "@/components/core";
import { CycleDetailsSidebar } from "@/components/cycles";
-import { CycleMobileHeader } from "@/components/cycles/cycle-mobile-header";
-import { CycleIssuesHeader } from "@/components/headers";
import { CycleLayoutRoot } from "@/components/issues/issue-layouts";
+// hooks
import { useCycle, useProject } from "@/hooks/store";
import useLocalStorage from "@/hooks/use-local-storage";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// components
-// ui
// assets
-import { NextPageWithLayout } from "@/lib/types";
import emptyCycle from "public/empty-state/cycle.svg";
-// types
-const CycleDetailPage: NextPageWithLayout = observer(() => {
+const CycleDetailPage = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
// store hooks
const { fetchCycleDetails, getCycleById } = useCycle();
const { getProjectById } = useProject();
@@ -84,12 +78,4 @@ const CycleDetailPage: NextPageWithLayout = observer(() => {
);
});
-CycleDetailPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<CycleIssuesHeader />} mobileHeader={<CycleMobileHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default CycleDetailPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/cycles/page.tsx
similarity index 81%
rename from web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/cycles/page.tsx
index 5b7f313e7a..9cebd29ce9 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/cycles/page.tsx
@@ -1,14 +1,14 @@
-import { useState, ReactElement } from "react";
+"use client";
+
+import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { TCycleFilters } from "@plane/types";
// components
import { PageHead } from "@/components/core";
import { CyclesView, CycleCreateUpdateModal, CycleAppliedFiltersList } from "@/components/cycles";
-import CyclesListMobileHeader from "@/components/cycles/cycles-list-mobile-header";
import { EmptyState } from "@/components/empty-state";
-import { CyclesHeader } from "@/components/headers";
import { CycleModuleListLayout } from "@/components/ui";
// constants
import { EmptyStateType } from "@/constants/empty-state";
@@ -16,12 +16,8 @@ import { EmptyStateType } from "@/constants/empty-state";
import { calculateTotalFilters } from "@/helpers/filter.helper";
// hooks
import { useEventTracker, useCycle, useProject, useCycleFilter } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectCyclesPage: NextPageWithLayout = observer(() => {
+const ProjectCyclesPage = observer(() => {
// states
const [createModal, setCreateModal] = useState(false);
// store hooks
@@ -29,8 +25,7 @@ const ProjectCyclesPage: NextPageWithLayout = observer(() => {
const { currentProjectCycleIds, loader } = useCycle();
const { getProjectById, currentProjectDetails } = useProject();
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// cycle filters hook
const { clearAllFilters, currentProjectFilters, updateFilters } = useCycleFilter();
// derived values
@@ -103,12 +98,4 @@ const ProjectCyclesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectCyclesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<CyclesHeader />} mobileHeader={<CyclesListMobileHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
-export default ProjectCyclesPage;
+export default ProjectCyclesPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/draft-issues/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/draft-issues/page.tsx
similarity index 67%
rename from web/pages/[workspaceSlug]/projects/[projectId]/draft-issues/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/draft-issues/page.tsx
index f6e0658d9a..350a18a6bb 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/draft-issues/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/draft-issues/page.tsx
@@ -1,21 +1,17 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import { X, PenSquare } from "lucide-react";
-// layouts
// components
import { PageHead } from "@/components/core";
-import { ProjectDraftIssueHeader } from "@/components/headers";
import { DraftIssueLayoutRoot } from "@/components/issues/issue-layouts/roots/draft-issue-layout-root";
-// types
// hooks
import { useProject } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectDraftIssuesPage: NextPageWithLayout = observer(() => {
+const ProjectDraftIssuesPage = observer(() => {
const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store
const { getProjectById } = useProject();
// derived values
@@ -43,12 +39,4 @@ const ProjectDraftIssuesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectDraftIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectDraftIssueHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
-export default ProjectDraftIssuesPage;
+export default ProjectDraftIssuesPage;
\ No newline at end of file
diff --git a/web/app/[workspaceSlug]/projects/[projectId]/inbox/page.tsx b/web/app/[workspaceSlug]/projects/[projectId]/inbox/page.tsx
new file mode 100644
index 0000000000..596de85b22
--- /dev/null
+++ b/web/app/[workspaceSlug]/projects/[projectId]/inbox/page.tsx
@@ -0,0 +1,63 @@
+"use client";
+
+import { observer } from "mobx-react";
+import { useParams, useSearchParams } from "next/navigation";
+// components
+import { PageHead } from "@/components/core";
+import { EmptyState } from "@/components/empty-state";
+import { InboxIssueRoot } from "@/components/inbox";
+// constants
+import { EmptyStateType } from "@/constants/empty-state";
+// helpers
+import { EInboxIssueCurrentTab } from "@/helpers/inbox.helper";
+// hooks
+import { useProject } from "@/hooks/store";
+
+const ProjectInboxPage = observer(() => {
+ /// router
+ const { workspaceSlug, projectId } = useParams();
+ const searchParams = useSearchParams();
+ const navigationTab = searchParams.get("currentTab");
+ const inboxIssueId = searchParams.get("inboxIssueId");
+ // hooks
+ const { currentProjectDetails } = useProject();
+
+ // No access to inbox
+ if (currentProjectDetails?.inbox_view === false)
+ return (
+ <div className="flex items-center justify-center h-full w-full">
+ <EmptyState
+ type={EmptyStateType.DISABLED_PROJECT_INBOX}
+ primaryButtonLink={`/${workspaceSlug}/projects/${projectId}/settings/features`}
+ />
+ </div>
+ );
+
+ // derived values
+ const pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Inbox` : "Plane - Inbox";
+
+ const currentNavigationTab = navigationTab
+ ? navigationTab === "open"
+ ? EInboxIssueCurrentTab.OPEN
+ : EInboxIssueCurrentTab.CLOSED
+ : undefined;
+
+ if (!workspaceSlug || !projectId) return <></>;
+
+ return (
+ <div className="flex h-full flex-col">
+ <PageHead title={pageTitle} />
+ <div className="w-full h-full overflow-hidden">
+ <InboxIssueRoot
+ workspaceSlug={workspaceSlug.toString()}
+ projectId={projectId.toString()}
+ inboxIssueId={inboxIssueId?.toString() || undefined}
+ inboxAccessible={currentProjectDetails?.inbox_view || false}
+ navigationTab={currentNavigationTab}
+ />
+ </div>
+ </div>
+ );
+});
+
+export default ProjectInboxPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx b/web/app/[workspaceSlug]/projects/[projectId]/issues/[issueId]/page.tsx
similarity index 85%
rename from web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/issues/[issueId]/page.tsx
index cdd40a38ec..0ff5757bd9 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/issues/[issueId]/page.tsx
@@ -1,6 +1,8 @@
-import React, { ReactElement, useEffect } from "react";
+"use client";
+
+import React, { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import { useTheme } from "next-themes";
import useSWR from "swr";
// ui
@@ -8,22 +10,17 @@ import { Loader } from "@plane/ui";
// components
import { EmptyState } from "@/components/common";
import { PageHead } from "@/components/core";
-import { ProjectIssueDetailsHeader } from "@/components/headers";
import { IssueDetailRoot } from "@/components/issues";
// hooks
import { useAppTheme, useIssueDetail, useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
// assets
import emptyIssueDark from "@/public/empty-state/search/issues-dark.webp";
import emptyIssueLight from "@/public/empty-state/search/issues-light.webp";
-const IssueDetailsPage: NextPageWithLayout = observer(() => {
+const IssueDetailsPage = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, issueId } = router.query;
+ const { workspaceSlug, projectId, issueId } = useParams();
// hooks
const { resolvedTheme } = useTheme();
// store hooks
@@ -108,12 +105,4 @@ const IssueDetailsPage: NextPageWithLayout = observer(() => {
);
});
-IssueDetailsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectIssueDetailsHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default IssueDetailsPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/issues/page.tsx
similarity index 52%
rename from web/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/issues/page.tsx
index 381b16267c..7ea73bb1c9 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/issues/page.tsx
@@ -1,22 +1,16 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
import Head from "next/head";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { PageHead } from "@/components/core";
-import { ProjectIssuesHeader } from "@/components/headers";
import { ProjectLayoutRoot } from "@/components/issues";
-// types
-import { IssuesMobileHeader } from "@/components/issues/issues-mobile-header";
-import { useProject } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { NextPageWithLayout } from "@/lib/types";
-// layouts
// hooks
+import { useProject } from "@/hooks/store";
-const ProjectIssuesPage: NextPageWithLayout = observer(() => {
- const router = useRouter();
- const { projectId } = router.query;
+const ProjectIssuesPage = observer(() => {
+ const { projectId } = useParams();
// store
const { getProjectById } = useProject();
@@ -41,12 +35,4 @@ const ProjectIssuesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectIssuesHeader />} mobileHeader={<IssuesMobileHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default ProjectIssuesPage;
diff --git a/web/app/[workspaceSlug]/projects/[projectId]/layout.tsx b/web/app/[workspaceSlug]/projects/[projectId]/layout.tsx
new file mode 100644
index 0000000000..03f01ae382
--- /dev/null
+++ b/web/app/[workspaceSlug]/projects/[projectId]/layout.tsx
@@ -0,0 +1,13 @@
+"use client";
+
+import { ReactNode } from "react"
+// layouts
+import { ProjectAuthWrapper } from "@/layouts/auth-layout"
+
+const ProjectLayout = ({ children }: { children: ReactNode }) => (
+ <ProjectAuthWrapper>
+ {children}
+ </ProjectAuthWrapper>
+);
+
+export default ProjectLayout;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx b/web/app/[workspaceSlug]/projects/[projectId]/modules/[moduleId]/page.tsx
similarity index 80%
rename from web/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/modules/[moduleId]/page.tsx
index d6a0c03423..c959cb2e6e 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/modules/[moduleId]/page.tsx
@@ -1,28 +1,23 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import useSWR from "swr";
-// hooks
+// components
import { EmptyState } from "@/components/common";
import { PageHead } from "@/components/core";
-import { ModuleIssuesHeader } from "@/components/headers";
import { ModuleLayoutRoot } from "@/components/issues";
import { ModuleDetailsSidebar } from "@/components/modules";
-import { ModuleMobileHeader } from "@/components/modules/module-mobile-header";
+// hooks
import { useModule, useProject } from "@/hooks/store";
import useLocalStorage from "@/hooks/use-local-storage";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// components
// assets
-import { NextPageWithLayout } from "@/lib/types";
import emptyModule from "public/empty-state/module.svg";
-// types
-const ModuleIssuesPage: NextPageWithLayout = observer(() => {
+const ModuleIssuesPage = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
// store hooks
const { fetchModuleDetails, getModuleById } = useModule();
const { getProjectById } = useProject();
@@ -82,12 +77,4 @@ const ModuleIssuesPage: NextPageWithLayout = observer(() => {
);
});
-ModuleIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ModuleIssuesHeader />} mobileHeader={<ModuleMobileHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default ModuleIssuesPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/modules/page.tsx
similarity index 78%
rename from web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/modules/page.tsx
index 08e621d0fe..f8b474d948 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/modules/page.tsx
@@ -1,28 +1,23 @@
-import { ReactElement, useCallback } from "react";
+"use client";
+
+import { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { TModuleFilters } from "@plane/types";
// components
import { PageHead } from "@/components/core";
import { EmptyState } from "@/components/empty-state";
-import { ModulesListHeader } from "@/components/headers";
import { ModuleAppliedFiltersList, ModulesListView } from "@/components/modules";
-import ModulesListMobileHeader from "@/components/modules/moduels-list-mobile-header";
// constants
import { EmptyStateType } from "@/constants/empty-state";
// helpers
import { calculateTotalFilters } from "@/helpers/filter.helper";
// hooks
import { useModuleFilter, useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectModulesPage: NextPageWithLayout = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+const ProjectModulesPage = observer(() => {
+ const { workspaceSlug, projectId } = useParams();
// store
const { getProjectById, currentProjectDetails } = useProject();
const { currentProjectFilters, currentProjectDisplayFilters, clearAllFilters, updateFilters, updateDisplayFilters } =
@@ -82,12 +77,4 @@ const ProjectModulesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectModulesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ModulesListHeader />} mobileHeader={<ModulesListMobileHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default ProjectModulesPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx b/web/app/[workspaceSlug]/projects/[projectId]/pages/[pageId]/page.tsx
similarity index 88%
rename from web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/pages/[pageId]/page.tsx
index 4a1f523b90..c61c291cb4 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/pages/[pageId]/page.tsx
@@ -1,7 +1,9 @@
-import { ReactElement, useRef, useState } from "react";
+"use client";
+
+import { useRef, useState } from "react";
import { observer } from "mobx-react-lite";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import useSWR from "swr";
// document-editor
import { EditorRefApi, useEditorMarkings } from "@plane/document-editor";
@@ -12,19 +14,14 @@ import { TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
// components
import { LogoSpinner } from "@/components/common";
import { PageHead } from "@/components/core";
-import { PageDetailsHeader } from "@/components/headers";
import { IssuePeekOverview } from "@/components/issues";
import { PageEditorBody, PageEditorHeaderRoot } from "@/components/pages";
// helpers
import { cn } from "@/helpers/common.helper";
// hooks
import { usePage, useProjectPages } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// lib
-import { NextPageWithLayout } from "@/lib/types";
-const PageDetailsPage: NextPageWithLayout = observer(() => {
+const PageDetailsPage = observer(() => {
// states
const [sidePeekVisible, setSidePeekVisible] = useState(window.innerWidth >= 768 ? true : false);
const [editorReady, setEditorReady] = useState(false);
@@ -34,7 +31,7 @@ const PageDetailsPage: NextPageWithLayout = observer(() => {
const readOnlyEditorRef = useRef<EditorRefApi>(null);
// router
const router = useRouter();
- const { workspaceSlug, projectId, pageId } = router.query;
+ const { workspaceSlug, projectId, pageId } = useParams();
// store hooks
const { createPage, getPageById } = useProjectPages();
const page = usePage(pageId?.toString() ?? "");
@@ -131,12 +128,4 @@ const PageDetailsPage: NextPageWithLayout = observer(() => {
);
});
-PageDetailsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<PageDetailsHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default PageDetailsPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/pages/page.tsx
similarity index 70%
rename from web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/pages/page.tsx
index 764c4a68a3..5b536108eb 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/pages/page.tsx
@@ -1,23 +1,19 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useSearchParams } from "next/navigation";
// types
import { TPageNavigationTabs } from "@plane/types";
// components
import { PageHead } from "@/components/core";
-import { PagesHeader } from "@/components/headers";
import { PagesListRoot, PagesListView } from "@/components/pages";
// hooks
import { useAppRouter, useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// lib
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectPagesPage: NextPageWithLayout = observer(() => {
+const ProjectPagesPage = observer(() => {
// router
- const router = useRouter();
- const { type } = router.query;
+ const searchParams = useSearchParams();
+ const type = searchParams.get("type");
// store hooks
const { workspaceSlug, projectId } = useAppRouter();
const { getProjectById } = useProject();
@@ -51,12 +47,4 @@ const ProjectPagesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectPagesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<PagesHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default ProjectPagesPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/automations/page.tsx
similarity index 68%
rename from web/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/automations/page.tsx
index 060520fafb..1676b25aa1 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/automations/page.tsx
@@ -1,30 +1,22 @@
-import React, { ReactElement } from "react";
+"use client";
+
+import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IProject } from "@plane/types";
-// hooks
-import { TOAST_TYPE, setToast } from "@plane/ui";
-import { AutoArchiveAutomation, AutoCloseAutomation } from "@/components/automation";
-// layouts
// ui
+import { TOAST_TYPE, setToast } from "@plane/ui";
// components
+import { AutoArchiveAutomation, AutoCloseAutomation } from "@/components/automation";
import { PageHead } from "@/components/core";
-import { ProjectSettingHeader } from "@/components/headers";
+// constants
import { EUserProjectRoles } from "@/constants/project";
-import { useProject, useUser } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-// layouts
-import { ProjectSettingLayout } from "@/layouts/settings-layout";
// hooks
-// components
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// constants
+import { useProject, useUser } from "@/hooks/store";
-const AutomationSettingsPage: NextPageWithLayout = observer(() => {
+const AutomationSettingsPage = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const {
membership: { currentProjectRole },
@@ -61,12 +53,4 @@ const AutomationSettingsPage: NextPageWithLayout = observer(() => {
);
});
-AutomationSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectSettingHeader />} withProjectWrapper>
- <ProjectSettingLayout>{page}</ProjectSettingLayout>
- </AppLayout>
- );
-};
-
export default AutomationSettingsPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/estimates/page.tsx
similarity index 58%
rename from web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/estimates/page.tsx
index c3426ee946..f292bd6d99 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/estimates/page.tsx
@@ -1,23 +1,17 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { PageHead } from "@/components/core";
import { EstimateRoot } from "@/components/estimates";
-import { ProjectSettingHeader } from "@/components/headers";
// constants
import { EUserProjectRoles } from "@/constants/project";
// hooks
import { useUser, useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { ProjectSettingLayout } from "@/layouts/settings-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const EstimatesSettingsPage: NextPageWithLayout = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+const EstimatesSettingsPage = observer(() => {
+ const { workspaceSlug, projectId } = useParams();
const {
membership: { currentProjectRole },
} = useUser();
@@ -38,12 +32,4 @@ const EstimatesSettingsPage: NextPageWithLayout = observer(() => {
);
});
-EstimatesSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectSettingHeader />} withProjectWrapper>
- <ProjectSettingLayout>{page}</ProjectSettingLayout>
- </AppLayout>
- );
-};
-
export default EstimatesSettingsPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/features/page.tsx
similarity index 66%
rename from web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/features/page.tsx
index a55b58beb2..9317003c7a 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/features/page.tsx
@@ -1,24 +1,18 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
-// hooks
+// components
import { PageHead } from "@/components/core";
-import { ProjectSettingHeader } from "@/components/headers";
import { ProjectFeaturesList } from "@/components/project";
+// constants
import { EUserProjectRoles } from "@/constants/project";
+// hooks
import { useProject, useUser } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { ProjectSettingLayout } from "@/layouts/settings-layout";
-// components
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// constants
-const FeaturesSettingsPage: NextPageWithLayout = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+const FeaturesSettingsPage = observer(() => {
+ const { workspaceSlug, projectId } = useParams();
// store
const {
membership: { fetchUserProjectInfo },
@@ -52,12 +46,4 @@ const FeaturesSettingsPage: NextPageWithLayout = observer(() => {
);
});
-FeaturesSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectSettingHeader />} withProjectWrapper>
- <ProjectSettingLayout>{page}</ProjectSettingLayout>
- </AppLayout>
- );
-};
-
-export default FeaturesSettingsPage;
+export default FeaturesSettingsPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/labels/page.tsx
similarity index 65%
rename from web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/labels/page.tsx
index 5c26443055..192d7147f7 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/labels/page.tsx
@@ -1,20 +1,16 @@
-import { ReactElement, useEffect, useRef } from "react";
+"use client";
+
+import { useEffect, useRef } from "react";
import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";
import { observer } from "mobx-react";
-// layouts
+// components
import { PageHead } from "@/components/core";
-import { ProjectSettingHeader } from "@/components/headers";
import { ProjectSettingsLabelList } from "@/components/labels";
-import { useProject } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { ProjectSettingLayout } from "@/layouts/settings-layout";
-// components
-// types
-import { NextPageWithLayout } from "@/lib/types";
// hooks
+import { useProject } from "@/hooks/store";
-const LabelsSettingsPage: NextPageWithLayout = observer(() => {
+const LabelsSettingsPage = observer(() => {
const { currentProjectDetails } = useProject();
const pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Labels` : undefined;
@@ -43,12 +39,4 @@ const LabelsSettingsPage: NextPageWithLayout = observer(() => {
);
});
-LabelsSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout withProjectWrapper header={<ProjectSettingHeader />}>
- <ProjectSettingLayout>{page}</ProjectSettingLayout>
- </AppLayout>
- );
-};
-
export default LabelsSettingsPage;
diff --git a/web/layouts/settings-layout/project/layout.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/layout.tsx
similarity index 83%
rename from web/layouts/settings-layout/project/layout.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/layout.tsx
index 8e5046d304..6645eb7d6a 100644
--- a/web/layouts/settings-layout/project/layout.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/layout.tsx
@@ -1,26 +1,28 @@
+"use client";
+
import { FC, ReactNode } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
-// hooks
-// components
+import { useParams } from "next/navigation";
+// ui
import { Button, LayersIcon } from "@plane/ui";
+// components
import { NotAuthorizedView } from "@/components/auth-screens";
-// ui
// constants
import { EUserProjectRoles } from "@/constants/project";
+// hooks
import { useUser } from "@/hooks/store";
-import { ProjectSettingsSidebar } from "./sidebar";
+// local components
+import ProjectSettingsSidebar from "./sidebar";
export interface IProjectSettingLayout {
children: ReactNode;
}
-export const ProjectSettingLayout: FC<IProjectSettingLayout> = observer((props) => {
+const ProjectSettingLayout: FC<IProjectSettingLayout> = observer((props) => {
const { children } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const {
membership: { currentProjectRole },
@@ -51,3 +53,5 @@ export const ProjectSettingLayout: FC<IProjectSettingLayout> = observer((props)
</div>
);
});
+
+export default ProjectSettingLayout;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/members/page.tsx
similarity index 54%
rename from web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/members/page.tsx
index 6d60c0e763..af1c82e12a 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/members/page.tsx
@@ -1,18 +1,13 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-// layouts
// components
import { PageHead } from "@/components/core";
-import { ProjectSettingHeader } from "@/components/headers";
import { ProjectMemberList, ProjectSettingsMemberDefaults } from "@/components/project";
-// types
// hooks
import { useProject } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { ProjectSettingLayout } from "@/layouts/settings-layout";
-import { NextPageWithLayout } from "@/lib/types";
-const MembersSettingsPage: NextPageWithLayout = observer(() => {
+const MembersSettingsPage = observer(() => {
// store
const { currentProjectDetails } = useProject();
// derived values
@@ -29,12 +24,4 @@ const MembersSettingsPage: NextPageWithLayout = observer(() => {
);
});
-MembersSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectSettingHeader />} withProjectWrapper>
- <ProjectSettingLayout>{page}</ProjectSettingLayout>
- </AppLayout>
- );
-};
-
export default MembersSettingsPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/page.tsx
similarity index 79%
rename from web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/page.tsx
index b07be48a5e..cc5cfc855d 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/page.tsx
@@ -1,10 +1,11 @@
-import { useState, ReactElement } from "react";
+"use client";
+
+import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// components
import { PageHead } from "@/components/core";
-import { ProjectSettingHeader } from "@/components/headers";
import {
ArchiveRestoreProjectModal,
ArchiveProjectSelection,
@@ -15,19 +16,13 @@ import {
} from "@/components/project";
// hooks
import { useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { ProjectSettingLayout } from "@/layouts/settings-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const GeneralSettingsPage: NextPageWithLayout = observer(() => {
+const GeneralSettingsPage = observer(() => {
// states
const [selectProject, setSelectedProject] = useState<string | null>(null);
const [archiveProject, setArchiveProject] = useState<boolean>(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { currentProjectDetails, fetchProjectDetails } = useProject();
// api call to fetch project details
@@ -91,12 +86,4 @@ const GeneralSettingsPage: NextPageWithLayout = observer(() => {
);
});
-GeneralSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectSettingHeader />} withProjectWrapper>
- <ProjectSettingLayout>{page}</ProjectSettingLayout>
- </AppLayout>
- );
-};
-
export default GeneralSettingsPage;
diff --git a/web/layouts/settings-layout/project/sidebar.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/sidebar.tsx
similarity index 84%
rename from web/layouts/settings-layout/project/sidebar.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/sidebar.tsx
index 98fc16bb90..3ebd49a585 100644
--- a/web/layouts/settings-layout/project/sidebar.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/sidebar.tsx
@@ -1,16 +1,16 @@
import React from "react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
// ui
import { Loader } from "@plane/ui";
-// hooks
+// constants
import { EUserProjectRoles, PROJECT_SETTINGS_LINKS } from "@/constants/project";
+// hooks
import { useUser } from "@/hooks/store";
-// constants
-export const ProjectSettingsSidebar = () => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+const ProjectSettingsSidebar = () => {
+ const { workspaceSlug, projectId } = useParams();
+ const pathname = usePathname();
// mobx store
const {
membership: { currentProjectRole },
@@ -43,11 +43,10 @@ export const ProjectSettingsSidebar = () => {
projectMemberInfo >= link.access && (
<Link key={link.key} href={`/${workspaceSlug}/projects/${projectId}${link.href}`}>
<div
- className={`rounded-md px-4 py-2 text-sm font-medium ${
- link.highlight(router.asPath, `/${workspaceSlug}/projects/${projectId}`)
+ className={`rounded-md px-4 py-2 text-sm font-medium ${link.highlight(pathname, `/${workspaceSlug}/projects/${projectId}`)
? "bg-custom-primary-100/10 text-custom-primary-100"
: "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
- }`}
+ }`}
>
{link.label}
</div>
@@ -59,3 +58,5 @@ export const ProjectSettingsSidebar = () => {
</div>
);
};
+
+export default ProjectSettingsSidebar;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx b/web/app/[workspaceSlug]/projects/[projectId]/settings/states/page.tsx
similarity index 57%
rename from web/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/settings/states/page.tsx
index 3a696cf8e9..6c030a1fdc 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/settings/states/page.tsx
@@ -1,18 +1,13 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-// layout
+// components
import { PageHead } from "@/components/core";
-import { ProjectSettingHeader } from "@/components/headers";
import { ProjectSettingStateList } from "@/components/states";
-import { useProject } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { ProjectSettingLayout } from "@/layouts/settings-layout";
-// components
-// types
-import { NextPageWithLayout } from "@/lib/types";
// hook
+import { useProject } from "@/hooks/store";
-const StatesSettingsPage: NextPageWithLayout = observer(() => {
+const StatesSettingsPage = observer(() => {
// store
const { currentProjectDetails } = useProject();
// derived values
@@ -30,12 +25,4 @@ const StatesSettingsPage: NextPageWithLayout = observer(() => {
);
});
-StatesSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout withProjectWrapper header={<ProjectSettingHeader />}>
- <ProjectSettingLayout>{page}</ProjectSettingLayout>
- </AppLayout>
- );
-};
-
export default StatesSettingsPage;
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/views/[viewId].tsx b/web/app/[workspaceSlug]/projects/[projectId]/views/[viewId]/page.tsx
similarity index 71%
rename from web/pages/[workspaceSlug]/projects/[projectId]/views/[viewId].tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/views/[viewId]/page.tsx
index 7358e836fd..ef153ca4d0 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/views/[viewId].tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/views/[viewId]/page.tsx
@@ -1,26 +1,21 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import useSWR from "swr";
-// hooks
+// components
import { EmptyState } from "@/components/common";
import { PageHead } from "@/components/core";
-import { ProjectViewIssuesHeader } from "@/components/headers";
import { ProjectViewLayoutRoot } from "@/components/issues";
+// hooks
import { useProject, useProjectView } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// components
-// ui
// assets
-import { NextPageWithLayout } from "@/lib/types";
import emptyView from "public/empty-state/view.svg";
-// types
-const ProjectViewIssuesPage: NextPageWithLayout = observer(() => {
+const ProjectViewIssuesPage = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, viewId } = router.query;
+ const { workspaceSlug, projectId, viewId } = useParams();
// store hooks
const { fetchViewDetails, getViewById } = useProjectView();
const { getProjectById } = useProject();
@@ -58,12 +53,4 @@ const ProjectViewIssuesPage: NextPageWithLayout = observer(() => {
);
});
-ProjectViewIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectViewIssuesHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
-export default ProjectViewIssuesPage;
+export default ProjectViewIssuesPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx b/web/app/[workspaceSlug]/projects/[projectId]/views/page.tsx
similarity index 65%
rename from web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
rename to web/app/[workspaceSlug]/projects/[projectId]/views/page.tsx
index dbdc0f192e..25daf594c5 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
+++ b/web/app/[workspaceSlug]/projects/[projectId]/views/page.tsx
@@ -1,24 +1,19 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { PageHead } from "@/components/core";
import { EmptyState } from "@/components/empty-state";
-import { ProjectViewsHeader } from "@/components/headers";
import { ProjectViewsList } from "@/components/views";
// constants
import { EmptyStateType } from "@/constants/empty-state";
// hooks
import { useProject } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectViewsPage: NextPageWithLayout = observer(() => {
+const ProjectViewsPage = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store
const { getProjectById, currentProjectDetails } = useProject();
// derived values
@@ -46,12 +41,4 @@ const ProjectViewsPage: NextPageWithLayout = observer(() => {
);
});
-ProjectViewsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<ProjectViewsHeader />} withProjectWrapper>
- {page}
- </AppLayout>
- );
-};
-
export default ProjectViewsPage;
diff --git a/web/pages/[workspaceSlug]/projects/index.tsx b/web/app/[workspaceSlug]/projects/page.tsx
similarity index 64%
rename from web/pages/[workspaceSlug]/projects/index.tsx
rename to web/app/[workspaceSlug]/projects/page.tsx
index 5646a5c01e..8cc9ae7720 100644
--- a/web/pages/[workspaceSlug]/projects/index.tsx
+++ b/web/app/[workspaceSlug]/projects/page.tsx
@@ -1,20 +1,18 @@
-import { ReactElement, useCallback } from "react";
+"use client";
+
+import { useCallback } from "react";
import { observer } from "mobx-react";
+// types
import { TProjectAppliedDisplayFilterKeys, TProjectFilters } from "@plane/types";
// components
import { PageHead } from "@/components/core";
-import { ProjectsHeader } from "@/components/headers";
import { ProjectAppliedFiltersList, ProjectCardList } from "@/components/project";
-// layouts
-import ProjectsMobileHeader from "@/components/project/projects-mobile-header";
+// helpers
import { calculateTotalFilters } from "@/helpers/filter.helper";
+// hooks
import { useAppRouter, useProject, useProjectFilter, useWorkspace } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-// helpers
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ProjectsPage: NextPageWithLayout = observer(() => {
+const ProjectsPage = observer(() => {
// store
const { workspaceSlug } = useAppRouter();
const { currentWorkspace } = useWorkspace();
@@ -63,27 +61,23 @@ const ProjectsPage: NextPageWithLayout = observer(() => {
<div className="flex h-full w-full flex-col">
{(calculateTotalFilters(currentWorkspaceFilters ?? {}) !== 0 ||
currentWorkspaceAppliedDisplayFilters?.length !== 0) && (
- <div className="border-b border-custom-border-200 px-5 py-3">
- <ProjectAppliedFiltersList
- appliedFilters={currentWorkspaceFilters ?? {}}
- appliedDisplayFilters={currentWorkspaceAppliedDisplayFilters ?? []}
- handleClearAllFilters={handleClearAllFilters}
- handleRemoveFilter={handleRemoveFilter}
- handleRemoveDisplayFilter={handleRemoveDisplayFilter}
- filteredProjects={filteredProjectIds?.length ?? 0}
- totalProjects={totalProjectIds?.length ?? 0}
- alwaysAllowEditing
- />
- </div>
- )}
+ <div className="border-b border-custom-border-200 px-5 py-3">
+ <ProjectAppliedFiltersList
+ appliedFilters={currentWorkspaceFilters ?? {}}
+ appliedDisplayFilters={currentWorkspaceAppliedDisplayFilters ?? []}
+ handleClearAllFilters={handleClearAllFilters}
+ handleRemoveFilter={handleRemoveFilter}
+ handleRemoveDisplayFilter={handleRemoveDisplayFilter}
+ filteredProjects={filteredProjectIds?.length ?? 0}
+ totalProjects={totalProjectIds?.length ?? 0}
+ alwaysAllowEditing
+ />
+ </div>
+ )}
<ProjectCardList />
</div>
</>
);
});
-ProjectsPage.getLayout = function getLayout(page: ReactElement) {
- return <AppLayout header={<ProjectsHeader />} mobileHeader={<ProjectsMobileHeader/>}>{page}</AppLayout>;
-};
-
-export default ProjectsPage;
+export default ProjectsPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/settings/api-tokens.tsx b/web/app/[workspaceSlug]/settings/api-tokens/page.tsx
similarity index 82%
rename from web/pages/[workspaceSlug]/settings/api-tokens.tsx
rename to web/app/[workspaceSlug]/settings/api-tokens/page.tsx
index 464c5e3736..906fee3284 100644
--- a/web/pages/[workspaceSlug]/settings/api-tokens.tsx
+++ b/web/app/[workspaceSlug]/settings/api-tokens/page.tsx
@@ -1,37 +1,32 @@
+"use client";
+
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
-// store hooks
+// ui
import { Button } from "@plane/ui";
+// component
import { ApiTokenListItem, CreateApiTokenModal } from "@/components/api-token";
import { PageHead } from "@/components/core";
import { EmptyState } from "@/components/empty-state";
-import { WorkspaceSettingHeader } from "@/components/headers";
import { APITokenSettingsLoader } from "@/components/ui";
+// constants
import { EmptyStateType } from "@/constants/empty-state";
import { API_TOKENS_LIST } from "@/constants/fetch-keys";
import { EUserWorkspaceRoles } from "@/constants/workspace";
+// store hooks
import { useUser, useWorkspace } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// component
-// ui
// services
-import { NextPageWithLayout } from "@/lib/types";
import { APITokenService } from "@/services/api_token.service";
-// types
-// constants
const apiTokenService = new APITokenService();
-const ApiTokensPage: NextPageWithLayout = observer(() => {
+const ApiTokensPage = observer(() => {
// states
const [isCreateTokenModalOpen, setIsCreateTokenModalOpen] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
membership: { currentWorkspaceRole },
@@ -97,12 +92,4 @@ const ApiTokensPage: NextPageWithLayout = observer(() => {
);
});
-ApiTokensPage.getLayout = function getLayout(page: React.ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
-export default ApiTokensPage;
+export default ApiTokensPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/settings/billing.tsx b/web/app/[workspaceSlug]/settings/billing/page.tsx
similarity index 76%
rename from web/pages/[workspaceSlug]/settings/billing.tsx
rename to web/app/[workspaceSlug]/settings/billing/page.tsx
index bde5abebbd..4dfe3101ff 100644
--- a/web/pages/[workspaceSlug]/settings/billing.tsx
+++ b/web/app/[workspaceSlug]/settings/billing/page.tsx
@@ -1,3 +1,6 @@
+<<<<<<< HEAD:web/app/[workspaceSlug]/settings/billing/page.tsx
+"use client";
+=======
import { observer } from "mobx-react";
// hooks
import { Button } from "@plane/ui";
@@ -14,8 +17,20 @@ import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
// types
import { NextPageWithLayout } from "@/lib/types";
// constants
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d:web/pages/[workspaceSlug]/settings/billing.tsx
-const BillingSettingsPage: NextPageWithLayout = observer(() => {
+import { observer } from "mobx-react";
+// ui
+import { Button } from "@plane/ui";
+// component
+import { PageHead } from "@/components/core";
+// constants
+import { MARKETING_PRICING_PAGE_LINK } from "@/constants/common";
+import { EUserWorkspaceRoles } from "@/constants/workspace";
+// hooks
+import { useUser, useWorkspace } from "@/hooks/store";
+
+const BillingSettingsPage = observer(() => {
// store hooks
const {
membership: { currentWorkspaceRole },
@@ -58,12 +73,4 @@ const BillingSettingsPage: NextPageWithLayout = observer(() => {
);
});
-BillingSettingsPage.getLayout = function getLayout(page: React.ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
-export default BillingSettingsPage;
+export default BillingSettingsPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/settings/exports.tsx b/web/app/[workspaceSlug]/settings/exports/page.tsx
similarity index 70%
rename from web/pages/[workspaceSlug]/settings/exports.tsx
rename to web/app/[workspaceSlug]/settings/exports/page.tsx
index 730f34e497..59fd4d2c75 100644
--- a/web/pages/[workspaceSlug]/settings/exports.tsx
+++ b/web/app/[workspaceSlug]/settings/exports/page.tsx
@@ -1,19 +1,15 @@
+"use client";
+
import { observer } from "mobx-react";
-// hooks
+// components
import { PageHead } from "@/components/core";
import ExportGuide from "@/components/exporter/guide";
-import { WorkspaceSettingHeader } from "@/components/headers";
+// constants
import { EUserWorkspaceRoles } from "@/constants/workspace";
+// hooks
import { useUser, useWorkspace } from "@/hooks/store";
-// layout
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// components
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// constants
-const ExportsPage: NextPageWithLayout = observer(() => {
+const ExportsPage = observer(() => {
// store hooks
const {
membership: { currentWorkspaceRole },
@@ -48,12 +44,4 @@ const ExportsPage: NextPageWithLayout = observer(() => {
);
});
-ExportsPage.getLayout = function getLayout(page: React.ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
-export default ExportsPage;
+export default ExportsPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/settings/imports.tsx b/web/app/[workspaceSlug]/settings/imports/page.tsx
similarity index 70%
rename from web/pages/[workspaceSlug]/settings/imports.tsx
rename to web/app/[workspaceSlug]/settings/imports/page.tsx
index 2eda7cce24..9245cb6ea2 100644
--- a/web/pages/[workspaceSlug]/settings/imports.tsx
+++ b/web/app/[workspaceSlug]/settings/imports/page.tsx
@@ -1,19 +1,13 @@
import { observer } from "mobx-react";
// components
import { PageHead } from "@/components/core";
-import { WorkspaceSettingHeader } from "@/components/headers";
import IntegrationGuide from "@/components/integration/guide";
// constants
import { EUserWorkspaceRoles } from "@/constants/workspace";
// hooks
import { useUser, useWorkspace } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const ImportsPage: NextPageWithLayout = observer(() => {
+const ImportsPage = observer(() => {
// store hooks
const {
membership: { currentWorkspaceRole },
@@ -47,12 +41,4 @@ const ImportsPage: NextPageWithLayout = observer(() => {
);
});
-ImportsPage.getLayout = function getLayout(page: React.ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
export default ImportsPage;
diff --git a/web/pages/[workspaceSlug]/settings/integrations.tsx b/web/app/[workspaceSlug]/settings/integrations/page.tsx
similarity index 72%
rename from web/pages/[workspaceSlug]/settings/integrations.tsx
rename to web/app/[workspaceSlug]/settings/integrations/page.tsx
index 702ca58847..7db73cbe65 100644
--- a/web/pages/[workspaceSlug]/settings/integrations.tsx
+++ b/web/app/[workspaceSlug]/settings/integrations/page.tsx
@@ -1,10 +1,9 @@
-import { ReactElement } from "react";
+"use client"
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// components
import { PageHead } from "@/components/core";
-import { WorkspaceSettingHeader } from "@/components/headers";
import { SingleIntegrationCard } from "@/components/integration";
import { IntegrationAndImportExportBanner, IntegrationsSettingsLoader } from "@/components/ui";
// constants
@@ -12,20 +11,14 @@ import { APP_INTEGRATIONS } from "@/constants/fetch-keys";
import { EUserWorkspaceRoles } from "@/constants/workspace";
// hooks
import { useUser, useWorkspace } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
// services
import { IntegrationService } from "@/services/integrations";
const integrationService = new IntegrationService();
-const WorkspaceIntegrationsPage: NextPageWithLayout = observer(() => {
+const WorkspaceIntegrationsPage = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
membership: { currentWorkspaceRole },
@@ -69,12 +62,4 @@ const WorkspaceIntegrationsPage: NextPageWithLayout = observer(() => {
);
});
-WorkspaceIntegrationsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
-export default WorkspaceIntegrationsPage;
+export default WorkspaceIntegrationsPage;
\ No newline at end of file
diff --git a/web/layouts/settings-layout/workspace/layout.tsx b/web/app/[workspaceSlug]/settings/layout.tsx
similarity index 85%
rename from web/layouts/settings-layout/workspace/layout.tsx
rename to web/app/[workspaceSlug]/settings/layout.tsx
index 6ed06fecbe..cc0274d455 100644
--- a/web/layouts/settings-layout/workspace/layout.tsx
+++ b/web/app/[workspaceSlug]/settings/layout.tsx
@@ -1,13 +1,16 @@
+"use client";
+
import { FC, ReactNode } from "react";
// components
import MobileWorkspaceSettingsTabs from "@/components/workspace/settings/mobile-workspace-settings-tabs";
+// local components
import { WorkspaceSettingsSidebar } from "./sidebar";
export interface IWorkspaceSettingLayout {
children: ReactNode;
}
-export const WorkspaceSettingLayout: FC<IWorkspaceSettingLayout> = (props) => {
+const WorkspaceSettingLayout: FC<IWorkspaceSettingLayout> = (props) => {
const { children } = props;
return (
@@ -24,3 +27,5 @@ export const WorkspaceSettingLayout: FC<IWorkspaceSettingLayout> = (props) => {
</div>
);
};
+
+export default WorkspaceSettingLayout;
diff --git a/web/pages/[workspaceSlug]/settings/members.tsx b/web/app/[workspaceSlug]/settings/members/page.tsx
similarity index 84%
rename from web/pages/[workspaceSlug]/settings/members.tsx
rename to web/app/[workspaceSlug]/settings/members/page.tsx
index e01528ddc1..2899c5ed57 100644
--- a/web/pages/[workspaceSlug]/settings/members.tsx
+++ b/web/app/[workspaceSlug]/settings/members/page.tsx
@@ -1,34 +1,30 @@
-import { useState, ReactElement } from "react";
+"use client";
+
+import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Search } from "lucide-react";
+// types
import { IWorkspaceBulkInviteFormData } from "@plane/types";
-// hooks
+// ui
import { Button, TOAST_TYPE, setToast } from "@plane/ui";
+// components
import { PageHead } from "@/components/core";
-import { WorkspaceSettingHeader } from "@/components/headers";
import { SendWorkspaceInvitationModal, WorkspaceMembersList } from "@/components/workspace";
+// constants
import { MEMBER_INVITED } from "@/constants/event-tracker";
import { EUserWorkspaceRoles } from "@/constants/workspace";
+// helpers
import { getUserRole } from "@/helpers/user.helper";
+// hooks
import { useEventTracker, useMember, useUser, useWorkspace } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// components
-// ui
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// helpers
-// constants
-const WorkspaceMembersSettingsPage: NextPageWithLayout = observer(() => {
+const WorkspaceMembersSettingsPage = observer(() => {
// states
const [inviteModal, setInviteModal] = useState(false);
const [searchQuery, setSearchQuery] = useState<string>("");
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { captureEvent } = useEventTracker();
const {
@@ -120,12 +116,4 @@ const WorkspaceMembersSettingsPage: NextPageWithLayout = observer(() => {
);
});
-WorkspaceMembersSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
export default WorkspaceMembersSettingsPage;
diff --git a/web/app/[workspaceSlug]/settings/page.tsx b/web/app/[workspaceSlug]/settings/page.tsx
new file mode 100644
index 0000000000..c628e313c5
--- /dev/null
+++ b/web/app/[workspaceSlug]/settings/page.tsx
@@ -0,0 +1,24 @@
+"use client";
+
+import { observer } from "mobx-react";
+// components
+import { PageHead } from "@/components/core";
+import { WorkspaceDetails } from "@/components/workspace";
+// hooks
+import { useWorkspace } from "@/hooks/store";
+
+const WorkspaceSettingsPage = observer(() => {
+ // store hooks
+ const { currentWorkspace } = useWorkspace();
+ // derived values
+ const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - General Settings` : undefined;
+
+ return (
+ <>
+ <PageHead title={pageTitle} />
+ <WorkspaceDetails />
+ </>
+ );
+});
+
+export default WorkspaceSettingsPage;
diff --git a/web/layouts/settings-layout/workspace/sidebar.tsx b/web/app/[workspaceSlug]/settings/sidebar.tsx
similarity index 73%
rename from web/layouts/settings-layout/workspace/sidebar.tsx
rename to web/app/[workspaceSlug]/settings/sidebar.tsx
index f49eb84d9e..8dfd0d7c39 100644
--- a/web/layouts/settings-layout/workspace/sidebar.tsx
+++ b/web/app/[workspaceSlug]/settings/sidebar.tsx
@@ -1,16 +1,18 @@
+"use client";
+
import React from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
-// hooks
+import { useParams, usePathname } from "next/navigation";
+// constants
import { EUserWorkspaceRoles, WORKSPACE_SETTINGS_LINKS } from "@/constants/workspace";
+// hooks
import { useUser } from "@/hooks/store";
-// constants
export const WorkspaceSettingsSidebar = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
+ const pathname = usePathname();
// mobx store
const {
membership: { currentWorkspaceRole },
@@ -29,11 +31,10 @@ export const WorkspaceSettingsSidebar = observer(() => {
<Link key={link.key} href={`/${workspaceSlug}${link.href}`}>
<span>
<div
- className={`rounded-md px-4 py-2 text-sm font-medium ${
- link.highlight(router.asPath, `/${workspaceSlug}`)
- ? "bg-custom-primary-100/10 text-custom-primary-100"
- : "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
- }`}
+ className={`rounded-md px-4 py-2 text-sm font-medium ${link.highlight(pathname, `/${workspaceSlug}`)
+ ? "bg-custom-primary-100/10 text-custom-primary-100"
+ : "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
+ }`}
>
{link.label}
</div>
diff --git a/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx b/web/app/[workspaceSlug]/settings/webhooks/[webhookId]/page.tsx
similarity index 81%
rename from web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx
rename to web/app/[workspaceSlug]/settings/webhooks/[webhookId]/page.tsx
index 71a16ea8ba..ce3e7a5ebe 100644
--- a/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx
+++ b/web/app/[workspaceSlug]/settings/webhooks/[webhookId]/page.tsx
@@ -1,29 +1,24 @@
+"use client";
+
import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
import { IWebhook } from "@plane/types";
-// hooks
+// ui
import { TOAST_TYPE, setToast } from "@plane/ui";
// components
import { LogoSpinner } from "@/components/common";
import { PageHead } from "@/components/core";
-import { WorkspaceSettingHeader } from "@/components/headers";
import { DeleteWebhookModal, WebhookDeleteSection, WebhookForm } from "@/components/web-hooks";
+// hooks
import { useUser, useWebhook, useWorkspace } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// ui
-// types
-import { NextPageWithLayout } from "@/lib/types";
-const WebhookDetailsPage: NextPageWithLayout = observer(() => {
+const WebhookDetailsPage = observer(() => {
// states
const [deleteWebhookModal, setDeleteWebhookModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, webhookId } = router.query;
+ const { workspaceSlug, webhookId } = useParams();
// mobx store
const {
membership: { currentWorkspaceRole },
@@ -105,12 +100,4 @@ const WebhookDetailsPage: NextPageWithLayout = observer(() => {
);
});
-WebhookDetailsPage.getLayout = function getLayout(page: React.ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
-export default WebhookDetailsPage;
+export default WebhookDetailsPage;
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/settings/webhooks/index.tsx b/web/app/[workspaceSlug]/settings/webhooks/page.tsx
similarity index 82%
rename from web/pages/[workspaceSlug]/settings/webhooks/index.tsx
rename to web/app/[workspaceSlug]/settings/webhooks/page.tsx
index 6046df7e15..695f1f16b2 100644
--- a/web/pages/[workspaceSlug]/settings/webhooks/index.tsx
+++ b/web/app/[workspaceSlug]/settings/webhooks/page.tsx
@@ -1,31 +1,26 @@
+"use client";
+
import React, { useEffect, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
-// hooks
+// ui
import { Button } from "@plane/ui";
+// components
import { PageHead } from "@/components/core";
import { EmptyState } from "@/components/empty-state";
-import { WorkspaceSettingHeader } from "@/components/headers";
import { WebhookSettingsLoader } from "@/components/ui";
import { WebhooksList, CreateWebhookModal } from "@/components/web-hooks";
+// constants
import { EmptyStateType } from "@/constants/empty-state";
+// hooks
import { useUser, useWebhook, useWorkspace } from "@/hooks/store";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// components
-// ui
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// constants
-const WebhooksListPage: NextPageWithLayout = observer(() => {
+const WebhooksListPage = observer(() => {
// states
const [showCreateWebhookModal, setShowCreateWebhookModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// mobx store
const {
membership: { currentWorkspaceRole },
@@ -100,12 +95,4 @@ const WebhooksListPage: NextPageWithLayout = observer(() => {
);
});
-WebhooksListPage.getLayout = function getLayout(page: React.ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
-export default WebhooksListPage;
+export default WebhooksListPage;
\ No newline at end of file
diff --git a/web/layouts/app-layout/sidebar.tsx b/web/app/[workspaceSlug]/sidebar.tsx
similarity index 92%
rename from web/layouts/app-layout/sidebar.tsx
rename to web/app/[workspaceSlug]/sidebar.tsx
index dcd4e45d28..f5ca4039fd 100644
--- a/web/layouts/app-layout/sidebar.tsx
+++ b/web/app/[workspaceSlug]/sidebar.tsx
@@ -12,9 +12,9 @@ import {
import { useAppTheme } from "@/hooks/store";
import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
-export interface IAppSidebar {}
+export interface IAppSidebar { }
-export const AppSidebar: FC<IAppSidebar> = observer(() => {
+const AppSidebar: FC<IAppSidebar> = observer(() => {
// store hooks
const { toggleSidebar, sidebarCollapsed } = useAppTheme();
// refs
@@ -48,3 +48,5 @@ export const AppSidebar: FC<IAppSidebar> = observer(() => {
</div>
);
});
+
+export default AppSidebar;
diff --git a/web/pages/[workspaceSlug]/workspace-views/[globalViewId].tsx b/web/app/[workspaceSlug]/workspace-views/[globalViewId]/page.tsx
similarity index 71%
rename from web/pages/[workspaceSlug]/workspace-views/[globalViewId].tsx
rename to web/app/[workspaceSlug]/workspace-views/[globalViewId]/page.tsx
index 4e04fe7fac..5cb5e54fc8 100644
--- a/web/pages/[workspaceSlug]/workspace-views/[globalViewId].tsx
+++ b/web/app/[workspaceSlug]/workspace-views/[globalViewId]/page.tsx
@@ -1,24 +1,19 @@
-import { ReactElement } from "react";
+"use client";
+
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-// layouts
+import { useParams } from "next/navigation";
+// components
import { PageHead } from "@/components/core";
-import { GlobalIssuesHeader } from "@/components/headers";
import { AllIssueLayoutRoot } from "@/components/issues";
import { GlobalViewsHeader } from "@/components/workspace";
+// constants
import { DEFAULT_GLOBAL_VIEWS_LIST } from "@/constants/workspace";
-import { useGlobalView, useWorkspace } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
// hooks
-// components
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// constants
+import { useGlobalView, useWorkspace } from "@/hooks/store";
-const GlobalViewIssuesPage: NextPageWithLayout = observer(() => {
+const GlobalViewIssuesPage = observer(() => {
// router
- const router = useRouter();
- const { globalViewId } = router.query;
+ const { globalViewId } = useParams();
// store hooks
const { currentWorkspace } = useWorkspace();
const { getViewDetailsById } = useGlobalView();
@@ -45,8 +40,4 @@ const GlobalViewIssuesPage: NextPageWithLayout = observer(() => {
);
});
-GlobalViewIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return <AppLayout header={<GlobalIssuesHeader />}>{page}</AppLayout>;
-};
-
export default GlobalViewIssuesPage;
diff --git a/web/pages/[workspaceSlug]/workspace-views/index.tsx b/web/app/[workspaceSlug]/workspace-views/page.tsx
similarity index 79%
rename from web/pages/[workspaceSlug]/workspace-views/index.tsx
rename to web/app/[workspaceSlug]/workspace-views/page.tsx
index 4a1ceddd71..7de4425847 100644
--- a/web/pages/[workspaceSlug]/workspace-views/index.tsx
+++ b/web/app/[workspaceSlug]/workspace-views/page.tsx
@@ -1,23 +1,20 @@
-import React, { useState, ReactElement } from "react";
+"use client";
+
+import React, { useState } from "react";
import { observer } from "mobx-react";
-// layouts
-// components
-// ui
+// icons
import { Search } from "lucide-react";
+// ui
import { Input } from "@plane/ui";
-// icons
+// components
import { PageHead } from "@/components/core";
-import { GlobalIssuesHeader } from "@/components/headers";
import { GlobalDefaultViewListItem, GlobalViewsList } from "@/components/workspace";
-// types
// constants
import { DEFAULT_GLOBAL_VIEWS_LIST } from "@/constants/workspace";
// hooks
import { useWorkspace } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { NextPageWithLayout } from "@/lib/types";
-const WorkspaceViewsPage: NextPageWithLayout = observer(() => {
+const WorkspaceViewsPage = observer(() => {
const [query, setQuery] = useState("");
// store
const { currentWorkspace } = useWorkspace();
@@ -51,8 +48,4 @@ const WorkspaceViewsPage: NextPageWithLayout = observer(() => {
);
});
-WorkspaceViewsPage.getLayout = function getLayout(page: ReactElement) {
- return <AppLayout header={<GlobalIssuesHeader />}>{page}</AppLayout>;
-};
-
export default WorkspaceViewsPage;
diff --git a/web/app/accounts/forgot-password/layout.tsx b/web/app/accounts/forgot-password/layout.tsx
new file mode 100644
index 0000000000..7ba8e8ded6
--- /dev/null
+++ b/web/app/accounts/forgot-password/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Forgot Password - Plane",
+};
+
+export default function ForgotPasswordLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/app/accounts/forgot-password/page.tsx b/web/app/accounts/forgot-password/page.tsx
new file mode 100644
index 0000000000..2aaedbb214
--- /dev/null
+++ b/web/app/accounts/forgot-password/page.tsx
@@ -0,0 +1,190 @@
+"use client";
+
+import Image from "next/image";
+import Link from "next/link";
+import { useSearchParams } from "next/navigation";
+import { useTheme } from "next-themes";
+import { Controller, useForm } from "react-hook-form";
+// icons
+import { CircleCheck } from "lucide-react";
+// ui
+import { Button, Input, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
+// constants
+import { FORGOT_PASS_LINK, NAVIGATE_TO_SIGNUP } from "@/constants/event-tracker";
+// helpers
+import { EPageTypes } from "@/helpers/authentication.helper";
+import { cn } from "@/helpers/common.helper";
+import { checkEmailValidity } from "@/helpers/string.helper";
+// hooks
+import { useEventTracker } from "@/hooks/store";
+import useTimer from "@/hooks/use-timer";
+// wrappers
+import { AuthenticationWrapper } from "@/lib/wrappers";
+// services
+import { AuthService } from "@/services/auth.service";
+// images
+import 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 TForgotPasswordFormValues = {
+ email: string;
+};
+
+const defaultValues: TForgotPasswordFormValues = {
+ email: "",
+};
+
+// services
+const authService = new AuthService();
+
+const ForgotPasswordPage = () => {
+ // search params
+ const searchParams = useSearchParams();
+ const email = searchParams.get("email");
+ // store hooks
+ const { captureEvent } = useEventTracker();
+ // hooks
+ const { resolvedTheme } = useTheme();
+ // timer
+ const { timer: resendTimerCode, setTimer: setResendCodeTimer } = useTimer(0);
+
+ // form info
+ const {
+ control,
+ formState: { errors, isSubmitting, isValid },
+ handleSubmit,
+ } = useForm<TForgotPasswordFormValues>({
+ defaultValues: {
+ ...defaultValues,
+ email: email?.toString() ?? "",
+ },
+ });
+
+ const handleForgotPassword = async (formData: TForgotPasswordFormValues) => {
+ await authService
+ .sendResetPasswordLink({
+ email: formData.email,
+ })
+ .then(() => {
+ captureEvent(FORGOT_PASS_LINK, {
+ state: "SUCCESS",
+ });
+ setToast({
+ type: TOAST_TYPE.SUCCESS,
+ title: "Email sent",
+ message:
+ "Check your inbox for a link to reset your password. If it doesn't appear within a few minutes, check your spam folder.",
+ });
+ setResendCodeTimer(30);
+ })
+ .catch((err) => {
+ captureEvent(FORGOT_PASS_LINK, {
+ state: "FAILED",
+ });
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: err?.error ?? "Something went wrong. Please try again.",
+ });
+ });
+ };
+
+ const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
+
+ return (
+ <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>
+ <div className="relative w-screen h-screen overflow-hidden">
+ <div className="absolute inset-0 z-0">
+ <Image
+ src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
+ className="w-full h-full object-cover"
+ alt="Plane background pattern"
+ />
+ </div>
+ <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
+ <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
+ <div className="flex items-center gap-x-2 py-10">
+ <Link href={`/`} className="h-[30px] w-[133px]">
+ <Image src={logo} alt="Plane logo" />
+ </Link>
+ </div>
+ <div className="flex flex-col items-end sm:items-center sm:gap-2 sm:flex-row text-center text-sm font-medium text-onboarding-text-300">
+ New to Plane?{" "}
+ <Link
+ href="/"
+ onClick={() => captureEvent(NAVIGATE_TO_SIGNUP, {})}
+ className="font-semibold text-custom-primary-100 hover:underline"
+ >
+ Create an account
+ </Link>
+ </div>
+ </div>
+ <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 py-4">
+ <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">
+ Reset your password
+ </h3>
+ <p className="font-medium text-onboarding-text-400">
+ Enter your user account{"'"}s verified email address and we will send you a password reset link.
+ </p>
+ </div>
+ <form onSubmit={handleSubmit(handleForgotPassword)} className="mt-5 space-y-4">
+ <div className="space-y-1">
+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">
+ Email
+ </label>
+ <Controller
+ control={control}
+ name="email"
+ rules={{
+ required: "Email is required",
+ validate: (value) => checkEmailValidity(value) || "Email is invalid",
+ }}
+ render={({ field: { value, onChange, ref } }) => (
+ <Input
+ id="email"
+ name="email"
+ type="email"
+ value={value}
+ onChange={onChange}
+ ref={ref}
+ hasError={Boolean(errors.email)}
+ placeholder="[email protected]"
+ className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
+ disabled={resendTimerCode > 0}
+ />
+ )}
+ />
+ {resendTimerCode > 0 && (
+ <p className="flex w-full items-start px-1 gap-1 text-xs font-medium text-green-700">
+ <CircleCheck height={12} width={12} className="mt-0.5" />
+ We sent the reset link to your email address
+ </p>
+ )}
+ </div>
+ <Button
+ type="submit"
+ variant="primary"
+ className="w-full"
+ size="lg"
+ disabled={!isValid}
+ loading={isSubmitting || resendTimerCode > 0}
+ >
+ {resendTimerCode > 0 ? `Resend in ${resendTimerCode} seconds` : "Send reset link"}
+ </Button>
+ <Link href="/" className={cn("w-full", getButtonStyling("link-neutral", "lg"))}>
+ Back to sign in
+ </Link>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ </AuthenticationWrapper>
+ );
+};
+
+export default ForgotPasswordPage;
diff --git a/web/app/accounts/reset-password/layout.tsx b/web/app/accounts/reset-password/layout.tsx
new file mode 100644
index 0000000000..dbc0a29b4b
--- /dev/null
+++ b/web/app/accounts/reset-password/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Reset Password - Plane",
+};
+
+export default function ResetPasswordLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/app/accounts/reset-password/page.tsx b/web/app/accounts/reset-password/page.tsx
new file mode 100644
index 0000000000..cd661feb0d
--- /dev/null
+++ b/web/app/accounts/reset-password/page.tsx
@@ -0,0 +1,235 @@
+"use client";
+
+import { useEffect, useMemo, useState } from "react";
+import Image from "next/image";
+import Link from "next/link";
+import { useSearchParams } from "next/navigation";
+// icons
+import { useTheme } from "next-themes";
+import { Eye, EyeOff } from "lucide-react";
+// ui
+import { Button, Input } from "@plane/ui";
+// components
+import { AuthBanner, PasswordStrengthMeter } from "@/components/account";
+// helpers
+import {
+ EAuthenticationErrorCodes,
+ EErrorAlertType,
+ EPageTypes,
+ TAuthErrorInfo,
+ authErrorHandler,
+} from "@/helpers/authentication.helper";
+import { API_BASE_URL } from "@/helpers/common.helper";
+import { getPasswordStrength } from "@/helpers/password.helper";
+// wrappers
+import { AuthenticationWrapper } from "@/lib/wrappers";
+// services
+import { AuthService } from "@/services/auth.service";
+// images
+import 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 TResetPasswordFormValues = {
+ email: string;
+ password: string;
+ confirm_password?: string;
+};
+
+const defaultValues: TResetPasswordFormValues = {
+ email: "",
+ password: "",
+};
+
+// services
+const authService = new AuthService();
+
+const ResetPasswordPage = () => {
+ // search params
+ const searchParams = useSearchParams();
+ const uidb64 = searchParams.get("uidb64");
+ const token = searchParams.get("token");
+ const email = searchParams.get("email");
+ const error_code = searchParams.get("error_code");
+ // states
+ const [showPassword, setShowPassword] = useState({
+ password: false,
+ retypePassword: false,
+ });
+ const [resetFormData, setResetFormData] = useState<TResetPasswordFormValues>({
+ ...defaultValues,
+ email: email ? email.toString() : "",
+ });
+ const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);
+ const [isPasswordInputFocused, setIsPasswordInputFocused] = useState(false);
+ const [isRetryPasswordInputFocused, setIsRetryPasswordInputFocused] = useState(false);
+ const [errorInfo, setErrorInfo] = useState<TAuthErrorInfo | undefined>(undefined);
+
+ // hooks
+ const { resolvedTheme } = useTheme();
+
+ const handleShowPassword = (key: keyof typeof showPassword) =>
+ setShowPassword((prev) => ({ ...prev, [key]: !prev[key] }));
+
+ const handleFormChange = (key: keyof TResetPasswordFormValues, value: string) =>
+ setResetFormData((prev) => ({ ...prev, [key]: value }));
+
+ useEffect(() => {
+ if (csrfToken === undefined)
+ authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));
+ }, [csrfToken]);
+
+ const isButtonDisabled = useMemo(
+ () =>
+ !!resetFormData.password &&
+ getPasswordStrength(resetFormData.password) >= 3 &&
+ resetFormData.password === resetFormData.confirm_password
+ ? false
+ : true,
+ [resetFormData]
+ );
+
+ useEffect(() => {
+ if (error_code) {
+ const errorhandler = authErrorHandler(error_code?.toString() as EAuthenticationErrorCodes);
+ if (errorhandler) {
+ setErrorInfo(errorhandler);
+ }
+ }
+ }, [error_code]);
+
+ const password = resetFormData?.password ?? "";
+ const confirmPassword = resetFormData?.confirm_password ?? "";
+ const renderPasswordMatchError = !isRetryPasswordInputFocused || confirmPassword.length >= password.length;
+
+ const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
+
+ return (
+ <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>
+ <div className="relative w-screen h-screen overflow-hidden">
+ <div className="absolute inset-0 z-0">
+ <Image
+ src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
+ className="w-full h-full object-cover"
+ alt="Plane background pattern"
+ />
+ </div>
+ <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
+ <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
+ <div className="flex items-center gap-x-2 py-10">
+ <Link href={`/`} className="h-[30px] w-[133px]">
+ <Image src={logo} alt="Plane logo" />
+ </Link>
+ </div>
+ </div>
+ <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 py-4">
+ <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">
+ Set new password
+ </h3>
+ <p className="font-medium text-onboarding-text-400">Secure your account with a strong password</p>
+ </div>
+ {errorInfo && errorInfo?.type === EErrorAlertType.BANNER_ALERT && (
+ <AuthBanner bannerData={errorInfo} handleBannerData={(value) => setErrorInfo(value)} />
+ )}
+ <form
+ className="mt-5 space-y-4"
+ method="POST"
+ action={`${API_BASE_URL}/auth/reset-password/${uidb64?.toString()}/${token?.toString()}/`}
+ >
+ <input type="hidden" name="csrfmiddlewaretoken" value={csrfToken} />
+ <div className="space-y-1">
+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">
+ Email
+ </label>
+ <div className="relative flex items-center rounded-md bg-onboarding-background-200">
+ <Input
+ id="email"
+ name="email"
+ type="email"
+ value={resetFormData.email}
+ //hasError={Boolean(errors.email)}
+ placeholder="[email protected]"
+ className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 text-onboarding-text-400 cursor-not-allowed"
+ disabled
+ />
+ </div>
+ </div>
+ <div className="space-y-1">
+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="password">
+ Password
+ </label>
+ <div className="relative flex items-center rounded-md bg-onboarding-background-200">
+ <Input
+ type={showPassword.password ? "text" : "password"}
+ name="password"
+ value={resetFormData.password}
+ onChange={(e) => handleFormChange("password", e.target.value)}
+ //hasError={Boolean(errors.password)}
+ placeholder="Enter password"
+ className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
+ minLength={8}
+ onFocus={() => setIsPasswordInputFocused(true)}
+ onBlur={() => setIsPasswordInputFocused(false)}
+ autoFocus
+ />
+ {showPassword.password ? (
+ <EyeOff
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("password")}
+ />
+ ) : (
+ <Eye
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("password")}
+ />
+ )}
+ </div>
+ {isPasswordInputFocused && <PasswordStrengthMeter password={resetFormData.password} />}
+ </div>
+ <div className="space-y-1">
+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="confirm_password">
+ Confirm password
+ </label>
+ <div className="relative flex items-center rounded-md bg-onboarding-background-200">
+ <Input
+ type={showPassword.retypePassword ? "text" : "password"}
+ name="confirm_password"
+ value={resetFormData.confirm_password}
+ onChange={(e) => handleFormChange("confirm_password", e.target.value)}
+ placeholder="Confirm password"
+ className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
+ onFocus={() => setIsRetryPasswordInputFocused(true)}
+ onBlur={() => setIsRetryPasswordInputFocused(false)}
+ />
+ {showPassword.retypePassword ? (
+ <EyeOff
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("retypePassword")}
+ />
+ ) : (
+ <Eye
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("retypePassword")}
+ />
+ )}
+ </div>
+ {!!resetFormData.confirm_password &&
+ resetFormData.password !== resetFormData.confirm_password &&
+ renderPasswordMatchError && <span className="text-sm text-red-500">Passwords don{"'"}t match</span>}
+ </div>
+ <Button type="submit" variant="primary" className="w-full" size="lg" disabled={isButtonDisabled}>
+ Set password
+ </Button>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ </AuthenticationWrapper>
+ );
+};
+
+export default ResetPasswordPage;
diff --git a/web/app/accounts/set-password/layout.tsx b/web/app/accounts/set-password/layout.tsx
new file mode 100644
index 0000000000..dbd32e9e8c
--- /dev/null
+++ b/web/app/accounts/set-password/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Set Password - Plane",
+};
+
+export default function SetPasswordLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/app/accounts/set-password/page.tsx b/web/app/accounts/set-password/page.tsx
new file mode 100644
index 0000000000..26553e87b2
--- /dev/null
+++ b/web/app/accounts/set-password/page.tsx
@@ -0,0 +1,228 @@
+"use client";
+
+import { FormEvent, useEffect, useMemo, useState } from "react";
+import { observer } from "mobx-react-lite";
+import Image from "next/image";
+import Link from "next/link";
+import { useRouter, useSearchParams } from "next/navigation";
+// icons
+import { useTheme } from "next-themes";
+import { Eye, EyeOff } from "lucide-react";
+// ui
+import { Button, Input, TOAST_TYPE, setToast } from "@plane/ui";
+// components
+import { PasswordStrengthMeter } from "@/components/account";
+// helpers
+import { EPageTypes } from "@/helpers/authentication.helper";
+import { getPasswordStrength } from "@/helpers/password.helper";
+// hooks
+import { useUser } from "@/hooks/store";
+// wrappers
+import { AuthenticationWrapper } from "@/lib/wrappers";
+// services
+import { AuthService } from "@/services/auth.service";
+// images
+import 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 TResetPasswordFormValues = {
+ email: string;
+ password: string;
+ confirm_password?: string;
+};
+
+const defaultValues: TResetPasswordFormValues = {
+ email: "",
+ password: "",
+};
+
+// services
+const authService = new AuthService();
+
+const SetPasswordPage = observer(() => {
+ // router
+ const router = useRouter();
+ // search params
+ const searchParams = useSearchParams();
+ const email = searchParams.get("email");
+ // states
+ const [showPassword, setShowPassword] = useState({
+ password: false,
+ retypePassword: false,
+ });
+ const [passwordFormData, setPasswordFormData] = useState<TResetPasswordFormValues>({
+ ...defaultValues,
+ email: email ? email.toString() : "",
+ });
+ const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);
+ const [isPasswordInputFocused, setIsPasswordInputFocused] = useState(false);
+ const [isRetryPasswordInputFocused, setIsRetryPasswordInputFocused] = useState(false);
+ // hooks
+ const { resolvedTheme } = useTheme();
+ // hooks
+ const { data: user, handleSetPassword } = useUser();
+
+ useEffect(() => {
+ if (csrfToken === undefined)
+ authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));
+ }, [csrfToken]);
+
+ const handleShowPassword = (key: keyof typeof showPassword) =>
+ setShowPassword((prev) => ({ ...prev, [key]: !prev[key] }));
+
+ const handleFormChange = (key: keyof TResetPasswordFormValues, value: string) =>
+ setPasswordFormData((prev) => ({ ...prev, [key]: value }));
+
+ const isButtonDisabled = useMemo(
+ () =>
+ !!passwordFormData.password &&
+ getPasswordStrength(passwordFormData.password) >= 3 &&
+ passwordFormData.password === passwordFormData.confirm_password
+ ? false
+ : true,
+ [passwordFormData]
+ );
+
+ const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+ try {
+ e.preventDefault();
+ if (!csrfToken) throw new Error("csrf token not found");
+ await handleSetPassword(csrfToken, { password: passwordFormData.password });
+ router.push("/");
+ } catch (err: any) {
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: err?.error ?? "Something went wrong. Please try again.",
+ });
+ }
+ };
+
+ const password = passwordFormData?.password ?? "";
+ const confirmPassword = passwordFormData?.confirm_password ?? "";
+ const renderPasswordMatchError = !isRetryPasswordInputFocused || confirmPassword.length >= password.length;
+
+ const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
+
+ return (
+ <AuthenticationWrapper pageType={EPageTypes.SET_PASSWORD}>
+ <div className="relative w-screen h-screen overflow-hidden">
+ <div className="absolute inset-0 z-0">
+ <Image
+ src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
+ className="w-full h-full object-cover"
+ alt="Plane background pattern"
+ />
+ </div>
+ <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
+ <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
+ <div className="flex items-center gap-x-2 py-10">
+ <Link href={`/`} className="h-[30px] w-[133px]">
+ <Image src={logo} alt="Plane logo" />
+ </Link>
+ </div>
+ </div>
+ <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 py-4">
+ <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">
+ Secure your account
+ </h3>
+ <p className="font-medium text-onboarding-text-400">Setting password helps you login securely</p>
+ </div>
+ <form className="mt-5 space-y-4" onSubmit={(e) => handleSubmit(e)}>
+ <div className="space-y-1">
+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">
+ Email
+ </label>
+ <div className="relative flex items-center rounded-md bg-onboarding-background-200">
+ <Input
+ id="email"
+ name="email"
+ type="email"
+ value={user?.email}
+ //hasError={Boolean(errors.email)}
+ placeholder="[email protected]"
+ className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 text-onboarding-text-400 cursor-not-allowed"
+ disabled
+ />
+ </div>
+ </div>
+ <div className="space-y-1">
+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="password">
+ Set a password
+ </label>
+ <div className="relative flex items-center rounded-md bg-onboarding-background-200">
+ <Input
+ type={showPassword.password ? "text" : "password"}
+ name="password"
+ value={passwordFormData.password}
+ onChange={(e) => handleFormChange("password", e.target.value)}
+ //hasError={Boolean(errors.password)}
+ placeholder="Enter password"
+ className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
+ minLength={8}
+ onFocus={() => setIsPasswordInputFocused(true)}
+ onBlur={() => setIsPasswordInputFocused(false)}
+ autoFocus
+ />
+ {showPassword.password ? (
+ <EyeOff
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("password")}
+ />
+ ) : (
+ <Eye
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("password")}
+ />
+ )}
+ </div>
+ {isPasswordInputFocused && <PasswordStrengthMeter password={passwordFormData.password} />}
+ </div>
+ <div className="space-y-1">
+ <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="confirm_password">
+ Confirm password
+ </label>
+ <div className="relative flex items-center rounded-md bg-onboarding-background-200">
+ <Input
+ type={showPassword.retypePassword ? "text" : "password"}
+ name="confirm_password"
+ value={passwordFormData.confirm_password}
+ onChange={(e) => handleFormChange("confirm_password", e.target.value)}
+ placeholder="Confirm password"
+ className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
+ onFocus={() => setIsRetryPasswordInputFocused(true)}
+ onBlur={() => setIsRetryPasswordInputFocused(false)}
+ />
+ {showPassword.retypePassword ? (
+ <EyeOff
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("retypePassword")}
+ />
+ ) : (
+ <Eye
+ className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
+ onClick={() => handleShowPassword("retypePassword")}
+ />
+ )}
+ </div>
+ {!!passwordFormData.confirm_password &&
+ passwordFormData.password !== passwordFormData.confirm_password &&
+ renderPasswordMatchError && <span className="text-sm text-red-500">Passwords don{"'"}t match</span>}
+ </div>
+ <Button type="submit" variant="primary" className="w-full" size="lg" disabled={isButtonDisabled}>
+ Continue
+ </Button>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ </AuthenticationWrapper>
+ );
+});
+
+export default SetPasswordPage;
diff --git a/web/app/create-workspace/layout.tsx b/web/app/create-workspace/layout.tsx
new file mode 100644
index 0000000000..32a220df7b
--- /dev/null
+++ b/web/app/create-workspace/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Create Workspace",
+};
+
+export default function CreateWorkspaceLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/pages/create-workspace.tsx b/web/app/create-workspace/page.tsx
similarity index 84%
rename from web/pages/create-workspace.tsx
rename to web/app/create-workspace/page.tsx
index e5992e0085..f2f92a7711 100644
--- a/web/pages/create-workspace.tsx
+++ b/web/app/create-workspace/page.tsx
@@ -1,26 +1,23 @@
-import { ReactElement, useState } from "react";
+"use client";
+
+import { useState } from "react";
import { observer } from "mobx-react";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { useTheme } from "next-themes";
import { IWorkspace } from "@plane/types";
-// hooks
-import { PageHead } from "@/components/core";
+// components
import { CreateWorkspaceForm } from "@/components/workspace";
+// hooks
import { useUser, useUserProfile } from "@/hooks/store";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// components
-// images
-import { NextPageWithLayout } from "@/lib/types";
// wrappers
import { AuthenticationWrapper } from "@/lib/wrappers";
+// images
import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
-// types
-const CreateWorkspacePage: NextPageWithLayout = observer(() => {
+const CreateWorkspacePage = observer(() => {
// router
const router = useRouter();
// store hooks
@@ -42,8 +39,7 @@ const CreateWorkspacePage: NextPageWithLayout = observer(() => {
const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
return (
- <>
- <PageHead title="Create Workspace" />
+ <AuthenticationWrapper>
<div className="flex h-full flex-col gap-y-2 overflow-hidden sm:flex-row sm:gap-y-0">
<div className="relative h-1/6 flex-shrink-0 sm:w-2/12 md:w-3/12 lg:w-1/5">
<div className="absolute left-0 top-1/2 h-[0.5px] w-full -translate-y-1/2 border-b-[0.5px] border-custom-border-200 sm:left-1/2 sm:top-0 sm:h-screen sm:w-[0.5px] sm:-translate-x-1/2 sm:translate-y-0 sm:border-r-[0.5px] md:left-1/3" />
@@ -72,16 +68,8 @@ const CreateWorkspacePage: NextPageWithLayout = observer(() => {
</div>
</div>
</div>
- </>
- );
-});
-
-CreateWorkspacePage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AuthenticationWrapper>
- <DefaultLayout>{page} </DefaultLayout>
</AuthenticationWrapper>
);
-};
+});
export default CreateWorkspacePage;
diff --git a/web/app/error.tsx b/web/app/error.tsx
new file mode 100644
index 0000000000..515a107fd4
--- /dev/null
+++ b/web/app/error.tsx
@@ -0,0 +1,88 @@
+"use client";
+
+import { useEffect } from "react";
+import * as Sentry from "@sentry/nextjs";
+// import { useRouter } from "next/navigation";
+// services
+import { Button } from "@plane/ui";
+// helpers
+// import { API_BASE_URL } from "@/helpers/common.helper";
+// layouts
+import DefaultLayout from "@/layouts/default-layout";
+//
+// import { AuthService } from "@/services/auth.service";
+// layouts
+// ui
+
+// services
+// const authService = new AuthService();
+
+type props = {
+ error: Error & { digest?: string };
+};
+
+const CustomErrorComponent = ({ error }: props) => {
+ // const router = useRouter();
+
+ useEffect(() => {
+ Sentry.captureException(error);
+ }, [error]);
+
+ const handleRefresh = () => {
+ window.location.reload();
+ };
+
+ const handleSignOut = async () => {
+ // await authService
+ // .signOut(API_BASE_URL)
+ // .catch(() =>
+ // setToast({
+ // type: TOAST_TYPE.ERROR,
+ // title: "Error!",
+ // message: "Failed to sign out. Please try again.",
+ // })
+ // )
+ // .finally(() => router.push("/"));
+ };
+
+ return (
+ <DefaultLayout>
+ <div className={`h-screen w-full overflow-hidden bg-custom-background-100`}>
+ <div className="grid h-full place-items-center p-4">
+ <div className="space-y-8 text-center">
+ <div className="space-y-2">
+ <h3 className="text-lg font-semibold">Exception Detected!</h3>
+ <p className="mx-auto w-1/2 text-sm text-custom-text-200">
+ We{"'"}re Sorry! An exception has been detected, and our engineering team has been notified. We
+ apologize for any inconvenience this may have caused. Please reach out to our engineering team at{" "}
+ <a href="mailto:[email protected]" className="text-custom-primary">
+ </a>{" "}
+ or on our{" "}
+ <a
+ href="https://discord.com/invite/A92xrEGCge"
+ target="_blank"
+ className="text-custom-primary"
+ rel="noopener noreferrer"
+ >
+ Discord
+ </a>{" "}
+ server for further assistance.
+ </p>
+ </div>
+ <div className="flex items-center justify-center gap-2">
+ <Button variant="primary" size="md" onClick={handleRefresh}>
+ Refresh
+ </Button>
+ <Button variant="neutral-primary" size="md" onClick={handleSignOut}>
+ Sign out
+ </Button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </DefaultLayout>
+ );
+};
+
+export default CustomErrorComponent;
diff --git a/web/app/installations/[provider]/layout.tsx b/web/app/installations/[provider]/layout.tsx
new file mode 100644
index 0000000000..51978de9e9
--- /dev/null
+++ b/web/app/installations/[provider]/layout.tsx
@@ -0,0 +1,3 @@
+export default function InstallationProviderLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/pages/installations/[provider]/index.tsx b/web/app/installations/[provider]/page.tsx
similarity index 82%
rename from web/pages/installations/[provider]/index.tsx
rename to web/app/installations/[provider]/page.tsx
index eb2e850c77..78e8f682d5 100644
--- a/web/pages/installations/[provider]/index.tsx
+++ b/web/app/installations/[provider]/page.tsx
@@ -1,18 +1,23 @@
-import React, { useEffect, ReactElement } from "react";
-import { useRouter } from "next/router";
+"use client";
+
+import React, { useEffect } from "react";
+import { useParams, useSearchParams } from "next/navigation";
// ui
import { LogoSpinner } from "@/components/common";
-// types
-import { NextPageWithLayout } from "@/lib/types";
// services
import { AppInstallationService } from "@/services/app_installation.service";
// services
const appInstallationService = new AppInstallationService();
-const AppPostInstallation: NextPageWithLayout = () => {
- const router = useRouter();
- const { installation_id, state, provider, code } = router.query;
+const AppPostInstallation = () => {
+ // params
+ const { provider } = useParams();
+ // query params
+ const searchParams = useSearchParams();
+ const installation_id = searchParams.get("installation_id");
+ const state = searchParams.get("state");
+ const code = searchParams.get("code");
useEffect(() => {
if (provider === "github" && state && installation_id) {
@@ -69,8 +74,4 @@ const AppPostInstallation: NextPageWithLayout = () => {
);
};
-AppPostInstallation.getLayout = function getLayout(page: ReactElement) {
- return <div>{page}</div>;
-};
-
export default AppPostInstallation;
diff --git a/web/app/invitations/layout.tsx b/web/app/invitations/layout.tsx
new file mode 100644
index 0000000000..2d9a7e688e
--- /dev/null
+++ b/web/app/invitations/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Invitations",
+};
+
+export default function InvitationsLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/pages/invitations/index.tsx b/web/app/invitations/page.tsx
similarity index 93%
rename from web/pages/invitations/index.tsx
rename to web/app/invitations/page.tsx
index aac6c833b4..c15b25d1af 100644
--- a/web/pages/invitations/index.tsx
+++ b/web/app/invitations/page.tsx
@@ -1,8 +1,10 @@
-import React, { useState, ReactElement } from "react";
+"use client";
+
+import React, { useState } from "react";
import { observer } from "mobx-react-lite";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { useTheme } from "next-themes";
import useSWR, { mutate } from "swr";
// icons
@@ -13,7 +15,6 @@ import type { IWorkspaceMemberInvitation } from "@plane/types";
import { Button, TOAST_TYPE, setToast } from "@plane/ui";
// components
import { EmptyState } from "@/components/common";
-import { PageHead } from "@/components/core";
// constants
import { MEMBER_ACCEPTED } from "@/constants/event-tracker";
import { USER_WORKSPACES_LIST } from "@/constants/fetch-keys";
@@ -22,12 +23,8 @@ import { ROLE } from "@/constants/workspace";
import { truncateText } from "@/helpers/string.helper";
import { getUserRole } from "@/helpers/user.helper";
import { useEventTracker, useUser, useUserProfile, useWorkspace } from "@/hooks/store";
-import DefaultLayout from "@/layouts/default-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
// services
+import { AuthenticationWrapper } from "@/lib/wrappers";
import { WorkspaceService } from "@/services/workspace.service";
// images
import emptyInvitation from "public/empty-state/invitation.svg";
@@ -36,7 +33,7 @@ import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-l
const workspaceService = new WorkspaceService();
-const UserInvitationsPage: NextPageWithLayout = observer(() => {
+const UserInvitationsPage = observer(() => {
// states
const [invitationsRespond, setInvitationsRespond] = useState<string[]>([]);
const [isJoiningWorkspaces, setIsJoiningWorkspaces] = useState(false);
@@ -130,8 +127,7 @@ const UserInvitationsPage: NextPageWithLayout = observer(() => {
const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
return (
- <>
- <PageHead title="Invitations" />
+ <AuthenticationWrapper>
<div className="flex h-full flex-col gap-y-2 overflow-hidden sm:flex-row sm:gap-y-0">
<div className="relative h-1/6 flex-shrink-0 sm:w-2/12 md:w-3/12 lg:w-1/5">
<div className="absolute left-0 top-1/2 h-[0.5px] w-full -translate-y-1/2 border-b-[0.5px] border-custom-border-200 sm:left-1/2 sm:top-0 sm:h-screen sm:w-[0.5px] sm:-translate-x-1/2 sm:translate-y-0 sm:border-r-[0.5px] md:left-1/3" />
@@ -157,11 +153,10 @@ const UserInvitationsPage: NextPageWithLayout = observer(() => {
return (
<div
key={invitation.id}
- className={`flex cursor-pointer items-center gap-2 rounded border px-3.5 py-5 ${
- isSelected
+ className={`flex cursor-pointer items-center gap-2 rounded border px-3.5 py-5 ${isSelected
? "border-custom-primary-100"
: "border-custom-border-200 hover:bg-custom-background-80"
- }`}
+ }`}
onClick={() => handleInvitation(invitation, isSelected ? "withdraw" : "accepted")}
>
<div className="flex-shrink-0">
@@ -230,16 +225,8 @@ const UserInvitationsPage: NextPageWithLayout = observer(() => {
)
) : null}
</div>
- </>
- );
-});
-
-UserInvitationsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AuthenticationWrapper>
- <DefaultLayout>{page}</DefaultLayout>
</AuthenticationWrapper>
);
-};
+});
export default UserInvitationsPage;
diff --git a/web/app/layout.tsx b/web/app/layout.tsx
new file mode 100644
index 0000000000..49d160412a
--- /dev/null
+++ b/web/app/layout.tsx
@@ -0,0 +1,61 @@
+import { Metadata } from "next";
+import Script from "next/script";
+// styles
+import "@/styles/globals.css";
+import "@/styles/command-pallette.css";
+import "@/styles/nprogress.css";
+import "@/styles/emoji.css";
+import "@/styles/react-day-picker.css";
+// local
+import { AppProvider } from "./provider";
+
+export const metadata: Metadata = {
+ title: "Plane | Simple, extensible, open-source project management tool.",
+ description:
+ "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
+ openGraph: {
+ title: "Plane | Simple, extensible, open-source project management tool.",
+ description: "Plane Deploy is a customer feedback management tool built on top of plane.so",
+ url: "https://app.plane.so/",
+ },
+ keywords:
+ "software development, plan, ship, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration",
+ twitter: {
+ site: "@planepowers",
+ },
+};
+
+export default function RootLayout({ children }: { children: React.ReactNode }) {
+ const isSessionRecorderEnabled = parseInt(process.env.NEXT_PUBLIC_ENABLE_SESSION_RECORDER || "0");
+
+ return (
+ <html lang="en">
+ <head>
+ <meta name="theme-color" content="#fff" />
+ <link rel="apple-touch-icon" sizes="512x512" href="/plane-logos/plane-mobile-pwa.png" />
+ <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png" />
+ <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png" />
+ <link rel="manifest" href="/site.webmanifest.json" />
+ <link rel="shortcut icon" href="/favicon/favicon.ico" />
+ </head>
+ <body>
+ <div id="context-menu-portal" />
+ <AppProvider>
+ <div className={`h-screen w-full overflow-hidden bg-custom-background-100`}>{children}</div>
+ </AppProvider>
+ </body>
+ {process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN && (
+ <Script defer data-domain={process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN} src="https://plausible.io/js/script.js" />
+ )}
+ {!!isSessionRecorderEnabled && process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY && (
+ <Script id="clarity-tracking">
+ {`(function(c,l,a,r,i,t,y){
+ c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+ t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+ y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+ })(window, document, "clarity", "script", "${process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY}");`}
+ </Script>
+ )}
+ </html>
+ );
+}
diff --git a/web/pages/404.tsx b/web/app/not-found.tsx
similarity index 78%
rename from web/pages/404.tsx
rename to web/app/not-found.tsx
index 514169deac..10040faabf 100644
--- a/web/pages/404.tsx
+++ b/web/app/not-found.tsx
@@ -1,21 +1,20 @@
-import React from "react";
+"use client";
-import type { NextPage } from "next";
+import React from "react";
+import { Metadata } from "next";
import Image from "next/image";
import Link from "next/link";
-// components
-import { Button } from "@plane/ui";
-import { PageHead } from "@/components/core";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
// ui
+import { Button } from "@plane/ui";
// images
import Image404 from "public/404.svg";
-// types
-const PageNotFound: NextPage = () => (
- <DefaultLayout>
- <PageHead title="404 - Page Not Found" />
+export const metadata: Metadata = {
+ title: "404 - Page Not Found",
+};
+
+const PageNotFound = () => (
+ <div className={`h-screen w-full overflow-hidden bg-custom-background-100`}>
<div className="grid h-full place-items-center p-4">
<div className="space-y-8 text-center">
<div className="relative mx-auto h-60 w-60 lg:h-80 lg:w-80">
@@ -37,7 +36,7 @@ const PageNotFound: NextPage = () => (
</Link>
</div>
</div>
- </DefaultLayout>
+ </div>
);
export default PageNotFound;
diff --git a/web/app/onboarding/layout.tsx b/web/app/onboarding/layout.tsx
new file mode 100644
index 0000000000..492ebc4023
--- /dev/null
+++ b/web/app/onboarding/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Onboarding",
+};
+
+export default function OnboardingLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/pages/onboarding/index.tsx b/web/app/onboarding/page.tsx
similarity index 90%
rename from web/pages/onboarding/index.tsx
rename to web/app/onboarding/page.tsx
index 89263e57db..0e95e0f478 100644
--- a/web/pages/onboarding/index.tsx
+++ b/web/app/onboarding/page.tsx
@@ -1,24 +1,20 @@
-import { ReactElement, useEffect, useState } from "react";
+"use client";
+
+import { useEffect, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import useSWR from "swr";
// types
+import { EPageTypes } from "@plane/constants";
import { TOnboardingSteps, TUserProfile } from "@plane/types";
// components
import { LogoSpinner } from "@/components/common";
-import { PageHead } from "@/components/core";
import { InviteMembers, CreateOrJoinWorkspaces, ProfileSetup } from "@/components/onboarding";
// constants
import { USER_ONBOARDING_COMPLETED } from "@/constants/event-tracker";
import { USER_WORKSPACES_LIST } from "@/constants/fetch-keys";
-// helpers
-import { EPageTypes } from "@/helpers/authentication.helper";
// hooks
import { useUser, useWorkspace, useUserProfile, useEventTracker } from "@/hooks/store";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// lib types
-import { NextPageWithLayout } from "@/lib/types";
// wrappers
import { AuthenticationWrapper } from "@/lib/wrappers";
// services
@@ -32,7 +28,7 @@ export enum EOnboardingSteps {
const workspaceService = new WorkspaceService();
-const OnboardingPage: NextPageWithLayout = observer(() => {
+const OnboardingPage = observer(() => {
// states
const [step, setStep] = useState<EOnboardingSteps | null>(null);
const [totalSteps, setTotalSteps] = useState<number | null>(null);
@@ -143,8 +139,7 @@ const OnboardingPage: NextPageWithLayout = observer(() => {
}, [user, step, profile.onboarding_step, updateCurrentUser, workspacesList]);
return (
- <>
- <PageHead title="Onboarding" />
+ <AuthenticationWrapper pageType={EPageTypes.ONBOARDING}>
{user && totalSteps && step !== null && invitations ? (
<div className={`flex h-full w-full flex-col`}>
{step === EOnboardingSteps.PROFILE_SETUP ? (
@@ -179,16 +174,8 @@ const OnboardingPage: NextPageWithLayout = observer(() => {
<LogoSpinner />
</div>
)}
- </>
- );
-});
-
-OnboardingPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AuthenticationWrapper pageType={EPageTypes.ONBOARDING}>
- <DefaultLayout>{page}</DefaultLayout>
</AuthenticationWrapper>
);
-};
+});
export default OnboardingPage;
diff --git a/web/app/page.tsx b/web/app/page.tsx
new file mode 100644
index 0000000000..8c502a7db8
--- /dev/null
+++ b/web/app/page.tsx
@@ -0,0 +1,77 @@
+"use client";
+
+import React from "react";
+import { observer } from "mobx-react";
+import Image from "next/image";
+import Link from "next/link";
+// ui
+import { useTheme } from "next-themes";
+// components
+import { AuthRoot } from "@/components/account";
+import { PageHead } from "@/components/core";
+// constants
+import { NAVIGATE_TO_SIGNUP } from "@/constants/event-tracker";
+// helpers
+import { EAuthModes, EPageTypes } from "@/helpers/authentication.helper";
+// hooks
+import { useEventTracker } from "@/hooks/store";
+// layouts
+import DefaultLayout from "@/layouts/default-layout";
+// wrappers
+import { AuthenticationWrapper } from "@/lib/wrappers";
+// assets
+import 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";
+
+const HomePage = observer(() => {
+ const { resolvedTheme } = useTheme();
+ // hooks
+ const { captureEvent } = useEventTracker();
+
+ const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
+
+ return (
+ <DefaultLayout>
+ <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>
+ <>
+ <div className="relative w-screen h-screen overflow-hidden">
+ <PageHead title="Log in - Plane" />
+ <div className="absolute inset-0 z-0">
+ <Image
+ src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
+ className="w-full h-full object-cover"
+ alt="Plane background pattern"
+ />
+ </div>
+ <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
+ <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
+ <div className="flex items-center gap-x-2 py-10">
+ <Link href={`/`} className="h-[30px] w-[133px]">
+ <Image src={logo} alt="Plane logo" />
+ </Link>
+ </div>
+ <div className="flex flex-col items-end sm:items-center sm:gap-2 sm:flex-row text-center text-sm font-medium text-onboarding-text-300">
+ New to Plane?{" "}
+ <Link
+ href="/sign-up"
+ onClick={() => captureEvent(NAVIGATE_TO_SIGNUP, {})}
+ className="font-semibold text-custom-primary-100 hover:underline"
+ >
+ Create an account
+ </Link>
+ </div>
+ </div>
+ <div className="flex flex-col justify-center flex-grow container h-[100vh-60px] mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 transition-all">
+ <AuthRoot authMode={EAuthModes.SIGN_IN} />
+ </div>
+ </div>
+ </div>
+ </>
+ </AuthenticationWrapper>
+ </DefaultLayout>
+ );
+});
+
+export default HomePage;
diff --git a/web/pages/profile/activity.tsx b/web/app/profile/activity/page.tsx
similarity index 88%
rename from web/pages/profile/activity.tsx
rename to web/app/profile/activity/page.tsx
index 1f724b4ffb..c9f089e09e 100644
--- a/web/pages/profile/activity.tsx
+++ b/web/app/profile/activity/page.tsx
@@ -1,4 +1,6 @@
-import { ReactElement, useState } from "react";
+"use client";
+
+import { useState } from "react";
import { observer } from "mobx-react";
// ui
import { Button } from "@plane/ui";
@@ -18,7 +20,7 @@ import { NextPageWithLayout } from "@/lib/types";
const PER_PAGE = 100;
-const ProfileActivityPage: NextPageWithLayout = observer(() => {
+const ProfileActivityPage = observer(() => {
// states
const [pageCount, setPageCount] = useState(1);
const [totalPages, setTotalPages] = useState(0);
@@ -59,7 +61,7 @@ const ProfileActivityPage: NextPageWithLayout = observer(() => {
<PageHead title="Profile - Activity" />
<section className="mx-auto mt-5 md:mt-16 h-full w-full flex flex-col overflow-hidden px-5 md:px-8 pb-8 lg:w-3/5">
<div className="flex items-center border-b border-custom-border-100 gap-4 pb-3.5">
- <SidebarHamburgerToggle onClick={() => toggleSidebar()} />
+ <SidebarHamburgerToggle />
<h3 className="text-xl font-medium">Activity</h3>
</div>
<div className="vertical-scrollbar scrollbar-md flex h-full w-full flex-col overflow-y-auto">
@@ -77,8 +79,4 @@ const ProfileActivityPage: NextPageWithLayout = observer(() => {
);
});
-ProfileActivityPage.getLayout = function getLayout(page: ReactElement) {
- return <ProfileSettingsLayout>{page}</ProfileSettingsLayout>;
-};
-
export default ProfileActivityPage;
diff --git a/web/pages/profile/preferences/theme.tsx b/web/app/profile/appearance/page.tsx
similarity index 77%
rename from web/pages/profile/preferences/theme.tsx
rename to web/app/profile/appearance/page.tsx
index f35fe72b81..e34fe8cdd7 100644
--- a/web/pages/profile/preferences/theme.tsx
+++ b/web/app/profile/appearance/page.tsx
@@ -1,21 +1,19 @@
-import { useEffect, useState, ReactElement } from "react";
+"use client";
+
+import { useEffect, useState } from "react";
import { observer } from "mobx-react";
import { useTheme } from "next-themes";
// ui
import { setPromiseToast } from "@plane/ui";
// components
import { LogoSpinner } from "@/components/common";
-import { CustomThemeSelector, ThemeSwitch, PageHead } from "@/components/core";
+import { CustomThemeSelector, ThemeSwitch, PageHead, SidebarHamburgerToggle } from "@/components/core";
// constants
import { I_THEME_OPTION, THEME_OPTIONS } from "@/constants/themes";
// hooks
import { useUserProfile } from "@/hooks/store";
-// layouts
-import { ProfilePreferenceSettingsLayout } from "@/layouts/settings-layout/profile/preferences";
-// type
-import { NextPageWithLayout } from "@/lib/types";
-const ProfilePreferencesThemePage: NextPageWithLayout = observer(() => {
+const ProfileAppearancePage = observer(() => {
const { setTheme } = useTheme();
// states
const [currentTheme, setCurrentTheme] = useState<I_THEME_OPTION | null>(null);
@@ -53,8 +51,9 @@ const ProfilePreferencesThemePage: NextPageWithLayout = observer(() => {
<PageHead title="Profile - Theme Prefrence" />
{userProfile ? (
<div className="mx-auto mt-10 h-full w-full overflow-y-auto md:px-6 px-4 pb-8 md:mt-14 lg:px-20 vertical-scrollbar scrollbar-md">
- <div className="flex items-center border-b border-custom-border-100 pb-3.5">
- <h3 className="text-xl font-medium">Preferences</h3>
+ <div className="flex items-center border-b border-custom-border-100 gap-4 pb-3.5">
+ <SidebarHamburgerToggle />
+ <h3 className="text-xl font-medium">Appearance</h3>
</div>
<div className="grid grid-cols-12 gap-4 py-6 sm:gap-16">
<div className="col-span-12 sm:col-span-6">
@@ -76,8 +75,4 @@ const ProfilePreferencesThemePage: NextPageWithLayout = observer(() => {
);
});
-ProfilePreferencesThemePage.getLayout = function getLayout(page: ReactElement) {
- return <ProfilePreferenceSettingsLayout>{page}</ProfilePreferenceSettingsLayout>;
-};
-
-export default ProfilePreferencesThemePage;
+export default ProfileAppearancePage;
\ No newline at end of file
diff --git a/web/layouts/settings-layout/profile/layout.tsx b/web/app/profile/layout.tsx
similarity index 67%
rename from web/layouts/settings-layout/profile/layout.tsx
rename to web/app/profile/layout.tsx
index e2d11155fb..1f1b1dff47 100644
--- a/web/layouts/settings-layout/profile/layout.tsx
+++ b/web/app/profile/layout.tsx
@@ -1,18 +1,19 @@
-import { FC, ReactNode } from "react";
-// layout
+"use client";
+
+import { ReactNode } from "react";
+// components
import { CommandPalette } from "@/components/command-palette";
-import { ProfileLayoutSidebar } from "@/layouts/settings-layout";
// wrappers
import { AuthenticationWrapper } from "@/lib/wrappers";
-// components
+// layout
+import { ProfileLayoutSidebar } from "./sidebar";
-interface IProfileSettingsLayout {
+type Props = {
children: ReactNode;
- header?: ReactNode;
-}
+};
-export const ProfileSettingsLayout: FC<IProfileSettingsLayout> = (props) => {
- const { children, header } = props;
+export default function ProfileSettingsLayout(props: Props) {
+ const { children } = props;
return (
<>
@@ -21,11 +22,10 @@ export const ProfileSettingsLayout: FC<IProfileSettingsLayout> = (props) => {
<div className="relative flex h-screen w-full overflow-hidden">
<ProfileLayoutSidebar />
<main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
- {header}
<div className="h-full w-full overflow-hidden">{children}</div>
</main>
</div>
</AuthenticationWrapper>
</>
);
-};
+}
diff --git a/web/pages/profile/preferences/email.tsx b/web/app/profile/notifications/page.tsx
similarity index 51%
rename from web/pages/profile/preferences/email.tsx
rename to web/app/profile/notifications/page.tsx
index 69dcb6ee67..8e8ff3f040 100644
--- a/web/pages/profile/preferences/email.tsx
+++ b/web/app/profile/notifications/page.tsx
@@ -1,21 +1,20 @@
-import { ReactElement } from "react";
+"use client";
+
import useSWR from "swr";
// layouts
-import { PageHead } from "@/components/core";
-import { EmailNotificationForm } from "@/components/profile/preferences";
+import { PageHead, SidebarHamburgerToggle } from "@/components/core";
+import { EmailNotificationForm } from "@/components/profile/notification";
import { EmailSettingsLoader } from "@/components/ui";
-import { ProfilePreferenceSettingsLayout } from "@/layouts/settings-layout/profile/preferences";
// ui
// components
// services
-import { NextPageWithLayout } from "@/lib/types";
import { UserService } from "@/services/user.service";
// type
// services
const userService = new UserService();
-const ProfilePreferencesThemePage: NextPageWithLayout = () => {
+const ProfileNotificationPage = () => {
// fetching user email notification settings
const { data, isLoading } = useSWR("CURRENT_USER_EMAIL_NOTIFICATION_SETTINGS", () =>
userService.currentUserEmailNotificationSettings()
@@ -29,14 +28,19 @@ const ProfilePreferencesThemePage: NextPageWithLayout = () => {
<>
<PageHead title="Profile - Email Preference" />
<div className="mx-auto mt-8 h-full w-full md:px-6 px-4 lg:px-20 pb-8 vertical-scrollbar scrollbar-md">
+ <div className="flex gap-4 items-start pt-4 sm:pt-6 mb-2 pb-6 border-b border-custom-border-100">
+ <SidebarHamburgerToggle />
+ <div className="grow">
+ <div className="pb-1 text-xl font-medium text-custom-text-100">Email notifications</div>
+ <div className="text-sm font-normal text-custom-text-300">
+ Stay in the loop on Issues you are subscribed to. Enable this to get notified.
+ </div>
+ </div>
+ </div>
<EmailNotificationForm data={data} />
</div>
</>
);
};
-ProfilePreferencesThemePage.getLayout = function getLayout(page: ReactElement) {
- return <ProfilePreferenceSettingsLayout>{page}</ProfilePreferenceSettingsLayout>;
-};
-
-export default ProfilePreferencesThemePage;
+export default ProfileNotificationPage;
\ No newline at end of file
diff --git a/web/pages/profile/index.tsx b/web/app/profile/page.tsx
similarity index 97%
rename from web/pages/profile/index.tsx
rename to web/app/profile/page.tsx
index a7415cf3ea..ebc0dfaf78 100644
--- a/web/pages/profile/index.tsx
+++ b/web/app/profile/page.tsx
@@ -1,4 +1,6 @@
-import React, { useEffect, useState, ReactElement } from "react";
+"use client";
+
+import React, { useEffect, useState } from "react";
import { observer } from "mobx-react";
import { Controller, useForm } from "react-hook-form";
import { ChevronDown, CircleUserRound } from "lucide-react";
@@ -20,11 +22,9 @@ import { SidebarHamburgerToggle } from "@/components/core/sidebar";
import { TIME_ZONES } from "@/constants/timezones";
import { USER_ROLES } from "@/constants/workspace";
// hooks
-import { useAppTheme, useUser } from "@/hooks/store";
-import { ProfileSettingsLayout } from "@/layouts/settings-layout";
+import { useUser } from "@/hooks/store";
+// import { ProfileSettingsLayout } from "@/layouts/settings-layout";
// layouts
-// lib types
-import type { NextPageWithLayout } from "@/lib/types";
import { FileService } from "@/services/file.service";
// services
// types
@@ -42,7 +42,7 @@ const defaultValues: Partial<IUser> = {
const fileService = new FileService();
-const ProfileSettingsPage: NextPageWithLayout = observer(() => {
+const ProfileSettingsPage = observer(() => {
// states
const [isLoading, setIsLoading] = useState(false);
const [isRemoving, setIsRemoving] = useState(false);
@@ -58,7 +58,6 @@ const ProfileSettingsPage: NextPageWithLayout = observer(() => {
} = useForm<IUser>({ defaultValues });
// store hooks
const { data: currentUser, updateCurrentUser } = useUser();
- const { toggleSidebar } = useAppTheme();
useEffect(() => {
reset({ ...defaultValues, ...currentUser });
@@ -135,7 +134,7 @@ const ProfileSettingsPage: NextPageWithLayout = observer(() => {
<PageHead title="Profile - General Settings" />
<div className="flex h-full flex-col">
<div className="block flex-shrink-0 border-b border-custom-border-200 p-4 md:hidden">
- <SidebarHamburgerToggle onClick={() => toggleSidebar()} />
+ <SidebarHamburgerToggle />
</div>
<div className="overflow-hidden">
<Controller
@@ -453,8 +452,8 @@ const ProfileSettingsPage: NextPageWithLayout = observer(() => {
);
});
-ProfileSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return <ProfileSettingsLayout>{page}</ProfileSettingsLayout>;
-};
+// ProfileSettingsPage.getLayout = function getLayout(page: ReactElement) {
+// return <ProfileSettingsLayout>{page}</ProfileSettingsLayout>;
+// };
export default ProfileSettingsPage;
diff --git a/web/pages/profile/change-password.tsx b/web/app/profile/security/page.tsx
similarity index 93%
rename from web/pages/profile/change-password.tsx
rename to web/app/profile/security/page.tsx
index 2ddc02090d..121ecb85f0 100644
--- a/web/pages/profile/change-password.tsx
+++ b/web/app/profile/security/page.tsx
@@ -1,6 +1,8 @@
-import { ReactElement, useEffect, useState } from "react";
+"use client";
+
+import { useEffect, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import { Eye, EyeOff } from "lucide-react";
// ui
@@ -14,11 +16,7 @@ import { SidebarHamburgerToggle } from "@/components/core/sidebar";
import { authErrorHandler } from "@/helpers/authentication.helper";
import { getPasswordStrength } from "@/helpers/password.helper";
// hooks
-import { useAppTheme, useUser } from "@/hooks/store";
-// layout
-import { ProfileSettingsLayout } from "@/layouts/settings-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
+import { useUser } from "@/hooks/store";
// services
import { AuthService } from "@/services/auth.service";
import { UserService } from "@/services/user.service";
@@ -44,7 +42,7 @@ const defaultShowPassword = {
confirmPassword: false,
};
-const ChangePasswordPage: NextPageWithLayout = observer(() => {
+const SecurityPage = observer(() => {
// states
const [isPageLoading, setIsPageLoading] = useState(true);
const [showPassword, setShowPassword] = useState(defaultShowPassword);
@@ -52,8 +50,6 @@ const ChangePasswordPage: NextPageWithLayout = observer(() => {
const [isRetryPasswordInputFocused, setIsRetryPasswordInputFocused] = useState(false);
// router
const router = useRouter();
- // store hooks
- const { toggleSidebar } = useAppTheme();
const { data: currentUser } = useUser();
// use form
const {
@@ -136,7 +132,7 @@ const ChangePasswordPage: NextPageWithLayout = observer(() => {
<PageHead title="Profile - Change Password" />
<div className="flex h-full flex-col">
<div className="block flex-shrink-0 border-b border-custom-border-200 p-4 md:hidden">
- <SidebarHamburgerToggle onClick={() => toggleSidebar()} />
+ <SidebarHamburgerToggle />
</div>
<form
onSubmit={handleSubmit(handleChangePassword)}
@@ -271,8 +267,4 @@ const ChangePasswordPage: NextPageWithLayout = observer(() => {
);
});
-ChangePasswordPage.getLayout = function getLayout(page: ReactElement) {
- return <ProfileSettingsLayout>{page}</ProfileSettingsLayout>;
-};
-
-export default ChangePasswordPage;
+export default SecurityPage;
\ No newline at end of file
diff --git a/web/layouts/settings-layout/profile/sidebar.tsx b/web/app/profile/sidebar.tsx
similarity index 98%
rename from web/layouts/settings-layout/profile/sidebar.tsx
rename to web/app/profile/sidebar.tsx
index 9e7fc95cca..f3f87f8e48 100644
--- a/web/layouts/settings-layout/profile/sidebar.tsx
+++ b/web/app/profile/sidebar.tsx
@@ -1,7 +1,9 @@
+"use client";
+
import { useEffect, useRef, useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
// icons
import { ChevronLeft, LogOut, MoveLeft, Plus, UserPlus } from "lucide-react";
// ui
@@ -32,7 +34,7 @@ export const ProfileLayoutSidebar = observer(() => {
// states
const [isSigningOut, setIsSigningOut] = useState(false);
// router
- const router = useRouter();
+ const pathname = usePathname();
// store hooks
const { sidebarCollapsed, toggleSidebar } = useAppTheme();
const { data: currentUser, signOut } = useUser();
@@ -133,7 +135,7 @@ export const ProfileLayoutSidebar = observer(() => {
>
<div
className={`group flex w-full items-center gap-2.5 rounded-md px-3 py-2 text-sm font-medium outline-none ${
- link.highlight(router.pathname)
+ link.highlight(pathname)
? "bg-custom-primary-100/10 text-custom-primary-100"
: "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80"
} ${sidebarCollapsed ? "justify-center" : ""}`}
diff --git a/web/app/provider.tsx b/web/app/provider.tsx
new file mode 100644
index 0000000000..1d68acb25e
--- /dev/null
+++ b/web/app/provider.tsx
@@ -0,0 +1,55 @@
+"use client";
+
+import { FC, ReactNode } from "react";
+import dynamic from "next/dynamic";
+// import Router from "next/navigation";
+import { useTheme, ThemeProvider } from "next-themes";
+import NProgress from "nprogress";
+import { SWRConfig } from "swr";
+// ui
+import { Toast } from "@plane/ui";
+// constants
+import { SWR_CONFIG } from "@/constants/swr-config";
+//helpers
+import { resolveGeneralTheme } from "@/helpers/theme.helper";
+// mobx store provider
+import { StoreProvider } from "@/lib/store-context";
+// wrappers
+import { InstanceWrapper } from "@/lib/wrappers";
+// dynamic imports
+const StoreWrapper = dynamic(() => import("@/lib/wrappers/store-wrapper"), { ssr: false });
+const PostHogProvider = dynamic(() => import("@/lib/posthog-provider"), { ssr: false });
+const CrispWrapper = dynamic(() => import("@/lib/wrappers/crisp-wrapper"), { ssr: false });
+// nprogress
+NProgress.configure({ showSpinner: false });
+// Router.events.on("routeChangeStart", NProgress.start);
+// Router.events.on("routeChangeError", NProgress.done);
+// Router.events.on("routeChangeComplete", NProgress.done);
+
+export interface IAppProvider {
+ children: ReactNode;
+}
+
+export const AppProvider: FC<IAppProvider> = (props) => {
+ const { children } = props;
+ // themes
+ const { resolvedTheme } = useTheme();
+ return (
+ <>
+ <Toast theme={resolveGeneralTheme(resolvedTheme)} />
+ <StoreProvider>
+ <ThemeProvider themes={["light", "dark", "light-contrast", "dark-contrast", "custom"]} defaultTheme="system">
+ <InstanceWrapper>
+ <StoreWrapper>
+ <CrispWrapper>
+ <PostHogProvider>
+ <SWRConfig value={SWR_CONFIG}>{children}</SWRConfig>
+ </PostHogProvider>
+ </CrispWrapper>
+ </StoreWrapper>
+ </InstanceWrapper>
+ </ThemeProvider>
+ </StoreProvider>
+ </>
+ );
+};
diff --git a/web/app/sign-up/layout.tsx b/web/app/sign-up/layout.tsx
new file mode 100644
index 0000000000..f7f405c279
--- /dev/null
+++ b/web/app/sign-up/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Sign up - Plane",
+};
+
+export default function SignUpLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/app/sign-up/page.tsx b/web/app/sign-up/page.tsx
new file mode 100644
index 0000000000..073277d35c
--- /dev/null
+++ b/web/app/sign-up/page.tsx
@@ -0,0 +1,70 @@
+"use client";
+
+import { observer } from "mobx-react";
+import Image from "next/image";
+import Link from "next/link";
+// ui
+import { useTheme } from "next-themes";
+// components
+import { AuthRoot } from "@/components/account";
+// constants
+import { NAVIGATE_TO_SIGNIN } from "@/constants/event-tracker";
+// helpers
+import { EAuthModes, EPageTypes } from "@/helpers/authentication.helper";
+// hooks
+import { useEventTracker } from "@/hooks/store";
+// assets
+import { AuthenticationWrapper } from "@/lib/wrappers";
+import 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";
+
+export type AuthType = "sign-in" | "sign-up";
+
+const SignInPage = observer(() => {
+ // store hooks
+ const { captureEvent } = useEventTracker();
+ // hooks
+ const { resolvedTheme } = useTheme();
+
+ const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
+
+ return (
+ <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>
+ <div className="relative w-screen h-screen overflow-hidden">
+ <div className="absolute inset-0 z-0">
+ <Image
+ src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
+ className="w-full h-full object-cover"
+ alt="Plane background pattern"
+ />
+ </div>
+ <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
+ <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
+ <div className="flex items-center gap-x-2 py-10">
+ <Link href={`/`} className="h-[30px] w-[133px]">
+ <Image src={logo} alt="Plane logo" />
+ </Link>
+ </div>
+ <div className="flex flex-col items-end sm:items-center sm:gap-2 sm:flex-row text-center text-sm font-medium text-onboarding-text-300">
+ Already have an account?{" "}
+ <Link
+ href="/"
+ onClick={() => captureEvent(NAVIGATE_TO_SIGNIN, {})}
+ className="font-semibold text-custom-primary-100 hover:underline"
+ >
+ Log in
+ </Link>
+ </div>
+ </div>
+ <div className="flex flex-col justify-center flex-grow container h-[100vh-60px] mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 transition-all">
+ <AuthRoot authMode={EAuthModes.SIGN_UP} />
+ </div>
+ </div>
+ </div>
+ </AuthenticationWrapper>
+ );
+});
+
+export default SignInPage;
diff --git a/web/app/workspace-invitations/layout.tsx b/web/app/workspace-invitations/layout.tsx
new file mode 100644
index 0000000000..8361dddfab
--- /dev/null
+++ b/web/app/workspace-invitations/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "Workspace Invitations",
+};
+
+export default function WorkspaceInvitationsLayout({ children }: { children: React.ReactNode }) {
+ return children;
+}
diff --git a/web/app/workspace-invitations/page.tsx b/web/app/workspace-invitations/page.tsx
new file mode 100644
index 0000000000..2c958fdeb2
--- /dev/null
+++ b/web/app/workspace-invitations/page.tsx
@@ -0,0 +1,127 @@
+"use client";
+
+import React from "react";
+import { observer } from "mobx-react";
+import { useRouter, useSearchParams } from "next/navigation";
+import useSWR from "swr";
+import { Boxes, Check, Share2, Star, User2, X } from "lucide-react";
+// components
+import { LogoSpinner } from "@/components/common";
+import { EmptySpace, EmptySpaceItem } from "@/components/ui/empty-space";
+// constants
+import { WORKSPACE_INVITATION } from "@/constants/fetch-keys";
+// helpers
+import { EPageTypes } from "@/helpers/authentication.helper";
+// hooks
+import { useUser } from "@/hooks/store";
+// wrappers
+import { AuthenticationWrapper } from "@/lib/wrappers";
+// services
+import { WorkspaceService } from "@/services/workspace.service";
+
+// service initialization
+const workspaceService = new WorkspaceService();
+
+const WorkspaceInvitationPage = observer(() => {
+ // router
+ const router = useRouter();
+ // query params
+ const searchParams = useSearchParams();
+ const invitation_id = searchParams.get("invitation_id");
+ const email = searchParams.get("email");
+ const slug = searchParams.get("slug");
+ // store hooks
+ const { data: currentUser } = useUser();
+
+ const { data: invitationDetail, error } = useSWR(
+ invitation_id && slug && WORKSPACE_INVITATION(invitation_id.toString()),
+ invitation_id && slug
+ ? () => workspaceService.getWorkspaceInvitation(slug.toString(), invitation_id.toString())
+ : null
+ );
+
+ const handleAccept = () => {
+ if (!invitationDetail) return;
+ workspaceService
+ .joinWorkspace(invitationDetail.workspace.slug, invitationDetail.id, {
+ accepted: true,
+ email: invitationDetail.email,
+ })
+ .then(() => {
+ if (email === currentUser?.email) {
+ router.push("/invitations");
+ } else {
+ router.push(`/?${searchParams.toString()}`);
+ }
+ })
+ .catch((err) => console.error(err));
+ };
+
+ const handleReject = () => {
+ if (!invitationDetail) return;
+ workspaceService
+ .joinWorkspace(invitationDetail.workspace.slug, invitationDetail.id, {
+ accepted: false,
+ email: invitationDetail.email,
+ })
+ .then(() => {
+ router.push("/");
+ })
+ .catch((err) => console.error(err));
+ };
+
+ return (
+ <AuthenticationWrapper pageType={EPageTypes.PUBLIC}>
+ <div className="flex h-full w-full flex-col items-center justify-center px-3">
+ {invitationDetail && !invitationDetail.responded_at ? (
+ error ? (
+ <div className="flex w-full flex-col space-y-4 rounded border border-custom-border-200 bg-custom-background-100 px-4 py-8 text-center shadow-2xl md:w-1/3">
+ <h2 className="text-xl uppercase">INVITATION NOT FOUND</h2>
+ </div>
+ ) : (
+ <EmptySpace
+ title={`You have been invited to ${invitationDetail.workspace.name}`}
+ description="Your workspace is where you'll create projects, collaborate on your issues, and organize different streams of work in your Plane account."
+ >
+ <EmptySpaceItem Icon={Check} title="Accept" action={handleAccept} />
+ <EmptySpaceItem Icon={X} title="Ignore" action={handleReject} />
+ </EmptySpace>
+ )
+ ) : error || invitationDetail?.responded_at ? (
+ invitationDetail?.accepted ? (
+ <EmptySpace
+ title={`You are already a member of ${invitationDetail.workspace.name}`}
+ description="Your workspace is where you'll create projects, collaborate on your issues, and organize different streams of work in your Plane account."
+ >
+ <EmptySpaceItem Icon={Boxes} title="Continue to home" href="/" />
+ </EmptySpace>
+ ) : (
+ <EmptySpace
+ title="This invitation link is not active anymore."
+ description="Your workspace is where you'll create projects, collaborate on your issues, and organize different streams of work in your Plane account."
+ link={{ text: "Or start from an empty project", href: "/" }}
+ >
+ {!currentUser ? (
+ <EmptySpaceItem Icon={User2} title="Sign in to continue" href="/" />
+ ) : (
+ <EmptySpaceItem Icon={Boxes} title="Continue to home" href="/" />
+ )}
+ <EmptySpaceItem Icon={Star} title="Star us on GitHub" href="https://github.com/makeplane" />
+ <EmptySpaceItem
+ Icon={Share2}
+ title="Join our community of active creators"
+ href="https://discord.com/invite/A92xrEGCge"
+ />
+ </EmptySpace>
+ )
+ ) : (
+ <div className="flex h-full w-full items-center justify-center">
+ <LogoSpinner />
+ </div>
+ )}
+ </div>
+ </AuthenticationWrapper>
+ );
+});
+
+export default WorkspaceInvitationPage;
diff --git a/web/components/account/auth-forms/auth-root.tsx b/web/components/account/auth-forms/auth-root.tsx
index 66f32f9fd7..9c89d488f0 100644
--- a/web/components/account/auth-forms/auth-root.tsx
+++ b/web/components/account/auth-forms/auth-root.tsx
@@ -1,6 +1,6 @@
import React, { FC, useEffect, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter, useSearchParams } from "next/navigation";
import { IEmailCheckData } from "@plane/types";
// components
import {
@@ -35,7 +35,12 @@ type TAuthRoot = {
export const AuthRoot: FC<TAuthRoot> = observer((props) => {
//router
const router = useRouter();
- const { email: emailParam, invitation_id, slug: workspaceSlug, error_code } = router.query;
+ const searchParams = useSearchParams();
+ // query params
+ const emailParam = searchParams.get("email");
+ const invitation_id = searchParams.get("invitation_id");
+ const workspaceSlug = searchParams.get("slug");
+ const error_code = searchParams.get("error_code");
// props
const { authMode: currentAuthMode } = props;
// states
@@ -130,7 +135,7 @@ export const AuthRoot: FC<TAuthRoot> = observer((props) => {
setErrorInfo(undefined);
setEmail("");
setAuthStep(EAuthSteps.EMAIL);
- router.push(currentAuthMode === EAuthModes.SIGN_IN ? `/` : "/sign-up", undefined, { shallow: true });
+ router.push(currentAuthMode === EAuthModes.SIGN_IN ? `/` : "/sign-up");
};
// generating the unique code
diff --git a/web/components/account/deactivate-account-modal.tsx b/web/components/account/deactivate-account-modal.tsx
index ee5100e36e..c2c6f20b1f 100644
--- a/web/components/account/deactivate-account-modal.tsx
+++ b/web/components/account/deactivate-account-modal.tsx
@@ -1,5 +1,5 @@
import React, { useState } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Trash2 } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
// hooks
diff --git a/web/components/account/oauth/github-button.tsx b/web/components/account/oauth/github-button.tsx
index 6d274c125f..02b5f55bd0 100644
--- a/web/components/account/oauth/github-button.tsx
+++ b/web/components/account/oauth/github-button.tsx
@@ -1,5 +1,5 @@
import { FC } from "react";
-import { useRouter } from "next/router";
+import { useSearchParams } from "next/navigation";
import Image from "next/image";
import { useTheme } from "next-themes";
// helpers
@@ -13,8 +13,8 @@ export type GithubOAuthButtonProps = {
};
export const GithubOAuthButton: FC<GithubOAuthButtonProps> = (props) => {
- const { query } = useRouter();
- const { next_path } = query;
+ const searchParams = useSearchParams();
+ const next_path = searchParams.get("next_path");
const { text } = props;
// hooks
const { resolvedTheme } = useTheme();
diff --git a/web/components/account/oauth/google-button.tsx b/web/components/account/oauth/google-button.tsx
index 279c5ea427..c125589ac7 100644
--- a/web/components/account/oauth/google-button.tsx
+++ b/web/components/account/oauth/google-button.tsx
@@ -1,5 +1,5 @@
import { FC } from "react";
-import { useRouter } from "next/router";
+import { useSearchParams } from "next/navigation";
import Image from "next/image";
import { useTheme } from "next-themes";
// helpers
@@ -12,8 +12,8 @@ export type GoogleOAuthButtonProps = {
};
export const GoogleOAuthButton: FC<GoogleOAuthButtonProps> = (props) => {
- const { query } = useRouter();
- const { next_path } = query;
+ const searchParams = useSearchParams();
+ const next_path = searchParams.get("next_path");
const { text } = props;
// hooks
const { resolvedTheme } = useTheme();
diff --git a/web/components/analytics/custom-analytics/custom-analytics.tsx b/web/components/analytics/custom-analytics/custom-analytics.tsx
index e5243cff51..413126c482 100644
--- a/web/components/analytics/custom-analytics/custom-analytics.tsx
+++ b/web/components/analytics/custom-analytics/custom-analytics.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { useForm } from "react-hook-form";
import useSWR from "swr";
import { IAnalyticsParams } from "@plane/types";
@@ -30,8 +30,7 @@ const analyticsService = new AnalyticsService();
export const CustomAnalytics: React.FC<Props> = observer((props) => {
const { additionalParams, fullScreen } = props;
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
const { control, watch, setValue } = useForm({ defaultValues });
diff --git a/web/components/analytics/custom-analytics/main-content.tsx b/web/components/analytics/custom-analytics/main-content.tsx
index f57edbefdd..b83f9cce2b 100644
--- a/web/components/analytics/custom-analytics/main-content.tsx
+++ b/web/components/analytics/custom-analytics/main-content.tsx
@@ -1,4 +1,4 @@
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { mutate } from "swr";
import { IAnalyticsParams, IAnalyticsResponse } from "@plane/types";
@@ -22,8 +22,7 @@ type Props = {
export const CustomAnalyticsMainContent: React.FC<Props> = (props) => {
const { analytics, error, fullScreen, params } = props;
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const yAxisKey = params.y_axis === "issue_count" ? "count" : "estimate";
const barGraphData = convertResponseToBarGraphData(analytics?.distribution, params);
diff --git a/web/components/analytics/custom-analytics/select/segment.tsx b/web/components/analytics/custom-analytics/select/segment.tsx
index f9dedc9654..842bcb6232 100644
--- a/web/components/analytics/custom-analytics/select/segment.tsx
+++ b/web/components/analytics/custom-analytics/select/segment.tsx
@@ -1,4 +1,4 @@
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IAnalyticsParams, TXAxisValues } from "@plane/types";
// ui
@@ -12,8 +12,7 @@ type Props = {
};
export const SelectSegment: React.FC<Props> = ({ value, onChange, params, analyticsOptions }) => {
- const router = useRouter();
- const { cycleId, moduleId } = router.query;
+ const { cycleId, moduleId } = useParams();
return (
<CustomSelect
diff --git a/web/components/analytics/custom-analytics/select/x-axis.tsx b/web/components/analytics/custom-analytics/select/x-axis.tsx
index 39a01f0c41..3c7eddaaa4 100644
--- a/web/components/analytics/custom-analytics/select/x-axis.tsx
+++ b/web/components/analytics/custom-analytics/select/x-axis.tsx
@@ -1,4 +1,4 @@
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IAnalyticsParams, TXAxisValues } from "@plane/types";
// ui
@@ -14,8 +14,7 @@ type Props = {
export const SelectXAxis: React.FC<Props> = (props) => {
const { value, onChange, params, analyticsOptions } = props;
- const router = useRouter();
- const { cycleId, moduleId } = router.query;
+ const { cycleId, moduleId } = useParams();
return (
<CustomSelect
diff --git a/web/components/analytics/custom-analytics/sidebar/sidebar-header.tsx b/web/components/analytics/custom-analytics/sidebar/sidebar-header.tsx
index ec1eb3ee35..9873d08a87 100644
--- a/web/components/analytics/custom-analytics/sidebar/sidebar-header.tsx
+++ b/web/components/analytics/custom-analytics/sidebar/sidebar-header.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { Logo } from "@/components/common";
// constants
@@ -10,8 +10,7 @@ import { renderFormattedDate } from "@/helpers/date-time.helper";
import { useCycle, useMember, useModule, useProject } from "@/hooks/store";
export const CustomAnalyticsSidebarHeader = observer(() => {
- const router = useRouter();
- const { projectId, cycleId, moduleId } = router.query;
+ const { projectId, cycleId, moduleId } = useParams();
const { getProjectById } = useProject();
const { getCycleById } = useCycle();
diff --git a/web/components/analytics/custom-analytics/sidebar/sidebar.tsx b/web/components/analytics/custom-analytics/sidebar/sidebar.tsx
index 93c91343c8..876074b85b 100644
--- a/web/components/analytics/custom-analytics/sidebar/sidebar.tsx
+++ b/web/components/analytics/custom-analytics/sidebar/sidebar.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { mutate } from "swr";
// icons
import { CalendarDays, Download, RefreshCw } from "lucide-react";
@@ -31,8 +31,7 @@ const analyticsService = new AnalyticsService();
export const CustomAnalyticsSidebar: React.FC<Props> = observer((props) => {
const { analytics, params, isProjectLevel = false } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
+ const { workspaceSlug, projectId, cycleId, moduleId } = useParams();
// store hooks
const { data: currentUser } = useUser();
const { workspaceProjectIds, getProjectById } = useProject();
diff --git a/web/components/analytics/scope-and-demand/scope-and-demand.tsx b/web/components/analytics/scope-and-demand/scope-and-demand.tsx
index ede3a8e250..047553804c 100644
--- a/web/components/analytics/scope-and-demand/scope-and-demand.tsx
+++ b/web/components/analytics/scope-and-demand/scope-and-demand.tsx
@@ -1,4 +1,4 @@
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
@@ -21,8 +21,7 @@ const analyticsService = new AnalyticsService();
export const ScopeAndDemand: React.FC<Props> = (props) => {
const { fullScreen = true } = props;
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
+ const { workspaceSlug, projectId, cycleId, moduleId } = useParams();
const isProjectLevel = projectId ? true : false;
diff --git a/web/components/api-token/delete-token-modal.tsx b/web/components/api-token/delete-token-modal.tsx
index 6918df463c..2075e2e6e5 100644
--- a/web/components/api-token/delete-token-modal.tsx
+++ b/web/components/api-token/delete-token-modal.tsx
@@ -1,5 +1,5 @@
import { useState, FC } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { mutate } from "swr";
// types
import { IApiToken } from "@plane/types";
@@ -24,9 +24,8 @@ export const DeleteApiTokenModal: FC<Props> = (props) => {
const { isOpen, onClose, tokenId } = props;
// states
const [deleteLoading, setDeleteLoading] = useState<boolean>(false);
- // router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
const handleClose = () => {
onClose();
diff --git a/web/components/api-token/modal/create-token-modal.tsx b/web/components/api-token/modal/create-token-modal.tsx
index f71b5fcdd5..1b5bf63ca7 100644
--- a/web/components/api-token/modal/create-token-modal.tsx
+++ b/web/components/api-token/modal/create-token-modal.tsx
@@ -1,5 +1,5 @@
import React, { useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { mutate } from "swr";
// types
import { IApiToken } from "@plane/types";
@@ -30,8 +30,7 @@ export const CreateApiTokenModal: React.FC<Props> = (props) => {
const [neverExpires, setNeverExpires] = useState<boolean>(false);
const [generatedToken, setGeneratedToken] = useState<IApiToken | null | undefined>(null);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const handleClose = () => {
onClose();
diff --git a/web/components/archives/archive-tabs-list.tsx b/web/components/archives/archive-tabs-list.tsx
index 57d1c36a1d..8088d745b1 100644
--- a/web/components/archives/archive-tabs-list.tsx
+++ b/web/components/archives/archive-tabs-list.tsx
@@ -1,7 +1,7 @@
import { FC } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
// constants
import { ARCHIVES_TAB_LIST } from "@/constants/archives";
// hooks
@@ -9,9 +9,9 @@ import { useProject } from "@/hooks/store";
export const ArchiveTabsList: FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
- const activeTab = router.pathname.split("/").pop();
+ const { workspaceSlug, projectId } = useParams();
+ const pathname = usePathname();
+ const activeTab = pathname.split("/").pop();
// store hooks
const { getProjectById } = useProject();
diff --git a/web/components/auth-screens/not-authorized-view.tsx b/web/components/auth-screens/not-authorized-view.tsx
index 68d3def3bb..10a04f81d7 100644
--- a/web/components/auth-screens/not-authorized-view.tsx
+++ b/web/components/auth-screens/not-authorized-view.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { observer } from "mobx-react";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useSearchParams } from "next/navigation";
// hooks
import { useUser } from "@/hooks/store";
// layouts
@@ -19,8 +19,8 @@ type Props = {
export const NotAuthorizedView: React.FC<Props> = observer((props) => {
const { actionButton, type } = props;
// router
- const { query } = useRouter();
- const { next_path } = query;
+ const searchParams = useSearchParams();
+ const next_path = searchParams.get("next_path");
// hooks
const { data: currentUser } = useUser();
diff --git a/web/components/auth-screens/project/join-project.tsx b/web/components/auth-screens/project/join-project.tsx
index 0c5d4740a5..8065c07084 100644
--- a/web/components/auth-screens/project/join-project.tsx
+++ b/web/components/auth-screens/project/join-project.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import Image from "next/image";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { ClipboardList } from "lucide-react";
import { Button } from "@plane/ui";
@@ -19,8 +19,7 @@ export const JoinProject: React.FC = () => {
} = useUser();
const { fetchProjects } = useProject();
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
const handleJoin = () => {
if (!workspaceSlug || !projectId) return;
diff --git a/web/components/automation/select-month-modal.tsx b/web/components/automation/select-month-modal.tsx
index 7b068fa41a..fc40cc31a5 100644
--- a/web/components/automation/select-month-modal.tsx
+++ b/web/components/automation/select-month-modal.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// react-hook-form
import { Controller, useForm } from "react-hook-form";
// headless ui
@@ -19,8 +19,7 @@ type Props = {
};
export const SelectMonthModal: React.FC<Props> = ({ type, initialValues, isOpen, handleClose, handleChange }) => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
const {
formState: { errors, isSubmitting },
diff --git a/web/components/command-palette/actions/issue-actions/actions-list.tsx b/web/components/command-palette/actions/issue-actions/actions-list.tsx
index 040eb2e3ca..6c1c01acad 100644
--- a/web/components/command-palette/actions/issue-actions/actions-list.tsx
+++ b/web/components/command-palette/actions/issue-actions/actions-list.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import { Command } from "cmdk";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { LinkIcon, Signal, Trash2, UserMinus2, UserPlus2, Users } from "lucide-react";
import { TIssue } from "@plane/types";
// hooks
@@ -24,8 +26,7 @@ type Props = {
export const CommandPaletteIssueActions: React.FC<Props> = observer((props) => {
const { closePalette, issueDetails, pages, setPages, setPlaceholder, setSearchTerm } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId, issueId } = useParams();
// hooks
const {
issues: { updateIssue },
@@ -60,7 +61,7 @@ export const CommandPaletteIssueActions: React.FC<Props> = observer((props) => {
};
const copyIssueUrlToClipboard = () => {
- if (!router.query.issueId) return;
+ if (!issueId) return;
const url = new URL(window.location.href);
copyTextToClipboard(url.href)
diff --git a/web/components/command-palette/actions/issue-actions/change-assignee.tsx b/web/components/command-palette/actions/issue-actions/change-assignee.tsx
index aee7eceaf3..30ef22aaf3 100644
--- a/web/components/command-palette/actions/issue-actions/change-assignee.tsx
+++ b/web/components/command-palette/actions/issue-actions/change-assignee.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import { Command } from "cmdk";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Check } from "lucide-react";
import { TIssue } from "@plane/types";
// mobx store
@@ -17,9 +19,8 @@ type Props = {
export const ChangeIssueAssignee: React.FC<Props> = observer((props) => {
const { closePalette, issue } = props;
- // router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ // router params
+ const { workspaceSlug, projectId } = useParams();
// store
const {
issues: { updateIssue },
diff --git a/web/components/command-palette/actions/issue-actions/change-priority.tsx b/web/components/command-palette/actions/issue-actions/change-priority.tsx
index c154cc44c6..5bd8ce850e 100644
--- a/web/components/command-palette/actions/issue-actions/change-priority.tsx
+++ b/web/components/command-palette/actions/issue-actions/change-priority.tsx
@@ -1,6 +1,8 @@
+"use client"; ``
+
import { Command } from "cmdk";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Check } from "lucide-react";
import { TIssue, TIssuePriorities } from "@plane/types";
// mobx store
@@ -18,10 +20,8 @@ type Props = {
export const ChangeIssuePriority: React.FC<Props> = observer((props) => {
const { closePalette, issue } = props;
-
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
-
+ // router params
+ const { workspaceSlug, projectId } = useParams();
const {
issues: { updateIssue },
} = useIssues(EIssuesStoreType.PROJECT);
diff --git a/web/components/command-palette/actions/issue-actions/change-state.tsx b/web/components/command-palette/actions/issue-actions/change-state.tsx
index fce081dfbb..5d512f4aca 100644
--- a/web/components/command-palette/actions/issue-actions/change-state.tsx
+++ b/web/components/command-palette/actions/issue-actions/change-state.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import { Command } from "cmdk";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { Check } from "lucide-react";
import { TIssue } from "@plane/types";
@@ -18,9 +20,8 @@ type Props = {
export const ChangeIssueState: React.FC<Props> = observer((props) => {
const { closePalette, issue } = props;
- // router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ // router params
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const {
issues: { updateIssue },
diff --git a/web/components/command-palette/actions/search-results.tsx b/web/components/command-palette/actions/search-results.tsx
index 489794295b..6d779d6547 100644
--- a/web/components/command-palette/actions/search-results.tsx
+++ b/web/components/command-palette/actions/search-results.tsx
@@ -1,5 +1,7 @@
+"use client";
+
import { Command } from "cmdk";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { IWorkspaceSearchResults } from "@plane/types";
// helpers
import { commandGroups } from "@/components/command-palette";
diff --git a/web/components/command-palette/actions/theme-actions.tsx b/web/components/command-palette/actions/theme-actions.tsx
index 7b0ddc72bc..254dda42c8 100644
--- a/web/components/command-palette/actions/theme-actions.tsx
+++ b/web/components/command-palette/actions/theme-actions.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import React, { FC, useEffect, useState } from "react";
import { Command } from "cmdk";
import { observer } from "mobx-react";
diff --git a/web/components/command-palette/actions/workspace-settings-actions.tsx b/web/components/command-palette/actions/workspace-settings-actions.tsx
index 56c118a51a..98a0a720bc 100644
--- a/web/components/command-palette/actions/workspace-settings-actions.tsx
+++ b/web/components/command-palette/actions/workspace-settings-actions.tsx
@@ -1,7 +1,9 @@
+"use client";
+
import { Command } from "cmdk";
// hooks
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// constants
import { EUserWorkspaceRoles, WORKSPACE_SETTINGS_LINKS } from "@/constants/workspace";
import { useUser } from "@/hooks/store";
@@ -14,7 +16,8 @@ export const CommandPaletteWorkspaceSettingsActions: React.FC<Props> = (props) =
const { closePalette } = props;
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
// mobx store
const {
membership: { currentWorkspaceRole },
diff --git a/web/components/command-palette/command-modal.tsx b/web/components/command-palette/command-modal.tsx
index 6c05c9b174..e00af3d30c 100644
--- a/web/components/command-palette/command-modal.tsx
+++ b/web/components/command-palette/command-modal.tsx
@@ -1,7 +1,9 @@
+"use client";
+
import React, { useEffect, useState } from "react";
import { Command } from "cmdk";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import useSWR from "swr";
import { FolderPlus, Search, Settings } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
@@ -67,7 +69,8 @@ export const CommandModal: React.FC = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, issueId } = router.query;
+ // router params
+ const { workspaceSlug, projectId, issueId } = useParams();
const page = pages[pages.length - 1];
diff --git a/web/components/command-palette/command-palette.tsx b/web/components/command-palette/command-palette.tsx
index 41afbb5e2f..4fe2e4438e 100644
--- a/web/components/command-palette/command-palette.tsx
+++ b/web/components/command-palette/command-palette.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import React, { useCallback, useEffect, FC, useMemo } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname, useRouter } from "next/navigation";
import useSWR from "swr";
// ui
import { TOAST_TYPE, setToast } from "@plane/ui";
@@ -32,7 +34,10 @@ const issueService = new IssueService();
export const CommandPalette: FC = observer(() => {
// router
const router = useRouter();
- const { workspaceSlug, projectId, issueId, cycleId, moduleId } = router.query;
+ // router params
+ const { workspaceSlug, projectId, issueId, cycleId, moduleId } = useParams();
+ // pathname
+ const pathname = usePathname();
// store hooks
const { toggleSidebar } = useAppTheme();
const { setTrackElement } = useEventTracker();
@@ -260,7 +265,7 @@ export const CommandPalette: FC = observer(() => {
return () => document.removeEventListener("keydown", handleKeyDown);
}, [handleKeyDown]);
- const isDraftIssue = router?.asPath?.includes("draft-issues") || false;
+ const isDraftIssue = pathname?.includes("draft-issues") || false;
if (!currentUser) return null;
diff --git a/web/components/command-palette/shortcuts-modal/modal.tsx b/web/components/command-palette/shortcuts-modal/modal.tsx
index bbaa554649..f4076db4cf 100644
--- a/web/components/command-palette/shortcuts-modal/modal.tsx
+++ b/web/components/command-palette/shortcuts-modal/modal.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { FC, useState, Fragment } from "react";
import { Search, X } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
diff --git a/web/components/core/activity.tsx b/web/components/core/activity.tsx
index 5def2d7a99..27ac7bceac 100644
--- a/web/components/core/activity.tsx
+++ b/web/components/core/activity.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// store hooks
// icons
import {
@@ -29,8 +29,8 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
// types
export const IssueLink = ({ activity }: { activity: IIssueActivity }) => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
const { isMobile } = usePlatformOS();
return (
@@ -61,8 +61,8 @@ export const IssueLink = ({ activity }: { activity: IIssueActivity }) => {
};
const UserLink = ({ activity }: { activity: IIssueActivity }) => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
return (
<a
@@ -725,8 +725,8 @@ type ActivityMessageProps = {
};
export const ActivityMessage = ({ activity, showIssue = false }: ActivityMessageProps) => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
return (
<>
diff --git a/web/components/core/image-picker-popover.tsx b/web/components/core/image-picker-popover.tsx
index 4a080fb703..c4e692f739 100644
--- a/web/components/core/image-picker-popover.tsx
+++ b/web/components/core/image-picker-popover.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useState, useRef, useCallback } from "react";
import { observer } from "mobx-react";
import Image from "next/image";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { useDropzone } from "react-dropzone";
import { Control, Controller } from "react-hook-form";
import useSWR from "swr";
@@ -58,9 +58,8 @@ export const ImagePickerPopover: React.FC<Props> = observer((props) => {
});
// refs
const ref = useRef<HTMLDivElement>(null);
- // router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
// store hooks
const { config } = useInstance();
const { currentWorkspace } = useWorkspace();
diff --git a/web/components/core/list/list-item.tsx b/web/components/core/list/list-item.tsx
index 8527d56b50..fba22bc915 100644
--- a/web/components/core/list/list-item.tsx
+++ b/web/components/core/list/list-item.tsx
@@ -1,5 +1,5 @@
import React, { FC } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
// ui
import { ControlLink, Tooltip } from "@plane/ui";
// helpers
diff --git a/web/components/core/modals/bulk-delete-issues-modal.tsx b/web/components/core/modals/bulk-delete-issues-modal.tsx
index 22d9401cf5..dd1b35307b 100644
--- a/web/components/core/modals/bulk-delete-issues-modal.tsx
+++ b/web/components/core/modals/bulk-delete-issues-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { SubmitHandler, useForm } from "react-hook-form";
import useSWR from "swr";
import { Search } from "lucide-react";
@@ -36,9 +36,8 @@ const issueService = new IssueService();
export const BulkDeleteIssuesModal: React.FC<Props> = observer((props) => {
const { isOpen, onClose } = props;
- // router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ // router params
+ const { workspaceSlug, projectId } = useParams();
// hooks
const { getProjectById } = useProject();
const {
diff --git a/web/components/core/modals/gpt-assistant-popover.tsx b/web/components/core/modals/gpt-assistant-popover.tsx
index 0c9c30b31a..3f4680172c 100644
--- a/web/components/core/modals/gpt-assistant-popover.tsx
+++ b/web/components/core/modals/gpt-assistant-popover.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState, useRef, Fragment, Ref } from "react";
import { Placement } from "@popperjs/core";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Controller, useForm } from "react-hook-form"; // services
import { usePopper } from "react-popper";
// ui
@@ -42,8 +42,7 @@ export const GptAssistantPopover: React.FC<Props> = (props) => {
const editorRef = useRef<any>(null);
const responseRef = useRef<any>(null);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// popper
const { styles, attributes } = usePopper(referenceElement, popperElement, {
placement: placement ?? "auto",
diff --git a/web/components/core/modals/workspace-image-upload-modal.tsx b/web/components/core/modals/workspace-image-upload-modal.tsx
index 8782177806..c9aef7f01c 100644
--- a/web/components/core/modals/workspace-image-upload-modal.tsx
+++ b/web/components/core/modals/workspace-image-upload-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { useDropzone } from "react-dropzone";
import { UserCircle2 } from "lucide-react";
import { Transition, Dialog } from "@headlessui/react";
@@ -31,8 +31,8 @@ export const WorkspaceImageUploadModal: React.FC<Props> = observer((props) => {
const [image, setImage] = useState<File | null>(null);
const [isImageUploading, setIsImageUploading] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
+ const pathname = usePathname();
// store hooks
const { config } = useInstance();
const { currentWorkspace } = useWorkspace();
@@ -55,7 +55,7 @@ export const WorkspaceImageUploadModal: React.FC<Props> = observer((props) => {
};
const handleSubmit = async () => {
- if (!image || (!workspaceSlug && router.pathname !== "/onboarding")) return;
+ if (!image || (!workspaceSlug && pathname !== "/onboarding")) return;
setIsImageUploading(true);
diff --git a/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx b/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx
index 33370378e4..fb847ec170 100644
--- a/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx
+++ b/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx
@@ -1,24 +1,18 @@
+"use client";
+
import { FC } from "react";
import { observer } from "mobx-react";
import { Menu } from "lucide-react";
import { useAppTheme } from "@/hooks/store";
-type Props = {
- onClick?: () => void;
-};
-
-export const SidebarHamburgerToggle: FC<Props> = observer((props) => {
- const { onClick } = props;
+export const SidebarHamburgerToggle: FC = observer(() => {
// store hooks
const { toggleSidebar } = useAppTheme();
return (
<div
className="group flex h-7 w-7 flex-shrink-0 cursor-pointer items-center justify-center rounded bg-custom-background-80 transition-all hover:bg-custom-background-90 md:hidden"
- onClick={() => {
- if (onClick) onClick();
- else toggleSidebar();
- }}
+ onClick={() => toggleSidebar()}
>
<Menu size={14} className="text-custom-text-200 transition-all group-hover:text-custom-text-100" />
</div>
diff --git a/web/components/cycles/active-cycle/upcoming-cycles-list-item.tsx b/web/components/cycles/active-cycle/upcoming-cycles-list-item.tsx
index a66af73c39..89d154cd20 100644
--- a/web/components/cycles/active-cycle/upcoming-cycles-list-item.tsx
+++ b/web/components/cycles/active-cycle/upcoming-cycles-list-item.tsx
@@ -1,7 +1,7 @@
import { useRef } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Users } from "lucide-react";
// ui
import { Avatar, AvatarGroup, setPromiseToast } from "@plane/ui";
@@ -24,8 +24,7 @@ export const UpcomingCycleListItem: React.FC<Props> = observer((props) => {
// refs
const parentRef = useRef(null);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { captureEvent } = useEventTracker();
const { addCycleToFavorites, getCycleById, removeCycleFromFavorites } = useCycle();
diff --git a/web/components/cycles/archived-cycles/header.tsx b/web/components/cycles/archived-cycles/header.tsx
index e45b50baa8..950128848c 100644
--- a/web/components/cycles/archived-cycles/header.tsx
+++ b/web/components/cycles/archived-cycles/header.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback, useRef, useState } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { ListFilter, Search, X } from "lucide-react";
// types
@@ -18,8 +18,7 @@ import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
export const ArchivedCyclesHeader: FC = observer(() => {
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// refs
const inputRef = useRef<HTMLInputElement>(null);
// hooks
diff --git a/web/components/cycles/archived-cycles/modal.tsx b/web/components/cycles/archived-cycles/modal.tsx
index b613d0de9d..d4c2b09303 100644
--- a/web/components/cycles/archived-cycles/modal.tsx
+++ b/web/components/cycles/archived-cycles/modal.tsx
@@ -1,5 +1,5 @@
import { useState, Fragment } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Dialog, Transition } from "@headlessui/react";
// ui
import { Button, TOAST_TYPE, setToast } from "@plane/ui";
diff --git a/web/components/cycles/archived-cycles/root.tsx b/web/components/cycles/archived-cycles/root.tsx
index 4d47c8f34e..bb175fe0e2 100644
--- a/web/components/cycles/archived-cycles/root.tsx
+++ b/web/components/cycles/archived-cycles/root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// types
import { TCycleFilters } from "@plane/types";
@@ -17,8 +17,7 @@ import { useCycle, useCycleFilter } from "@/hooks/store";
export const ArchivedCycleLayoutRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// hooks
const { fetchArchivedCycles, currentProjectArchivedCycleIds, loader } = useCycle();
// cycle filters hook
diff --git a/web/components/cycles/board/cycles-board-card.tsx b/web/components/cycles/board/cycles-board-card.tsx
index 6410077987..700c6a882d 100644
--- a/web/components/cycles/board/cycles-board-card.tsx
+++ b/web/components/cycles/board/cycles-board-card.tsx
@@ -1,7 +1,7 @@
import { FC, MouseEvent, useRef } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { CalendarCheck2, CalendarClock, Info, MoveRight } from "lucide-react";
// types
import type { TCycleGroups } from "@plane/types";
@@ -16,6 +16,7 @@ import { CYCLE_FAVORITED, CYCLE_UNFAVORITED } from "@/constants/event-tracker";
import { EUserWorkspaceRoles } from "@/constants/workspace";
// helpers
import { findHowManyDaysLeft, getDate, renderFormattedDate } from "@/helpers/date-time.helper";
+import { generateQueryParams } from "@/helpers/router.helper";
// hooks
import { useEventTracker, useCycle, useUser, useMember } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -32,6 +33,8 @@ export const CyclesBoardCard: FC<ICyclesBoardCard> = observer((props) => {
const parentRef = useRef(null);
// router
const router = useRouter();
+ const searchParams = useSearchParams();
+ const pathname = usePathname();
// store
const { captureEvent } = useEventTracker();
const {
@@ -130,21 +133,14 @@ export const CyclesBoardCard: FC<ICyclesBoardCard> = observer((props) => {
};
const openCycleOverview = (e: MouseEvent<HTMLButtonElement>) => {
- const { query } = router;
e.preventDefault();
e.stopPropagation();
- if (query.peekCycle) {
- delete query.peekCycle;
- router.push({
- pathname: router.pathname,
- query: { ...query },
- });
+ const query = generateQueryParams(searchParams, ['peekCycle']);
+ if (searchParams.has('peekCycle')) {
+ router.push(`${pathname}?${query}`);
} else {
- router.push({
- pathname: router.pathname,
- query: { ...query, peekCycle: cycleId },
- });
+ router.push(`${pathname}?${query}&peekCycle=${cycleId}`);
}
};
diff --git a/web/components/cycles/cycle-peek-overview.tsx b/web/components/cycles/cycle-peek-overview.tsx
index 316f4538c5..3a5c1d9b01 100644
--- a/web/components/cycles/cycle-peek-overview.tsx
+++ b/web/components/cycles/cycle-peek-overview.tsx
@@ -1,7 +1,8 @@
import React, { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
// hooks
+import { generateQueryParams } from "@/helpers/router.helper";
import { useCycle } from "@/hooks/store";
// components
import { CycleDetailsSidebar } from "./sidebar";
@@ -15,18 +16,17 @@ type Props = {
export const CyclePeekOverview: React.FC<Props> = observer(({ projectId, workspaceSlug, isArchived = false }) => {
// router
const router = useRouter();
- const { peekCycle } = router.query;
+ const pathname = usePathname();
+ const searchParams = useSearchParams();
+ const peekCycle = searchParams.get("peekCycle");
// refs
const ref = React.useRef(null);
// store hooks
const { fetchCycleDetails, fetchArchivedCycleDetails } = useCycle();
const handleClose = () => {
- delete router.query.peekCycle;
- router.push({
- pathname: router.pathname,
- query: { ...router.query },
- });
+ const query = generateQueryParams(searchParams, ['peekCycle']);
+ router.push(`${pathname}?${query}`);
};
useEffect(() => {
diff --git a/web/components/cycles/delete-modal.tsx b/web/components/cycles/delete-modal.tsx
index 9a6578f49f..93407a2367 100644
--- a/web/components/cycles/delete-modal.tsx
+++ b/web/components/cycles/delete-modal.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter, useSearchParams } from "next/navigation";
// types
import { ICycle } from "@plane/types";
// ui
@@ -29,7 +29,9 @@ export const CycleDeleteModal: React.FC<ICycleDelete> = observer((props) => {
const { deleteCycle } = useCycle();
// router
const router = useRouter();
- const { cycleId, peekCycle } = router.query;
+ const { cycleId } = useParams();
+ const searchParams = useSearchParams();
+ const peekCycle = searchParams.get("peekCycle");
const formSubmit = async () => {
if (!cycle) return;
diff --git a/web/components/cycles/gantt-chart/blocks.tsx b/web/components/cycles/gantt-chart/blocks.tsx
index 68e25a43ca..d0c7be8006 100644
--- a/web/components/cycles/gantt-chart/blocks.tsx
+++ b/web/components/cycles/gantt-chart/blocks.tsx
@@ -1,6 +1,6 @@
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
// hooks
// ui
import { Tooltip, ContrastIcon } from "@plane/ui";
diff --git a/web/components/cycles/gantt-chart/cycles-list-layout.tsx b/web/components/cycles/gantt-chart/cycles-list-layout.tsx
index 1b0e0ab82a..aa0aeea41b 100644
--- a/web/components/cycles/gantt-chart/cycles-list-layout.tsx
+++ b/web/components/cycles/gantt-chart/cycles-list-layout.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { ICycle } from "@plane/types";
// hooks
import { CycleGanttBlock } from "@/components/cycles";
@@ -19,8 +19,7 @@ type Props = {
export const CyclesListGanttChartView: FC<Props> = observer((props) => {
const { cycleIds } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { getCycleById, updateCycleDetails } = useCycle();
diff --git a/web/components/cycles/list/cycles-list-item.tsx b/web/components/cycles/list/cycles-list-item.tsx
index 414c8081a1..78a1cfb7bd 100644
--- a/web/components/cycles/list/cycles-list-item.tsx
+++ b/web/components/cycles/list/cycles-list-item.tsx
@@ -1,6 +1,6 @@
import { FC, MouseEvent, useRef } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
// icons
import { Check, Info } from "lucide-react";
// types
@@ -10,6 +10,8 @@ import { CircularProgressIndicator } from "@plane/ui";
// components
import { ListItem } from "@/components/core/list";
import { CycleListItemAction } from "@/components/cycles/list";
+// helpers
+import { generateQueryParams } from "@/helpers/router.helper";
// hooks
import { useCycle } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -31,6 +33,8 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {
const parentRef = useRef(null);
// router
const router = useRouter();
+ const searchParams = useSearchParams();
+ const pathname = usePathname();
// hooks
const { isMobile } = usePlatformOS();
// store hooks
@@ -59,21 +63,14 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {
// handlers
const openCycleOverview = (e: MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => {
- const { query } = router;
e.preventDefault();
e.stopPropagation();
- if (query.peekCycle) {
- delete query.peekCycle;
- router.push({
- pathname: router.pathname,
- query: { ...query },
- });
+ const query = generateQueryParams(searchParams, ["peekCycle"]);
+ if (searchParams.has("peekCycle")) {
+ router.push(`${pathname}?${query}`);
} else {
- router.push({
- pathname: router.pathname,
- query: { ...query, peekCycle: cycleId },
- });
+ router.push(`${pathname}?${query}&peekCycle=${cycleId}`);
}
};
diff --git a/web/components/cycles/quick-actions.tsx b/web/components/cycles/quick-actions.tsx
index 9c130ef7a7..0843959567 100644
--- a/web/components/cycles/quick-actions.tsx
+++ b/web/components/cycles/quick-actions.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
// icons
import { ArchiveRestoreIcon, ExternalLink, LinkIcon, Pencil, Trash2 } from "lucide-react";
// ui
diff --git a/web/components/cycles/sidebar.tsx b/web/components/cycles/sidebar.tsx
index 595fe9b7a4..cc40b81576 100644
--- a/web/components/cycles/sidebar.tsx
+++ b/web/components/cycles/sidebar.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from "react";
import isEmpty from "lodash/isEmpty";
import isEqual from "lodash/isEqual";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter, useSearchParams } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
// icons
import {
@@ -60,7 +60,9 @@ export const CycleDetailsSidebar: React.FC<Props> = observer((props) => {
const [cycleDeleteModal, setCycleDeleteModal] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug, projectId, peekCycle } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const searchParams = useSearchParams();
+ const peekCycle = searchParams.get("peekCycle");
// store hooks
const { setTrackElement, captureCycleEvent } = useEventTracker();
const {
diff --git a/web/components/cycles/transfer-issues-modal.tsx b/web/components/cycles/transfer-issues-modal.tsx
index 399774faa3..5d547bcfd4 100644
--- a/web/components/cycles/transfer-issues-modal.tsx
+++ b/web/components/cycles/transfer-issues-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { AlertCircle, Search, X } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
// hooks
@@ -28,8 +28,7 @@ export const TransferIssuesModal: React.FC<Props> = observer((props) => {
issues: { transferIssuesFromCycle },
} = useIssues(EIssuesStoreType.CYCLE);
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
const transferIssue = async (payload: any) => {
if (!workspaceSlug || !projectId || !cycleId) return;
diff --git a/web/components/cycles/transfer-issues.tsx b/web/components/cycles/transfer-issues.tsx
index d7a5a2178e..881b001750 100644
--- a/web/components/cycles/transfer-issues.tsx
+++ b/web/components/cycles/transfer-issues.tsx
@@ -1,7 +1,7 @@
import React from "react";
import isEmpty from "lodash/isEmpty";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
@@ -24,8 +24,7 @@ const cycleService = new CycleService();
export const TransferIssues: React.FC<Props> = (props) => {
const { handleClick, disabled = false } = props;
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
const { data: cycleDetails } = useSWR(
cycleId ? CYCLE_DETAILS(cycleId as string) : null,
diff --git a/web/components/dashboard/widgets/issues-by-priority.tsx b/web/components/dashboard/widgets/issues-by-priority.tsx
index 9862b440b1..34bcae2401 100644
--- a/web/components/dashboard/widgets/issues-by-priority.tsx
+++ b/web/components/dashboard/widgets/issues-by-priority.tsx
@@ -1,7 +1,7 @@
import { useEffect } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { TIssuesByPriorityWidgetFilters, TIssuesByPriorityWidgetResponse } from "@plane/types";
// hooks
// components
diff --git a/web/components/dashboard/widgets/issues-by-state-group.tsx b/web/components/dashboard/widgets/issues-by-state-group.tsx
index 22552ea8c5..bfdc7d6690 100644
--- a/web/components/dashboard/widgets/issues-by-state-group.tsx
+++ b/web/components/dashboard/widgets/issues-by-state-group.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { TIssuesByStateGroupsWidgetFilters, TIssuesByStateGroupsWidgetResponse, TStateGroups } from "@plane/types";
// hooks
import {
diff --git a/web/components/estimates/create-update-estimate-modal.tsx b/web/components/estimates/create-update-estimate-modal.tsx
new file mode 100644
index 0000000000..5e68095f3b
--- /dev/null
+++ b/web/components/estimates/create-update-estimate-modal.tsx
@@ -0,0 +1,291 @@
+import React, { useEffect } from "react";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+import { Controller, useForm } from "react-hook-form";
+// types
+import { IEstimate, IEstimateFormData } from "@plane/types";
+// ui
+import { Button, Input, TextArea, TOAST_TYPE, setToast } from "@plane/ui";
+// components
+import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
+// helpers
+import { checkDuplicates } from "@/helpers/array.helper";
+// hooks
+import { useEstimate } from "@/hooks/store";
+
+type Props = {
+ isOpen: boolean;
+ handleClose: () => void;
+ data?: IEstimate;
+};
+
+const defaultValues = {
+ name: "",
+ description: "",
+ value1: "",
+ value2: "",
+ value3: "",
+ value4: "",
+ value5: "",
+ value6: "",
+};
+
+type FormValues = typeof defaultValues;
+
+export const CreateUpdateEstimateModal: React.FC<Props> = observer((props) => {
+ const { handleClose, data, isOpen } = props;
+ // router
+ const { workspaceSlug, projectId } = useParams();
+ // store hooks
+ const { createEstimate, updateEstimate } = useEstimate();
+ // form info
+ const {
+ formState: { errors, isSubmitting },
+ handleSubmit,
+ control,
+ reset,
+ } = useForm<FormValues>({
+ defaultValues,
+ });
+
+ const onClose = () => {
+ handleClose();
+ reset();
+ };
+
+ const handleCreateEstimate = async (payload: IEstimateFormData) => {
+ if (!workspaceSlug || !projectId) return;
+
+ await createEstimate(workspaceSlug.toString(), projectId.toString(), payload)
+ .then(() => {
+ onClose();
+ })
+ .catch((err) => {
+ const error = err?.error;
+ const errorString = Array.isArray(error) ? error[0] : error;
+
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message:
+ errorString ?? err.status === 400
+ ? "Estimate with that name already exists. Please try again with another name."
+ : "Estimate could not be created. Please try again.",
+ });
+ });
+ };
+
+ const handleUpdateEstimate = async (payload: IEstimateFormData) => {
+ if (!workspaceSlug || !projectId || !data) return;
+
+ await updateEstimate(workspaceSlug.toString(), projectId.toString(), data.id, payload)
+ .then(() => {
+ onClose();
+ })
+ .catch((err) => {
+ const error = err?.error;
+ const errorString = Array.isArray(error) ? error[0] : error;
+
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: errorString ?? "Estimate could not be updated. Please try again.",
+ });
+ });
+ };
+
+ const onSubmit = async (formData: FormValues) => {
+ if (!formData.name || formData.name === "") {
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: "Estimate title cannot be empty.",
+ });
+ return;
+ }
+
+ if (
+ formData.value1 === "" ||
+ formData.value2 === "" ||
+ formData.value3 === "" ||
+ formData.value4 === "" ||
+ formData.value5 === "" ||
+ formData.value6 === ""
+ ) {
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: "Estimate point cannot be empty.",
+ });
+ return;
+ }
+
+ if (
+ formData.value1.length > 20 ||
+ formData.value2.length > 20 ||
+ formData.value3.length > 20 ||
+ formData.value4.length > 20 ||
+ formData.value5.length > 20 ||
+ formData.value6.length > 20
+ ) {
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: "Estimate point cannot have more than 20 characters.",
+ });
+ return;
+ }
+
+ if (
+ checkDuplicates([
+ formData.value1,
+ formData.value2,
+ formData.value3,
+ formData.value4,
+ formData.value5,
+ formData.value6,
+ ])
+ ) {
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: "Estimate points cannot have duplicate values.",
+ });
+ return;
+ }
+
+ const payload: IEstimateFormData = {
+ estimate: {
+ name: formData.name,
+ description: formData.description,
+ },
+ estimate_points: [],
+ };
+
+ for (let i = 0; i < 6; i++) {
+ const point = {
+ key: i,
+ value: formData[`value${i + 1}` as keyof FormValues],
+ };
+
+ if (data)
+ payload.estimate_points.push({
+ id: data.points[i].id,
+ ...point,
+ });
+ else payload.estimate_points.push({ ...point });
+ }
+
+ if (data) await handleUpdateEstimate(payload);
+ else await handleCreateEstimate(payload);
+ };
+
+ useEffect(() => {
+ if (data)
+ reset({
+ ...defaultValues,
+ ...data,
+ value1: data.points[0]?.value,
+ value2: data.points[1]?.value,
+ value3: data.points[2]?.value,
+ value4: data.points[3]?.value,
+ value5: data.points[4]?.value,
+ value6: data.points[5]?.value,
+ });
+ else reset({ ...defaultValues });
+ }, [data, reset]);
+
+ return (
+ <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>
+ <form onSubmit={handleSubmit(onSubmit)}>
+ <div className="space-y-5 p-5">
+ <div className="text-xl font-medium text-custom-text-200">{data ? "Update" : "Create"} Estimate</div>
+ <div className="space-y-3">
+ <div>
+ <Controller
+ control={control}
+ name="name"
+ render={({ field: { value, onChange, ref } }) => (
+ <Input
+ id="name"
+ name="name"
+ type="name"
+ value={value}
+ onChange={onChange}
+ ref={ref}
+ hasError={Boolean(errors.name)}
+ placeholder="Title"
+ className="w-full text-base"
+ />
+ )}
+ />
+ </div>
+ <div>
+ <Controller
+ name="description"
+ control={control}
+ render={({ field: { value, onChange } }) => (
+ <TextArea
+ id="description"
+ name="description"
+ value={value}
+ placeholder="Description"
+ onChange={onChange}
+ className="w-full text-base resize-none min-h-24"
+ hasError={Boolean(errors?.description)}
+ />
+ )}
+ />
+ </div>
+ </div>
+ {/* list of all the points */}
+ {/* since they are all the same, we can use a loop to render them */}
+ <div className="grid grid-cols-3 gap-3">
+ {Array(6)
+ .fill(0)
+ .map((_, i) => (
+ <div className="flex items-center" key={i}>
+ <span className="flex h-full items-center rounded-lg bg-custom-background-80">
+ <span className="rounded-lg px-2 text-sm text-custom-text-200">{i + 1}</span>
+ <span className="rounded-r-lg bg-custom-background-100">
+ <Controller
+ control={control}
+ name={`value${i + 1}` as keyof FormValues}
+ rules={{
+ maxLength: {
+ value: 20,
+ message: "Estimate point must at most be of 20 characters",
+ },
+ }}
+ render={({ field: { value, onChange, ref } }) => (
+ <Input
+ ref={ref}
+ type="text"
+ value={value}
+ onChange={onChange}
+ id={`value${i + 1}`}
+ name={`value${i + 1}`}
+ placeholder={`Point ${i + 1}`}
+ className="w-full rounded-l-none"
+ hasError={Boolean(errors[`value${i + 1}` as keyof FormValues])}
+ />
+ )}
+ />
+ </span>
+ </span>
+ </div>
+ ))}
+ </div>
+ </div>
+ <div className="px-5 py-4 flex items-center justify-end gap-2 border-t-[0.5px] border-custom-border-200">
+ <Button variant="neutral-primary" size="sm" onClick={handleClose}>
+ Cancel
+ </Button>
+ <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>
+ {data ? (isSubmitting ? "Updating" : "Update Estimate") : isSubmitting ? "Creating" : "Create Estimate"}
+ </Button>
+ </div>
+ </form>
+ </ModalCore>
+ );
+});
diff --git a/web/components/estimates/delete-estimate-modal.tsx b/web/components/estimates/delete-estimate-modal.tsx
new file mode 100644
index 0000000000..528a7d8ac7
--- /dev/null
+++ b/web/components/estimates/delete-estimate-modal.tsx
@@ -0,0 +1,78 @@
+import React, { useEffect, useState } from "react";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+// types
+import { IEstimate } from "@plane/types";
+// ui
+import { TOAST_TYPE, setToast } from "@plane/ui";
+// components
+import { AlertModalCore } from "@/components/core";
+// hooks
+import { useEstimate } from "@/hooks/store";
+
+type Props = {
+ isOpen: boolean;
+ data: IEstimate | null;
+ handleClose: () => void;
+};
+
+export const DeleteEstimateModal: React.FC<Props> = observer((props) => {
+ const { isOpen, handleClose, data } = props;
+ // states
+ const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+ // router
+ const { workspaceSlug, projectId } = useParams();
+ // store hooks
+ const { deleteEstimate } = useEstimate();
+
+ const handleEstimateDelete = async () => {
+ if (!workspaceSlug || !projectId) return;
+
+ setIsDeleteLoading(true);
+
+ // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+ const estimateId = data?.id!;
+
+ await deleteEstimate(workspaceSlug.toString(), projectId.toString(), estimateId)
+ .then(() => {
+ handleClose();
+ })
+ .catch((err) => {
+ const error = err?.error;
+ const errorString = Array.isArray(error) ? error[0] : error;
+
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: errorString ?? "Estimate could not be deleted. Please try again",
+ });
+ })
+ .finally(() => setIsDeleteLoading(false));
+ };
+
+ useEffect(() => {
+ setIsDeleteLoading(false);
+ }, [isOpen]);
+
+ const onClose = () => {
+ setIsDeleteLoading(false);
+ handleClose();
+ };
+
+ return (
+ <AlertModalCore
+ handleClose={onClose}
+ handleSubmit={handleEstimateDelete}
+ isSubmitting={isDeleteLoading}
+ isOpen={isOpen}
+ title="Delete Estimate"
+ content={
+ <>
+ Are you sure you want to delete estimate-{" "}
+ <span className="break-words font-medium text-custom-text-100">{data?.name}</span>
+ {""}? All of the data related to the estiamte will be permanently removed. This action cannot be undone.
+ </>
+ }
+ />
+ );
+});
diff --git a/web/components/estimates/estimates-list.tsx b/web/components/estimates/estimates-list.tsx
new file mode 100644
index 0000000000..ff0625e386
--- /dev/null
+++ b/web/components/estimates/estimates-list.tsx
@@ -0,0 +1,120 @@
+import React, { useState } from "react";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+import { IEstimate } from "@plane/types";
+// store hooks
+import { Button, Loader, TOAST_TYPE, setToast } from "@plane/ui";
+import { EmptyState } from "@/components/empty-state";
+import { CreateUpdateEstimateModal, DeleteEstimateModal, EstimateListItem } from "@/components/estimates";
+import { EmptyStateType } from "@/constants/empty-state";
+import { orderArrayBy } from "@/helpers/array.helper";
+import { useEstimate, useProject } from "@/hooks/store";
+// components
+// ui
+// types
+// helpers
+// constants
+
+export const EstimatesList: React.FC = observer(() => {
+ // states
+ const [estimateFormOpen, setEstimateFormOpen] = useState(false);
+ const [estimateToDelete, setEstimateToDelete] = useState<string | null>(null);
+ const [estimateToUpdate, setEstimateToUpdate] = useState<IEstimate | undefined>();
+ // router
+ const { workspaceSlug, projectId } = useParams();
+ // store hooks
+ const { updateProject, currentProjectDetails } = useProject();
+ const { projectEstimates, getProjectEstimateById } = useEstimate();
+
+ const editEstimate = (estimate: IEstimate) => {
+ setEstimateFormOpen(true);
+ // Order the points array by key before updating the estimate to update state
+ setEstimateToUpdate({
+ ...estimate,
+ points: orderArrayBy(estimate.points, "key"),
+ });
+ };
+
+ const disableEstimates = () => {
+ if (!workspaceSlug || !projectId) return;
+
+ updateProject(workspaceSlug.toString(), projectId.toString(), { estimate: null }).catch((err) => {
+ const error = err?.error;
+ const errorString = Array.isArray(error) ? error[0] : error;
+
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: errorString ?? "Estimate could not be disabled. Please try again",
+ });
+ });
+ };
+
+ return (
+ <>
+ <CreateUpdateEstimateModal
+ isOpen={estimateFormOpen}
+ data={estimateToUpdate}
+ handleClose={() => {
+ setEstimateFormOpen(false);
+ setEstimateToUpdate(undefined);
+ }}
+ />
+
+ <DeleteEstimateModal
+ isOpen={!!estimateToDelete}
+ handleClose={() => setEstimateToDelete(null)}
+ data={getProjectEstimateById(estimateToDelete!)}
+ />
+
+ <section className="flex items-center justify-between border-b border-custom-border-100 py-3.5">
+ <h3 className="text-xl font-medium">Estimates</h3>
+ <div className="col-span-12 space-y-5 sm:col-span-7">
+ <div className="flex items-center gap-2">
+ <Button
+ variant="primary"
+ onClick={() => {
+ setEstimateFormOpen(true);
+ setEstimateToUpdate(undefined);
+ }}
+ size="sm"
+ >
+ Add Estimate
+ </Button>
+ {currentProjectDetails?.estimate && (
+ <Button variant="neutral-primary" onClick={disableEstimates} size="sm">
+ Disable Estimates
+ </Button>
+ )}
+ </div>
+ </div>
+ </section>
+
+ {projectEstimates ? (
+ projectEstimates.length > 0 ? (
+ <section className="h-full overflow-y-auto bg-custom-background-100">
+ {projectEstimates.map((estimate) => (
+ <EstimateListItem
+ key={estimate.id}
+ estimate={estimate}
+ editEstimate={(estimate) => editEstimate(estimate)}
+ deleteEstimate={(estimateId) => setEstimateToDelete(estimateId)}
+ />
+ ))}
+ </section>
+ ) : (
+ <div className="h-full w-full py-8">
+ <EmptyState type={EmptyStateType.PROJECT_SETTINGS_ESTIMATE} />
+ </div>
+ )
+ ) : (
+ <Loader className="mt-5 space-y-5">
+ <Loader.Item height="40px" />
+ <Loader.Item height="40px" />
+ <Loader.Item height="40px" />
+ <Loader.Item height="40px" />
+ </Loader>
+ )}
+ </>
+ );
+});
diff --git a/web/components/exporter/export-modal.tsx b/web/components/exporter/export-modal.tsx
index f44268a91e..bb702c2b3d 100644
--- a/web/components/exporter/export-modal.tsx
+++ b/web/components/exporter/export-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import { Dialog, Transition } from "@headlessui/react";
import { IUser, IImporterService } from "@plane/types";
// hooks
@@ -30,7 +30,7 @@ export const Exporter: React.FC<Props> = observer((props) => {
const [isSelectOpen, setIsSelectOpen] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { workspaceProjectIds, getProjectById } = useProject();
diff --git a/web/components/exporter/guide.tsx b/web/components/exporter/guide.tsx
index 3c99a48887..9af53ff81d 100644
--- a/web/components/exporter/guide.tsx
+++ b/web/components/exporter/guide.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
import { observer } from "mobx-react";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useRouter, useParams, useSearchParams } from "next/navigation";
import useSWR, { mutate } from "swr";
// icons
import { MoveLeft, MoveRight, RefreshCw } from "lucide-react";
@@ -30,7 +30,9 @@ const IntegrationGuide = observer(() => {
const [cursor, setCursor] = useState<string | undefined>(`10:0:0`);
// router
const router = useRouter();
- const { workspaceSlug, provider } = router.query;
+ const { workspaceSlug } = useParams();
+ const searchParams = useSearchParams();
+ const provider = searchParams.get("provider");
// store hooks
const { data: currentUser } = useUser();
diff --git a/web/components/headers/index.ts b/web/components/headers/index.ts
deleted file mode 100644
index b50074c8e7..0000000000
--- a/web/components/headers/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export * from "./cycle-issues";
-export * from "./global-issues";
-export * from "./module-issues";
-export * from "./project-inbox";
-export * from "./project-issues";
-export * from "./project-view-issues";
-export * from "./project-views";
-export * from "./workspace-analytics";
-export * from "./workspace-dashboard";
-export * from "./projects";
-export * from "./profile-preferences";
-export * from "./profile-settings";
-export * from "./cycles";
-export * from "./modules-list";
-export * from "./project-settings";
-export * from "./workspace-settings";
-export * from "./page-details";
-export * from "./pages";
-export * from "./project-draft-issues";
-export * from "./project-archived-issue-details";
-export * from "./project-archives";
-export * from "./project-issue-details";
-export * from "./user-profile";
-export * from "./workspace-active-cycles";
diff --git a/web/components/headers/profile-preferences.tsx b/web/components/headers/profile-preferences.tsx
deleted file mode 100644
index 792842fe2d..0000000000
--- a/web/components/headers/profile-preferences.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-// components
-import { Breadcrumbs } from "@plane/ui";
-import { BreadcrumbLink } from "@/components/common";
-
-export const ProfilePreferencesHeader = () => (
- <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-border-200 bg-custom-sidebar-background-100 p-4">
- <div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
- <div>
- <Breadcrumbs>
- <Breadcrumbs.BreadcrumbItem type="text" link={<BreadcrumbLink label="My Profile Preferences" />} />
- </Breadcrumbs>
- </div>
- </div>
- </div>
-);
diff --git a/web/components/headers/profile-settings.tsx b/web/components/headers/profile-settings.tsx
deleted file mode 100644
index e0402cda49..0000000000
--- a/web/components/headers/profile-settings.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { FC } from "react";
-// ui
-import { Settings } from "lucide-react";
-import { Breadcrumbs } from "@plane/ui";
-import { BreadcrumbLink } from "@/components/common";
-
-interface IProfileSettingHeader {
- title: string;
-}
-
-export const ProfileSettingsHeader: FC<IProfileSettingHeader> = (props) => {
- const { title } = props;
-
- 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-border-200 bg-custom-sidebar-background-100 p-4">
- <div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
- <div>
- <Breadcrumbs>
- <Breadcrumbs.BreadcrumbItem
- type="text"
- link={
- <BreadcrumbLink
- href="/profile"
- label="My Profile"
- icon={<Settings className="h-4 w-4 text-custom-text-300" />}
- />
- }
- />
- <Breadcrumbs.BreadcrumbItem type="text" link={<BreadcrumbLink label={title} />} />
- </Breadcrumbs>
- </div>
- </div>
- </div>
- );
-};
diff --git a/web/components/inbox/content/inbox-issue-header.tsx b/web/components/inbox/content/inbox-issue-header.tsx
index d94fabeba1..823efa114a 100644
--- a/web/components/inbox/content/inbox-issue-header.tsx
+++ b/web/components/inbox/content/inbox-issue-header.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback, useEffect, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import {
CircleCheck,
CircleX,
diff --git a/web/components/inbox/content/inbox-issue-mobile-header.tsx b/web/components/inbox/content/inbox-issue-mobile-header.tsx
index cd26bfccce..049f80070b 100644
--- a/web/components/inbox/content/inbox-issue-mobile-header.tsx
+++ b/web/components/inbox/content/inbox-issue-mobile-header.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import {
CircleCheck,
CircleX,
diff --git a/web/components/inbox/content/issue-properties.tsx b/web/components/inbox/content/issue-properties.tsx
index 92205e626c..85fd314071 100644
--- a/web/components/inbox/content/issue-properties.tsx
+++ b/web/components/inbox/content/issue-properties.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { CalendarCheck2, CopyPlus, Signal, Tag, Users } from "lucide-react";
import { TInboxDuplicateIssueDetails, TIssue } from "@plane/types";
import { ControlLink, DoubleCircleIcon, Tooltip } from "@plane/ui";
diff --git a/web/components/inbox/content/issue-root.tsx b/web/components/inbox/content/issue-root.tsx
index 3d078bb2ff..36a124b166 100644
--- a/web/components/inbox/content/issue-root.tsx
+++ b/web/components/inbox/content/issue-root.tsx
@@ -1,6 +1,6 @@
import { Dispatch, SetStateAction, useEffect, useMemo } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
import { TIssue } from "@plane/types";
import { Loader, TOAST_TYPE, setToast } from "@plane/ui";
// components
@@ -29,7 +29,7 @@ type Props = {
};
export const InboxIssueMainContent: React.FC<Props> = observer((props) => {
- const router = useRouter();
+ const pathname = usePathname();
const { workspaceSlug, projectId, inboxIssue, isEditable, isSubmitting, setIsSubmitting } = props;
// hooks
const { data: currentUser } = useUser();
@@ -87,7 +87,7 @@ export const InboxIssueMainContent: React.FC<Props> = observer((props) => {
changed_property: Object.keys(data).join(","),
change_details: Object.values(data).join(","),
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -102,7 +102,7 @@ export const InboxIssueMainContent: React.FC<Props> = observer((props) => {
changed_property: Object.keys(data).join(","),
change_details: Object.values(data).join(","),
},
- path: router.asPath,
+ path: pathname,
});
}
},
diff --git a/web/components/inbox/content/root.tsx b/web/components/inbox/content/root.tsx
index b1dc8f08ce..2dc3bffd1b 100644
--- a/web/components/inbox/content/root.tsx
+++ b/web/components/inbox/content/root.tsx
@@ -1,6 +1,6 @@
import { FC, useEffect, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import useSWR from "swr";
import { InboxIssueActionsHeader, InboxIssueMainContent } from "@/components/inbox";
import { EUserProjectRoles } from "@/constants/project";
diff --git a/web/components/inbox/modals/create-edit-modal/create-root.tsx b/web/components/inbox/modals/create-edit-modal/create-root.tsx
index 36f1b0abe5..31b926e7fc 100644
--- a/web/components/inbox/modals/create-edit-modal/create-root.tsx
+++ b/web/components/inbox/modals/create-edit-modal/create-root.tsx
@@ -1,6 +1,6 @@
import { FC, FormEvent, useCallback, useRef, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname, useRouter } from "next/navigation";
// editor
import { EditorRefApi } from "@plane/rich-text-editor";
// types
@@ -41,6 +41,7 @@ export const defaultIssueData: Partial<TIssue> = {
export const InboxIssueCreateRoot: FC<TInboxIssueCreateRoot> = observer((props) => {
const { workspaceSlug, projectId, handleModalClose } = props;
const router = useRouter();
+ const pathname = usePathname();
// refs
const descriptionEditorRef = useRef<EditorRefApi>(null);
const submitBtnRef = useRef<HTMLButtonElement | null>(null);
@@ -117,7 +118,7 @@ export const InboxIssueCreateRoot: FC<TInboxIssueCreateRoot> = observer((props)
state: "SUCCESS",
element: "Inbox page",
},
- path: router.pathname,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.SUCCESS,
@@ -134,7 +135,7 @@ export const InboxIssueCreateRoot: FC<TInboxIssueCreateRoot> = observer((props)
state: "FAILED",
element: "Inbox page",
},
- path: router.pathname,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.ERROR,
diff --git a/web/components/inbox/modals/create-edit-modal/edit-root.tsx b/web/components/inbox/modals/create-edit-modal/edit-root.tsx
index a162599acd..ae34cfd7aa 100644
--- a/web/components/inbox/modals/create-edit-modal/edit-root.tsx
+++ b/web/components/inbox/modals/create-edit-modal/edit-root.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback, useEffect, useRef, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
// editor
import { EditorRefApi } from "@plane/rich-text-editor";
// types
@@ -31,7 +31,7 @@ type TInboxIssueEditRoot = {
export const InboxIssueEditRoot: FC<TInboxIssueEditRoot> = observer((props) => {
const { workspaceSlug, projectId, issueId, issue, handleModalClose, onSubmit } = props;
- const router = useRouter();
+ const pathname = usePathname();
// refs
const descriptionEditorRef = useRef<EditorRefApi>(null);
const submitBtnRef = useRef<HTMLButtonElement | null>(null);
@@ -96,7 +96,7 @@ export const InboxIssueEditRoot: FC<TInboxIssueEditRoot> = observer((props) => {
state: "SUCCESS",
element: "Inbox page",
},
- path: router.pathname,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.SUCCESS,
@@ -115,7 +115,7 @@ export const InboxIssueEditRoot: FC<TInboxIssueEditRoot> = observer((props) => {
state: "FAILED",
element: "Inbox page",
},
- path: router.pathname,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.ERROR,
diff --git a/web/components/inbox/modals/select-duplicate.tsx b/web/components/inbox/modals/select-duplicate.tsx
index 34418bdd3f..8747eee405 100644
--- a/web/components/inbox/modals/select-duplicate.tsx
+++ b/web/components/inbox/modals/select-duplicate.tsx
@@ -1,5 +1,5 @@
import React, { useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
import { Search } from "lucide-react";
import { Combobox, Dialog, Transition } from "@headlessui/react";
@@ -30,8 +30,7 @@ export const SelectDuplicateInboxIssueModal: React.FC<Props> = (props) => {
const [query, setQuery] = useState("");
- const router = useRouter();
- const { workspaceSlug, projectId, issueId } = router.query;
+ const { workspaceSlug, projectId, issueId } = useParams();
// hooks
const { getProjectStates } = useProjectState();
diff --git a/web/components/inbox/sidebar/inbox-list-item.tsx b/web/components/inbox/sidebar/inbox-list-item.tsx
index 7153422895..6f9bc529ac 100644
--- a/web/components/inbox/sidebar/inbox-list-item.tsx
+++ b/web/components/inbox/sidebar/inbox-list-item.tsx
@@ -1,7 +1,7 @@
import { FC, MouseEvent } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useSearchParams } from "next/navigation";
import { Tooltip, PriorityIcon } from "@plane/ui";
// components
import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
@@ -24,8 +24,8 @@ type InboxIssueListItemProps = {
export const InboxIssueListItem: FC<InboxIssueListItemProps> = observer((props) => {
const { workspaceSlug, projectId, inboxIssueId, projectIdentifier, setIsMobileSidebar } = props;
// router
- const router = useRouter();
- const { inboxIssueId: selectedInboxIssueId } = router.query;
+ const searchParams = useSearchParams();
+ const selectedInboxIssueId = searchParams.get("inboxIssueId");
// store
const { currentTab, getIssueInboxByIssueId } = useProjectInbox();
const { projectLabels } = useLabel();
diff --git a/web/components/inbox/sidebar/root.tsx b/web/components/inbox/sidebar/root.tsx
index 9b7ad2581e..7e91b29427 100644
--- a/web/components/inbox/sidebar/root.tsx
+++ b/web/components/inbox/sidebar/root.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback, useRef, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { TInboxIssueCurrentTab } from "@plane/types";
import { Loader } from "@plane/ui";
// components
diff --git a/web/components/integration/delete-import-modal.tsx b/web/components/integration/delete-import-modal.tsx
index efd9bb0d20..464a0dfcc7 100644
--- a/web/components/integration/delete-import-modal.tsx
+++ b/web/components/integration/delete-import-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { mutate } from "swr";
@@ -31,8 +31,7 @@ export const DeleteImportModal: React.FC<Props> = ({ isOpen, handleClose, data }
const [deleteLoading, setDeleteLoading] = useState(false);
const [confirmDeleteImport, setConfirmDeleteImport] = useState(false);
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const handleDeletion = () => {
if (!workspaceSlug || !data) return;
diff --git a/web/components/integration/github/repo-details.tsx b/web/components/integration/github/repo-details.tsx
index 1ab75c64e4..e6d4a2b128 100644
--- a/web/components/integration/github/repo-details.tsx
+++ b/web/components/integration/github/repo-details.tsx
@@ -1,6 +1,6 @@
import { FC, useEffect } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// react-hook-form
import { UseFormSetValue } from "react-hook-form";
@@ -25,8 +25,7 @@ type Props = {
const githubIntegrationService = new GithubIntegrationService();
export const GithubRepoDetails: FC<Props> = ({ selectedRepo, handleStepChange, setUsers, setValue }) => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const { data: repoInfo } = useSWR(
workspaceSlug && selectedRepo ? GITHUB_REPOSITORY_INFO(workspaceSlug as string, selectedRepo.name) : null,
diff --git a/web/components/integration/github/root.tsx b/web/components/integration/github/root.tsx
index 7e9322a5a6..5c3e3b3ffc 100644
--- a/web/components/integration/github/root.tsx
+++ b/web/components/integration/github/root.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter, useSearchParams } from "next/navigation";
import { useForm } from "react-hook-form";
import useSWR, { mutate } from "swr";
@@ -92,7 +92,9 @@ export const GithubImporterRoot: React.FC = () => {
const [users, setUsers] = useState<IUserDetails[]>([]);
const router = useRouter();
- const { workspaceSlug, provider } = router.query;
+ const { workspaceSlug } = useParams();
+ const searchParams = useSearchParams();
+ const provider = searchParams.get("provider");
const { handleSubmit, control, setValue, watch } = useForm<TFormValues>({
defaultValues: defaultFormValues,
diff --git a/web/components/integration/github/select-repository.tsx b/web/components/integration/github/select-repository.tsx
index f4ec4bb2f1..698f032681 100644
--- a/web/components/integration/github/select-repository.tsx
+++ b/web/components/integration/github/select-repository.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWRInfinite from "swr/infinite";
import { IWorkspaceIntegration } from "@plane/types";
// services
@@ -23,8 +23,7 @@ const projectService = new ProjectService();
export const SelectRepository: React.FC<Props> = (props) => {
const { integration, value, label, onChange, characterLimit = 25 } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const getKey = (pageIndex: number) => {
if (!workspaceSlug || !integration) return;
diff --git a/web/components/integration/github/single-user-select.tsx b/web/components/integration/github/single-user-select.tsx
index 9a13b27b59..ab6eb87a3c 100644
--- a/web/components/integration/github/single-user-select.tsx
+++ b/web/components/integration/github/single-user-select.tsx
@@ -1,4 +1,4 @@
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
import { IGithubRepoCollaborator } from "@plane/types";
// services
@@ -36,8 +36,7 @@ const importOptions = [
const workspaceService = new WorkspaceService();
export const SingleUserSelect: React.FC<Props> = ({ collaborator, index, users, setUsers }) => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const { data: members } = useSWR(
workspaceSlug ? WORKSPACE_MEMBERS(workspaceSlug.toString()) : null,
diff --git a/web/components/integration/guide.tsx b/web/components/integration/guide.tsx
index ff0f8d27b9..8da166746d 100644
--- a/web/components/integration/guide.tsx
+++ b/web/components/integration/guide.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
import { observer } from "mobx-react";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useSearchParams } from "next/navigation";
import useSWR, { mutate } from "swr";
// icons
import { RefreshCw } from "lucide-react";
@@ -32,8 +32,9 @@ const IntegrationGuide = observer(() => {
const [deleteImportModal, setDeleteImportModal] = useState(false);
const [importToDelete, setImportToDelete] = useState<IImporterService | null>(null);
// router
- const router = useRouter();
- const { workspaceSlug, provider } = router.query;
+ const { workspaceSlug } = useParams();
+ const searchParams = useSearchParams();
+ const provider = searchParams.get("provider");
// store hooks
const { data: currentUser } = useUser();
diff --git a/web/components/integration/jira/import-users.tsx b/web/components/integration/jira/import-users.tsx
index 703c4b2506..77e3b514e3 100644
--- a/web/components/integration/jira/import-users.tsx
+++ b/web/components/integration/jira/import-users.tsx
@@ -1,5 +1,5 @@
import { FC } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { useFormContext, useFieldArray, Controller } from "react-hook-form";
import useSWR from "swr";
import { IJiraImporterForm } from "@plane/types";
@@ -14,8 +14,7 @@ import { WorkspaceService } from "@/services/workspace.service";
const workspaceService = new WorkspaceService();
export const JiraImportUsers: FC = () => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// form info
const {
control,
diff --git a/web/components/integration/jira/jira-project-detail.tsx b/web/components/integration/jira/jira-project-detail.tsx
index b69b6093b2..7c6f09f708 100644
--- a/web/components/integration/jira/jira-project-detail.tsx
+++ b/web/components/integration/jira/jira-project-detail.tsx
@@ -1,7 +1,7 @@
import React, { useEffect } from "react";
// next
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// swr
import { useFormContext, Controller } from "react-hook-form";
@@ -39,8 +39,7 @@ export const JiraProjectDetail: React.FC<Props> = (props) => {
formState: { errors },
} = useFormContext<IJiraImporterForm>();
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const params: IJiraMetadata = {
api_token: watch("metadata.api_token"),
diff --git a/web/components/integration/jira/root.tsx b/web/components/integration/jira/root.tsx
index 1b98c27ba9..dd8bac6f6b 100644
--- a/web/components/integration/jira/root.tsx
+++ b/web/components/integration/jira/root.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import { FormProvider, useForm } from "react-hook-form";
import { mutate } from "swr";
// icons
@@ -63,7 +63,7 @@ export const JiraImporterRoot: React.FC = () => {
const [disableTopBarAfter, setDisableTopBarAfter] = useState<TJiraIntegrationSteps | null>(null);
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const methods = useForm<IJiraImporterForm>({
defaultValues: jiraFormDefaultValues,
diff --git a/web/components/integration/single-integration-card.tsx b/web/components/integration/single-integration-card.tsx
index 2697bf6cdf..7ee70a7127 100644
--- a/web/components/integration/single-integration-card.tsx
+++ b/web/components/integration/single-integration-card.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { observer } from "mobx-react";
import Image from "next/image";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR, { mutate } from "swr";
import { CheckCircle } from "lucide-react";
import { IAppIntegration, IWorkspaceIntegration } from "@plane/types";
@@ -43,8 +43,7 @@ export const SingleIntegrationCard: React.FC<Props> = observer(({ integration })
// states
const [deletingIntegration, setDeletingIntegration] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { config } = useInstance();
const {
diff --git a/web/components/integration/slack/select-channel.tsx b/web/components/integration/slack/select-channel.tsx
index 19275fc1f2..39721db2c8 100644
--- a/web/components/integration/slack/select-channel.tsx
+++ b/web/components/integration/slack/select-channel.tsx
@@ -1,6 +1,6 @@
import { useState, useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR, { mutate } from "swr";
// types
import { IWorkspaceIntegration, ISlackIntegration } from "@plane/types";
@@ -27,8 +27,7 @@ export const SelectChannel: React.FC<Props> = observer(({ integration }) => {
const [slackChannelAvailabilityToggle, setSlackChannelAvailabilityToggle] = useState<boolean>(false);
const [slackChannel, setSlackChannel] = useState<ISlackIntegration | null>(null);
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// FIXME:
const { startAuth } = useIntegrationPopup({
diff --git a/web/components/issues/archived-issues-header.tsx b/web/components/issues/archived-issues-header.tsx
index 8a3df40b33..80daadfee4 100644
--- a/web/components/issues/archived-issues-header.tsx
+++ b/web/components/issues/archived-issues-header.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import type { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
// components
@@ -15,8 +15,7 @@ import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/h
export const ArchivedIssuesHeader: FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { currentProjectDetails } = useProject();
const {
diff --git a/web/components/issues/bulk-operations/properties.tsx b/web/components/issues/bulk-operations/properties.tsx
new file mode 100644
index 0000000000..7d2f061846
--- /dev/null
+++ b/web/components/issues/bulk-operations/properties.tsx
@@ -0,0 +1,200 @@
+import { useState } from "react";
+import { useParams } from "next/navigation";
+import { Controller, useForm } from "react-hook-form";
+import { CalendarCheck2, CalendarClock } from "lucide-react";
+// types
+import { TBulkIssueProperties } from "@plane/types";
+// ui
+import { Button, TOAST_TYPE, setToast } from "@plane/ui";
+// components
+import { DateDropdown, MemberDropdown, PriorityDropdown, StateDropdown } from "@/components/dropdowns";
+import { IssueLabelSelect } from "@/components/issues/select";
+import { CreateLabelModal } from "@/components/labels";
+// constants
+import { EErrorCodes, ERROR_DETAILS } from "@/constants/errors";
+import { EIssuesStoreType } from "@/constants/issue";
+// helpers
+import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper";
+// hooks
+import { useIssues } from "@/hooks/store";
+import { TSelectionHelper, TSelectionSnapshot } from "@/hooks/use-multiple-select";
+
+type Props = {
+ selectionHelpers: TSelectionHelper;
+ snapshot: TSelectionSnapshot;
+};
+
+const defaultValues: TBulkIssueProperties = {
+ state_id: "",
+ // @ts-expect-error priority should not be undefined, but it should be, in this case
+ priority: undefined,
+ assignee_ids: [],
+ start_date: null,
+ target_date: null,
+ label_ids: [],
+};
+
+export const IssueBulkOperationsProperties: React.FC<Props> = (props) => {
+ const { snapshot } = props;
+ // states
+ const [createLabelModal, setCreateLabelModal] = useState(false);
+ // router
+ const { workspaceSlug, projectId } = useParams();
+ // store hooks
+ const {
+ issues: { bulkUpdateProperties },
+ } = useIssues(EIssuesStoreType.PROJECT);
+ // form info
+ const {
+ control,
+ formState: { dirtyFields, isDirty, isSubmitting },
+ handleSubmit,
+ reset,
+ watch,
+ } = useForm<TBulkIssueProperties>({
+ defaultValues,
+ });
+
+ const handleBulkOperations = async (data: TBulkIssueProperties) => {
+ if (!workspaceSlug || !projectId) return;
+
+ const payload: Partial<TBulkIssueProperties> = {};
+ Object.keys(dirtyFields).forEach((key) => {
+ const payloadKey = key as keyof typeof dirtyFields;
+ // @ts-expect-error values might not match
+ payload[payloadKey] = data[payloadKey];
+ });
+
+ await bulkUpdateProperties(workspaceSlug.toString(), projectId.toString(), {
+ issue_ids: snapshot.selectedEntityIds,
+ properties: payload,
+ })
+ .then(() => {
+ reset(defaultValues);
+ })
+ .catch((error) => {
+ const errorInfo = ERROR_DETAILS[error?.error_code as EErrorCodes] ?? undefined;
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: errorInfo?.title ?? "Error!",
+ message: errorInfo?.message ?? "Something went wrong. Please try again.",
+ });
+ });
+ };
+ const isUpdateDisabled = !snapshot.isSelectionActive;
+
+ const startDate = watch("start_date");
+ const targetDate = watch("target_date");
+
+ const minDate = getDate(startDate);
+ minDate?.setDate(minDate.getDate());
+
+ const maxDate = getDate(targetDate);
+ maxDate?.setDate(maxDate.getDate());
+
+ return (
+ <form onSubmit={handleSubmit(handleBulkOperations)} className="size-full flex items-center justify-between gap-3">
+ <div className="flex items-center gap-3">
+ <Controller
+ name="state_id"
+ control={control}
+ render={({ field: { onChange, value } }) => (
+ <StateDropdown
+ value={value}
+ onChange={onChange}
+ projectId={projectId?.toString() ?? ""}
+ buttonVariant="border-with-text"
+ disabled={isUpdateDisabled}
+ />
+ )}
+ />
+ <Controller
+ name="priority"
+ control={control}
+ render={({ field: { onChange, value } }) => (
+ <PriorityDropdown
+ value={value}
+ onChange={onChange}
+ buttonVariant="border-with-text"
+ buttonClassName="!text-custom-text-300"
+ disabled={isUpdateDisabled}
+ />
+ )}
+ />
+ <Controller
+ name="assignee_ids"
+ control={control}
+ render={({ field: { onChange, value } }) => (
+ <MemberDropdown
+ value={value}
+ onChange={onChange}
+ buttonVariant={value?.length > 0 ? "transparent-without-text" : "border-with-text"}
+ buttonClassName={value?.length > 0 ? "hover:bg-transparent" : ""}
+ placeholder="Assignees"
+ multiple
+ disabled={isUpdateDisabled}
+ />
+ )}
+ />
+ <Controller
+ name="start_date"
+ control={control}
+ render={({ field: { onChange, value } }) => (
+ <DateDropdown
+ value={value}
+ onChange={(val) => onChange(val ? renderFormattedPayloadDate(val) : null)}
+ buttonVariant="border-with-text"
+ placeholder="Start date"
+ icon={<CalendarClock className="size-3 flex-shrink-0" />}
+ disabled={isUpdateDisabled}
+ maxDate={maxDate ?? undefined}
+ />
+ )}
+ />
+ <Controller
+ name="target_date"
+ control={control}
+ render={({ field: { onChange, value } }) => (
+ <DateDropdown
+ value={value}
+ onChange={(val) => onChange(val ? renderFormattedPayloadDate(val) : null)}
+ buttonVariant="border-with-text"
+ placeholder="Due date"
+ icon={<CalendarCheck2 className="size-3 flex-shrink-0" />}
+ disabled={isUpdateDisabled}
+ minDate={minDate ?? undefined}
+ />
+ )}
+ />
+ {projectId && (
+ <Controller
+ name="label_ids"
+ control={control}
+ render={({ field: { onChange, value } }) => (
+ <>
+ <CreateLabelModal
+ isOpen={createLabelModal}
+ handleClose={() => setCreateLabelModal(false)}
+ projectId={projectId.toString()}
+ onSuccess={(res) => onChange([...value, res.id])}
+ />
+ <IssueLabelSelect
+ value={value}
+ projectId={projectId.toString()}
+ onChange={onChange}
+ setIsOpen={() => setCreateLabelModal(true)}
+ buttonClassName="text-custom-text-300"
+ />
+ </>
+ )}
+ />
+ )}
+ </div>
+ {isDirty && (
+ <Button type="submit" variant="primary" size="sm" className="py-1" loading={isSubmitting}>
+ {isSubmitting ? "Updating" : "Update"}
+ </Button>
+ )}
+ </form>
+ );
+};
diff --git a/web/components/issues/issue-detail/root.tsx b/web/components/issues/issue-detail/root.tsx
index 6fff55aa83..d515cf6492 100644
--- a/web/components/issues/issue-detail/root.tsx
+++ b/web/components/issues/issue-detail/root.tsx
@@ -1,6 +1,6 @@
import { FC, useMemo } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname, useRouter } from "next/navigation";
// types
import { TIssue } from "@plane/types";
// ui
@@ -56,6 +56,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
const { workspaceSlug, projectId, issueId, swrIssueDetails, is_archived = false } = props;
// router
const router = useRouter();
+ const pathname = usePathname();
// hooks
const {
issue: { getIssueById },
@@ -98,7 +99,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: Object.keys(data).join(","),
change_details: Object.values(data).join(","),
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
captureIssueEvent({
@@ -108,7 +109,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: Object.keys(data).join(","),
change_details: Object.values(data).join(","),
},
- path: router.asPath,
+ path: pathname,
});
setToast({
title: "Error!",
@@ -129,7 +130,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_DELETED,
payload: { id: issueId, state: "SUCCESS", element: "Issue detail page" },
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -140,7 +141,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_DELETED,
payload: { id: issueId, state: "FAILED", element: "Issue detail page" },
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -150,13 +151,13 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_ARCHIVED,
payload: { id: issueId, state: "SUCCESS", element: "Issue details page" },
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
captureIssueEvent({
eventName: ISSUE_ARCHIVED,
payload: { id: issueId, state: "FAILED", element: "Issue details page" },
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -170,7 +171,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -185,7 +186,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -199,7 +200,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -214,7 +215,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -240,7 +241,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "cycle_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
captureIssueEvent({
@@ -250,7 +251,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "cycle_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -264,7 +265,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "module_id",
change_details: moduleIds,
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -279,7 +280,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "module_id",
change_details: moduleIds,
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -305,7 +306,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "module_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
captureIssueEvent({
@@ -315,7 +316,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
changed_property: "module_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -353,7 +354,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
removeIssueFromModule,
removeModulesFromIssue,
captureIssueEvent,
- router.asPath,
+ pathname,
]
);
diff --git a/web/components/issues/issue-detail/sidebar.tsx b/web/components/issues/issue-detail/sidebar.tsx
index 0b62a51e8f..e7b0d846f0 100644
--- a/web/components/issues/issue-detail/sidebar.tsx
+++ b/web/components/issues/issue-detail/sidebar.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import {
CalendarCheck2,
CalendarClock,
diff --git a/web/components/issues/issue-layouts/calendar/base-calendar-root.tsx b/web/components/issues/issue-layouts/calendar/base-calendar-root.tsx
index 946ae0ed49..d66aaa37b7 100644
--- a/web/components/issues/issue-layouts/calendar/base-calendar-root.tsx
+++ b/web/components/issues/issue-layouts/calendar/base-calendar-root.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { TGroupedIssues } from "@plane/types";
// components
import { TOAST_TYPE, setToast } from "@plane/ui";
@@ -33,8 +33,7 @@ export const BaseCalendarRoot = observer((props: IBaseCalendarRoot) => {
const { QuickActions, storeType, addIssuesToView, viewId, isCompletedCycle = false } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// hooks
const {
diff --git a/web/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx b/web/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx
index 04786a6771..559f7b81c0 100644
--- a/web/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx
+++ b/web/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { usePopper } from "react-popper";
import { Check, ChevronUp, MoreVerticalIcon } from "lucide-react";
import { Popover, Transition } from "@headlessui/react";
@@ -38,8 +38,7 @@ interface ICalendarHeader {
export const CalendarOptionsDropdown: React.FC<ICalendarHeader> = observer((props) => {
const { issuesFilterStore, updateFilters } = props;
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
const issueCalendarView = useCalendarView();
const [windowWidth] = useSize();
diff --git a/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsx b/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsx
index 2585467abc..4b685b5918 100644
--- a/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsx
+++ b/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsx
@@ -1,7 +1,7 @@
import { useEffect, useRef, useState } from "react";
import { differenceInCalendarDays } from "date-fns";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { useForm } from "react-hook-form";
import { PlusIcon } from "lucide-react";
// types
@@ -67,8 +67,8 @@ export const CalendarQuickAddIssueForm: React.FC<Props> = observer((props) => {
const { formKey, prePopulatedData, quickAddCallback, addIssuesToView, viewId, onOpen } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
+ const pathname = usePathname();
// store hooks
const { getProjectById } = useProject();
const { captureIssueEvent } = useEventTracker();
@@ -156,14 +156,14 @@ export const CalendarQuickAddIssueForm: React.FC<Props> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...res, state: "SUCCESS", element: "Calendar quick add" },
- path: router.asPath,
+ path: pathname,
});
})
.catch(() => {
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...payload, state: "FAILED", element: "Calendar quick add" },
- path: router.asPath,
+ path: pathname,
});
});
}
diff --git a/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsx b/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsx
index 34760cef05..e9dbcab9c7 100644
--- a/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsx
+++ b/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsx
@@ -1,6 +1,6 @@
import { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
//hooks
import { CycleIssueQuickActions } from "@/components/issues";
import { EIssuesStoreType } from "@/constants/issue";
@@ -12,8 +12,7 @@ import { BaseCalendarRoot } from "../base-calendar-root";
export const CycleCalendarLayout: React.FC = observer(() => {
const { currentProjectCompletedCycleIds } = useCycle();
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
const { issues } = useIssues(EIssuesStoreType.CYCLE);
diff --git a/web/components/issues/issue-layouts/calendar/roots/module-root.tsx b/web/components/issues/issue-layouts/calendar/roots/module-root.tsx
index f1dbf70ff7..609cd606f6 100644
--- a/web/components/issues/issue-layouts/calendar/roots/module-root.tsx
+++ b/web/components/issues/issue-layouts/calendar/roots/module-root.tsx
@@ -1,6 +1,6 @@
import { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
// components
import { ModuleIssueQuickActions } from "@/components/issues";
@@ -11,8 +11,7 @@ import { useIssues } from "@/hooks/store";
import { BaseCalendarRoot } from "../base-calendar-root";
export const ModuleCalendarLayout: React.FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
const { issues } = useIssues(EIssuesStoreType.MODULE);
diff --git a/web/components/issues/issue-layouts/calendar/roots/project-view-root.tsx b/web/components/issues/issue-layouts/calendar/roots/project-view-root.tsx
index 43e4342637..f54b5209e6 100644
--- a/web/components/issues/issue-layouts/calendar/roots/project-view-root.tsx
+++ b/web/components/issues/issue-layouts/calendar/roots/project-view-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { ProjectIssueQuickActions } from "@/components/issues";
import { EIssuesStoreType } from "@/constants/issue";
@@ -10,8 +10,7 @@ import { BaseCalendarRoot } from "../base-calendar-root";
export const ProjectViewCalendarLayout: React.FC = observer(() => {
// router
- const router = useRouter();
- const { viewId } = router.query;
+ const { viewId } = useParams();
return (
<BaseCalendarRoot
diff --git a/web/components/issues/issue-layouts/empty-states/archived-issues.tsx b/web/components/issues/issue-layouts/empty-states/archived-issues.tsx
index b81fc84ff0..020062e4e3 100644
--- a/web/components/issues/issue-layouts/empty-states/archived-issues.tsx
+++ b/web/components/issues/issue-layouts/empty-states/archived-issues.tsx
@@ -1,6 +1,6 @@
import size from "lodash/size";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
// components
@@ -13,8 +13,7 @@ import { useIssues } from "@/hooks/store";
export const ProjectArchivedEmptyState: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// theme
// store hooks
const { issuesFilter } = useIssues(EIssuesStoreType.ARCHIVED);
diff --git a/web/components/issues/issue-layouts/empty-states/draft-issues.tsx b/web/components/issues/issue-layouts/empty-states/draft-issues.tsx
index 7fc6811c85..88eed515c4 100644
--- a/web/components/issues/issue-layouts/empty-states/draft-issues.tsx
+++ b/web/components/issues/issue-layouts/empty-states/draft-issues.tsx
@@ -1,6 +1,6 @@
import size from "lodash/size";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
// components
@@ -13,8 +13,7 @@ import { useIssues } from "@/hooks/store";
export const ProjectDraftEmptyState: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { issuesFilter } = useIssues(EIssuesStoreType.DRAFT);
diff --git a/web/components/issues/issue-layouts/empty-states/project-issues.tsx b/web/components/issues/issue-layouts/empty-states/project-issues.tsx
index 5682eaf776..5ec86340d7 100644
--- a/web/components/issues/issue-layouts/empty-states/project-issues.tsx
+++ b/web/components/issues/issue-layouts/empty-states/project-issues.tsx
@@ -1,6 +1,6 @@
import size from "lodash/size";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IIssueFilterOptions } from "@plane/types";
// components
@@ -13,8 +13,7 @@ import { useCommandPalette, useEventTracker, useIssues } from "@/hooks/store";
export const ProjectEmptyState: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { toggleCreateIssueModal } = useCommandPalette();
const { setTrackElement } = useEventTracker();
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/archived-issue.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/archived-issue.tsx
index d5c6bc701f..92a9d8db37 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/archived-issue.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/archived-issue.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
import { AppliedFiltersList } from "@/components/issues";
@@ -10,8 +10,7 @@ import { useIssues, useLabel, useProjectState } from "@/hooks/store";
export const ArchivedIssueAppliedFiltersRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query as { workspaceSlug: string; projectId: string };
+ const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
// store hooks
const {
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/cycle-root.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/cycle-root.tsx
index b555c1cfec..f51a2d7fa8 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/cycle-root.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/cycle-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
import { AppliedFiltersList, SaveFilterView } from "@/components/issues";
@@ -10,8 +10,7 @@ import { useIssues, useLabel, useProjectState } from "@/hooks/store";
export const CycleAppliedFiltersRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
// store hooks
const {
issuesFilter: { issueFilters, updateFilters },
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/draft-issue.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/draft-issue.tsx
index f45e568884..ba0777eea6 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/draft-issue.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/draft-issue.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
import { AppliedFiltersList } from "@/components/issues";
@@ -10,8 +10,7 @@ import { useIssues, useLabel, useProjectState } from "@/hooks/store";
export const DraftIssueAppliedFiltersRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query as { workspaceSlug: string; projectId: string };
+ const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
// store hooks
const {
issuesFilter: { issueFilters, updateFilters },
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
index fffeecd8d9..1f7289cfa9 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
@@ -1,7 +1,7 @@
import isEmpty from "lodash/isEmpty";
import isEqual from "lodash/isEqual";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions, TStaticViewTypes } from "@plane/types";
// hooks
//ui
@@ -22,8 +22,7 @@ type Props = {
export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
const { globalViewId } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
issuesFilter: { filters, updateFilters },
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/module-root.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/module-root.tsx
index a6841ab065..92e9878d2c 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/module-root.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/module-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
import { AppliedFiltersList, SaveFilterView } from "@/components/issues";
@@ -10,8 +10,7 @@ import { useIssues, useLabel, useProjectState } from "@/hooks/store";
export const ModuleAppliedFiltersRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
// store hooks
const {
issuesFilter: { issueFilters, updateFilters },
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/profile-issues-root.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/profile-issues-root.tsx
index 592b5cd170..f32c919b2d 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/profile-issues-root.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/profile-issues-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
// components
@@ -11,8 +11,7 @@ import { useWorkspaceIssueProperties } from "@/hooks/use-workspace-issue-propert
export const ProfileIssuesAppliedFiltersRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
//swr hook for fetching issue properties
useWorkspaceIssueProperties(workspaceSlug);
// store hooks
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx
index ac0d1dd721..56ab5f37ce 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
// components
@@ -13,8 +13,7 @@ import { useIssues } from "@/hooks/store/use-issues";
export const ProjectAppliedFiltersRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query as {
+ const { workspaceSlug, projectId } = useParams() as {
workspaceSlug: string;
projectId: string;
};
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx
index 1423fc3938..dd3f0ba041 100644
--- a/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx
+++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx
@@ -1,6 +1,6 @@
import isEmpty from "lodash/isEmpty";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueFilterOptions } from "@plane/types";
// hooks
import { Button } from "@plane/ui";
@@ -14,8 +14,7 @@ import { getAreFiltersEqual } from "../../../utils";
export const ProjectViewAppliedFiltersRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, viewId } = router.query;
+ const { workspaceSlug, projectId, viewId } = useParams();
// store hooks
const {
issuesFilter: { issueFilters, updateFilters },
diff --git a/web/components/issues/issue-layouts/gantt/base-gantt-root.tsx b/web/components/issues/issue-layouts/gantt/base-gantt-root.tsx
index 2f257c6cd7..4709a0699e 100644
--- a/web/components/issues/issue-layouts/gantt/base-gantt-root.tsx
+++ b/web/components/issues/issue-layouts/gantt/base-gantt-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { TIssue, TUnGroupedIssues } from "@plane/types";
// hooks
import { GanttChartRoot, IBlockUpdateData, IssueGanttSidebar } from "@/components/gantt-chart";
@@ -28,8 +28,7 @@ interface IBaseGanttRoot {
export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGanttRoot) => {
const { viewId, storeType } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const { issues, issuesFilter } = useIssues(storeType);
const { updateIssue } = useIssuesActions(storeType);
diff --git a/web/components/issues/issue-layouts/gantt/cycle-root.tsx b/web/components/issues/issue-layouts/gantt/cycle-root.tsx
index 03817a1c56..c0dab31b4d 100644
--- a/web/components/issues/issue-layouts/gantt/cycle-root.tsx
+++ b/web/components/issues/issue-layouts/gantt/cycle-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { EIssuesStoreType } from "@/constants/issue";
// components
@@ -7,8 +7,7 @@ import { BaseGanttRoot } from "./base-gantt-root";
export const CycleGanttLayout: React.FC = observer(() => {
// router
- const router = useRouter();
- const { cycleId } = router.query;
+ const { cycleId } = useParams();
return <BaseGanttRoot viewId={cycleId?.toString()} storeType={EIssuesStoreType.CYCLE} />;
});
diff --git a/web/components/issues/issue-layouts/gantt/module-root.tsx b/web/components/issues/issue-layouts/gantt/module-root.tsx
index fce9e61144..95fff2a4f3 100644
--- a/web/components/issues/issue-layouts/gantt/module-root.tsx
+++ b/web/components/issues/issue-layouts/gantt/module-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { EIssuesStoreType } from "@/constants/issue";
// components
@@ -7,8 +7,7 @@ import { BaseGanttRoot } from "./base-gantt-root";
export const ModuleGanttLayout: React.FC = observer(() => {
// router
- const router = useRouter();
- const { moduleId } = router.query;
+ const { moduleId } = useParams();
return <BaseGanttRoot viewId={moduleId?.toString()} storeType={EIssuesStoreType.MODULE} />;
});
diff --git a/web/components/issues/issue-layouts/gantt/project-view-root.tsx b/web/components/issues/issue-layouts/gantt/project-view-root.tsx
index 765b5aa731..5cf2634177 100644
--- a/web/components/issues/issue-layouts/gantt/project-view-root.tsx
+++ b/web/components/issues/issue-layouts/gantt/project-view-root.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { EIssuesStoreType } from "@/constants/issue";
// components
@@ -9,8 +9,7 @@ import { BaseGanttRoot } from "./base-gantt-root";
export const ProjectViewGanttLayout: React.FC = observer(() => {
// router
- const router = useRouter();
- const { viewId } = router.query;
+ const { viewId } = useParams();
return <BaseGanttRoot viewId={viewId?.toString()} storeType={EIssuesStoreType.PROJECT_VIEW} />;
});
diff --git a/web/components/issues/issue-layouts/gantt/quick-add-issue-form.tsx b/web/components/issues/issue-layouts/gantt/quick-add-issue-form.tsx
index db3a38813a..3c34b8f8a4 100644
--- a/web/components/issues/issue-layouts/gantt/quick-add-issue-form.tsx
+++ b/web/components/issues/issue-layouts/gantt/quick-add-issue-form.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState, useRef, FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { useForm } from "react-hook-form";
import { PlusIcon } from "lucide-react";
import { IProject, TIssue } from "@plane/types";
@@ -66,8 +66,8 @@ const defaultValues: Partial<TIssue> = {
export const GanttQuickAddIssueForm: React.FC<IGanttQuickAddIssueForm> = observer((props) => {
const { prePopulatedData, quickAddCallback, viewId } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const pathname = usePathname();
// hooks
const { getProjectById } = useProject();
const { captureIssueEvent } = useEventTracker();
@@ -129,14 +129,14 @@ export const GanttQuickAddIssueForm: React.FC<IGanttQuickAddIssueForm> = observe
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...res, state: "SUCCESS", element: "Gantt quick add" },
- path: router.asPath,
+ path: pathname,
});
})
.catch(() => {
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...payload, state: "FAILED", element: "Gantt quick add" },
- path: router.asPath,
+ path: pathname,
});
});
}
diff --git a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
index 831c3119ef..00f9ff5403 100644
--- a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
+++ b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
@@ -3,7 +3,7 @@ import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { Spinner } from "@plane/ui";
import { DeleteIssueModal } from "@/components/issues";
import { ISSUE_DELETED } from "@/constants/event-tracker";
@@ -50,8 +50,8 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
isCompletedCycle = false,
} = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const pathname = usePathname();
// store hooks
const {
membership: { currentProjectRole },
@@ -176,7 +176,7 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
captureIssueEvent({
eventName: ISSUE_DELETED,
payload: { id: draggedIssueId, state: "FAILED", element: "Kanban layout drag & drop" },
- path: router.asPath,
+ path: pathname,
});
});
};
diff --git a/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx b/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx
index 247ec5cccc..229b8e6ec1 100644
--- a/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx
+++ b/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx
@@ -1,6 +1,6 @@
import React, { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
// lucide icons
import { Minimize2, Maximize2, Circle, Plus } from "lucide-react";
import { TIssue, ISearchIssueResponse, TIssueKanbanFilters, TIssueGroupByOptions } from "@plane/types";
@@ -51,10 +51,10 @@ export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {
// hooks
const { setTrackElement } = useEventTracker();
// router
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId, cycleId } = router.query;
+ const { workspaceSlug, projectId, moduleId, cycleId } = useParams();
+ const pathname = usePathname();
- const isDraftIssue = router.pathname.includes("draft-issue");
+ const isDraftIssue = pathname.includes("draft-issue");
const renderExistingIssueModal = moduleId || cycleId;
const ExistingIssuesListModalPayload = moduleId ? { module: moduleId.toString() } : { cycle: true };
diff --git a/web/components/issues/issue-layouts/kanban/quick-add-issue-form.tsx b/web/components/issues/issue-layouts/kanban/quick-add-issue-form.tsx
index df2c4a31ff..be1919c4d6 100644
--- a/web/components/issues/issue-layouts/kanban/quick-add-issue-form.tsx
+++ b/web/components/issues/issue-layouts/kanban/quick-add-issue-form.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState, useRef } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { useForm } from "react-hook-form";
import { PlusIcon } from "lucide-react";
import { TIssue } from "@plane/types";
@@ -59,8 +59,8 @@ const defaultValues: Partial<TIssue> = {
export const KanBanQuickAddIssueForm: React.FC<IKanBanQuickAddIssueForm> = observer((props) => {
const { formKey, prePopulatedData, quickAddCallback, viewId } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const pathname = usePathname();
// store hooks
const { getProjectById } = useProject();
const { captureIssueEvent } = useEventTracker();
@@ -123,14 +123,14 @@ export const KanBanQuickAddIssueForm: React.FC<IKanBanQuickAddIssueForm> = obser
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...res, state: "SUCCESS", element: "Kanban quick add" },
- path: router.asPath,
+ path: pathname,
});
})
.catch(() => {
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...payload, state: "FAILED", element: "Kanban quick add" },
- path: router.asPath,
+ path: pathname,
});
});
}
diff --git a/web/components/issues/issue-layouts/kanban/roots/cycle-root.tsx b/web/components/issues/issue-layouts/kanban/roots/cycle-root.tsx
index d2150aa97f..9ad7ea8fc6 100644
--- a/web/components/issues/issue-layouts/kanban/roots/cycle-root.tsx
+++ b/web/components/issues/issue-layouts/kanban/roots/cycle-root.tsx
@@ -1,6 +1,6 @@
import React, { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { CycleIssueQuickActions } from "@/components/issues";
// constants
@@ -14,8 +14,7 @@ import { BaseKanBanRoot } from "../base-kanban-root";
export interface ICycleKanBanLayout {}
export const CycleKanBanLayout: React.FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
// store
const { issues } = useIssues(EIssuesStoreType.CYCLE);
diff --git a/web/components/issues/issue-layouts/kanban/roots/module-root.tsx b/web/components/issues/issue-layouts/kanban/roots/module-root.tsx
index d8bd714b04..f454bee4e7 100644
--- a/web/components/issues/issue-layouts/kanban/roots/module-root.tsx
+++ b/web/components/issues/issue-layouts/kanban/roots/module-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hook
import { ModuleIssueQuickActions } from "@/components/issues";
import { EIssuesStoreType } from "@/constants/issue";
@@ -13,8 +13,7 @@ import { BaseKanBanRoot } from "../base-kanban-root";
export interface IModuleKanBanLayout {}
export const ModuleKanBanLayout: React.FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
// store
const { issues } = useIssues(EIssuesStoreType.MODULE);
diff --git a/web/components/issues/issue-layouts/kanban/roots/project-view-root.tsx b/web/components/issues/issue-layouts/kanban/roots/project-view-root.tsx
index dded244cee..433dbf9f4a 100644
--- a/web/components/issues/issue-layouts/kanban/roots/project-view-root.tsx
+++ b/web/components/issues/issue-layouts/kanban/roots/project-view-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { EIssuesStoreType } from "@/constants/issue";
// constant
@@ -11,8 +11,7 @@ import { BaseKanBanRoot } from "../base-kanban-root";
export const ProjectViewKanBanLayout: React.FC = observer(() => {
// router
- const router = useRouter();
- const { viewId } = router.query;
+ const { viewId } = useParams();
return (
<BaseKanBanRoot
diff --git a/web/components/issues/issue-layouts/list/headers/group-by-card.tsx b/web/components/issues/issue-layouts/list/headers/group-by-card.tsx
index 23253b55f3..df72170994 100644
--- a/web/components/issues/issue-layouts/list/headers/group-by-card.tsx
+++ b/web/components/issues/issue-layouts/list/headers/group-by-card.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { CircleDashed, Plus } from "lucide-react";
// types
import { TIssue, ISearchIssueResponse } from "@plane/types";
@@ -47,12 +47,12 @@ export const HeaderGroupByCard = observer((props: IHeaderGroupByCard) => {
const [isOpen, setIsOpen] = useState(false);
const [openExistingIssueListModal, setOpenExistingIssueListModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId, cycleId } = router.query;
+ const { workspaceSlug, projectId, moduleId, cycleId } = useParams();
+ const pathname = usePathname();
// hooks
const { setTrackElement } = useEventTracker();
// derived values
- const isDraftIssue = router.pathname.includes("draft-issue");
+ const isDraftIssue = pathname.includes("draft-issue");
const renderExistingIssueModal = moduleId || cycleId;
const existingIssuesListModalPayload = moduleId ? { module: moduleId.toString() } : { cycle: true };
const isGroupSelectionEmpty = selectionHelpers.isGroupSelected(groupID) === "empty";
diff --git a/web/components/issues/issue-layouts/list/quick-add-issue-form.tsx b/web/components/issues/issue-layouts/list/quick-add-issue-form.tsx
index 2942483c05..1bf061b3bb 100644
--- a/web/components/issues/issue-layouts/list/quick-add-issue-form.tsx
+++ b/web/components/issues/issue-layouts/list/quick-add-issue-form.tsx
@@ -1,6 +1,6 @@
import { FC, useEffect, useState, useRef } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { useForm } from "react-hook-form";
import { PlusIcon } from "lucide-react";
import { TIssue, IProject } from "@plane/types";
@@ -63,8 +63,8 @@ const defaultValues: Partial<TIssue> = {
export const ListQuickAddIssueForm: FC<IListQuickAddIssueForm> = observer((props) => {
const { prePopulatedData, quickAddCallback, viewId } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const pathname = usePathname();
// hooks
const { getProjectById } = useProject();
const { captureIssueEvent } = useEventTracker();
@@ -120,14 +120,14 @@ export const ListQuickAddIssueForm: FC<IListQuickAddIssueForm> = observer((props
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...res, state: "SUCCESS", element: "List quick add" },
- path: router.asPath,
+ path: pathname,
});
})
.catch(() => {
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...payload, state: "FAILED", element: "List quick add" },
- path: router.asPath,
+ path: pathname,
});
});
}
diff --git a/web/components/issues/issue-layouts/list/roots/cycle-root.tsx b/web/components/issues/issue-layouts/list/roots/cycle-root.tsx
index 54ac2a4767..befe8d3b3b 100644
--- a/web/components/issues/issue-layouts/list/roots/cycle-root.tsx
+++ b/web/components/issues/issue-layouts/list/roots/cycle-root.tsx
@@ -1,6 +1,6 @@
import React, { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// components
import { CycleIssueQuickActions } from "@/components/issues";
// constants
@@ -14,8 +14,7 @@ import { BaseListRoot } from "../base-list-root";
export interface ICycleListLayout {}
export const CycleListLayout: React.FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
// store
const { issues } = useIssues(EIssuesStoreType.CYCLE);
const { currentProjectCompletedCycleIds } = useCycle(); // mobx store
diff --git a/web/components/issues/issue-layouts/list/roots/draft-issue-root.tsx b/web/components/issues/issue-layouts/list/roots/draft-issue-root.tsx
index bf4e7efeed..eb6ff1d230 100644
--- a/web/components/issues/issue-layouts/list/roots/draft-issue-root.tsx
+++ b/web/components/issues/issue-layouts/list/roots/draft-issue-root.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { DraftIssueQuickActions } from "@/components/issues";
import { EIssuesStoreType } from "@/constants/issue";
@@ -10,8 +10,7 @@ import { EIssuesStoreType } from "@/constants/issue";
import { BaseListRoot } from "../base-list-root";
export const DraftIssueListLayout: FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
if (!workspaceSlug || !projectId) return null;
diff --git a/web/components/issues/issue-layouts/list/roots/module-root.tsx b/web/components/issues/issue-layouts/list/roots/module-root.tsx
index 10b8fd8f5a..010dcd7981 100644
--- a/web/components/issues/issue-layouts/list/roots/module-root.tsx
+++ b/web/components/issues/issue-layouts/list/roots/module-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// mobx store
import { ModuleIssueQuickActions } from "@/components/issues";
import { EIssuesStoreType } from "@/constants/issue";
@@ -13,8 +13,7 @@ import { BaseListRoot } from "../base-list-root";
export interface IModuleListLayout {}
export const ModuleListLayout: React.FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
const { issues } = useIssues(EIssuesStoreType.MODULE);
diff --git a/web/components/issues/issue-layouts/list/roots/project-root.tsx b/web/components/issues/issue-layouts/list/roots/project-root.tsx
index 0bbb87c2bf..0dc66e5c39 100644
--- a/web/components/issues/issue-layouts/list/roots/project-root.tsx
+++ b/web/components/issues/issue-layouts/list/roots/project-root.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// hooks
import { ProjectIssueQuickActions } from "@/components/issues";
import { EIssuesStoreType } from "@/constants/issue";
@@ -10,8 +10,7 @@ import { EIssuesStoreType } from "@/constants/issue";
import { BaseListRoot } from "../base-list-root";
export const ListLayout: FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
if (!workspaceSlug || !projectId) return null;
diff --git a/web/components/issues/issue-layouts/list/roots/project-view-root.tsx b/web/components/issues/issue-layouts/list/roots/project-view-root.tsx
index 8fba58bbda..966b05184c 100644
--- a/web/components/issues/issue-layouts/list/roots/project-view-root.tsx
+++ b/web/components/issues/issue-layouts/list/roots/project-view-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// store
import { EIssuesStoreType } from "@/constants/issue";
// constants
@@ -10,8 +10,7 @@ import { ProjectIssueQuickActions } from "../../quick-action-dropdowns";
import { BaseListRoot } from "../base-list-root";
export const ProjectViewListLayout: React.FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId, viewId } = router.query;
+ const { workspaceSlug, projectId, viewId } = useParams();
if (!workspaceSlug || !projectId) return null;
diff --git a/web/components/issues/issue-layouts/properties/all-properties.tsx b/web/components/issues/issue-layouts/properties/all-properties.tsx
index 7d5600a4a8..d79161ea6f 100644
--- a/web/components/issues/issue-layouts/properties/all-properties.tsx
+++ b/web/components/issues/issue-layouts/properties/all-properties.tsx
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from "react";
import xor from "lodash/xor";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname, useRouter } from "next/navigation";
// icons
import { CalendarCheck2, CalendarClock, Layers, Link, Paperclip } from "lucide-react";
// types
@@ -60,6 +60,10 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
const { getStateById } = useProjectState();
const { isMobile } = usePlatformOS();
const projectDetails = getProjectById(issue.project_id);
+ // router
+ const router = useRouter();
+ const { workspaceSlug } = useParams();
+ const pathname = usePathname();
const currentLayout = `${activeLayout} layout`;
// derived values
const stateDetails = getStateById(issue.state_id);
@@ -93,7 +97,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: {
changed_property: "state",
change_details: stateId,
@@ -108,7 +112,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: {
changed_property: "priority",
change_details: value,
@@ -123,7 +127,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: {
changed_property: "labels",
change_details: ids,
@@ -138,7 +142,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: {
changed_property: "assignees",
change_details: ids,
@@ -163,11 +167,11 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: { changed_property: "module_ids", change_details: { module_ids: moduleIds } },
});
},
- [issueOperations, captureIssueEvent, currentLayout, router, issue]
+ [issueOperations, captureIssueEvent, currentLayout, pathname, issue]
);
const handleCycle = useCallback(
@@ -179,11 +183,11 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: { changed_property: "cycle", change_details: { cycle_id: cycleId } },
});
},
- [issue, issueOperations, captureIssueEvent, currentLayout, router.asPath]
+ [issue, issueOperations, captureIssueEvent, currentLayout, pathname]
);
const handleStartDate = (date: Date | null) => {
@@ -193,7 +197,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: {
changed_property: "start_date",
change_details: date ? renderFormattedPayloadDate(date) : null,
@@ -210,7 +214,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: {
changed_property: "target_date",
change_details: date ? renderFormattedPayloadDate(date) : null,
@@ -226,7 +230,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...issue, state: "SUCCESS", element: currentLayout },
- path: router.asPath,
+ path: pathname,
updates: {
changed_property: "estimate_point",
change_details: value,
@@ -236,12 +240,15 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
};
const redirectToIssueDetail = () => {
- router.push({
- pathname: `/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${
- issue.id
- }`,
- hash: "sub-issues",
- });
+ router.push(
+ `/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${issue.id}#sub-issues`
+ );
+ // router.push({
+ // pathname: `/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${
+ // issue.id
+ // }`,
+ // hash: "sub-issues",
+ // });
};
if (!displayProperties) return null;
diff --git a/web/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx b/web/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx
index b56a6f7ebd..dd10f6fdad 100644
--- a/web/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx
+++ b/web/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import omit from "lodash/omit";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Copy, ExternalLink, Link, Pencil, Trash2 } from "lucide-react";
// types
import { TIssue } from "@plane/types";
@@ -38,8 +38,7 @@ export const AllIssueQuickActions: React.FC<IQuickActionProps> = observer((props
const [deleteIssueModal, setDeleteIssueModal] = useState(false);
const [archiveIssueModal, setArchiveIssueModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { setTrackElement } = useEventTracker();
const { getStateById } = useProjectState();
diff --git a/web/components/issues/issue-layouts/quick-action-dropdowns/archived-issue.tsx b/web/components/issues/issue-layouts/quick-action-dropdowns/archived-issue.tsx
index e6b3887c35..9a43237577 100644
--- a/web/components/issues/issue-layouts/quick-action-dropdowns/archived-issue.tsx
+++ b/web/components/issues/issue-layouts/quick-action-dropdowns/archived-issue.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { ArchiveRestoreIcon, ExternalLink, Link, Trash2 } from "lucide-react";
// ui
@@ -32,8 +32,7 @@ export const ArchivedIssueQuickActions: React.FC<IQuickActionProps> = observer((
// states
const [deleteIssueModal, setDeleteIssueModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
membership: { currentProjectRole },
diff --git a/web/components/issues/issue-layouts/quick-action-dropdowns/cycle-issue.tsx b/web/components/issues/issue-layouts/quick-action-dropdowns/cycle-issue.tsx
index ddfbb4a022..6a3954e6d5 100644
--- a/web/components/issues/issue-layouts/quick-action-dropdowns/cycle-issue.tsx
+++ b/web/components/issues/issue-layouts/quick-action-dropdowns/cycle-issue.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import omit from "lodash/omit";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Copy, ExternalLink, Link, Pencil, Trash2, XCircle } from "lucide-react";
// types
import { TIssue } from "@plane/types";
@@ -40,8 +40,7 @@ export const CycleIssueQuickActions: React.FC<IQuickActionProps> = observer((pro
const [deleteIssueModal, setDeleteIssueModal] = useState(false);
const [archiveIssueModal, setArchiveIssueModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, cycleId } = router.query;
+ const { workspaceSlug, cycleId } = useParams();
// store hooks
const { setTrackElement } = useEventTracker();
const { issuesFilter } = useIssues(EIssuesStoreType.CYCLE);
diff --git a/web/components/issues/issue-layouts/quick-action-dropdowns/module-issue.tsx b/web/components/issues/issue-layouts/quick-action-dropdowns/module-issue.tsx
index e8a950b254..693d52ae12 100644
--- a/web/components/issues/issue-layouts/quick-action-dropdowns/module-issue.tsx
+++ b/web/components/issues/issue-layouts/quick-action-dropdowns/module-issue.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import omit from "lodash/omit";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Copy, ExternalLink, Link, Pencil, Trash2, XCircle } from "lucide-react";
// types
import { TIssue } from "@plane/types";
@@ -40,8 +40,7 @@ export const ModuleIssueQuickActions: React.FC<IQuickActionProps> = observer((pr
const [deleteIssueModal, setDeleteIssueModal] = useState(false);
const [archiveIssueModal, setArchiveIssueModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, moduleId } = router.query;
+ const { workspaceSlug, moduleId } = useParams();
// store hooks
const { setTrackElement } = useEventTracker();
const { issuesFilter } = useIssues(EIssuesStoreType.MODULE);
diff --git a/web/components/issues/issue-layouts/quick-action-dropdowns/project-issue.tsx b/web/components/issues/issue-layouts/quick-action-dropdowns/project-issue.tsx
index 14879f1fcc..9530fd18f7 100644
--- a/web/components/issues/issue-layouts/quick-action-dropdowns/project-issue.tsx
+++ b/web/components/issues/issue-layouts/quick-action-dropdowns/project-issue.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import omit from "lodash/omit";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { Copy, ExternalLink, Link, Pencil, Trash2 } from "lucide-react";
// types
import { TIssue } from "@plane/types";
@@ -34,8 +34,8 @@ export const ProjectIssueQuickActions: React.FC<IQuickActionProps> = observer((p
parentRef,
} = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
+ const pathname = usePathname();
// states
const [createUpdateIssueModal, setCreateUpdateIssueModal] = useState(false);
const [issueToEdit, setIssueToEdit] = useState<TIssue | undefined>(undefined);
@@ -68,7 +68,7 @@ export const ProjectIssueQuickActions: React.FC<IQuickActionProps> = observer((p
);
const handleOpenInNewTab = () => window.open(`/${issueLink}`, "_blank");
- const isDraftIssue = router?.asPath?.includes("draft-issues") || false;
+ const isDraftIssue = pathname?.includes("draft-issues") || false;
const duplicateIssuePayload = omit(
{
diff --git a/web/components/issues/issue-layouts/roots/all-issue-layout-root.tsx b/web/components/issues/issue-layouts/roots/all-issue-layout-root.tsx
index 93a275f39f..4d7f9c017d 100644
--- a/web/components/issues/issue-layouts/roots/all-issue-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/all-issue-layout-root.tsx
@@ -1,7 +1,7 @@
import React, { Fragment, useCallback } from "react";
import isEmpty from "lodash/isEmpty";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useSearchParams } from "next/navigation";
import useSWR from "swr";
import { IIssueDisplayFilterOptions } from "@plane/types";
// hooks
@@ -23,8 +23,14 @@ import { TRenderQuickActions } from "../list/list-view-types";
export const AllIssueLayoutRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, globalViewId, ...routeFilters } = router.query;
+ const { workspaceSlug, globalViewId } = useParams();
+ const searchParams = useSearchParams();
+ const routeFilters: {
+ [key: string]: string;
+ } = {};
+ searchParams.forEach((value: string, key: string) => {
+ routeFilters[key] = value;
+ });
//swr hook for fetching issue properties
useWorkspaceIssueProperties(workspaceSlug);
// store
diff --git a/web/components/issues/issue-layouts/roots/archived-issue-layout-root.tsx b/web/components/issues/issue-layouts/roots/archived-issue-layout-root.tsx
index 359de202fc..c319c6c0ac 100644
--- a/web/components/issues/issue-layouts/roots/archived-issue-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/archived-issue-layout-root.tsx
@@ -1,6 +1,6 @@
import React, { Fragment } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// mobx store
// components
@@ -17,8 +17,7 @@ import { useIssues } from "@/hooks/store";
export const ArchivedIssueLayoutRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// hooks
const { issues, issuesFilter } = useIssues(EIssuesStoreType.ARCHIVED);
diff --git a/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx b/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx
index 929eb8ea82..75503c625a 100644
--- a/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/cycle-layout-root.tsx
@@ -2,7 +2,7 @@ import React, { Fragment, useState } from "react";
import isEmpty from "lodash/isEmpty";
import size from "lodash/size";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
import { IIssueFilterOptions } from "@plane/types";
// hooks
@@ -25,8 +25,7 @@ import { useCycle, useIssues } from "@/hooks/store";
// types
export const CycleLayoutRoot: React.FC = observer(() => {
- const router = useRouter();
- const { workspaceSlug, projectId, cycleId } = router.query;
+ const { workspaceSlug, projectId, cycleId } = useParams();
// store hooks
const { issues, issuesFilter } = useIssues(EIssuesStoreType.CYCLE);
const { getCycleById } = useCycle();
diff --git a/web/components/issues/issue-layouts/roots/draft-issue-layout-root.tsx b/web/components/issues/issue-layouts/roots/draft-issue-layout-root.tsx
index c2cea7a265..a37187da35 100644
--- a/web/components/issues/issue-layouts/roots/draft-issue-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/draft-issue-layout-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// hooks
import { IssuePeekOverview } from "@/components/issues/peek-overview";
@@ -17,8 +17,7 @@ import { DraftIssueListLayout } from "../list/roots/draft-issue-root";
export const DraftIssueLayoutRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// hooks
const { issues, issuesFilter } = useIssues(EIssuesStoreType.DRAFT);
diff --git a/web/components/issues/issue-layouts/roots/module-layout-root.tsx b/web/components/issues/issue-layouts/roots/module-layout-root.tsx
index ed2eafd001..df348ba0b7 100644
--- a/web/components/issues/issue-layouts/roots/module-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/module-layout-root.tsx
@@ -1,7 +1,7 @@
import React, { Fragment } from "react";
import size from "lodash/size";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
import { IIssueFilterOptions } from "@plane/types";
// mobx store
@@ -24,8 +24,7 @@ import { useIssues } from "@/hooks/store";
export const ModuleLayoutRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, moduleId } = router.query;
+ const { workspaceSlug, projectId, moduleId } = useParams();
// hooks
const { issues, issuesFilter } = useIssues(EIssuesStoreType.MODULE);
diff --git a/web/components/issues/issue-layouts/roots/project-layout-root.tsx b/web/components/issues/issue-layouts/roots/project-layout-root.tsx
index e153356b80..b2532569a4 100644
--- a/web/components/issues/issue-layouts/roots/project-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/project-layout-root.tsx
@@ -1,6 +1,6 @@
import { FC, Fragment } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// components
import { Spinner } from "@plane/ui";
@@ -22,8 +22,7 @@ import { useIssues } from "@/hooks/store";
export const ProjectLayoutRoot: FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// hooks
const { issues, issuesFilter } = useIssues(EIssuesStoreType.PROJECT);
diff --git a/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx b/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx
index 62b2b8a8d2..29399cbfdb 100644
--- a/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/project-view-layout-root.tsx
@@ -1,6 +1,6 @@
import React, { Fragment } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// mobx store
// components
@@ -22,8 +22,7 @@ import { useIssues } from "@/hooks/store";
export const ProjectViewLayoutRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, viewId } = router.query;
+ const { workspaceSlug, projectId, viewId } = useParams();
// hooks
const { issues, issuesFilter } = useIssues(EIssuesStoreType.PROJECT_VIEW);
diff --git a/web/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsx b/web/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsx
index cf57c7f7e7..deb9c677ad 100644
--- a/web/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueDisplayFilterOptions, TUnGroupedIssues } from "@plane/types";
// hooks
import { EIssueFilterType, EIssuesStoreType } from "@/constants/issue";
@@ -29,8 +29,7 @@ interface IBaseSpreadsheetRoot {
export const BaseSpreadsheetRoot = observer((props: IBaseSpreadsheetRoot) => {
const { viewId, QuickActions, storeType, canEditPropertiesBasedOnProject, isCompletedCycle = false } = props;
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// store hooks
const {
membership: { currentProjectRole },
diff --git a/web/components/issues/issue-layouts/spreadsheet/columns/cycle-column.tsx b/web/components/issues/issue-layouts/spreadsheet/columns/cycle-column.tsx
index 574ab6feac..e0727c844b 100644
--- a/web/components/issues/issue-layouts/spreadsheet/columns/cycle-column.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/columns/cycle-column.tsx
@@ -1,6 +1,6 @@
import React, { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
// types
import { TIssue } from "@plane/types";
// components
@@ -19,8 +19,8 @@ type Props = {
export const SpreadsheetCycleColumn: React.FC<Props> = observer((props) => {
const { issue, disabled, onClose } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
+ const pathname = usePathname();
// hooks
const { captureIssueEvent } = useEventTracker();
const {
@@ -40,10 +40,10 @@ export const SpreadsheetCycleColumn: React.FC<Props> = observer((props) => {
element: "Spreadsheet layout",
},
updates: { changed_property: "cycle", change_details: { cycle_id: cycleId } },
- path: router.asPath,
+ path: pathname,
});
},
- [workspaceSlug, issue, addCycleToIssue, removeCycleFromIssue, captureIssueEvent, router.asPath]
+ [workspaceSlug, issue, addCycleToIssue, removeCycleFromIssue, captureIssueEvent, pathname]
);
return (
diff --git a/web/components/issues/issue-layouts/spreadsheet/columns/module-column.tsx b/web/components/issues/issue-layouts/spreadsheet/columns/module-column.tsx
index 2357a6791a..ba724f2011 100644
--- a/web/components/issues/issue-layouts/spreadsheet/columns/module-column.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/columns/module-column.tsx
@@ -1,7 +1,7 @@
import React, { useCallback } from "react";
import xor from "lodash/xor";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
// types
import { TIssue } from "@plane/types";
// components
@@ -20,8 +20,8 @@ type Props = {
export const SpreadsheetModuleColumn: React.FC<Props> = observer((props) => {
const { issue, disabled, onClose } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
+ const pathname = usePathname();
// hooks
const { captureIssueEvent } = useEventTracker();
const {
@@ -49,10 +49,10 @@ export const SpreadsheetModuleColumn: React.FC<Props> = observer((props) => {
element: "Spreadsheet layout",
},
updates: { changed_property: "module_ids", change_details: { module_ids: moduleIds } },
- path: router.asPath,
+ path: pathname,
});
},
- [workspaceSlug, issue, changeModulesInIssue, captureIssueEvent, router.asPath]
+ [workspaceSlug, issue, changeModulesInIssue, captureIssueEvent, pathname]
);
return (
diff --git a/web/components/issues/issue-layouts/spreadsheet/columns/sub-issue-column.tsx b/web/components/issues/issue-layouts/spreadsheet/columns/sub-issue-column.tsx
index 7059545412..437b74145b 100644
--- a/web/components/issues/issue-layouts/spreadsheet/columns/sub-issue-column.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/columns/sub-issue-column.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
// types
import { TIssue } from "@plane/types";
// helpers
@@ -22,12 +22,7 @@ export const SpreadsheetSubIssueColumn: React.FC<Props> = observer((props: Props
const subIssueCount = issue?.sub_issues_count ?? 0;
const redirectToIssueDetail = () => {
- router.push({
- pathname: `/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${
- issue.id
- }`,
- hash: "sub-issues",
- });
+ router.push(`/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${issue.id}#sub-issues`);
};
return (
diff --git a/web/components/issues/issue-layouts/spreadsheet/issue-column.tsx b/web/components/issues/issue-layouts/spreadsheet/issue-column.tsx
index 086d0fe3e0..9ba38c5010 100644
--- a/web/components/issues/issue-layouts/spreadsheet/issue-column.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/issue-column.tsx
@@ -1,6 +1,6 @@
import { useRef } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
// types
import { IIssueDisplayProperties, TIssue } from "@plane/types";
// constants
@@ -22,7 +22,7 @@ type Props = {
export const IssueColumn = observer((props: Props) => {
const { displayProperties, issueDetail, disableUserActions, property, updateIssue, isEstimateEnabled } = props;
// router
- const router = useRouter();
+ const pathname = usePathname();
const tableCellRef = useRef<HTMLTableCellElement | null>(null);
const { captureIssueEvent } = useEventTracker();
@@ -54,7 +54,7 @@ export const IssueColumn = observer((props: Props) => {
element: "Spreadsheet layout",
},
updates: updates,
- path: router.asPath,
+ path: pathname,
});
})
}
diff --git a/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx b/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx
index d80a4bfdc1..899490d765 100644
--- a/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx
@@ -1,6 +1,6 @@
import { Dispatch, MouseEvent, MutableRefObject, SetStateAction, useRef, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { ChevronRight, MoreHorizontal } from "lucide-react";
// types
import { IIssueDisplayProperties, TIssue } from "@plane/types";
@@ -163,8 +163,7 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {
const cellRef = useRef(null);
const menuActionRef = useRef<HTMLDivElement | null>(null);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// hooks
const { getProjectIdentifierById } = useProject();
const { getIsIssuePeeked, peekIssue, setPeekIssue } = useIssueDetail();
diff --git a/web/components/issues/issue-layouts/spreadsheet/quick-add-issue-form.tsx b/web/components/issues/issue-layouts/spreadsheet/quick-add-issue-form.tsx
index 692363494a..6181826dff 100644
--- a/web/components/issues/issue-layouts/spreadsheet/quick-add-issue-form.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/quick-add-issue-form.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState, useRef } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
import { useForm } from "react-hook-form";
import { PlusIcon } from "lucide-react";
import { TIssue } from "@plane/types";
@@ -64,7 +64,7 @@ export const SpreadsheetQuickAddIssueForm: React.FC<Props> = observer((props) =>
const { currentProjectDetails } = useProject();
const { captureIssueEvent } = useEventTracker();
// router
- const router = useRouter();
+ const pathname = usePathname();
// form info
const {
reset,
@@ -183,14 +183,14 @@ export const SpreadsheetQuickAddIssueForm: React.FC<Props> = observer((props) =>
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...res, state: "SUCCESS", element: "Spreadsheet quick add" },
- path: router.asPath,
+ path: pathname,
});
})
.catch((err) => {
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...payload, state: "FAILED", element: "Spreadsheet quick add" },
- path: router.asPath,
+ path: pathname,
});
console.error(err);
});
diff --git a/web/components/issues/issue-layouts/spreadsheet/roots/cycle-root.tsx b/web/components/issues/issue-layouts/spreadsheet/roots/cycle-root.tsx
index c2d2cd246f..fc3cf69949 100644
--- a/web/components/issues/issue-layouts/spreadsheet/roots/cycle-root.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/roots/cycle-root.tsx
@@ -1,6 +1,6 @@
import React, { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// constants
import { EIssuesStoreType } from "@/constants/issue";
import { EUserProjectRoles } from "@/constants/project";
@@ -12,8 +12,7 @@ import { BaseSpreadsheetRoot } from "../base-spreadsheet-root";
export const CycleSpreadsheetLayout: React.FC = observer(() => {
// router
- const router = useRouter();
- const { cycleId } = router.query;
+ const { cycleId } = useParams();
// store hooks
const { currentProjectCompletedCycleIds } = useCycle();
const {
diff --git a/web/components/issues/issue-layouts/spreadsheet/roots/module-root.tsx b/web/components/issues/issue-layouts/spreadsheet/roots/module-root.tsx
index 5b1e2f34b7..9506a6ac66 100644
--- a/web/components/issues/issue-layouts/spreadsheet/roots/module-root.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/roots/module-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// mobx store
import { EIssuesStoreType } from "@/constants/issue";
// components
@@ -8,8 +8,7 @@ import { ModuleIssueQuickActions } from "../../quick-action-dropdowns";
import { BaseSpreadsheetRoot } from "../base-spreadsheet-root";
export const ModuleSpreadsheetLayout: React.FC = observer(() => {
- const router = useRouter();
- const { moduleId } = router.query;
+ const { moduleId } = useParams();
if (!moduleId) return null;
diff --git a/web/components/issues/issue-layouts/spreadsheet/roots/project-view-root.tsx b/web/components/issues/issue-layouts/spreadsheet/roots/project-view-root.tsx
index 73d643b21a..454445bc80 100644
--- a/web/components/issues/issue-layouts/spreadsheet/roots/project-view-root.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/roots/project-view-root.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// mobx store
import { EIssuesStoreType } from "@/constants/issue";
// components
@@ -11,8 +11,7 @@ import { BaseSpreadsheetRoot } from "../base-spreadsheet-root";
export const ProjectViewSpreadsheetLayout: React.FC = observer(() => {
// router
- const router = useRouter();
- const { viewId } = router.query;
+ const { viewId } = useParams();
return (
<BaseSpreadsheetRoot
diff --git a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx
index 6052454d1b..ca84e6c237 100644
--- a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// ui
import { IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
// components
@@ -33,8 +33,7 @@ export const SpreadsheetHeader = observer((props: Props) => {
selectionHelpers,
} = props;
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// derived values
const isGroupSelectionEmpty = selectionHelpers.isGroupSelected(SPREADSHEET_SELECT_GROUP) === "empty";
// auth
diff --git a/web/components/issues/issue-modal/draft-issue-layout.tsx b/web/components/issues/issue-modal/draft-issue-layout.tsx
index df89d363e1..b6dfffb229 100644
--- a/web/components/issues/issue-modal/draft-issue-layout.tsx
+++ b/web/components/issues/issue-modal/draft-issue-layout.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import isEmpty from "lodash/isEmpty";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import type { TIssue } from "@plane/types";
// hooks
import { TOAST_TYPE, setToast } from "@plane/ui";
@@ -42,9 +42,10 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {
} = props;
// states
const [issueDiscardModal, setIssueDiscardModal] = useState(false);
- // router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
+ // pathname
+ const pathname = usePathname();
// store hooks
const { captureIssueEvent } = useEventTracker();
@@ -98,7 +99,7 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {
captureIssueEvent({
eventName: "Draft issue created",
payload: { ...res, state: "SUCCESS" },
- path: router.asPath,
+ path: pathname,
});
onChange(null);
setIssueDiscardModal(false);
@@ -113,7 +114,7 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {
captureIssueEvent({
eventName: "Draft issue created",
payload: { ...payload, state: "FAILED" },
- path: router.asPath,
+ path: pathname,
});
});
};
diff --git a/web/components/issues/issue-modal/form.tsx b/web/components/issues/issue-modal/form.tsx
index 7ff3ff6346..bc6de23c47 100644
--- a/web/components/issues/issue-modal/form.tsx
+++ b/web/components/issues/issue-modal/form.tsx
@@ -1,6 +1,6 @@
import React, { FC, useState, useRef, useEffect } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import { LayoutPanelTop, Sparkle, X } from "lucide-react";
import { EditorRefApi } from "@plane/rich-text-editor";
@@ -28,6 +28,9 @@ import { renderFormattedPayloadDate, getDate } from "@/helpers/date-time.helper"
import { getChangedIssuefields, getDescriptionPlaceholder } from "@/helpers/issue.helper";
import { shouldRenderProject } from "@/helpers/project.helper";
// hooks
+<<<<<<< HEAD
+import { useAppRouter, useEstimate, useInstance, useIssueDetail, useProject, useWorkspace } from "@/hooks/store";
+=======
import {
useAppRouter,
useProjectEstimates,
@@ -36,6 +39,7 @@ import {
useProject,
useWorkspace,
} from "@/hooks/store";
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
import useKeypress from "@/hooks/use-keypress";
import { useProjectIssueProperties } from "@/hooks/use-project-issue-properties";
// services
@@ -119,8 +123,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
const editorRef = useRef<EditorRefApi>(null);
const submitBtnRef = useRef<HTMLButtonElement | null>(null);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const workspaceStore = useWorkspace();
const workspaceId = workspaceStore.getWorkspaceBySlug(workspaceSlug as string)?.id as string;
@@ -144,6 +147,21 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
useKeypress("Escape", handleKeyDown);
+ const handleKeyDown = (event: KeyboardEvent) => {
+ if (editorRef.current?.isEditorReadyToDiscard()) {
+ onClose();
+ } else {
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: "Error!",
+ message: "Editor is still processing changes. Please wait before proceeding.",
+ });
+ event.preventDefault(); // Prevent default action if editor is not ready to discard
+ }
+ };
+
+ useKeypress("Escape", handleKeyDown);
+
const {
issue: { getIssueById },
} = useIssueDetail();
diff --git a/web/components/issues/issue-modal/modal.tsx b/web/components/issues/issue-modal/modal.tsx
index 6558c55c4f..b6f19aef7f 100644
--- a/web/components/issues/issue-modal/modal.tsx
+++ b/web/components/issues/issue-modal/modal.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useRef, useState } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
// types
import type { TIssue } from "@plane/types";
// ui
@@ -63,8 +63,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((prop
const { issues: cycleIssues } = useIssues(EIssuesStoreType.CYCLE);
const { issues: draftIssues } = useIssues(EIssuesStoreType.DRAFT);
const { fetchIssue } = useIssueDetail();
- // router
- const router = useRouter();
+ // pathname
+ const pathname = usePathname();
// local storage
const { storedValue: localStorageDraftIssues, setValue: setLocalStorageDraftIssue } = useLocalStorage<
Record<string, Partial<TIssue>>
@@ -168,7 +168,7 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((prop
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...response, state: "SUCCESS" },
- path: router.asPath,
+ path: pathname,
});
!createMore && handleClose();
if (createMore) issueTitleRef && issueTitleRef?.current?.focus();
@@ -184,7 +184,7 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((prop
captureIssueEvent({
eventName: ISSUE_CREATED,
payload: { ...payload, state: "FAILED" },
- path: router.asPath,
+ path: pathname,
});
}
};
@@ -205,7 +205,7 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((prop
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...payload, issueId: data.id, state: "SUCCESS" },
- path: router.asPath,
+ path: pathname,
});
handleClose();
} catch (error) {
@@ -217,7 +217,7 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((prop
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { ...payload, state: "FAILED" },
- path: router.asPath,
+ path: pathname,
});
}
};
diff --git a/web/components/issues/parent-issues-list-modal.tsx b/web/components/issues/parent-issues-list-modal.tsx
index b9489bdc48..dd712304e6 100644
--- a/web/components/issues/parent-issues-list-modal.tsx
+++ b/web/components/issues/parent-issues-list-modal.tsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// headless ui
import { Rocket, Search } from "lucide-react";
import { Combobox, Dialog, Transition } from "@headlessui/react";
@@ -44,8 +44,7 @@ export const ParentIssuesListModal: React.FC<Props> = ({
const { isMobile } = usePlatformOS();
const debouncedSearchTerm: string = useDebounce(searchTerm, 500);
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const handleClose = () => {
onClose();
diff --git a/web/components/issues/peek-overview/root.tsx b/web/components/issues/peek-overview/root.tsx
index 5aa6d2e8a1..d3d671cea4 100644
--- a/web/components/issues/peek-overview/root.tsx
+++ b/web/components/issues/peek-overview/root.tsx
@@ -1,6 +1,6 @@
import { FC, useEffect, useState, useMemo } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
// types
import { TIssue } from "@plane/types";
// ui
@@ -45,7 +45,7 @@ export type TIssuePeekOperations = {
export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
const { is_archived = false, is_draft = false } = props;
// router
- const router = useRouter();
+ const pathname = usePathname();
const {
membership: { currentWorkspaceAllProjectsRole },
} = useUser();
@@ -95,14 +95,14 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: Object.keys(data).join(","),
change_details: Object.values(data).join(","),
},
- path: router.asPath,
+ path: pathname,
});
})
.catch(() => {
captureIssueEvent({
eventName: ISSUE_UPDATED,
payload: { state: "FAILED", element: "Issue peek-overview" },
- path: router.asPath,
+ path: pathname,
});
setToast({
title: "Error!",
@@ -122,7 +122,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_DELETED,
payload: { id: issueId, state: "SUCCESS", element: "Issue peek-overview" },
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -133,7 +133,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_DELETED,
payload: { id: issueId, state: "FAILED", element: "Issue peek-overview" },
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -143,13 +143,13 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_ARCHIVED,
payload: { id: issueId, state: "SUCCESS", element: "Issue peek-overview" },
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
captureIssueEvent({
eventName: ISSUE_ARCHIVED,
payload: { id: issueId, state: "FAILED", element: "Issue peek-overview" },
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -164,7 +164,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_RESTORED,
payload: { id: issueId, state: "SUCCESS", element: "Issue peek-overview" },
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -175,7 +175,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
captureIssueEvent({
eventName: ISSUE_RESTORED,
payload: { id: issueId, state: "FAILED", element: "Issue peek-overview" },
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -190,7 +190,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -205,7 +205,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -219,7 +219,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -234,7 +234,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "cycle_id",
change_details: cycleId,
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -260,7 +260,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "cycle_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
captureIssueEvent({
@@ -270,7 +270,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "cycle_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -284,7 +284,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "module_id",
change_details: moduleIds,
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
setToast({
@@ -299,7 +299,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "module_id",
change_details: moduleIds,
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -325,7 +325,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "module_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
} catch (error) {
captureIssueEvent({
@@ -335,7 +335,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
changed_property: "module_id",
change_details: "",
},
- path: router.asPath,
+ path: pathname,
});
}
},
@@ -374,7 +374,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
removeIssueFromModule,
removeModulesFromIssue,
captureIssueEvent,
- router.asPath,
+ pathname,
]
);
diff --git a/web/components/issues/select/label.tsx b/web/components/issues/select/label.tsx
index ddc0e41b3f..bfe2282f61 100644
--- a/web/components/issues/select/label.tsx
+++ b/web/components/issues/select/label.tsx
@@ -1,6 +1,6 @@
import React, { Fragment, useEffect, useRef, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { usePopper } from "react-popper";
import { Check, Component, Plus, Search, Tag } from "lucide-react";
import { Combobox } from "@headlessui/react";
@@ -38,8 +38,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
buttonClassName,
} = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { getProjectLabels, fetchProjectLabels } = useLabel();
// states
diff --git a/web/components/issues/sub-issues/root.tsx b/web/components/issues/sub-issues/root.tsx
index 45d6119c1e..4b3e7ba2b0 100644
--- a/web/components/issues/sub-issues/root.tsx
+++ b/web/components/issues/sub-issues/root.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback, useEffect, useMemo, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname } from "next/navigation";
// icons
import { Plus, ChevronRight, Loader, Pencil } from "lucide-react";
// types
@@ -16,6 +16,7 @@ import { copyTextToClipboard } from "@/helpers/string.helper";
// hooks
import { useEventTracker, useIssueDetail } from "@/hooks/store";
// local components
+import useURLHash from "@/hooks/use-url-hash";
import { IssueList } from "./issues-list";
export interface ISubIssuesRoot {
@@ -46,7 +47,8 @@ export type TSubIssueOperations = {
export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
const { workspaceSlug, projectId, parentIssueId, disabled = false } = props;
// router
- const router = useRouter();
+ const pathname = usePathname();
+ const hashValue = useURLHash();
const {
issue: { getIssueById },
subIssues: { subIssuesByIssueId, stateDistributionByIssueId, subIssueHelpersByIssueId, setSubIssueHelpers },
@@ -94,7 +96,7 @@ export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
});
const scrollToSubIssuesView = useCallback(() => {
- if (router.asPath.split("#")[1] === "sub-issues") {
+ if (hashValue === "sub-issues") {
setTimeout(() => {
const subIssueDiv = document.getElementById(`sub-issues`);
if (subIssueDiv)
@@ -104,13 +106,13 @@ export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
});
}, 200);
}
- }, [router.asPath]);
+ }, [hashValue]);
useEffect(() => {
- if (router.asPath) {
+ if (hashValue) {
scrollToSubIssuesView();
}
- }, [router.asPath, scrollToSubIssuesView]);
+ }, [hashValue, scrollToSubIssuesView]);
const handleIssueCrudState = (
key: "create" | "existing" | "update" | "delete",
@@ -185,7 +187,7 @@ export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
changed_property: Object.keys(issueData).join(","),
change_details: Object.values(issueData).join(","),
},
- path: router.asPath,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.SUCCESS,
@@ -201,7 +203,7 @@ export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
changed_property: Object.keys(issueData).join(","),
change_details: Object.values(issueData).join(","),
},
- path: router.asPath,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.ERROR,
@@ -226,7 +228,7 @@ export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
changed_property: "parent_id",
change_details: parentIssueId,
},
- path: router.asPath,
+ path: pathname,
});
setSubIssueHelpers(parentIssueId, "issue_loader", issueId);
} catch (error) {
@@ -237,7 +239,7 @@ export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
changed_property: "parent_id",
change_details: parentIssueId,
},
- path: router.asPath,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.ERROR,
@@ -253,14 +255,14 @@ export const SubIssuesRoot: FC<ISubIssuesRoot> = observer((props) => {
captureIssueEvent({
eventName: "Sub-issue deleted",
payload: { id: issueId, state: "SUCCESS", element: "Issue detail page" },
- path: router.asPath,
+ path: pathname,
});
setSubIssueHelpers(parentIssueId, "issue_loader", issueId);
} catch (error) {
captureIssueEvent({
eventName: "Sub-issue removed",
payload: { id: issueId, state: "FAILED", element: "Issue detail page" },
- path: router.asPath,
+ path: pathname,
});
setToast({
type: TOAST_TYPE.ERROR,
diff --git a/web/components/labels/create-label-modal.tsx b/web/components/labels/create-label-modal.tsx
index 18bed7a3ae..ca45515539 100644
--- a/web/components/labels/create-label-modal.tsx
+++ b/web/components/labels/create-label-modal.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { TwitterPicker } from "react-color";
import { Controller, useForm } from "react-hook-form";
import { ChevronDown } from "lucide-react";
@@ -30,8 +30,7 @@ const defaultValues: Partial<IState> = {
export const CreateLabelModal: React.FC<Props> = observer((props) => {
const { isOpen, projectId, handleClose, onSuccess } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { createLabel } = useLabel();
// form info
diff --git a/web/components/labels/create-update-label-inline.tsx b/web/components/labels/create-update-label-inline.tsx
index 280ae55d92..3da84331c8 100644
--- a/web/components/labels/create-update-label-inline.tsx
+++ b/web/components/labels/create-update-label-inline.tsx
@@ -1,6 +1,6 @@
import React, { forwardRef, useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { TwitterPicker } from "react-color";
import { Controller, SubmitHandler, useForm } from "react-hook-form";
import { Popover, Transition } from "@headlessui/react";
@@ -30,8 +30,7 @@ export const CreateUpdateLabelInline = observer(
forwardRef<HTMLFormElement, Props>(function CreateUpdateLabelInline(props, ref) {
const { labelForm, setLabelForm, isUpdating, labelToUpdate, onClose } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { createLabel, updateLabel } = useLabel();
// form info
diff --git a/web/components/labels/delete-label-modal.tsx b/web/components/labels/delete-label-modal.tsx
index cb1943f059..832ea80885 100644
--- a/web/components/labels/delete-label-modal.tsx
+++ b/web/components/labels/delete-label-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import type { IIssueLabel } from "@plane/types";
// ui
@@ -19,8 +19,7 @@ type Props = {
export const DeleteLabelModal: React.FC<Props> = observer((props) => {
const { isOpen, onClose, data } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { deleteLabel } = useLabel();
// states
diff --git a/web/components/labels/project-setting-label-item.tsx b/web/components/labels/project-setting-label-item.tsx
index 0a596fe413..fbc812e12d 100644
--- a/web/components/labels/project-setting-label-item.tsx
+++ b/web/components/labels/project-setting-label-item.tsx
@@ -1,5 +1,5 @@
import React, { Dispatch, SetStateAction, useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { X, Pencil } from "lucide-react";
// types
import { IIssueLabel } from "@plane/types";
@@ -30,8 +30,7 @@ export const ProjectSettingLabelItem: React.FC<Props> = (props) => {
// states
const [isEditLabelForm, setEditLabelForm] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { updateLabel } = useLabel();
diff --git a/web/components/labels/project-setting-label-list.tsx b/web/components/labels/project-setting-label-list.tsx
index 8de57e8b20..2c147de3d7 100644
--- a/web/components/labels/project-setting-label-list.tsx
+++ b/web/components/labels/project-setting-label-list.tsx
@@ -1,6 +1,6 @@
import React, { useState, useRef } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IIssueLabel } from "@plane/types";
// hooks
import { Button, Loader } from "@plane/ui";
@@ -26,8 +26,7 @@ export const ProjectSettingsLabelList: React.FC = observer(() => {
// refs
const scrollToRef = useRef<HTMLFormElement>(null);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { projectLabels, updateLabelPosition, projectLabelsTree } = useLabel();
diff --git a/web/components/modules/archived-modules/header.tsx b/web/components/modules/archived-modules/header.tsx
index 68146a8a98..db46b3a899 100644
--- a/web/components/modules/archived-modules/header.tsx
+++ b/web/components/modules/archived-modules/header.tsx
@@ -1,6 +1,6 @@
import { FC, useCallback, useRef, useState } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { ListFilter, Search, X } from "lucide-react";
// types
@@ -18,8 +18,7 @@ import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
export const ArchivedModulesHeader: FC = observer(() => {
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// refs
const inputRef = useRef<HTMLInputElement>(null);
// hooks
diff --git a/web/components/modules/archived-modules/modal.tsx b/web/components/modules/archived-modules/modal.tsx
index abfb084f08..61fb5a4111 100644
--- a/web/components/modules/archived-modules/modal.tsx
+++ b/web/components/modules/archived-modules/modal.tsx
@@ -1,5 +1,5 @@
import { useState, Fragment } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Dialog, Transition } from "@headlessui/react";
// ui
import { Button, TOAST_TYPE, setToast } from "@plane/ui";
diff --git a/web/components/modules/archived-modules/root.tsx b/web/components/modules/archived-modules/root.tsx
index 9abf4f87d5..4ec9c1e5ad 100644
--- a/web/components/modules/archived-modules/root.tsx
+++ b/web/components/modules/archived-modules/root.tsx
@@ -1,6 +1,6 @@
import React, { useCallback } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// types
import { TModuleFilters } from "@plane/types";
@@ -17,8 +17,7 @@ import { useModule, useModuleFilter } from "@/hooks/store";
export const ArchivedModuleLayoutRoot: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// hooks
const { fetchArchivedModules, projectArchivedModuleIds, loader } = useModule();
// module filters hook
diff --git a/web/components/modules/delete-module-modal.tsx b/web/components/modules/delete-module-modal.tsx
index a19afb4d4f..574f100864 100644
--- a/web/components/modules/delete-module-modal.tsx
+++ b/web/components/modules/delete-module-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// types
import type { IModule } from "@plane/types";
// ui
@@ -24,7 +24,7 @@ export const DeleteModuleModal: React.FC<Props> = observer((props) => {
const [isDeleteLoading, setIsDeleteLoading] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug, projectId, moduleId, peekModule } = router.query;
+ const { workspaceSlug, projectId, moduleId, peekModule } = useParams();
// store hooks
const { captureModuleEvent } = useEventTracker();
const { deleteModule } = useModule();
diff --git a/web/components/modules/gantt-chart/blocks.tsx b/web/components/modules/gantt-chart/blocks.tsx
index 191b422100..f239f08be3 100644
--- a/web/components/modules/gantt-chart/blocks.tsx
+++ b/web/components/modules/gantt-chart/blocks.tsx
@@ -1,6 +1,6 @@
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
// hooks
// ui
import { Tooltip, ModuleStatusIcon } from "@plane/ui";
diff --git a/web/components/modules/gantt-chart/modules-list-layout.tsx b/web/components/modules/gantt-chart/modules-list-layout.tsx
index 4c679454f0..0d55cf3a57 100644
--- a/web/components/modules/gantt-chart/modules-list-layout.tsx
+++ b/web/components/modules/gantt-chart/modules-list-layout.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IModule } from "@plane/types";
// mobx store
// components
@@ -11,8 +11,7 @@ import { useModule, useModuleFilter, useProject } from "@/hooks/store";
export const ModulesListGanttChartView: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store
const { currentProjectDetails } = useProject();
const { getFilteredModuleIds, moduleMap, updateModuleDetails } = useModule();
diff --git a/web/components/modules/module-card-item.tsx b/web/components/modules/module-card-item.tsx
index 7377c7b2ff..91c16896d2 100644
--- a/web/components/modules/module-card-item.tsx
+++ b/web/components/modules/module-card-item.tsx
@@ -1,7 +1,7 @@
import React, { useRef } from "react";
import { observer } from "mobx-react-lite";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, usePathname, useRouter, useSearchParams } from "next/navigation";
import { CalendarCheck2, CalendarClock, Info, MoveRight, SquareUser } from "lucide-react";
// ui
import { LayersIcon, Tooltip, setPromiseToast } from "@plane/ui";
@@ -16,6 +16,7 @@ import { MODULE_STATUS } from "@/constants/module";
import { EUserProjectRoles } from "@/constants/project";
// helpers
import { getDate, renderFormattedDate } from "@/helpers/date-time.helper";
+import { generateQueryParams } from "@/helpers/router.helper";
// hooks
import { useEventTracker, useMember, useModule, useProjectEstimates, useUser } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -30,7 +31,9 @@ export const ModuleCardItem: React.FC<Props> = observer((props) => {
const parentRef = useRef(null);
// router
const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const searchParams = useSearchParams();
+ const pathname = usePathname();
// store hooks
const {
membership: { currentProjectRole },
@@ -105,19 +108,12 @@ export const ModuleCardItem: React.FC<Props> = observer((props) => {
const openModuleOverview = (e: React.MouseEvent<HTMLButtonElement>) => {
e.stopPropagation();
e.preventDefault();
- const { query } = router;
- if (query.peekModule) {
- delete query.peekModule;
- router.push({
- pathname: router.pathname,
- query: { ...query },
- });
+ const query = generateQueryParams(searchParams, ['peekModule']);
+ if (searchParams.has('peekModule')) {
+ router.push(`${pathname}?${query}`);
} else {
- router.push({
- pathname: router.pathname,
- query: { ...query, peekModule: moduleId },
- });
+ router.push(`${pathname}?${query}&peekModule=${moduleId}`);
}
};
diff --git a/web/components/modules/module-list-item-action.tsx b/web/components/modules/module-list-item-action.tsx
index 2a5a3cdd04..f1f718909e 100644
--- a/web/components/modules/module-list-item-action.tsx
+++ b/web/components/modules/module-list-item-action.tsx
@@ -1,6 +1,6 @@
import React, { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { CalendarCheck2, CalendarClock, MoveRight, SquareUser } from "lucide-react";
// types
@@ -29,8 +29,7 @@ type Props = {
export const ModuleListItemAction: FC<Props> = observer((props) => {
const { moduleId, moduleDetails, parentRef } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const {
membership: { currentProjectRole },
diff --git a/web/components/modules/module-list-item.tsx b/web/components/modules/module-list-item.tsx
index 251e7f12fd..1d21f342fe 100644
--- a/web/components/modules/module-list-item.tsx
+++ b/web/components/modules/module-list-item.tsx
@@ -1,6 +1,6 @@
import React, { useRef } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams, usePathname, useRouter, useSearchParams } from "next/navigation";
// icons
import { Check, Info } from "lucide-react";
// ui
@@ -10,6 +10,8 @@ import { ListItem } from "@/components/core/list";
import { ModuleListItemAction } from "@/components/modules";
// constants
import { EEstimateSystem } from "@/constants/estimates";
+// helpers
+import { generateQueryParams } from "@/helpers/router.helper";
// hooks
import { useAppRouter, useModule, useProjectEstimates } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -24,7 +26,9 @@ export const ModuleListItem: React.FC<Props> = observer((props) => {
const parentRef = useRef(null);
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
+ const searchParams = useSearchParams();
+ const pathname = usePathname();
// store hooks
const { getModuleById } = useModule();
const { isMobile } = usePlatformOS();
@@ -59,19 +63,12 @@ export const ModuleListItem: React.FC<Props> = observer((props) => {
const openModuleOverview = (e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => {
e.stopPropagation();
e.preventDefault();
- const { query } = router;
- if (query.peekModule) {
- delete query.peekModule;
- router.push({
- pathname: router.pathname,
- query: { ...query },
- });
+ const query = generateQueryParams(searchParams, ["peekModule"]);
+ if (searchParams.has("peekModule")) {
+ router.push(`${pathname}?${query}`);
} else {
- router.push({
- pathname: router.pathname,
- query: { ...query, peekModule: moduleId },
- });
+ router.push(`${pathname}?${query}&peekModule=${moduleId}`);
}
};
diff --git a/web/components/modules/module-peek-overview.tsx b/web/components/modules/module-peek-overview.tsx
index a157470b6d..22c57a5d21 100644
--- a/web/components/modules/module-peek-overview.tsx
+++ b/web/components/modules/module-peek-overview.tsx
@@ -1,7 +1,8 @@
import React, { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
// hooks
+import { generateQueryParams } from "@/helpers/router.helper";
import { useModule } from "@/hooks/store";
// components
import { ModuleDetailsSidebar } from "./sidebar";
@@ -15,18 +16,17 @@ type Props = {
export const ModulePeekOverview: React.FC<Props> = observer(({ projectId, workspaceSlug, isArchived = false }) => {
// router
const router = useRouter();
- const { peekModule } = router.query;
+ const pathname = usePathname();
+ const searchParams = useSearchParams();
+ const peekModule = searchParams.get("peekModule");
// refs
const ref = React.useRef(null);
// store hooks
const { fetchModuleDetails, fetchArchivedModuleDetails } = useModule();
const handleClose = () => {
- delete router.query.peekModule;
- router.push({
- pathname: router.pathname,
- query: { ...router.query },
- });
+ const query = generateQueryParams(searchParams, ["peekModule"]);
+ router.push(`${pathname}?${query}`);
};
useEffect(() => {
diff --git a/web/components/modules/module-view-header.tsx b/web/components/modules/module-view-header.tsx
index 426bca68c3..7721cb28b9 100644
--- a/web/components/modules/module-view-header.tsx
+++ b/web/components/modules/module-view-header.tsx
@@ -1,6 +1,6 @@
import React, { FC, useCallback, useRef, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { ListFilter, Search, X } from "lucide-react";
// helpers
@@ -26,8 +26,7 @@ export const ModuleViewHeader: FC = observer(() => {
const inputRef = useRef<HTMLInputElement>(null);
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// hooks
const { isMobile } = usePlatformOS();
diff --git a/web/components/modules/modules-list-view.tsx b/web/components/modules/modules-list-view.tsx
index d211c60219..b62393062b 100644
--- a/web/components/modules/modules-list-view.tsx
+++ b/web/components/modules/modules-list-view.tsx
@@ -1,6 +1,6 @@
import { observer } from "mobx-react-lite";
import Image from "next/image";
-import { useRouter } from "next/router";
+import { useParams, useSearchParams } from "next/navigation";
// components
import { ListLayout } from "@/components/core/list";
import { EmptyState } from "@/components/empty-state";
@@ -15,8 +15,9 @@ import NameFilterImage from "public/empty-state/module/name-filter.svg";
export const ModulesListView: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId, peekModule } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const searchParams = useSearchParams();
+ const peekModule = searchParams.get("peekModule");
// store hooks
const { toggleCreateModuleModal } = useCommandPalette();
const { setTrackElement } = useEventTracker();
diff --git a/web/components/modules/quick-actions.tsx b/web/components/modules/quick-actions.tsx
index d7b7a23ef7..5b66dd2e4a 100644
--- a/web/components/modules/quick-actions.tsx
+++ b/web/components/modules/quick-actions.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
// icons
import { ArchiveRestoreIcon, ExternalLink, LinkIcon, Pencil, Trash2 } from "lucide-react";
// ui
diff --git a/web/components/modules/sidebar.tsx b/web/components/modules/sidebar.tsx
index 9688db1890..47f901e886 100644
--- a/web/components/modules/sidebar.tsx
+++ b/web/components/modules/sidebar.tsx
@@ -1,7 +1,7 @@
import React, { useCallback, useEffect, useState } from "react";
import isEqual from "lodash/isEqual";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams, useRouter, useSearchParams } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import {
AlertCircle,
@@ -76,7 +76,9 @@ export const ModuleDetailsSidebar: React.FC<Props> = observer((props) => {
const [selectedLinkToUpdate, setSelectedLinkToUpdate] = useState<ILinkDetails | null>(null);
// router
const router = useRouter();
- const { workspaceSlug, projectId, peekModule } = router.query;
+ const { workspaceSlug, projectId } = useParams();
+ const searchParams = useSearchParams();
+ const peekModule = searchParams.get("peekModule");
// store hooks
const {
membership: { currentProjectRole },
diff --git a/web/components/notifications/notification-card.tsx b/web/components/notifications/notification-card.tsx
index cfae8a7c12..e7f9c5b7d3 100644
--- a/web/components/notifications/notification-card.tsx
+++ b/web/components/notifications/notification-card.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useRef } from "react";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { ArchiveRestore, Clock, MessageSquare, MoreVertical, User2 } from "lucide-react";
import { Menu } from "@headlessui/react";
// type
@@ -50,8 +50,7 @@ export const NotificationCard: React.FC<NotificationCardProps> = (props) => {
// store hooks
const { captureEvent } = useEventTracker();
const { isMobile } = usePlatformOS();
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// states
const [showSnoozeOptions, setShowSnoozeOptions] = React.useState(false);
// refs
diff --git a/web/components/notifications/select-snooze-till-modal.tsx b/web/components/notifications/select-snooze-till-modal.tsx
index a6e4c5466e..239eca0656 100644
--- a/web/components/notifications/select-snooze-till-modal.tsx
+++ b/web/components/notifications/select-snooze-till-modal.tsx
@@ -1,5 +1,5 @@
import { Fragment, FC } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { useForm, Controller } from "react-hook-form";
import { X } from "lucide-react";
import { Transition, Dialog } from "@headlessui/react";
@@ -38,8 +38,7 @@ const timeStamps = allTimeIn30MinutesInterval12HoursFormat;
export const SnoozeNotificationModal: FC<SnoozeModalProps> = (props) => {
const { isOpen, onClose, notification, onSuccess, onSubmit: handleSubmitSnooze } = props;
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const {
formState: { isSubmitting },
diff --git a/web/components/onboarding/switch-account-modal.tsx b/web/components/onboarding/switch-account-modal.tsx
index 35f23588d5..6333f5ce96 100644
--- a/web/components/onboarding/switch-account-modal.tsx
+++ b/web/components/onboarding/switch-account-modal.tsx
@@ -1,5 +1,5 @@
import React, { useState } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { useTheme } from "next-themes";
import { ArrowRightLeft } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
diff --git a/web/components/pages/editor/editor-body.tsx b/web/components/pages/editor/editor-body.tsx
index 28f8790131..330c626ebb 100644
--- a/web/components/pages/editor/editor-body.tsx
+++ b/web/components/pages/editor/editor-body.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// document-editor
import {
DocumentEditorWithRef,
@@ -49,8 +49,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
updateMarkings,
} = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { data: currentUser } = useUser();
const { getWorkspaceBySlug } = useWorkspace();
diff --git a/web/components/pages/modals/create-page-modal.tsx b/web/components/pages/modals/create-page-modal.tsx
index 747cba275e..b98697554b 100644
--- a/web/components/pages/modals/create-page-modal.tsx
+++ b/web/components/pages/modals/create-page-modal.tsx
@@ -1,5 +1,5 @@
import { FC, useEffect, useState } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
// types
import { TPage } from "@plane/types";
// components
diff --git a/web/components/profile/activity/download-button.tsx b/web/components/profile/activity/download-button.tsx
index d930a4e308..4f03b23692 100644
--- a/web/components/profile/activity/download-button.tsx
+++ b/web/components/profile/activity/download-button.tsx
@@ -1,5 +1,5 @@
import { useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// services
// ui
import { Button } from "@plane/ui";
@@ -13,8 +13,7 @@ export const DownloadActivityButton = () => {
// states
const [isDownloading, setIsDownloading] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
const handleDownload = async () => {
const today = renderFormattedPayloadDate(new Date());
diff --git a/web/components/profile/activity/workspace-activity-list.tsx b/web/components/profile/activity/workspace-activity-list.tsx
index 25a69fe1c6..2511700059 100644
--- a/web/components/profile/activity/workspace-activity-list.tsx
+++ b/web/components/profile/activity/workspace-activity-list.tsx
@@ -1,5 +1,5 @@
import { useEffect } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// services
import { USER_PROFILE_ACTIVITY } from "@/constants/fetch-keys";
@@ -21,8 +21,7 @@ type Props = {
export const WorkspaceActivityListPage: React.FC<Props> = (props) => {
const { cursor, perPage, updateResultsCount, updateTotalPages } = props;
// router
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
const { data: userProfileActivity } = useSWR(
workspaceSlug && userId
diff --git a/web/components/profile/index.ts b/web/components/profile/index.ts
index 35ac288adb..dac5f5641d 100644
--- a/web/components/profile/index.ts
+++ b/web/components/profile/index.ts
@@ -1,6 +1,5 @@
export * from "./activity";
export * from "./overview";
-export * from "./navbar";
export * from "./profile-issues-filter";
export * from "./sidebar";
export * from "./time";
diff --git a/web/components/profile/preferences/email-notification-form.tsx b/web/components/profile/notification/email-notification-form.tsx
similarity index 93%
rename from web/components/profile/preferences/email-notification-form.tsx
rename to web/components/profile/notification/email-notification-form.tsx
index 4f72f0dabb..5e1cddc23b 100644
--- a/web/components/profile/preferences/email-notification-form.tsx
+++ b/web/components/profile/notification/email-notification-form.tsx
@@ -57,14 +57,6 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
return (
<>
- <div className="flex gap-2 items-center pt-6 mb-2 pb-6 border-b border-custom-border-100">
- <div className="grow">
- <div className="pb-1 text-xl font-medium text-custom-text-100">Email notifications</div>
- <div className="text-sm font-normal text-custom-text-300">
- Stay in the loop on Issues you are subscribed to. Enable this to get notified.
- </div>
- </div>
- </div>
<div className="pt-2 text-lg font-medium text-custom-text-100">Notify me when:</div>
{/* Notification Settings */}
<div className="flex flex-col py-2">
diff --git a/web/components/profile/preferences/index.ts b/web/components/profile/notification/index.ts
similarity index 100%
rename from web/components/profile/preferences/index.ts
rename to web/components/profile/notification/index.ts
diff --git a/web/components/profile/overview/activity.tsx b/web/components/profile/overview/activity.tsx
index 50a67e7378..079ae76d6c 100644
--- a/web/components/profile/overview/activity.tsx
+++ b/web/components/profile/overview/activity.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// ui
import { Loader } from "@plane/ui";
@@ -20,8 +20,7 @@ import recentActivityEmptyState from "public/empty-state/recent_activity.svg";
const userService = new UserService();
export const ProfileActivity = observer(() => {
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
// store hooks
const { data: currentUser } = useUser();
diff --git a/web/components/profile/overview/stats.tsx b/web/components/profile/overview/stats.tsx
index f259b5f9c5..1b773ac0de 100644
--- a/web/components/profile/overview/stats.tsx
+++ b/web/components/profile/overview/stats.tsx
@@ -1,5 +1,5 @@
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// ui
import { UserCircle2 } from "lucide-react";
@@ -12,8 +12,7 @@ type Props = {
};
export const ProfileStats: React.FC<Props> = ({ userProfile }) => {
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
const overviewCards = [
{
diff --git a/web/components/profile/preferences/preferences-mobile-header.tsx b/web/components/profile/preferences/preferences-mobile-header.tsx
deleted file mode 100644
index 4d1e3505b4..0000000000
--- a/web/components/profile/preferences/preferences-mobile-header.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import Link from "next/link";
-import router from "next/router";
-// helpers
-import { cn } from "@/helpers/common.helper";
-
-export const PreferencesMobileHeader = () => {
- const profilePreferenceLinks: Array<{
- label: string;
- href: string;
- }> = [
- {
- label: "Theme",
- href: `/profile/preferences/theme`,
- },
- {
- label: "Email",
- href: `/profile/preferences/email`,
- },
- ];
-
- return (
- <div className={cn("sticky top-0 flex md:hidden w-full border-b border-custom-border-200")}>
- {profilePreferenceLinks.map((link, index) => (
- <Link
- key={index}
- href={link.href}
- className={cn(
- "flex justify-around py-2 w-full",
- router.asPath.includes(link.label.toLowerCase()) ? "border-b-2 border-custom-primary-100" : ""
- )}
- >
- <div className="text-sm text-custom-text-200">{link.label}</div>
- </Link>
- ))}
- </div>
- );
-};
diff --git a/web/components/profile/profile-issues-filter.tsx b/web/components/profile/profile-issues-filter.tsx
index faee981525..c6e3dec9f5 100644
--- a/web/components/profile/profile-issues-filter.tsx
+++ b/web/components/profile/profile-issues-filter.tsx
@@ -1,6 +1,6 @@
import { useCallback } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueLayouts } from "@plane/types";
// components
@@ -14,8 +14,7 @@ import { useIssues, useLabel } from "@/hooks/store";
export const ProfileIssuesFilter = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
// store hook
const {
issuesFilter: { issueFilters, updateFilters },
diff --git a/web/components/profile/profile-issues.tsx b/web/components/profile/profile-issues.tsx
index 4d722bfefc..ccca34bf13 100644
--- a/web/components/profile/profile-issues.tsx
+++ b/web/components/profile/profile-issues.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// components
import { EmptyState } from "@/components/empty-state";
@@ -21,8 +21,7 @@ interface IProfileIssuesPage {
export const ProfileIssuesPage = observer((props: IProfileIssuesPage) => {
const { type } = props;
- const router = useRouter();
- const { workspaceSlug, userId } = router.query as {
+ const { workspaceSlug, userId } = useParams() as {
workspaceSlug: string;
userId: string;
};
diff --git a/web/components/profile/sidebar.tsx b/web/components/profile/sidebar.tsx
index 75a1b2c015..b4dd477205 100644
--- a/web/components/profile/sidebar.tsx
+++ b/web/components/profile/sidebar.tsx
@@ -1,7 +1,7 @@
import { useEffect, useRef } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// icons
import { ChevronDown, Pencil } from "lucide-react";
@@ -31,8 +31,7 @@ export const ProfileSidebar = observer(() => {
// refs
const ref = useRef<HTMLDivElement>(null);
// router
- const router = useRouter();
- const { workspaceSlug, userId } = router.query;
+ const { workspaceSlug, userId } = useParams();
// store hooks
const { data: currentUser } = useUser();
const { profileSidebarCollapsed, toggleProfileSidebar } = useAppTheme();
diff --git a/web/components/project/card.tsx b/web/components/project/card.tsx
index 8f94c6bca3..055c676cea 100644
--- a/web/components/project/card.tsx
+++ b/web/components/project/card.tsx
@@ -1,7 +1,7 @@
import React, { useRef, useState } from "react";
import { observer } from "mobx-react-lite";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import { ArchiveRestoreIcon, Check, ExternalLink, LinkIcon, Lock, Settings, Trash2, UserPlus } from "lucide-react";
// types
import type { IProject } from "@plane/types";
@@ -45,7 +45,7 @@ export const ProjectCard: React.FC<Props> = observer((props) => {
const projectCardRef = useRef(null);
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { addProjectToFavorites, removeProjectFromFavorites } = useProject();
// hooks
diff --git a/web/components/project/confirm-project-member-remove.tsx b/web/components/project/confirm-project-member-remove.tsx
index be0c0a080f..dce460ba2b 100644
--- a/web/components/project/confirm-project-member-remove.tsx
+++ b/web/components/project/confirm-project-member-remove.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { AlertTriangle } from "lucide-react";
// headless ui
import { Dialog, Transition } from "@headlessui/react";
@@ -21,8 +21,7 @@ type Props = {
export const ConfirmProjectMemberRemove: React.FC<Props> = observer((props) => {
const { data, onSubmit, isOpen, onClose } = props;
// router
- const router = useRouter();
- const { projectId } = router.query;
+ const { projectId } = useParams();
// states
const [isDeleteLoading, setIsDeleteLoading] = useState(false);
// store hooks
diff --git a/web/components/project/delete-project-modal.tsx b/web/components/project/delete-project-modal.tsx
index de2eb041d2..af43179f94 100644
--- a/web/components/project/delete-project-modal.tsx
+++ b/web/components/project/delete-project-modal.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import { AlertTriangle } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
@@ -30,7 +30,7 @@ export const DeleteProjectModal: React.FC<DeleteProjectModal> = (props) => {
const { deleteProject } = useProject();
// router
const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// form info
const {
control,
diff --git a/web/components/project/integration-card.tsx b/web/components/project/integration-card.tsx
index 5fa606f254..00c5dd18f3 100644
--- a/web/components/project/integration-card.tsx
+++ b/web/components/project/integration-card.tsx
@@ -1,6 +1,6 @@
import React from "react";
import Image from "next/image";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR, { mutate } from "swr";
import { IWorkspaceIntegration } from "@plane/types";
// ui
@@ -34,8 +34,7 @@ const integrationDetails: { [key: string]: any } = {
const projectService = new ProjectService();
export const IntegrationCard: React.FC<Props> = ({ integration }) => {
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
const { data: syncedGithubRepository } = useSWR(
projectId ? PROJECT_GITHUB_REPOSITORY(projectId as string) : null,
diff --git a/web/components/project/join-project-modal.tsx b/web/components/project/join-project-modal.tsx
index a5717b80a8..48672ab17d 100644
--- a/web/components/project/join-project-modal.tsx
+++ b/web/components/project/join-project-modal.tsx
@@ -1,5 +1,5 @@
import { useState, Fragment } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Transition, Dialog } from "@headlessui/react";
import type { IProject } from "@plane/types";
// hooks
diff --git a/web/components/project/leave-project-modal.tsx b/web/components/project/leave-project-modal.tsx
index 9dba479962..a4272702a3 100644
--- a/web/components/project/leave-project-modal.tsx
+++ b/web/components/project/leave-project-modal.tsx
@@ -1,6 +1,6 @@
import { FC, Fragment } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
// headless ui
import { AlertTriangleIcon } from "lucide-react";
@@ -35,7 +35,7 @@ export const LeaveProjectModal: FC<ILeaveProjectModal> = observer((props) => {
const { project, isOpen, onClose } = props;
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { captureEvent } = useEventTracker();
const {
diff --git a/web/components/project/member-list-item.tsx b/web/components/project/member-list-item.tsx
index 597b3c61e4..a148a03f81 100644
--- a/web/components/project/member-list-item.tsx
+++ b/web/components/project/member-list-item.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// icons
import { ChevronDown, Dot, XCircle } from "lucide-react";
// ui
@@ -26,7 +26,7 @@ export const ProjectMemberListItem: React.FC<Props> = observer((props) => {
const [removeMemberModal, setRemoveMemberModal] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const {
membership: { currentProjectRole, leaveProject },
diff --git a/web/components/project/project-settings-member-defaults.tsx b/web/components/project/project-settings-member-defaults.tsx
index 50ed5a6ae6..2145b6dd55 100644
--- a/web/components/project/project-settings-member-defaults.tsx
+++ b/web/components/project/project-settings-member-defaults.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import useSWR from "swr";
import { IProject, IUserLite, IWorkspace } from "@plane/types";
@@ -22,8 +22,7 @@ const defaultValues: Partial<IProject> = {
export const ProjectSettingsMemberDefaults: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const {
membership: { currentProjectRole },
diff --git a/web/components/project/publish-project/modal.tsx b/web/components/project/publish-project/modal.tsx
index bec4e7f17a..d7807d5502 100644
--- a/web/components/project/publish-project/modal.tsx
+++ b/web/components/project/publish-project/modal.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import { Check, ExternalLink, Globe2 } from "lucide-react";
// types
@@ -45,8 +45,7 @@ export const PublishProjectModal: React.FC<Props> = observer((props) => {
// states
const [isUnPublishing, setIsUnPublishing] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
fetchPublishSettings,
diff --git a/web/components/project/send-project-invitation-modal.tsx b/web/components/project/send-project-invitation-modal.tsx
index 9faa526caf..8417303fad 100644
--- a/web/components/project/send-project-invitation-modal.tsx
+++ b/web/components/project/send-project-invitation-modal.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { useForm, Controller, useFieldArray } from "react-hook-form";
import { ChevronDown, Plus, X } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
@@ -41,8 +41,7 @@ const defaultValues: FormValues = {
export const SendProjectInvitationModal: React.FC<Props> = observer((props) => {
const { isOpen, onClose, onSuccess } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { captureEvent } = useEventTracker();
const {
diff --git a/web/components/project/settings/archive-project/archive-restore-modal.tsx b/web/components/project/settings/archive-project/archive-restore-modal.tsx
index 88361895c9..ba2ba9104f 100644
--- a/web/components/project/settings/archive-project/archive-restore-modal.tsx
+++ b/web/components/project/settings/archive-project/archive-restore-modal.tsx
@@ -1,5 +1,5 @@
import { useState, Fragment } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Dialog, Transition } from "@headlessui/react";
// ui
import { Button, TOAST_TYPE, setToast } from "@plane/ui";
diff --git a/web/components/project/sidebar-list-item.tsx b/web/components/project/sidebar-list-item.tsx
index 2bf79de72c..b451e0a32a 100644
--- a/web/components/project/sidebar-list-item.tsx
+++ b/web/components/project/sidebar-list-item.tsx
@@ -6,7 +6,7 @@ import { setCustomNativeDragPreview } from "@atlaskit/pragmatic-drag-and-drop/el
import { attachInstruction, extractInstruction } from "@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { createRoot } from "react-dom/client";
// icons
import {
@@ -123,9 +123,10 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
const actionSectionRef = useRef<HTMLDivElement | null>(null);
const projectRef = useRef<HTMLDivElement | null>(null);
const dragHandleRef = useRef<HTMLButtonElement | null>(null);
- // router
- const router = useRouter();
- const { workspaceSlug, projectId: URLProjectId } = router.query;
+ // router params
+ const { workspaceSlug, projectId: URLProjectId } = useParams();
+ // pathname
+ const pathname = usePathname();
// derived values
const project = getProjectById(projectId);
// auth
@@ -477,7 +478,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
>
<div
className={`group flex items-center gap-2.5 rounded-md px-2 py-1.5 text-xs font-medium outline-none ${
- router.asPath.includes(item.href)
+ pathname.includes(item.href)
? "bg-custom-primary-100/10 text-custom-primary-100"
: "text-custom-sidebar-text-300 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
} ${isCollapsed ? "justify-center" : ""}`}
diff --git a/web/components/project/sidebar-list.tsx b/web/components/project/sidebar-list.tsx
index 698869f98a..35c2a5ed43 100644
--- a/web/components/project/sidebar-list.tsx
+++ b/web/components/project/sidebar-list.tsx
@@ -2,7 +2,7 @@ import { useState, FC, useRef, useEffect } from "react";
import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { ChevronDown, ChevronRight, Plus } from "lucide-react";
import { Disclosure, Transition } from "@headlessui/react";
// types
@@ -47,9 +47,8 @@ export const ProjectSidebarList: FC = observer(() => {
favoriteProjectIds: favoriteProjects,
updateProjectView,
} = useProject();
- // router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;
diff --git a/web/components/states/create-state-modal.tsx b/web/components/states/create-state-modal.tsx
index 1075c62413..99b69a58ff 100644
--- a/web/components/states/create-state-modal.tsx
+++ b/web/components/states/create-state-modal.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { TwitterPicker } from "react-color";
import { Controller, useForm } from "react-hook-form";
import { ChevronDown } from "lucide-react";
@@ -32,8 +32,7 @@ const defaultValues: Partial<IState> = {
export const CreateStateModal: React.FC<Props> = observer((props) => {
const { isOpen, projectId, handleClose } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { createState } = useProjectState();
// form info
diff --git a/web/components/states/create-update-state-inline.tsx b/web/components/states/create-update-state-inline.tsx
index 1029c9e35e..57f716dfc6 100644
--- a/web/components/states/create-update-state-inline.tsx
+++ b/web/components/states/create-update-state-inline.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { TwitterPicker } from "react-color";
import { useForm, Controller } from "react-hook-form";
import { Popover, Transition } from "@headlessui/react";
@@ -34,8 +34,7 @@ const defaultValues: Partial<IState> = {
export const CreateUpdateStateInline: React.FC<Props> = observer((props) => {
const { data, onClose, selectedGroup, groupLength } = props;
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { captureProjectStateEvent, setTrackElement } = useEventTracker();
const { createState, updateState } = useProjectState();
diff --git a/web/components/states/delete-state-modal.tsx b/web/components/states/delete-state-modal.tsx
index 353f88a45f..b71c8fa210 100644
--- a/web/components/states/delete-state-modal.tsx
+++ b/web/components/states/delete-state-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import type { IState } from "@plane/types";
// ui
@@ -23,8 +23,7 @@ export const DeleteStateModal: React.FC<Props> = observer((props) => {
// states
const [isDeleteLoading, setIsDeleteLoading] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { captureProjectStateEvent } = useEventTracker();
const { deleteState } = useProjectState();
diff --git a/web/components/states/project-setting-state-list-item.tsx b/web/components/states/project-setting-state-list-item.tsx
index 01ac01c0e8..97de0bdadd 100644
--- a/web/components/states/project-setting-state-list-item.tsx
+++ b/web/components/states/project-setting-state-list-item.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { Pencil, X, ArrowDown, ArrowUp } from "lucide-react";
// types
@@ -24,8 +24,7 @@ export const StatesListItem: React.FC<Props> = observer((props) => {
// states
const [isSubmitting, setIsSubmitting] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { setTrackElement } = useEventTracker();
const { markStateAsDefault, moveStatePosition } = useProjectState();
diff --git a/web/components/states/project-setting-state-list.tsx b/web/components/states/project-setting-state-list.tsx
index 75d49293a0..3a8b55b2fd 100644
--- a/web/components/states/project-setting-state-list.tsx
+++ b/web/components/states/project-setting-state-list.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// hooks
import { Plus } from "lucide-react";
@@ -18,8 +18,7 @@ import { useEventTracker, useProjectState } from "@/hooks/store";
export const ProjectSettingStateList: React.FC = observer(() => {
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store
const { setTrackElement } = useEventTracker();
const { groupedProjectStates, projectStates, fetchProjectStates } = useProjectState();
diff --git a/web/components/ui/index.ts b/web/components/ui/index.ts
index 87a9686b6d..e441b896f2 100644
--- a/web/components/ui/index.ts
+++ b/web/components/ui/index.ts
@@ -1,7 +1,6 @@
export * from "./graphs";
export * from "./empty-space";
export * from "./labels-list";
-export * from "./multi-level-dropdown";
export * from "./markdown-to-component";
export * from "./integration-and-import-export-banner";
export * from "./profile-empty-state";
diff --git a/web/components/ui/multi-level-dropdown.tsx b/web/components/ui/multi-level-dropdown.tsx
deleted file mode 100644
index f32b19ac0b..0000000000
--- a/web/components/ui/multi-level-dropdown.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-import { Fragment, useState } from "react";
-
-// headless ui
-import { Check, ChevronDown, ChevronLeft, ChevronRight } from "lucide-react";
-import { Menu, Transition } from "@headlessui/react";
-// ui
-import { Loader } from "@plane/ui";
-// icons
-
-type MultiLevelDropdownProps = {
- label: string;
- options: {
- id: string;
- children?: {
- id: string;
- label: string | JSX.Element;
- value: any;
- selected?: boolean;
- element?: JSX.Element;
- }[];
- hasChildren: boolean;
- label: string;
- onClick?: () => void;
- selected?: boolean;
- value: any;
- }[];
- onSelect: (value: any) => void;
- direction?: "left" | "right";
- height?: "sm" | "md" | "rg" | "lg";
-};
-
-export const MultiLevelDropdown: React.FC<MultiLevelDropdownProps> = ({
- label,
- options,
- onSelect,
- direction = "right",
- height = "md",
-}) => {
- const [openChildFor, setOpenChildFor] = useState<string | null>(null);
-
- return (
- <>
- <Menu as="div" className="relative z-10 inline-block text-left">
- {({ open }) => (
- <>
- <div>
- <Menu.Button
- onClick={() => setOpenChildFor(null)}
- className={`group flex items-center justify-between gap-2 rounded-md border border-custom-border-200 px-3 py-1.5 text-xs shadow-sm duration-300 hover:bg-custom-background-90 hover:text-custom-text-100 focus:outline-none ${
- open ? "bg-custom-background-90 text-custom-text-100" : "text-custom-text-200"
- }`}
- >
- {label}
- <ChevronDown className="h-3 w-3" aria-hidden="true" />
- </Menu.Button>
- </div>
- <Transition
- as={Fragment}
- enter="transition ease-out duration-100"
- enterFrom="transform opacity-0 scale-95"
- enterTo="transform opacity-100 scale-100"
- leave="transition ease-in duration-75"
- leaveFrom="transform opacity-100 scale-100"
- leaveTo="transform opacity-0 scale-95"
- >
- <Menu.Items
- static
- className="absolute right-0 z-10 mt-1 w-36 origin-top-right select-none rounded-md border border-custom-border-300 bg-custom-background-90 text-xs shadow-lg focus:outline-none"
- >
- {options.map((option) => (
- <div className="relative p-1" key={option.id}>
- <Menu.Item
- as="button"
- onClick={(e: any) => {
- if (option.hasChildren) {
- e?.stopPropagation();
- e?.preventDefault();
-
- if (option.onClick) option.onClick();
-
- if (openChildFor === option.id) setOpenChildFor(null);
- else setOpenChildFor(option.id);
- } else onSelect(option.value);
- }}
- className="w-full"
- >
- {({ active }) => (
- <>
- <div
- className={`${
- active || option.selected ? "bg-custom-background-80" : ""
- } flex items-center gap-1 rounded px-1 py-1.5 text-custom-text-200 ${
- direction === "right" ? "justify-between" : ""
- }`}
- >
- {direction === "left" && option.hasChildren && <ChevronLeft className="h-3.5 w-3.5" />}
- <span>{option.label}</span>
- {direction === "right" && option.hasChildren && <ChevronRight className="h-3.5 w-3.5" />}
- </div>
- </>
- )}
- </Menu.Item>
- {option.hasChildren && option.id === openChildFor && (
- <div
- className={`min-w-36 absolute top-0 origin-top-right select-none overflow-y-scroll whitespace-nowrap rounded-md border border-custom-border-300 bg-custom-background-90 shadow-lg focus:outline-none ${
- direction === "left" ? "right-full -translate-x-1" : "left-full translate-x-1"
- } ${
- height === "sm"
- ? "max-h-28"
- : height === "md"
- ? "max-h-44"
- : height === "rg"
- ? "max-h-56"
- : height === "lg"
- ? "max-h-80"
- : ""
- }`}
- >
- {option.children ? (
- <div className="space-y-1 p-1">
- {option.children.length === 0 ? (
- <p className="px-1 py-1.5 text-center text-custom-text-200">No {option.label} found</p> //if no children found, show this message.
- ) : (
- option.children.map((child) => {
- if (child.element) return child.element;
- else
- return (
- <button
- key={child.id}
- type="button"
- onClick={() => onSelect(child.value)}
- className={`${
- child.selected ? "bg-custom-background-80" : ""
- } flex w-full items-center justify-between break-words rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80`}
- >
- {child.label}{" "}
- <Check
- className={`h-3.5 w-3.5 opacity-0 ${child.selected ? "opacity-100" : ""}`}
- />
- </button>
- );
- })
- )}
- </div>
- ) : (
- <Loader className="space-y-2 p-1">
- <Loader.Item height="20px" />
- <Loader.Item height="20px" />
- <Loader.Item height="20px" />
- <Loader.Item height="20px" />
- </Loader>
- )}
- </div>
- )}
- </div>
- ))}
- </Menu.Items>
- </Transition>
- </>
- )}
- </Menu>
- </>
- );
-};
diff --git a/web/components/views/delete-view-modal.tsx b/web/components/views/delete-view-modal.tsx
index 2555ceb41f..249c72b26d 100644
--- a/web/components/views/delete-view-modal.tsx
+++ b/web/components/views/delete-view-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IProjectView } from "@plane/types";
// ui
@@ -21,8 +21,7 @@ export const DeleteProjectViewModal: React.FC<Props> = observer((props) => {
// states
const [isDeleteLoading, setIsDeleteLoading] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { deleteView } = useProjectView();
diff --git a/web/components/views/view-list-item-action.tsx b/web/components/views/view-list-item-action.tsx
index 80ba5ba0ca..277e370b8f 100644
--- a/web/components/views/view-list-item-action.tsx
+++ b/web/components/views/view-list-item-action.tsx
@@ -1,6 +1,6 @@
import React, { FC, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IProjectView } from "@plane/types";
// components
@@ -25,8 +25,7 @@ export const ViewListItemAction: FC<Props> = observer((props) => {
const [createUpdateViewModal, setCreateUpdateViewModal] = useState(false);
const [deleteViewModal, setDeleteViewModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store
const {
membership: { currentProjectRole },
diff --git a/web/components/views/view-list-item.tsx b/web/components/views/view-list-item.tsx
index 8d8e3f4323..e3b1e62a07 100644
--- a/web/components/views/view-list-item.tsx
+++ b/web/components/views/view-list-item.tsx
@@ -1,6 +1,6 @@
import { FC, useRef, useState } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IProjectView, TLogoProps } from "@plane/types";
// ui
@@ -26,8 +26,7 @@ export const ProjectViewListItem: FC<Props> = observer((props) => {
// state
const [isOpen, setIsOpen] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// store hooks
const { isMobile } = usePlatformOS();
const { updateView } = useProjectView();
diff --git a/web/components/web-hooks/create-webhook-modal.tsx b/web/components/web-hooks/create-webhook-modal.tsx
index 99c14d493b..5db7ef8df0 100644
--- a/web/components/web-hooks/create-webhook-modal.tsx
+++ b/web/components/web-hooks/create-webhook-modal.tsx
@@ -1,5 +1,5 @@
import React, { useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IWebhook, IWorkspace, TWebhookEventTypes } from "@plane/types";
// ui
@@ -33,8 +33,7 @@ export const CreateWebhookModal: React.FC<ICreateWebhookModal> = (props) => {
// states
const [generatedWebhook, setGeneratedKey] = useState<IWebhook | null>(null);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const handleCreateWebhook = async (formData: IWebhook, webhookEventType: TWebhookEventTypes) => {
if (!workspaceSlug) return;
diff --git a/web/components/web-hooks/delete-webhook-modal.tsx b/web/components/web-hooks/delete-webhook-modal.tsx
index a8d3ae4294..d27eb37186 100644
--- a/web/components/web-hooks/delete-webhook-modal.tsx
+++ b/web/components/web-hooks/delete-webhook-modal.tsx
@@ -1,5 +1,5 @@
import React, { FC, useState } from "react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// ui
import { TOAST_TYPE, setToast } from "@plane/ui";
// components
@@ -21,7 +21,7 @@ export const DeleteWebhookModal: FC<IDeleteWebhook> = (props) => {
// store hooks
const { removeWebhook } = useWebhook();
- const { workspaceSlug, webhookId } = router.query;
+ const { workspaceSlug, webhookId } = useParams();
const handleClose = () => {
onClose();
diff --git a/web/components/web-hooks/form/secret-key.tsx b/web/components/web-hooks/form/secret-key.tsx
index bf71260d89..e8748bd796 100644
--- a/web/components/web-hooks/form/secret-key.tsx
+++ b/web/components/web-hooks/form/secret-key.tsx
@@ -1,6 +1,6 @@
import { useState, FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { Copy, Eye, EyeOff, RefreshCw } from "lucide-react";
import { IWebhook } from "@plane/types";
@@ -27,8 +27,7 @@ export const WebhookSecretKey: FC<Props> = observer((props) => {
const [isRegenerating, setIsRegenerating] = useState(false);
const [shouldShowKey, setShouldShowKey] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug, webhookId } = router.query;
+ const { workspaceSlug, webhookId } = useParams();
// store hooks
const { currentWorkspace } = useWorkspace();
const { currentWebhook, regenerateSecretKey, webhookSecretKey } = useWebhook();
diff --git a/web/components/web-hooks/webhooks-list-item.tsx b/web/components/web-hooks/webhooks-list-item.tsx
index 7388e9c7f2..9a4820c812 100644
--- a/web/components/web-hooks/webhooks-list-item.tsx
+++ b/web/components/web-hooks/webhooks-list-item.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { IWebhook } from "@plane/types";
// hooks
import { ToggleSwitch } from "@plane/ui";
@@ -15,8 +15,7 @@ interface IWebhookListItem {
export const WebhooksListItem: FC<IWebhookListItem> = (props) => {
const { webhook } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { updateWebhook } = useWebhook();
diff --git a/web/components/workspace/create-workspace-form.tsx b/web/components/workspace/create-workspace-form.tsx
index d96bf093fd..de094f0e66 100644
--- a/web/components/workspace/create-workspace-form.tsx
+++ b/web/components/workspace/create-workspace-form.tsx
@@ -1,6 +1,6 @@
import { Dispatch, SetStateAction, useEffect, useState, FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import { IWorkspace } from "@plane/types";
// ui
diff --git a/web/components/workspace/delete-workspace-modal.tsx b/web/components/workspace/delete-workspace-modal.tsx
index 45c1cbbb84..0e50f9944f 100644
--- a/web/components/workspace/delete-workspace-modal.tsx
+++ b/web/components/workspace/delete-workspace-modal.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
import { AlertTriangle } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
diff --git a/web/components/workspace/settings/invitations-list-item.tsx b/web/components/workspace/settings/invitations-list-item.tsx
index 3b7bd80411..9ca6928517 100644
--- a/web/components/workspace/settings/invitations-list-item.tsx
+++ b/web/components/workspace/settings/invitations-list-item.tsx
@@ -1,6 +1,6 @@
import { useState, FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { ChevronDown, XCircle } from "lucide-react";
// ui
import { CustomSelect, Tooltip, TOAST_TYPE, setToast } from "@plane/ui";
@@ -21,8 +21,7 @@ export const WorkspaceInvitationsListItem: FC<Props> = observer((props) => {
// states
const [removeMemberModal, setRemoveMemberModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
membership: { currentWorkspaceMemberInfo, currentWorkspaceRole },
diff --git a/web/components/workspace/settings/members-list-item.tsx b/web/components/workspace/settings/members-list-item.tsx
index 00a36b54ae..eb568e14c1 100644
--- a/web/components/workspace/settings/members-list-item.tsx
+++ b/web/components/workspace/settings/members-list-item.tsx
@@ -1,7 +1,7 @@
import { FC, useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// lucide icons
import { ChevronDown, Dot, XCircle } from "lucide-react";
// ui
@@ -25,7 +25,7 @@ export const WorkspaceMembersListItem: FC<Props> = observer((props) => {
const [removeMemberModal, setRemoveMemberModal] = useState(false);
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
// currentUser,
diff --git a/web/components/workspace/settings/members-list.tsx b/web/components/workspace/settings/members-list.tsx
index e5b66c7811..b0da45dde3 100644
--- a/web/components/workspace/settings/members-list.tsx
+++ b/web/components/workspace/settings/members-list.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// components
import { MembersSettingsLoader } from "@/components/ui";
@@ -11,8 +11,7 @@ import { useMember } from "@/hooks/store";
export const WorkspaceMembersList: FC<{ searchQuery: string }> = observer((props) => {
const { searchQuery } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const {
workspace: {
diff --git a/web/components/workspace/settings/mobile-workspace-settings-tabs.tsx b/web/components/workspace/settings/mobile-workspace-settings-tabs.tsx
index 1cea866bde..ad093115b6 100644
--- a/web/components/workspace/settings/mobile-workspace-settings-tabs.tsx
+++ b/web/components/workspace/settings/mobile-workspace-settings-tabs.tsx
@@ -1,14 +1,16 @@
-import router from "next/router";
+import { useParams, usePathname, useRouter } from "next/navigation";
import { WORKSPACE_SETTINGS_LINKS } from "@/constants/workspace";
const MobileWorkspaceSettingsTabs = () => {
- const { workspaceSlug } = router.query;
+ const router = useRouter();
+ const { workspaceSlug } = useParams();
+ const pathname = usePathname();
return (
<div className="flex-shrink-0 md:hidden sticky inset-0 flex overflow-x-auto bg-custom-background-100 z-10">
{WORKSPACE_SETTINGS_LINKS.map((item, index) => (
<div
className={`${
- item.highlight(router.asPath, `/${workspaceSlug}`)
+ item.highlight(pathname, `/${workspaceSlug}`)
? "text-custom-primary-100 text-sm py-2 px-3 whitespace-nowrap flex flex-grow cursor-pointer justify-around border-b border-custom-primary-200"
: "text-custom-text-200 flex flex-grow cursor-pointer justify-around border-b border-custom-border-200 text-sm py-2 px-3 whitespace-nowrap"
}`}
diff --git a/web/components/workspace/sidebar-dropdown.tsx b/web/components/workspace/sidebar-dropdown.tsx
index 6b063f8e7d..0029e8bb20 100644
--- a/web/components/workspace/sidebar-dropdown.tsx
+++ b/web/components/workspace/sidebar-dropdown.tsx
@@ -1,7 +1,7 @@
import { Fragment, Ref, useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { usePopper } from "react-popper";
// icons
import { Activity, Check, ChevronDown, LogOut, Mails, PlusSquare, Settings } from "lucide-react";
@@ -43,9 +43,8 @@ const profileLinks = (workspaceSlug: string, userId: string) => [
},
];
export const WorkspaceSidebarDropdown = observer(() => {
- // router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
// store hooks
const { sidebarCollapsed, toggleSidebar } = useAppTheme();
const { data: currentUser } = useUser();
diff --git a/web/components/workspace/sidebar-menu.tsx b/web/components/workspace/sidebar-menu.tsx
index c2d4168382..c6ebee5eee 100644
--- a/web/components/workspace/sidebar-menu.tsx
+++ b/web/components/workspace/sidebar-menu.tsx
@@ -1,7 +1,7 @@
import React from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams, usePathname } from "next/navigation";
import { Crown } from "lucide-react";
// ui
import { Tooltip } from "@plane/ui";
@@ -25,9 +25,10 @@ export const WorkspaceSidebarMenu = observer(() => {
const {
membership: { currentWorkspaceRole },
} = useUser();
- // router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
+ // pathname
+ const pathname = usePathname();
// computed
const workspaceMemberInfo = currentWorkspaceRole || EUserWorkspaceRoles.GUEST;
@@ -56,7 +57,7 @@ export const WorkspaceSidebarMenu = observer(() => {
>
<div
className={`group flex w-full items-center gap-2.5 rounded-md px-3 py-2 text-sm font-medium outline-none ${
- link.highlight(router.asPath, `/${workspaceSlug}`)
+ link.highlight(pathname, `/${workspaceSlug}`)
? "bg-custom-primary-100/10 text-custom-primary-100"
: "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
} ${sidebarCollapsed ? "justify-center" : ""}`}
diff --git a/web/components/workspace/views/default-view-list-item.tsx b/web/components/workspace/views/default-view-list-item.tsx
index c868082149..0d0e627b65 100644
--- a/web/components/workspace/views/default-view-list-item.tsx
+++ b/web/components/workspace/views/default-view-list-item.tsx
@@ -1,6 +1,6 @@
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// helpers
import { truncateText } from "@/helpers/string.helper";
@@ -9,8 +9,7 @@ type Props = { view: { key: string; label: string } };
export const GlobalDefaultViewListItem: React.FC<Props> = observer((props) => {
const { view } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
return (
<div className="group border-b border-custom-border-200 hover:bg-custom-background-90">
diff --git a/web/components/workspace/views/delete-view-modal.tsx b/web/components/workspace/views/delete-view-modal.tsx
index fadf62271c..5ada772740 100644
--- a/web/components/workspace/views/delete-view-modal.tsx
+++ b/web/components/workspace/views/delete-view-modal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// types
import { IWorkspaceView } from "@plane/types";
// ui
@@ -23,8 +23,7 @@ export const DeleteGlobalViewModal: React.FC<Props> = observer((props) => {
// states
const [isDeleteLoading, setIsDeleteLoading] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { deleteGlobalView } = useGlobalView();
const { captureEvent } = useEventTracker();
diff --git a/web/components/workspace/views/header.tsx b/web/components/workspace/views/header.tsx
index 2e381052a8..c5c90a4e0d 100644
--- a/web/components/workspace/views/header.tsx
+++ b/web/components/workspace/views/header.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useRef, useState } from "react";
import { observer } from "mobx-react-lite";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { Plus } from "lucide-react";
// types
@@ -22,8 +22,7 @@ const ViewTab = observer((props: { viewId: string }) => {
// refs
const parentRef = useRef<HTMLDivElement>(null);
// router
- const router = useRouter();
- const { workspaceSlug, globalViewId } = router.query;
+ const { workspaceSlug, globalViewId } = useParams();
// store hooks
const { getViewDetailsById } = useGlobalView();
@@ -54,8 +53,7 @@ const DefaultViewTab = (props: {
// refs
const parentRef = useRef<HTMLDivElement>(null);
// router
- const router = useRouter();
- const { workspaceSlug, globalViewId } = router.query;
+ const { workspaceSlug, globalViewId } = useParams();
if (!workspaceSlug || !globalViewId) return null;
return (
@@ -75,8 +73,7 @@ export const GlobalViewsHeader: React.FC = observer(() => {
const [createViewModal, setCreateViewModal] = useState(false);
const containerRef = useRef<HTMLDivElement>(null);
// router
- const router = useRouter();
- const { globalViewId } = router.query;
+ const { globalViewId } = useParams();
// store hooks
const { currentWorkspaceViews } = useGlobalView();
const {
diff --git a/web/components/workspace/views/modal.tsx b/web/components/workspace/views/modal.tsx
index 22e740d927..6a87acd355 100644
--- a/web/components/workspace/views/modal.tsx
+++ b/web/components/workspace/views/modal.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams, useRouter } from "next/navigation";
// types
import { IWorkspaceView } from "@plane/types";
// ui
@@ -24,7 +24,7 @@ export const CreateUpdateWorkspaceViewModal: React.FC<Props> = observer((props)
const { isOpen, onClose, data, preLoadedData } = props;
// router
const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { createGlobalView, updateGlobalView } = useGlobalView();
const { captureEvent } = useEventTracker();
diff --git a/web/components/workspace/views/view-list-item.tsx b/web/components/workspace/views/view-list-item.tsx
index 5da007745f..a789d62f54 100644
--- a/web/components/workspace/views/view-list-item.tsx
+++ b/web/components/workspace/views/view-list-item.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// icons
import { Pencil, Trash2 } from "lucide-react";
// ui
@@ -22,8 +22,7 @@ export const GlobalViewListItem: React.FC<Props> = observer((props) => {
const [updateViewModal, setUpdateViewModal] = useState(false);
const [deleteViewModal, setDeleteViewModal] = useState(false);
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { getViewDetailsById } = useGlobalView();
const { setTrackElement } = useEventTracker();
diff --git a/web/components/workspace/views/views-list.tsx b/web/components/workspace/views/views-list.tsx
index edc6285016..ec2cc5e8e6 100644
--- a/web/components/workspace/views/views-list.tsx
+++ b/web/components/workspace/views/views-list.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// components
import { ViewListLoader } from "@/components/ui";
@@ -14,8 +14,7 @@ type Props = {
export const GlobalViewsList: React.FC<Props> = observer((props) => {
const { searchQuery } = props;
// router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
// store hooks
const { fetchAllGlobalViews, currentWorkspaceViews, getSearchedViews } = useGlobalView();
diff --git a/web/constants/profile.ts b/web/constants/profile.ts
index 4d8e37640a..111332d73b 100644
--- a/web/constants/profile.ts
+++ b/web/constants/profile.ts
@@ -1,6 +1,6 @@
import React from "react";
// icons
-import { Activity, CircleUser, KeyRound, LucideProps, Settings2 } from "lucide-react";
+import { Activity, Bell, CircleUser, KeyRound, LucideProps, Settings2 } from "lucide-react";
export const PROFILE_ACTION_LINKS: {
key: string;
@@ -17,10 +17,10 @@ export const PROFILE_ACTION_LINKS: {
Icon: CircleUser,
},
{
- key: "change-password",
- label: "Change password",
- href: `/profile/change-password`,
- highlight: (pathname: string) => pathname === "/profile/change-password",
+ key: "security",
+ label: "Security",
+ href: `/profile/security`,
+ highlight: (pathname: string) => pathname === "/profile/security",
Icon: KeyRound,
},
{
@@ -31,19 +31,26 @@ export const PROFILE_ACTION_LINKS: {
Icon: Activity,
},
{
- key: "preferences",
- label: "Preferences",
- href: `/profile/preferences/theme`,
- highlight: (pathname: string) => pathname.includes("/profile/preferences"),
- Icon: Settings2,
- },
+ key: "appearance",
+ label: "Appearance",
+ href: `/profile/appearance`,
+ highlight: (pathname: string) => pathname.includes("/profile/appearance"),
+ Icon: Settings2,
+ },
+ {
+ key: "notifications",
+ label: "Notifications",
+ href: `/profile/notifications`,
+ highlight: (pathname: string) => pathname === "/profile/notifications",
+ Icon: Bell,
+ },
];
export const PROFILE_VIEWER_TAB = [
{
route: "",
label: "Summary",
- selected: "/[workspaceSlug]/profile/[userId]",
+ selected: "",
},
];
@@ -51,21 +58,21 @@ export const PROFILE_ADMINS_TAB = [
{
route: "assigned",
label: "Assigned",
- selected: "/[workspaceSlug]/profile/[userId]/assigned",
+ selected: "/assigned",
},
{
route: "created",
label: "Created",
- selected: "/[workspaceSlug]/profile/[userId]/created",
+ selected: "/created",
},
{
route: "subscribed",
label: "Subscribed",
- selected: "/[workspaceSlug]/profile/[userId]/subscribed",
+ selected: "/subscribed",
},
{
route: "activity",
label: "Activity",
- selected: "/[workspaceSlug]/profile/[userId]/activity",
+ selected: "/activity",
},
];
diff --git a/web/helpers/router.helper.ts b/web/helpers/router.helper.ts
new file mode 100644
index 0000000000..4b795e7e2a
--- /dev/null
+++ b/web/helpers/router.helper.ts
@@ -0,0 +1,9 @@
+import { ReadonlyURLSearchParams } from "next/navigation";
+
+export const generateQueryParams = (searchParams: ReadonlyURLSearchParams, excludedParamKeys?: string[]): string => {
+ const params = new URLSearchParams(searchParams);
+ excludedParamKeys && excludedParamKeys.forEach((key) => {
+ params.delete(key);
+ });
+ return params.toString();
+};
diff --git a/web/helpers/user.helper.ts b/web/helpers/user.helper.ts
index 2b053a31c4..286fdc73ab 100644
--- a/web/helpers/user.helper.ts
+++ b/web/helpers/user.helper.ts
@@ -1,6 +1,7 @@
+import { EUserProjectRoles } from "@/constants/project";
import { EUserWorkspaceRoles } from "@/constants/workspace";
-export const getUserRole = (role: EUserWorkspaceRoles) => {
+export const getUserRole = (role: EUserWorkspaceRoles | EUserProjectRoles) => {
switch (role) {
case EUserWorkspaceRoles.GUEST:
return "GUEST";
diff --git a/web/hooks/store/use-mention.ts b/web/hooks/store/use-mention.ts
index b6a1338370..6d183e0fbd 100644
--- a/web/hooks/store/use-mention.ts
+++ b/web/hooks/store/use-mention.ts
@@ -1,3 +1,5 @@
+"use client";
+
import { useRef, useEffect } from "react";
// types
import { IUser, IUserLite } from "@plane/types";
diff --git a/web/hooks/use-group-dragndrop.ts b/web/hooks/use-group-dragndrop.ts
index f33129baef..4b5ad80fa8 100644
--- a/web/hooks/use-group-dragndrop.ts
+++ b/web/hooks/use-group-dragndrop.ts
@@ -1,4 +1,4 @@
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { TIssue, TIssueGroupByOptions, TIssueOrderByOptions } from "@plane/types";
import { TOAST_TYPE, setToast } from "@plane/ui";
import { GroupDropLocation, handleGroupDragDrop } from "@/components/issues/issue-layouts/utils";
@@ -22,8 +22,7 @@ export const useGroupIssuesDragNDrop = (
groupBy: TIssueGroupByOptions | undefined,
subGroupBy?: TIssueGroupByOptions
) => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const {
issue: { getIssueById },
diff --git a/web/hooks/use-integration-popup.tsx b/web/hooks/use-integration-popup.tsx
index fb9aab2238..371aef0064 100644
--- a/web/hooks/use-integration-popup.tsx
+++ b/web/hooks/use-integration-popup.tsx
@@ -1,5 +1,5 @@
import { useRef, useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
const useIntegrationPopup = ({
provider,
@@ -14,8 +14,7 @@ const useIntegrationPopup = ({
}) => {
const [authLoader, setAuthLoader] = useState(false);
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
const providerUrls: { [key: string]: string } = {
github: `https://github.com/apps/${github_app_name}/installations/new?state=${workspaceSlug?.toString()}`,
diff --git a/web/hooks/use-multiple-select.ts b/web/hooks/use-multiple-select.ts
index 0a0013eac9..d35042701e 100644
--- a/web/hooks/use-multiple-select.ts
+++ b/web/hooks/use-multiple-select.ts
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useMemo } from "react";
-import { useRouter } from "next/router";
+// import { useRouter } from "next/navigation";
// hooks
import { useMultipleSelectStore } from "@/hooks/store";
@@ -32,7 +32,7 @@ export type TSelectionHelper = {
export const useMultipleSelect = (props: Props) => {
const { containerRef, disabled, entities } = props;
// router
- const router = useRouter();
+ // const router = useRouter();
// store hooks
const {
selectedEntityIds,
@@ -343,15 +343,15 @@ export const useMultipleSelect = (props: Props) => {
}, [disabled, getActiveEntityDetails, entitiesList, groups, getPreviousAndNextEntities, handleActiveEntityChange]);
// clear selection on route change
- useEffect(() => {
- const handleRouteChange = () => clearSelection();
+ // useEffect(() => {
+ // const handleRouteChange = () => clearSelection();
- router.events.on("routeChangeComplete", handleRouteChange);
+ // router.events.on("routeChangeComplete", handleRouteChange);
- return () => {
- router.events.off("routeChangeComplete", handleRouteChange);
- };
- }, [clearSelection, router.events]);
+ // return () => {
+ // router.events.off("routeChangeComplete", handleRouteChange);
+ // };
+ // }, [clearSelection, router.events]);
// when entities list change, remove entityIds from the selected entities array, which are not present in the new list
useEffect(() => {
diff --git a/web/hooks/use-platform-os.tsx b/web/hooks/use-platform-os.tsx
index fb9336fa6b..ebee50c84d 100644
--- a/web/hooks/use-platform-os.tsx
+++ b/web/hooks/use-platform-os.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { useEffect, useState } from "react";
export const usePlatformOS = () => {
diff --git a/web/hooks/use-reload-confirmation.tsx b/web/hooks/use-reload-confirmation.tsx
index 3489d600c6..9bd324d06a 100644
--- a/web/hooks/use-reload-confirmation.tsx
+++ b/web/hooks/use-reload-confirmation.tsx
@@ -1,41 +1,41 @@
import { useCallback, useEffect, useState } from "react";
-import { useRouter } from "next/router";
+import { useRouter } from "next/navigation";
//TODO: remove temp flag isActive later and use showAlert as the source of truth
const useReloadConfirmations = (isActive = true) => {
const [showAlert, setShowAlert] = useState(false);
- const router = useRouter();
+ // const router = useRouter();
- const handleBeforeUnload = useCallback(
- (event: BeforeUnloadEvent) => {
- if (!isActive || !showAlert) return;
- event.preventDefault();
- event.returnValue = "";
- },
- [isActive, showAlert]
- );
+ // const handleBeforeUnload = useCallback(
+ // (event: BeforeUnloadEvent) => {
+ // if (!isActive || !showAlert) return;
+ // event.preventDefault();
+ // event.returnValue = "";
+ // },
+ // [isActive, showAlert]
+ // );
- const handleRouteChangeStart = useCallback(
- (url: string, { shallow }: { shallow: boolean }) => {
- if (!isActive || !showAlert) return;
- const leave = confirm("Are you sure you want to leave? Changes you made may not be saved.");
- if (!leave) {
- router.events.emit("routeChangeError", new Error("Route change cancelled by user"), url, shallow);
- throw "routeChange aborted.";
- }
- },
- [isActive, router.events, showAlert]
- );
+ // const handleRouteChangeStart = useCallback(
+ // (url: string, { shallow }: { shallow: boolean }) => {
+ // if (!isActive || !showAlert) return;
+ // const leave = confirm("Are you sure you want to leave? Changes you made may not be saved.");
+ // if (!leave) {
+ // router.events.emit("routeChangeError", new Error("Route change cancelled by user"), url, shallow);
+ // throw "routeChange aborted.";
+ // }
+ // },
+ // [isActive, router.events, showAlert]
+ // );
- useEffect(() => {
- window.addEventListener("beforeunload", handleBeforeUnload);
- router.events.on("routeChangeStart", handleRouteChangeStart);
+ // useEffect(() => {
+ // window.addEventListener("beforeunload", handleBeforeUnload);
+ // router.events.on("routeChangeStart", handleRouteChangeStart);
- return () => {
- window.removeEventListener("beforeunload", handleBeforeUnload);
- router.events.off("routeChangeStart", handleRouteChangeStart);
- };
- }, [handleBeforeUnload, handleRouteChangeStart, router.events]);
+ // return () => {
+ // window.removeEventListener("beforeunload", handleBeforeUnload);
+ // router.events.off("routeChangeStart", handleRouteChangeStart);
+ // };
+ // }, [handleBeforeUnload, handleRouteChangeStart, router.events]);
return { setShowAlert };
};
diff --git a/web/hooks/use-url-hash.tsx b/web/hooks/use-url-hash.tsx
new file mode 100644
index 0000000000..9dc6d1770f
--- /dev/null
+++ b/web/hooks/use-url-hash.tsx
@@ -0,0 +1,14 @@
+import { useEffect, useState } from "react";
+
+const useURLHash = () => {
+ const [hashValue, setHashValue] = useState<string>();
+
+ useEffect(() => {
+ const hash = window.location.hash?.split("#")[1];
+ setHashValue(hash);
+ }, []);
+
+ return hashValue;
+};
+
+export default useURLHash;
diff --git a/web/hooks/use-user-notifications.tsx b/web/hooks/use-user-notifications.tsx
index 19f150b886..3de3f9f3b9 100644
--- a/web/hooks/use-user-notifications.tsx
+++ b/web/hooks/use-user-notifications.tsx
@@ -1,5 +1,5 @@
import { useMemo, useState } from "react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
// swr
import useSWR from "swr";
import useSWRInfinite from "swr/infinite";
@@ -16,8 +16,7 @@ const PER_PAGE = 30;
const userNotificationServices = new NotificationService();
const useUserNotification = (): any => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ const { workspaceSlug } = useParams();
const [snoozed, setSnoozed] = useState<boolean>(false);
const [archived, setArchived] = useState<boolean>(false);
diff --git a/web/layouts/app-layout/index.ts b/web/layouts/app-layout/index.ts
deleted file mode 100644
index c4bfd4db38..0000000000
--- a/web/layouts/app-layout/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./layout";
-export * from "./sidebar";
diff --git a/web/layouts/app-layout/layout.tsx b/web/layouts/app-layout/layout.tsx
deleted file mode 100644
index 8516b7033f..0000000000
--- a/web/layouts/app-layout/layout.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { FC, ReactNode } from "react";
-import { observer } from "mobx-react-lite";
-// components
-import { CommandPalette } from "@/components/command-palette";
-import { SidebarHamburgerToggle } from "@/components/core/sidebar";
-// layouts
-import { WorkspaceAuthWrapper, ProjectAuthWrapper } from "@/layouts/auth-layout";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
-import { AppSidebar } from "./sidebar";
-
-export interface IAppLayout {
- children: ReactNode;
- header: ReactNode;
- withProjectWrapper?: boolean;
- mobileHeader?: ReactNode;
-}
-
-export const AppLayout: FC<IAppLayout> = observer((props) => {
- const { children, header, withProjectWrapper = false, mobileHeader } = props;
-
- return (
- <AuthenticationWrapper>
- <CommandPalette />
- <WorkspaceAuthWrapper>
- <div className="relative flex h-screen w-full overflow-hidden">
- <AppSidebar />
- <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
- <div className="z-[15]">
- <div className="z-10 flex w-full items-center border-b border-custom-border-200">
- <div className="block bg-custom-sidebar-background-100 py-4 pl-5 md:hidden">
- <SidebarHamburgerToggle />
- </div>
- <div className="w-full">{header}</div>
- </div>
- {mobileHeader && mobileHeader}
- </div>
- <div className="h-full w-full overflow-hidden">
- <div className="relative h-full w-full overflow-x-hidden overflow-y-scroll">
- {withProjectWrapper ? <ProjectAuthWrapper>{children}</ProjectAuthWrapper> : <>{children}</>}
- </div>
- </div>
- </main>
- </div>
- </WorkspaceAuthWrapper>
- </AuthenticationWrapper>
- );
-});
diff --git a/web/layouts/auth-layout/project-wrapper.tsx b/web/layouts/auth-layout/project-wrapper.tsx
index 69e5b57f92..db05a5ea24 100644
--- a/web/layouts/auth-layout/project-wrapper.tsx
+++ b/web/layouts/auth-layout/project-wrapper.tsx
@@ -1,6 +1,6 @@
import { FC, ReactNode } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import useSWR from "swr";
// components
import { JoinProject } from "@/components/auth-screens";
@@ -46,8 +46,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
const { fetchProjectLabels } = useLabel();
const { getProjectEstimates } = useProjectEstimates();
// router
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
+ const { workspaceSlug, projectId } = useParams();
// fetching project details
useSWR(
diff --git a/web/layouts/auth-layout/workspace-wrapper.tsx b/web/layouts/auth-layout/workspace-wrapper.tsx
index 603fa9b6b9..b609392440 100644
--- a/web/layouts/auth-layout/workspace-wrapper.tsx
+++ b/web/layouts/auth-layout/workspace-wrapper.tsx
@@ -2,7 +2,7 @@ import { FC, ReactNode } from "react";
import { observer } from "mobx-react-lite";
import Image from "next/image";
import Link from "next/link";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { useTheme } from "next-themes";
import useSWR from "swr";
import { LogOut } from "lucide-react";
@@ -22,9 +22,8 @@ export interface IWorkspaceAuthWrapper {
export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props) => {
const { children } = props;
- // router
- const router = useRouter();
- const { workspaceSlug } = router.query;
+ // router params
+ const { workspaceSlug } = useParams();
// next themes
const { resolvedTheme } = useTheme();
// store hooks
diff --git a/web/layouts/settings-layout/index.ts b/web/layouts/settings-layout/index.ts
deleted file mode 100644
index e24ff3c651..0000000000
--- a/web/layouts/settings-layout/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./profile";
-export * from "./project";
-export * from "./workspace";
diff --git a/web/layouts/settings-layout/profile/index.ts b/web/layouts/settings-layout/profile/index.ts
deleted file mode 100644
index c4bfd4db38..0000000000
--- a/web/layouts/settings-layout/profile/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./layout";
-export * from "./sidebar";
diff --git a/web/layouts/settings-layout/profile/preferences/index.ts b/web/layouts/settings-layout/profile/preferences/index.ts
deleted file mode 100644
index c4bfd4db38..0000000000
--- a/web/layouts/settings-layout/profile/preferences/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./layout";
-export * from "./sidebar";
diff --git a/web/layouts/settings-layout/profile/preferences/layout.tsx b/web/layouts/settings-layout/profile/preferences/layout.tsx
deleted file mode 100644
index 509f1b2e15..0000000000
--- a/web/layouts/settings-layout/profile/preferences/layout.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { FC, ReactNode } from "react";
-// layout
-import { SidebarHamburgerToggle } from "@/components/core/sidebar/sidebar-menu-hamburger-toggle";
-import { PreferencesMobileHeader } from "@/components/profile/preferences/preferences-mobile-header";
-import { useAppTheme } from "@/hooks/store";
-import { ProfileSettingsLayout } from "@/layouts/settings-layout";
-// local components
-import { ProfilePreferenceSettingsSidebar } from "./sidebar";
-
-interface IProfilePreferenceSettingsLayout {
- children: ReactNode;
- header?: ReactNode;
-}
-
-export const ProfilePreferenceSettingsLayout: FC<IProfilePreferenceSettingsLayout> = (props) => {
- const { children, header } = props;
- const { toggleSidebar } = useAppTheme();
-
- return (
- <ProfileSettingsLayout
- header={
- <div className="md:hidden flex flex-shrink-0 gap-4 items-center justify-start border-b border-custom-border-200 p-4">
- <SidebarHamburgerToggle onClick={toggleSidebar} />
- </div>
- }
- >
- <div className="h-full">
- <PreferencesMobileHeader />
- <div className="relative flex h-full w-full overflow-hidden">
- <ProfilePreferenceSettingsSidebar />
- <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
- {header}
- <div className="h-full w-full">{children}</div>
- </main>
- </div>
- </div>
- </ProfileSettingsLayout>
- );
-};
diff --git a/web/layouts/settings-layout/profile/preferences/sidebar.tsx b/web/layouts/settings-layout/profile/preferences/sidebar.tsx
deleted file mode 100644
index 27b28905ba..0000000000
--- a/web/layouts/settings-layout/profile/preferences/sidebar.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from "react";
-import Link from "next/link";
-import { useRouter } from "next/router";
-
-export const ProfilePreferenceSettingsSidebar = () => {
- const router = useRouter();
-
- const profilePreferenceLinks: Array<{
- label: string;
- href: string;
- }> = [
- {
- label: "Theme",
- href: `/profile/preferences/theme`,
- },
- {
- label: "Email",
- href: `/profile/preferences/email`,
- },
- ];
- return (
- <div className="hidden md:flex w-96 flex-col gap-6 px-8 py-12">
- <div className="flex flex-col gap-4">
- <span className="text-xs font-semibold text-custom-text-400">Preference</span>
- <div className="flex w-full flex-col gap-2">
- {profilePreferenceLinks.map((link) => (
- <Link key={link.href} href={link.href}>
- <div
- className={`rounded-md px-4 py-2 text-sm font-medium ${
- (link.label === "Import" ? router.asPath.includes(link.href) : router.asPath === link.href)
- ? "bg-custom-primary-100/10 text-custom-primary-100"
- : "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
- }`}
- >
- {link.label}
- </div>
- </Link>
- ))}
- </div>
- </div>
- </div>
- );
-};
diff --git a/web/layouts/settings-layout/project/index.ts b/web/layouts/settings-layout/project/index.ts
deleted file mode 100644
index c4bfd4db38..0000000000
--- a/web/layouts/settings-layout/project/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./layout";
-export * from "./sidebar";
diff --git a/web/layouts/settings-layout/workspace/index.ts b/web/layouts/settings-layout/workspace/index.ts
deleted file mode 100644
index c4bfd4db38..0000000000
--- a/web/layouts/settings-layout/workspace/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./layout";
-export * from "./sidebar";
diff --git a/web/layouts/user-profile-layout/index.ts b/web/layouts/user-profile-layout/index.ts
deleted file mode 100644
index eec9d1e67d..0000000000
--- a/web/layouts/user-profile-layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./layout";
diff --git a/web/lib/app-provider.tsx b/web/lib/app-provider.tsx
index 692a43b9fd..132c96cfd8 100644
--- a/web/lib/app-provider.tsx
+++ b/web/lib/app-provider.tsx
@@ -1,7 +1,7 @@
import { FC, ReactNode } from "react";
import { observer } from "mobx-react";
import dynamic from "next/dynamic";
-import Router from "next/router";
+// import Router from "next/navigation";
import { useTheme } from "next-themes";
import NProgress from "nprogress";
import { SWRConfig } from "swr";
@@ -21,9 +21,9 @@ const PostHogProvider = dynamic(() => import("@/lib/posthog-provider"), { ssr: f
const CrispWrapper = dynamic(() => import("@/lib/wrappers/crisp-wrapper"), { ssr: false });
// nprogress
NProgress.configure({ showSpinner: false });
-Router.events.on("routeChangeStart", NProgress.start);
-Router.events.on("routeChangeError", NProgress.done);
-Router.events.on("routeChangeComplete", NProgress.done);
+// Router.events.on("routeChangeStart", NProgress.start);
+// Router.events.on("routeChangeError", NProgress.done);
+// Router.events.on("routeChangeComplete", NProgress.done);
export interface IAppProvider {
children: ReactNode;
diff --git a/web/lib/posthog-provider.tsx b/web/lib/posthog-provider.tsx
index d1a7ed5427..c17d647c35 100644
--- a/web/lib/posthog-provider.tsx
+++ b/web/lib/posthog-provider.tsx
@@ -1,30 +1,29 @@
-import { FC, ReactNode, useEffect, useState } from "react";
-import { useRouter } from "next/router";
+import { FC, ReactNode, useEffect } from "react";
+import { observer } from "mobx-react";
+// import { useRouter } from "next/navigation";
import posthog from "posthog-js";
import { PostHogProvider as PHProvider } from "posthog-js/react";
-import { IUser } from "@plane/types";
// constants
import { GROUP_WORKSPACE } from "@/constants/event-tracker";
// helpers
import { getUserRole } from "@/helpers/user.helper";
+// hooks
+import { useWorkspace, useUser } from "@/hooks/store";
// types
export interface IPosthogWrapper {
children: ReactNode;
- user: IUser | undefined;
- currentWorkspaceId: string | undefined;
- workspaceRole: number | undefined;
- projectRole: number | undefined;
- posthogAPIKey: string | undefined;
- posthogHost: string | undefined;
}
-const PostHogProvider: FC<IPosthogWrapper> = (props) => {
- const { children, user, workspaceRole, currentWorkspaceId, projectRole } = props;
- // states
- const [lastWorkspaceId, setLastWorkspaceId] = useState(currentWorkspaceId);
+const PostHogProvider: FC<IPosthogWrapper> = observer((props) => {
+ const { children } = props;
+ const {
+ data: user,
+ membership: { currentProjectRole, currentWorkspaceRole },
+ } = useUser();
+ const { currentWorkspace } = useWorkspace();
// router
- const router = useRouter();
+ // const router = useRouter();
useEffect(() => {
if (user) {
@@ -35,11 +34,11 @@ const PostHogProvider: FC<IPosthogWrapper> = (props) => {
last_name: user.last_name,
email: user.email,
// use_case: user.use_case, FIXME:
- workspace_role: workspaceRole ? getUserRole(workspaceRole) : undefined,
- project_role: projectRole ? getUserRole(projectRole) : undefined,
+ workspace_role: currentWorkspaceRole ? getUserRole(currentWorkspaceRole) : undefined,
+ project_role: currentProjectRole ? getUserRole(currentProjectRole) : undefined,
});
}
- }, [user, workspaceRole, projectRole]);
+ }, [user, currentProjectRole, currentWorkspaceRole]);
useEffect(() => {
if (process.env.NEXT_PUBLIC_POSTHOG_KEY && process.env.NEXT_PUBLIC_POSTHOG_HOST) {
@@ -55,30 +54,29 @@ const PostHogProvider: FC<IPosthogWrapper> = (props) => {
useEffect(() => {
// Join workspace group on workspace change
- if (lastWorkspaceId !== currentWorkspaceId && currentWorkspaceId && user) {
- setLastWorkspaceId(currentWorkspaceId);
- posthog?.identify(user.email);
- posthog?.group(GROUP_WORKSPACE, currentWorkspaceId);
+ if (currentWorkspace?.id && user?.email) {
+ posthog?.identify(user?.email);
+ posthog?.group(GROUP_WORKSPACE, currentWorkspace?.id);
}
- }, [currentWorkspaceId, lastWorkspaceId, user]);
+ }, [currentWorkspace?.id, user?.email]);
- useEffect(() => {
+ useEffect(() =>
// Track page views
- const handleRouteChange = () => {
- posthog?.capture("$pageview");
- };
- router.events.on("routeChangeComplete", handleRouteChange);
+ // const handleRouteChange = () => {
+ // posthog?.capture("$pageview");
+ // };
+ // router.events.on("routeChangeComplete", handleRouteChange);
- return () => {
- router.events.off("routeChangeComplete", handleRouteChange);
- };
+ () => {
+ // router.events.off("routeChangeComplete", handleRouteChange);
+ }
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, []);
+ , []);
if (process.env.NEXT_PUBLIC_POSTHOG_KEY && process.env.NEXT_PUBLIC_POSTHOG_HOST)
return <PHProvider client={posthog}>{children}</PHProvider>;
return <>{children}</>;
-};
+});
export default PostHogProvider;
diff --git a/web/lib/store-context.tsx b/web/lib/store-context.tsx
index 0170cfe37d..8b523455f7 100644
--- a/web/lib/store-context.tsx
+++ b/web/lib/store-context.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { ReactElement, createContext } from "react";
// mobx store
import { RootStore } from "@/store/root.store";
diff --git a/web/lib/types.d.ts b/web/lib/types.d.ts
deleted file mode 100644
index 8dac1ff825..0000000000
--- a/web/lib/types.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type NextPageWithLayout<P = {}, IP = P> = NextPage<P, IP> & {
- getLayout?: (page: ReactElement) => ReactNode;
-};
diff --git a/web/lib/wrappers/authentication-wrapper.tsx b/web/lib/wrappers/authentication-wrapper.tsx
index 774dabdbac..d855dd8586 100644
--- a/web/lib/wrappers/authentication-wrapper.tsx
+++ b/web/lib/wrappers/authentication-wrapper.tsx
@@ -1,6 +1,8 @@
+"use client";
+
import { FC, ReactNode } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useRouter, useSearchParams } from "next/navigation";
import useSWR from "swr";
// components
import { LogoSpinner } from "@/components/common";
@@ -23,7 +25,8 @@ const isValidURL = (url: string): boolean => {
export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props) => {
const router = useRouter();
- const { next_path } = router.query;
+ const searchParams = useSearchParams();
+ const next_path = searchParams.get("next_path");
// props
const { children, pageType = EPageTypes.AUTHENTICATED } = props;
// hooks
diff --git a/web/lib/wrappers/crisp-wrapper.tsx b/web/lib/wrappers/crisp-wrapper.tsx
index 5ea5e93b06..1debf8ea5b 100644
--- a/web/lib/wrappers/crisp-wrapper.tsx
+++ b/web/lib/wrappers/crisp-wrapper.tsx
@@ -1,6 +1,7 @@
import { useEffect, ReactNode, FC } from "react";
+import { observer } from "mobx-react";
// hooks
-import { IUser } from "@plane/types";
+import { useUser } from "@/hooks/store";
declare global {
interface Window {
@@ -11,11 +12,11 @@ declare global {
export interface ICrispWrapper {
children: ReactNode;
- user: IUser | undefined;
}
-const CrispWrapper: FC<ICrispWrapper> = (props) => {
- const { children, user } = props;
+const CrispWrapper: FC<ICrispWrapper> = observer((props) => {
+ const { children } = props;
+ const { data: user } = useUser();
useEffect(() => {
if (typeof window && user?.email && process.env.NEXT_PUBLIC_CRISP_ID) {
@@ -35,6 +36,6 @@ const CrispWrapper: FC<ICrispWrapper> = (props) => {
}, [user?.email]);
return <>{children}</>;
-};
+});
export default CrispWrapper;
diff --git a/web/lib/wrappers/store-wrapper.tsx b/web/lib/wrappers/store-wrapper.tsx
index 785e929eae..b664bfe59e 100644
--- a/web/lib/wrappers/store-wrapper.tsx
+++ b/web/lib/wrappers/store-wrapper.tsx
@@ -1,6 +1,6 @@
import { ReactNode, useEffect, FC, useState } from "react";
import { observer } from "mobx-react";
-import { useRouter } from "next/router";
+import { useParams } from "next/navigation";
import { useTheme } from "next-themes";
// helpers
import { applyTheme, unsetCustomCssVariables } from "@/helpers/theme.helper";
@@ -14,9 +14,9 @@ type TStoreWrapper = {
const StoreWrapper: FC<TStoreWrapper> = observer((props) => {
const { children } = props;
// theme
- const {resolvedTheme, setTheme } = useTheme();
+ const { resolvedTheme, setTheme } = useTheme();
// router
- const router = useRouter();
+ const params = useParams();
// store hooks
const { setQuery } = useAppRouter();
const { sidebarCollapsed, toggleSidebar } = useAppTheme();
@@ -74,9 +74,9 @@ const StoreWrapper: FC<TStoreWrapper> = observer((props) => {
}, [dom]);
useEffect(() => {
- if (!router.query) return;
- setQuery(router.query);
- }, [router.query, setQuery]);
+ if (!params) return;
+ setQuery(params);
+ }, [params, setQuery]);
return <>{children}</>;
});
diff --git a/web/pages/[workspaceSlug]/profile/[userId]/assigned.tsx b/web/pages/[workspaceSlug]/profile/[userId]/assigned.tsx
deleted file mode 100644
index 2d73195fe4..0000000000
--- a/web/pages/[workspaceSlug]/profile/[userId]/assigned.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React, { ReactElement } from "react";
-// components
-import { PageHead } from "@/components/core";
-import { UserProfileHeader } from "@/components/headers";
-import { ProfileIssuesPage } from "@/components/profile/profile-issues";
-import ProfileIssuesMobileHeader from "@/components/profile/profile-issues-mobile-header";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { ProfileAuthWrapper } from "@/layouts/user-profile-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-
-const ProfileAssignedIssuesPage: NextPageWithLayout = () => (
- <>
- <PageHead title="Profile - Assigned" />
- <ProfileIssuesPage type="assigned" />
- </>
-);
-
-ProfileAssignedIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<UserProfileHeader type="Assigned" />} mobileHeader={<ProfileIssuesMobileHeader />}>
- <ProfileAuthWrapper showProfileIssuesFilter>{page}</ProfileAuthWrapper>
- </AppLayout>
- );
-};
-
-export default ProfileAssignedIssuesPage;
diff --git a/web/pages/[workspaceSlug]/profile/[userId]/created.tsx b/web/pages/[workspaceSlug]/profile/[userId]/created.tsx
deleted file mode 100644
index 169ab4841e..0000000000
--- a/web/pages/[workspaceSlug]/profile/[userId]/created.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ReactElement } from "react";
-// store
-import { observer } from "mobx-react-lite";
-// components
-import { PageHead } from "@/components/core";
-import { UserProfileHeader } from "@/components/headers";
-import { ProfileIssuesPage } from "@/components/profile/profile-issues";
-import ProfileIssuesMobileHeader from "@/components/profile/profile-issues-mobile-header";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { ProfileAuthWrapper } from "@/layouts/user-profile-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-
-const ProfileCreatedIssuesPage: NextPageWithLayout = () => (
- <>
- <PageHead title="Profile - Created" />
- <ProfileIssuesPage type="created" />
- </>
-);
-
-ProfileCreatedIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<UserProfileHeader type="Created" />} mobileHeader={<ProfileIssuesMobileHeader />}>
- <ProfileAuthWrapper showProfileIssuesFilter>{page}</ProfileAuthWrapper>
- </AppLayout>
- );
-};
-
-export default observer(ProfileCreatedIssuesPage);
diff --git a/web/pages/[workspaceSlug]/profile/[userId]/subscribed.tsx b/web/pages/[workspaceSlug]/profile/[userId]/subscribed.tsx
deleted file mode 100644
index feb7a01602..0000000000
--- a/web/pages/[workspaceSlug]/profile/[userId]/subscribed.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ReactElement } from "react";
-// store
-import { observer } from "mobx-react-lite";
-// components
-import { PageHead } from "@/components/core";
-import { UserProfileHeader } from "@/components/headers";
-import { ProfileIssuesPage } from "@/components/profile/profile-issues";
-import ProfileIssuesMobileHeader from "@/components/profile/profile-issues-mobile-header";
-// layouts
-import { AppLayout } from "@/layouts/app-layout";
-import { ProfileAuthWrapper } from "@/layouts/user-profile-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-
-const ProfileSubscribedIssuesPage: NextPageWithLayout = () => (
- <>
- <PageHead title="Profile - Subscribed" />
- <ProfileIssuesPage type="subscribed" />
- </>
-);
-
-ProfileSubscribedIssuesPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<UserProfileHeader type="Subscribed" />} mobileHeader={<ProfileIssuesMobileHeader />}>
- <ProfileAuthWrapper showProfileIssuesFilter>{page}</ProfileAuthWrapper>
- </AppLayout>
- );
-};
-
-export default observer(ProfileSubscribedIssuesPage);
diff --git a/web/pages/[workspaceSlug]/settings/index.tsx b/web/pages/[workspaceSlug]/settings/index.tsx
deleted file mode 100644
index cbe92de615..0000000000
--- a/web/pages/[workspaceSlug]/settings/index.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ReactElement } from "react";
-import { observer } from "mobx-react";
-// layouts
-import { PageHead } from "@/components/core";
-import { WorkspaceSettingHeader } from "@/components/headers";
-import { WorkspaceDetails } from "@/components/workspace";
-import { useWorkspace } from "@/hooks/store";
-import { AppLayout } from "@/layouts/app-layout";
-import { WorkspaceSettingLayout } from "@/layouts/settings-layout";
-// hooks
-// components
-// types
-import { NextPageWithLayout } from "@/lib/types";
-
-const WorkspaceSettingsPage: NextPageWithLayout = observer(() => {
- // store hooks
- const { currentWorkspace } = useWorkspace();
- // derived values
- const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - General Settings` : undefined;
-
- return (
- <>
- <PageHead title={pageTitle} />
- <WorkspaceDetails />
- </>
- );
-});
-
-WorkspaceSettingsPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AppLayout header={<WorkspaceSettingHeader />}>
- <WorkspaceSettingLayout>{page}</WorkspaceSettingLayout>
- </AppLayout>
- );
-};
-
-export default WorkspaceSettingsPage;
diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
deleted file mode 100644
index b99e550326..0000000000
--- a/web/pages/_app.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ReactElement } from "react";
-import { AppProps } from "next/app";
-import Head from "next/head";
-import { ThemeProvider } from "next-themes";
-// styles
-import "@/styles/globals.css";
-import "@/styles/command-pallette.css";
-import "@/styles/nprogress.css";
-import "@/styles/emoji.css";
-import "@/styles/react-day-picker.css";
-// constants
-import { SITE_TITLE } from "@/constants/seo-variables";
-import { THEMES } from "@/constants/themes";
-// mobx store provider
-import { AppProvider } from "@/lib/app-provider";
-import { StoreProvider } from "@/lib/store-context";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-
-type AppPropsWithLayout = AppProps & {
- Component: NextPageWithLayout;
-};
-
-function MyApp({ Component, pageProps: { ...pageProps } }: AppPropsWithLayout) {
- // Use the layout defined at the page level, if available
- const getLayout = Component.getLayout ?? ((page: ReactElement) => page);
-
- return (
- <>
- <Head>
- <title>{SITE_TITLE}</title>
- </Head>
- <StoreProvider {...pageProps}>
- <ThemeProvider themes={THEMES} defaultTheme="system">
- <AppProvider>{getLayout(<Component {...pageProps} />)}</AppProvider>
- </ThemeProvider>
- </StoreProvider>
- </>
- );
-}
-
-export default MyApp;
diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx
deleted file mode 100644
index 4f5da70d5f..0000000000
--- a/web/pages/_document.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import Document, { Html, Head, Main, NextScript } from "next/document";
-// constants
-import Script from "next/script";
-import {
- SITE_NAME,
- SITE_DESCRIPTION,
- SITE_URL,
- TWITTER_USER_NAME,
- SITE_KEYWORDS,
- SITE_TITLE,
-} from "@/constants/seo-variables";
-
-class MyDocument extends Document {
- render() {
- const isSessionRecorderEnabled = parseInt(process.env.NEXT_PUBLIC_ENABLE_SESSION_RECORDER || "0");
-
- return (
- <Html>
- <Head>
- <meta property="og:site_name" content={SITE_NAME} />
- <meta property="og:title" content={SITE_TITLE} />
- <meta property="og:url" content={SITE_URL} />
- <meta name="description" content={SITE_DESCRIPTION} />
- <meta property="og:description" content={SITE_DESCRIPTION} />
- <meta name="keywords" content={SITE_KEYWORDS} />
- <meta name="twitter:site" content={`@${TWITTER_USER_NAME}`} />
- <meta name="theme-color" content="#fff" />
- <link rel="apple-touch-icon" sizes="512x512" href="/plane-logos/plane-mobile-pwa.png" />
- <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png" />
- <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png" />
- <link rel="manifest" href="/site.webmanifest.json" />
- <link rel="shortcut icon" href="/favicon/favicon.ico" />
- {isSessionRecorderEnabled && process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY && (
- <Script id="clarity-tracking">
- {`(function(c,l,a,r,i,t,y){
- c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
- t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
- y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
- })(window, document, "clarity", "script", "${process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY}");`}
- </Script>
- )}
- </Head>
- <body>
- <div id="context-menu-portal" />
- <Main />
- <NextScript />
- {process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN && (
- <script
- defer
- data-domain={process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN}
- src="https://plausible.io/js/script.js"
- />
- )}
- </body>
- </Html>
- );
- }
-}
-
-export default MyDocument;
diff --git a/web/pages/_error.tsx b/web/pages/_error.tsx
deleted file mode 100644
index 29f0a6ea5e..0000000000
--- a/web/pages/_error.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-
-import { useRouter } from "next/router";
-
-// services
-import { Button, TOAST_TYPE, setToast } from "@plane/ui";
-
-import { API_BASE_URL } from "@/helpers/common.helper";
-import DefaultLayout from "@/layouts/default-layout";
-import { AuthService } from "@/services/auth.service";
-// layouts
-// ui
-
-// services
-const authService = new AuthService();
-
-const CustomErrorComponent = () => {
- const router = useRouter();
-
- const handleSignOut = async () => {
- await authService
- .signOut(API_BASE_URL)
- .catch(() =>
- setToast({
- type: TOAST_TYPE.ERROR,
- title: "Error!",
- message: "Failed to sign out. Please try again.",
- })
- )
- .finally(() => router.push("/"));
- };
-
- return (
- <DefaultLayout>
- <div className="grid h-full place-items-center p-4">
- <div className="space-y-8 text-center">
- <div className="space-y-2">
- <h3 className="text-lg font-semibold">Exception Detected!</h3>
- <p className="mx-auto w-1/2 text-sm text-custom-text-200">
- We{"'"}re Sorry! An exception has been detected, and our engineering team has been notified. We apologize
- for any inconvenience this may have caused. Please reach out to our engineering team at{" "}
- <a href="mailto:[email protected]" className="text-custom-primary">
- </a>{" "}
- or on our{" "}
- <a
- href="https://discord.com/invite/A92xrEGCge"
- target="_blank"
- className="text-custom-primary"
- rel="noopener noreferrer"
- >
- Discord
- </a>{" "}
- server for further assistance.
- </p>
- </div>
- <div className="flex items-center justify-center gap-2">
- <Button variant="primary" size="md" onClick={() => router.reload()}>
- Refresh
- </Button>
- <Button variant="neutral-primary" size="md" onClick={handleSignOut}>
- Sign out
- </Button>
- </div>
- </div>
- </div>
- </DefaultLayout>
- );
-};
-
-CustomErrorComponent.getInitialProps = async (contextData: any) => {
- await Sentry.captureUnderscoreErrorException(contextData);
-
- const { res, err } = contextData;
-
- const statusCode = res ? res.statusCode : err ? err.statusCode : 404;
-
- return { statusCode };
-};
-
-export default CustomErrorComponent;
diff --git a/web/pages/accounts/forgot-password.tsx b/web/pages/accounts/forgot-password.tsx
deleted file mode 100644
index 8810e47cd7..0000000000
--- a/web/pages/accounts/forgot-password.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import { ReactElement } from "react";
-import Image from "next/image";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useTheme } from "next-themes";
-import { Controller, useForm } from "react-hook-form";
-// icons
-import { CircleCheck } from "lucide-react";
-// ui
-import { Button, Input, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
-// components
-import { PageHead } from "@/components/core";
-// constants
-import { FORGOT_PASS_LINK, NAVIGATE_TO_SIGNUP } from "@/constants/event-tracker";
-// helpers
-import { EPageTypes } from "@/helpers/authentication.helper";
-import { cn } from "@/helpers/common.helper";
-import { checkEmailValidity } from "@/helpers/string.helper";
-// hooks
-import { useEventTracker } from "@/hooks/store";
-import useTimer from "@/hooks/use-timer";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// lib
-import { NextPageWithLayout } from "@/lib/types";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
-// services
-import { AuthService } from "@/services/auth.service";
-// images
-import 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 TForgotPasswordFormValues = {
- email: string;
-};
-
-const defaultValues: TForgotPasswordFormValues = {
- email: "",
-};
-
-// services
-const authService = new AuthService();
-
-const ForgotPasswordPage: NextPageWithLayout = () => {
- // router
- const router = useRouter();
- const { email } = router.query;
- // store hooks
- const { captureEvent } = useEventTracker();
- // hooks
- const { resolvedTheme } = useTheme();
- // timer
- const { timer: resendTimerCode, setTimer: setResendCodeTimer } = useTimer(0);
-
- // form info
- const {
- control,
- formState: { errors, isSubmitting, isValid },
- handleSubmit,
- } = useForm<TForgotPasswordFormValues>({
- defaultValues: {
- ...defaultValues,
- email: email?.toString() ?? "",
- },
- });
-
- const handleForgotPassword = async (formData: TForgotPasswordFormValues) => {
- await authService
- .sendResetPasswordLink({
- email: formData.email,
- })
- .then(() => {
- captureEvent(FORGOT_PASS_LINK, {
- state: "SUCCESS",
- });
- setToast({
- type: TOAST_TYPE.SUCCESS,
- title: "Email sent",
- message:
- "Check your inbox for a link to reset your password. If it doesn't appear within a few minutes, check your spam folder.",
- });
- setResendCodeTimer(30);
- })
- .catch((err) => {
- captureEvent(FORGOT_PASS_LINK, {
- state: "FAILED",
- });
- setToast({
- type: TOAST_TYPE.ERROR,
- title: "Error!",
- message: err?.error ?? "Something went wrong. Please try again.",
- });
- });
- };
-
- const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
-
- return (
- <div className="relative w-screen h-screen overflow-hidden">
- <PageHead title="Forgot Password - Plane" />
- <div className="absolute inset-0 z-0">
- <Image
- src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
- className="w-full h-full object-cover"
- alt="Plane background pattern"
- />
- </div>
- <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
- <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
- <div className="flex items-center gap-x-2 py-10">
- <Link href={`/`} className="h-[30px] w-[133px]">
- <Image src={logo} alt="Plane logo" />
- </Link>
- </div>
- <div className="flex flex-col items-end sm:items-center sm:gap-2 sm:flex-row text-center text-sm font-medium text-onboarding-text-300">
- New to Plane?{" "}
- <Link
- href="/"
- onClick={() => captureEvent(NAVIGATE_TO_SIGNUP, {})}
- className="font-semibold text-custom-primary-100 hover:underline"
- >
- Create an account
- </Link>
- </div>
- </div>
- <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 py-4">
- <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">
- Reset your password
- </h3>
- <p className="font-medium text-onboarding-text-400">
- Enter your user account{"'"}s verified email address and we will send you a password reset link.
- </p>
- </div>
- <form onSubmit={handleSubmit(handleForgotPassword)} className="mt-5 space-y-4">
- <div className="space-y-1">
- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">
- Email
- </label>
- <Controller
- control={control}
- name="email"
- rules={{
- required: "Email is required",
- validate: (value) => checkEmailValidity(value) || "Email is invalid",
- }}
- render={({ field: { value, onChange, ref } }) => (
- <Input
- id="email"
- name="email"
- type="email"
- value={value}
- onChange={onChange}
- ref={ref}
- hasError={Boolean(errors.email)}
- placeholder="[email protected]"
- className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
- disabled={resendTimerCode > 0}
- />
- )}
- />
- {resendTimerCode > 0 && (
- <p className="flex w-full items-start px-1 gap-1 text-xs font-medium text-green-700">
- <CircleCheck height={12} width={12} className="mt-0.5" />
- We sent the reset link to your email address
- </p>
- )}
- </div>
- <Button
- type="submit"
- variant="primary"
- className="w-full"
- size="lg"
- disabled={!isValid}
- loading={isSubmitting || resendTimerCode > 0}
- >
- {resendTimerCode > 0 ? `Resend in ${resendTimerCode} seconds` : "Send reset link"}
- </Button>
- <Link href="/" className={cn("w-full", getButtonStyling("link-neutral", "lg"))}>
- Back to sign in
- </Link>
- </form>
- </div>
- </div>
- </div>
- </div>
- );
-};
-
-ForgotPasswordPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <DefaultLayout>
- <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>{page}</AuthenticationWrapper>
- </DefaultLayout>
- );
-};
-
-export default ForgotPasswordPage;
diff --git a/web/pages/accounts/reset-password.tsx b/web/pages/accounts/reset-password.tsx
deleted file mode 100644
index 92756cd436..0000000000
--- a/web/pages/accounts/reset-password.tsx
+++ /dev/null
@@ -1,242 +0,0 @@
-import { ReactElement, useEffect, useMemo, useState } from "react";
-import Image from "next/image";
-import Link from "next/link";
-import { useRouter } from "next/router";
-// icons
-import { useTheme } from "next-themes";
-import { Eye, EyeOff } from "lucide-react";
-// ui
-import { Button, Input } from "@plane/ui";
-// components
-import { AuthBanner, PasswordStrengthMeter } from "@/components/account";
-import { PageHead } from "@/components/core";
-// helpers
-import {
- EAuthenticationErrorCodes,
- EErrorAlertType,
- EPageTypes,
- TAuthErrorInfo,
- authErrorHandler,
-} from "@/helpers/authentication.helper";
-import { API_BASE_URL } from "@/helpers/common.helper";
-import { getPasswordStrength } from "@/helpers/password.helper";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// lib
-import { NextPageWithLayout } from "@/lib/types";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
-// services
-import { AuthService } from "@/services/auth.service";
-// images
-import 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 TResetPasswordFormValues = {
- email: string;
- password: string;
- confirm_password?: string;
-};
-
-const defaultValues: TResetPasswordFormValues = {
- email: "",
- password: "",
-};
-
-// services
-const authService = new AuthService();
-
-const ResetPasswordPage: NextPageWithLayout = () => {
- // router
- const router = useRouter();
- const { uidb64, token, email, error_code } = router.query;
- // states
- const [showPassword, setShowPassword] = useState({
- password: false,
- retypePassword: false,
- });
- const [resetFormData, setResetFormData] = useState<TResetPasswordFormValues>({
- ...defaultValues,
- email: email ? email.toString() : "",
- });
- const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);
- const [isPasswordInputFocused, setIsPasswordInputFocused] = useState(false);
- const [isRetryPasswordInputFocused, setIsRetryPasswordInputFocused] = useState(false);
- const [errorInfo, setErrorInfo] = useState<TAuthErrorInfo | undefined>(undefined);
-
- // hooks
- const { resolvedTheme } = useTheme();
-
- const handleShowPassword = (key: keyof typeof showPassword) =>
- setShowPassword((prev) => ({ ...prev, [key]: !prev[key] }));
-
- const handleFormChange = (key: keyof TResetPasswordFormValues, value: string) =>
- setResetFormData((prev) => ({ ...prev, [key]: value }));
-
- useEffect(() => {
- if (csrfToken === undefined)
- authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));
- }, [csrfToken]);
-
- const isButtonDisabled = useMemo(
- () =>
- !!resetFormData.password &&
- getPasswordStrength(resetFormData.password) >= 3 &&
- resetFormData.password === resetFormData.confirm_password
- ? false
- : true,
- [resetFormData]
- );
-
- useEffect(() => {
- if (error_code) {
- const errorhandler = authErrorHandler(error_code?.toString() as EAuthenticationErrorCodes);
- if (errorhandler) {
- setErrorInfo(errorhandler);
- }
- }
- }, [error_code]);
-
- const password = resetFormData?.password ?? "";
- const confirmPassword = resetFormData?.confirm_password ?? "";
- const renderPasswordMatchError = !isRetryPasswordInputFocused || confirmPassword.length >= password.length;
-
- const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
-
- return (
- <div className="relative w-screen h-screen overflow-hidden">
- <PageHead title="Reset Password - Plane" />
- <div className="absolute inset-0 z-0">
- <Image
- src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
- className="w-full h-full object-cover"
- alt="Plane background pattern"
- />
- </div>
- <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
- <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
- <div className="flex items-center gap-x-2 py-10">
- <Link href={`/`} className="h-[30px] w-[133px]">
- <Image src={logo} alt="Plane logo" />
- </Link>
- </div>
- </div>
- <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 py-4">
- <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">
- Set new password
- </h3>
- <p className="font-medium text-onboarding-text-400">Secure your account with a strong password</p>
- </div>
- {errorInfo && errorInfo?.type === EErrorAlertType.BANNER_ALERT && (
- <AuthBanner bannerData={errorInfo} handleBannerData={(value) => setErrorInfo(value)} />
- )}
- <form
- className="mt-5 space-y-4"
- method="POST"
- action={`${API_BASE_URL}/auth/reset-password/${uidb64?.toString()}/${token?.toString()}/`}
- >
- <input type="hidden" name="csrfmiddlewaretoken" value={csrfToken} />
- <div className="space-y-1">
- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">
- Email
- </label>
- <div className="relative flex items-center rounded-md bg-onboarding-background-200">
- <Input
- id="email"
- name="email"
- type="email"
- value={resetFormData.email}
- //hasError={Boolean(errors.email)}
- placeholder="[email protected]"
- className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 text-onboarding-text-400 cursor-not-allowed"
- disabled
- />
- </div>
- </div>
- <div className="space-y-1">
- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="password">
- Password
- </label>
- <div className="relative flex items-center rounded-md bg-onboarding-background-200">
- <Input
- type={showPassword.password ? "text" : "password"}
- name="password"
- value={resetFormData.password}
- onChange={(e) => handleFormChange("password", e.target.value)}
- //hasError={Boolean(errors.password)}
- placeholder="Enter password"
- className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
- minLength={8}
- onFocus={() => setIsPasswordInputFocused(true)}
- onBlur={() => setIsPasswordInputFocused(false)}
- autoFocus
- />
- {showPassword.password ? (
- <EyeOff
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("password")}
- />
- ) : (
- <Eye
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("password")}
- />
- )}
- </div>
- {isPasswordInputFocused && <PasswordStrengthMeter password={resetFormData.password} />}
- </div>
- <div className="space-y-1">
- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="confirm_password">
- Confirm password
- </label>
- <div className="relative flex items-center rounded-md bg-onboarding-background-200">
- <Input
- type={showPassword.retypePassword ? "text" : "password"}
- name="confirm_password"
- value={resetFormData.confirm_password}
- onChange={(e) => handleFormChange("confirm_password", e.target.value)}
- placeholder="Confirm password"
- className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
- onFocus={() => setIsRetryPasswordInputFocused(true)}
- onBlur={() => setIsRetryPasswordInputFocused(false)}
- />
- {showPassword.retypePassword ? (
- <EyeOff
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("retypePassword")}
- />
- ) : (
- <Eye
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("retypePassword")}
- />
- )}
- </div>
- {!!resetFormData.confirm_password &&
- resetFormData.password !== resetFormData.confirm_password &&
- renderPasswordMatchError && <span className="text-sm text-red-500">Passwords don{"'"}t match</span>}
- </div>
- <Button type="submit" variant="primary" className="w-full" size="lg" disabled={isButtonDisabled}>
- Set password
- </Button>
- </form>
- </div>
- </div>
- </div>
- </div>
- );
-};
-
-ResetPasswordPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <DefaultLayout>
- <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>{page}</AuthenticationWrapper>
- </DefaultLayout>
- );
-};
-
-export default ResetPasswordPage;
diff --git a/web/pages/accounts/set-password.tsx b/web/pages/accounts/set-password.tsx
deleted file mode 100644
index 9328d2cc95..0000000000
--- a/web/pages/accounts/set-password.tsx
+++ /dev/null
@@ -1,236 +0,0 @@
-import { FormEvent, ReactElement, useEffect, useMemo, useState } from "react";
-import { observer } from "mobx-react-lite";
-import Image from "next/image";
-import Link from "next/link";
-import { useRouter } from "next/router";
-// icons
-import { useTheme } from "next-themes";
-import { Eye, EyeOff } from "lucide-react";
-// ui
-import { Button, Input, TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { PasswordStrengthMeter } from "@/components/account";
-import { PageHead } from "@/components/core";
-// helpers
-import { EPageTypes } from "@/helpers/authentication.helper";
-import { getPasswordStrength } from "@/helpers/password.helper";
-// hooks
-import { useUser } from "@/hooks/store";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// lib
-import { NextPageWithLayout } from "@/lib/types";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
-// services
-import { AuthService } from "@/services/auth.service";
-// images
-import 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 TResetPasswordFormValues = {
- email: string;
- password: string;
- confirm_password?: string;
-};
-
-const defaultValues: TResetPasswordFormValues = {
- email: "",
- password: "",
-};
-
-// services
-const authService = new AuthService();
-
-const SetPasswordPage: NextPageWithLayout = observer(() => {
- // router
- const router = useRouter();
- const { email } = router.query;
- // states
- const [showPassword, setShowPassword] = useState({
- password: false,
- retypePassword: false,
- });
- const [passwordFormData, setPasswordFormData] = useState<TResetPasswordFormValues>({
- ...defaultValues,
- email: email ? email.toString() : "",
- });
- const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);
- const [isPasswordInputFocused, setIsPasswordInputFocused] = useState(false);
- const [isRetryPasswordInputFocused, setIsRetryPasswordInputFocused] = useState(false);
- // hooks
- const { resolvedTheme } = useTheme();
- // hooks
- const { data: user, handleSetPassword } = useUser();
-
- useEffect(() => {
- if (csrfToken === undefined)
- authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));
- }, [csrfToken]);
-
- const handleShowPassword = (key: keyof typeof showPassword) =>
- setShowPassword((prev) => ({ ...prev, [key]: !prev[key] }));
-
- const handleFormChange = (key: keyof TResetPasswordFormValues, value: string) =>
- setPasswordFormData((prev) => ({ ...prev, [key]: value }));
-
- const isButtonDisabled = useMemo(
- () =>
- !!passwordFormData.password &&
- getPasswordStrength(passwordFormData.password) >= 3 &&
- passwordFormData.password === passwordFormData.confirm_password
- ? false
- : true,
- [passwordFormData]
- );
-
- const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
- try {
- e.preventDefault();
- if (!csrfToken) throw new Error("csrf token not found");
- await handleSetPassword(csrfToken, { password: passwordFormData.password });
- router.push("/");
- } catch (err: any) {
- setToast({
- type: TOAST_TYPE.ERROR,
- title: "Error!",
- message: err?.error ?? "Something went wrong. Please try again.",
- });
- }
- };
-
- const password = passwordFormData?.password ?? "";
- const confirmPassword = passwordFormData?.confirm_password ?? "";
- const renderPasswordMatchError = !isRetryPasswordInputFocused || confirmPassword.length >= password.length;
-
- const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
-
- return (
- <div className="relative w-screen h-screen overflow-hidden">
- <PageHead title="Reset Password - Plane" />
- <div className="absolute inset-0 z-0">
- <Image
- src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
- className="w-full h-full object-cover"
- alt="Plane background pattern"
- />
- </div>
- <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
- <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
- <div className="flex items-center gap-x-2 py-10">
- <Link href={`/`} className="h-[30px] w-[133px]">
- <Image src={logo} alt="Plane logo" />
- </Link>
- </div>
- </div>
- <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 py-4">
- <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">
- Secure your account
- </h3>
- <p className="font-medium text-onboarding-text-400">Setting password helps you login securely</p>
- </div>
- <form className="mt-5 space-y-4" onSubmit={(e) => handleSubmit(e)}>
- <div className="space-y-1">
- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="email">
- Email
- </label>
- <div className="relative flex items-center rounded-md bg-onboarding-background-200">
- <Input
- id="email"
- name="email"
- type="email"
- value={user?.email}
- //hasError={Boolean(errors.email)}
- placeholder="[email protected]"
- className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 text-onboarding-text-400 cursor-not-allowed"
- disabled
- />
- </div>
- </div>
- <div className="space-y-1">
- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="password">
- Set a password
- </label>
- <div className="relative flex items-center rounded-md bg-onboarding-background-200">
- <Input
- type={showPassword.password ? "text" : "password"}
- name="password"
- value={passwordFormData.password}
- onChange={(e) => handleFormChange("password", e.target.value)}
- //hasError={Boolean(errors.password)}
- placeholder="Enter password"
- className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
- minLength={8}
- onFocus={() => setIsPasswordInputFocused(true)}
- onBlur={() => setIsPasswordInputFocused(false)}
- autoFocus
- />
- {showPassword.password ? (
- <EyeOff
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("password")}
- />
- ) : (
- <Eye
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("password")}
- />
- )}
- </div>
- {isPasswordInputFocused && <PasswordStrengthMeter password={passwordFormData.password} />}
- </div>
- <div className="space-y-1">
- <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="confirm_password">
- Confirm password
- </label>
- <div className="relative flex items-center rounded-md bg-onboarding-background-200">
- <Input
- type={showPassword.retypePassword ? "text" : "password"}
- name="confirm_password"
- value={passwordFormData.confirm_password}
- onChange={(e) => handleFormChange("confirm_password", e.target.value)}
- placeholder="Confirm password"
- className="h-[46px] w-full border border-onboarding-border-100 !bg-onboarding-background-200 pr-12 placeholder:text-onboarding-text-400"
- onFocus={() => setIsRetryPasswordInputFocused(true)}
- onBlur={() => setIsRetryPasswordInputFocused(false)}
- />
- {showPassword.retypePassword ? (
- <EyeOff
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("retypePassword")}
- />
- ) : (
- <Eye
- className="absolute right-3 h-5 w-5 stroke-custom-text-400 hover:cursor-pointer"
- onClick={() => handleShowPassword("retypePassword")}
- />
- )}
- </div>
- {!!passwordFormData.confirm_password &&
- passwordFormData.password !== passwordFormData.confirm_password &&
- renderPasswordMatchError && <span className="text-sm text-red-500">Passwords don{"'"}t match</span>}
- </div>
- <Button type="submit" variant="primary" className="w-full" size="lg" disabled={isButtonDisabled}>
- Continue
- </Button>
- </form>
- </div>
- </div>
- </div>
- </div>
- );
-});
-
-SetPasswordPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <AuthenticationWrapper pageType={EPageTypes.SET_PASSWORD}>
- <DefaultLayout>{page}</DefaultLayout>
- </AuthenticationWrapper>
- );
-};
-
-export default SetPasswordPage;
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
deleted file mode 100644
index ee22cd77f8..0000000000
--- a/web/pages/index.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { ReactElement } from "react";
-import { observer } from "mobx-react";
-import Image from "next/image";
-import Link from "next/link";
-// ui
-import { useTheme } from "next-themes";
-// components
-import { AuthRoot } from "@/components/account";
-import { PageHead } from "@/components/core";
-// constants
-import { NAVIGATE_TO_SIGNUP } from "@/constants/event-tracker";
-// helpers
-import { EAuthModes, EPageTypes } from "@/helpers/authentication.helper";
-// hooks
-import { useEventTracker } from "@/hooks/store";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
-// assets
-import 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";
-
-const HomePage: NextPageWithLayout = observer(() => {
- const { resolvedTheme } = useTheme();
- // hooks
- const { captureEvent } = useEventTracker();
-
- const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
-
- return (
- <div className="relative w-screen h-screen overflow-hidden">
- <PageHead title="Log in - Plane" />
- <div className="absolute inset-0 z-0">
- <Image
- src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
- className="w-full h-full object-cover"
- alt="Plane background pattern"
- />
- </div>
- <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
- <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
- <div className="flex items-center gap-x-2 py-10">
- <Link href={`/`} className="h-[30px] w-[133px]">
- <Image src={logo} alt="Plane logo" />
- </Link>
- </div>
- <div className="flex flex-col items-end sm:items-center sm:gap-2 sm:flex-row text-center text-sm font-medium text-onboarding-text-300">
- New to Plane?{" "}
- <Link
- href="/sign-up"
- onClick={() => captureEvent(NAVIGATE_TO_SIGNUP, {})}
- className="font-semibold text-custom-primary-100 hover:underline"
- >
- Create an account
- </Link>
- </div>
- </div>
- <div className="flex flex-col justify-center flex-grow container h-[100vh-60px] mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 transition-all">
- <AuthRoot authMode={EAuthModes.SIGN_IN} />
- </div>
- </div>
- </div>
- );
-});
-
-HomePage.getLayout = function getLayout(page: ReactElement) {
- return (
- <DefaultLayout>
- <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>{page}</AuthenticationWrapper>
- </DefaultLayout>
- );
-};
-
-export default HomePage;
diff --git a/web/pages/sign-up.tsx b/web/pages/sign-up.tsx
deleted file mode 100644
index 2c511d7300..0000000000
--- a/web/pages/sign-up.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { observer } from "mobx-react";
-import Image from "next/image";
-import Link from "next/link";
-// ui
-import { useTheme } from "next-themes";
-// components
-import { AuthRoot } from "@/components/account";
-import { PageHead } from "@/components/core";
-// constants
-import { NAVIGATE_TO_SIGNIN } from "@/constants/event-tracker";
-// helpers
-import { EAuthModes, EPageTypes } from "@/helpers/authentication.helper";
-// hooks
-import { useEventTracker } from "@/hooks/store";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
-// assets
-import 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";
-
-export type AuthType = "sign-in" | "sign-up";
-
-const SignInPage: NextPageWithLayout = observer(() => {
- // store hooks
- const { captureEvent } = useEventTracker();
- // hooks
- const { resolvedTheme } = useTheme();
-
- const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
-
- return (
- <div className="relative w-screen h-screen overflow-hidden">
- <PageHead title="Sign up - Plane" />
- <div className="absolute inset-0 z-0">
- <Image
- src={resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern}
- className="w-full h-full object-cover"
- alt="Plane background pattern"
- />
- </div>
- <div className="relative z-10 w-screen h-screen overflow-hidden overflow-y-auto flex flex-col">
- <div className="container mx-auto px-10 lg:px-0 flex-shrink-0 relative flex items-center justify-between pb-4 transition-all">
- <div className="flex items-center gap-x-2 py-10">
- <Link href={`/`} className="h-[30px] w-[133px]">
- <Image src={logo} alt="Plane logo" />
- </Link>
- </div>
- <div className="flex flex-col items-end sm:items-center sm:gap-2 sm:flex-row text-center text-sm font-medium text-onboarding-text-300">
- Already have an account?{" "}
- <Link
- href="/"
- onClick={() => captureEvent(NAVIGATE_TO_SIGNIN, {})}
- className="font-semibold text-custom-primary-100 hover:underline"
- >
- Log in
- </Link>
- </div>
- </div>
- <div className="flex flex-col justify-center flex-grow container h-[100vh-60px] mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 transition-all">
- <AuthRoot authMode={EAuthModes.SIGN_UP} />
- </div>
- </div>
- </div>
- );
-});
-
-SignInPage.getLayout = function getLayout(page: React.ReactElement) {
- return (
- <DefaultLayout>
- <AuthenticationWrapper pageType={EPageTypes.NON_AUTHENTICATED}>{page}</AuthenticationWrapper>
- </DefaultLayout>
- );
-};
-
-export default SignInPage;
diff --git a/web/pages/workspace-invitations.tsx b/web/pages/workspace-invitations.tsx
deleted file mode 100644
index 19c8fab2e7..0000000000
--- a/web/pages/workspace-invitations.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import React, { ReactElement } from "react";
-import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-import useSWR from "swr";
-import { Boxes, Check, Share2, Star, User2, X } from "lucide-react";
-// components
-import { LogoSpinner } from "@/components/common";
-import { EmptySpace, EmptySpaceItem } from "@/components/ui/empty-space";
-// constants
-import { WORKSPACE_INVITATION } from "@/constants/fetch-keys";
-// helpers
-import { EPageTypes } from "@/helpers/authentication.helper";
-// hooks
-import { useUser } from "@/hooks/store";
-// layouts
-import DefaultLayout from "@/layouts/default-layout";
-// types
-import { NextPageWithLayout } from "@/lib/types";
-// wrappers
-import { AuthenticationWrapper } from "@/lib/wrappers";
-// services
-import { WorkspaceService } from "@/services/workspace.service";
-
-// service initialization
-const workspaceService = new WorkspaceService();
-
-const WorkspaceInvitationPage: NextPageWithLayout = observer(() => {
- // router
- const router = useRouter();
- const { invitation_id, email, slug } = router.query;
- // store hooks
- const { data: currentUser } = useUser();
-
- const { data: invitationDetail, error } = useSWR(
- invitation_id && slug && WORKSPACE_INVITATION(invitation_id.toString()),
- invitation_id && slug
- ? () => workspaceService.getWorkspaceInvitation(slug.toString(), invitation_id.toString())
- : null
- );
-
- const handleAccept = () => {
- if (!invitationDetail) return;
- workspaceService
- .joinWorkspace(invitationDetail.workspace.slug, invitationDetail.id, {
- accepted: true,
- email: invitationDetail.email,
- })
- .then(() => {
- if (email === currentUser?.email) {
- router.push("/invitations");
- } else {
- router.push({ pathname: "/", query: router.query });
- }
- })
- .catch((err) => console.error(err));
- };
-
- const handleReject = () => {
- if (!invitationDetail) return;
- workspaceService
- .joinWorkspace(invitationDetail.workspace.slug, invitationDetail.id, {
- accepted: false,
- email: invitationDetail.email,
- })
- .then(() => {
- router.push("/");
- })
- .catch((err) => console.error(err));
- };
-
- return (
- <div className="flex h-full w-full flex-col items-center justify-center px-3">
- {invitationDetail && !invitationDetail.responded_at ? (
- error ? (
- <div className="flex w-full flex-col space-y-4 rounded border border-custom-border-200 bg-custom-background-100 px-4 py-8 text-center shadow-2xl md:w-1/3">
- <h2 className="text-xl uppercase">INVITATION NOT FOUND</h2>
- </div>
- ) : (
- <EmptySpace
- title={`You have been invited to ${invitationDetail.workspace.name}`}
- description="Your workspace is where you'll create projects, collaborate on your issues, and organize different streams of work in your Plane account."
- >
- <EmptySpaceItem Icon={Check} title="Accept" action={handleAccept} />
- <EmptySpaceItem Icon={X} title="Ignore" action={handleReject} />
- </EmptySpace>
- )
- ) : error || invitationDetail?.responded_at ? (
- invitationDetail?.accepted ? (
- <EmptySpace
- title={`You are already a member of ${invitationDetail.workspace.name}`}
- description="Your workspace is where you'll create projects, collaborate on your issues, and organize different streams of work in your Plane account."
- >
- <EmptySpaceItem Icon={Boxes} title="Continue to home" href="/" />
- </EmptySpace>
- ) : (
- <EmptySpace
- title="This invitation link is not active anymore."
- description="Your workspace is where you'll create projects, collaborate on your issues, and organize different streams of work in your Plane account."
- link={{ text: "Or start from an empty project", href: "/" }}
- >
- {!currentUser ? (
- <EmptySpaceItem Icon={User2} title="Sign in to continue" href="/" />
- ) : (
- <EmptySpaceItem Icon={Boxes} title="Continue to home" href="/" />
- )}
- <EmptySpaceItem Icon={Star} title="Star us on GitHub" href="https://github.com/makeplane" />
- <EmptySpaceItem
- Icon={Share2}
- title="Join our community of active creators"
- href="https://discord.com/invite/A92xrEGCge"
- />
- </EmptySpace>
- )
- ) : (
- <div className="flex h-full w-full items-center justify-center">
- <LogoSpinner />
- </div>
- )}
- </div>
- );
-});
-
-WorkspaceInvitationPage.getLayout = function getLayout(page: ReactElement) {
- return (
- <DefaultLayout>
- <AuthenticationWrapper pageType={EPageTypes.PUBLIC}>{page}</AuthenticationWrapper>
- </DefaultLayout>
- );
-};
-
-export default WorkspaceInvitationPage;
diff --git a/web/services/api.service.ts b/web/services/api.service.ts
index e191cd8f7b..c80f71017b 100644
--- a/web/services/api.service.ts
+++ b/web/services/api.service.ts
@@ -1,7 +1,5 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import axios, { AxiosInstance } from "axios";
-// store
-import { rootStore } from "@/lib/store-context";
export abstract class APIService {
protected baseURL: string;
@@ -13,22 +11,6 @@ export abstract class APIService {
baseURL,
withCredentials: true,
});
-
- this.setupInterceptors();
- }
-
- private setupInterceptors() {
- this.axiosInstance.interceptors.response.use(
- (response) => response,
- (error) => {
- const store = rootStore;
- if (error.response && error.response.status === 401 && store.user.data) {
- store.user.reset();
- store.resetOnSignOut();
- }
- return Promise.reject(error);
- }
- );
}
get(url: string, params = {}, config = {}) {
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index 05bc93bdcd..9b3463d0b1 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
const sharedConfig = require("tailwind-config-custom/tailwind.config.js");
module.exports = {
diff --git a/yarn.lock b/yarn.lock
index f25b406bc0..0b5152b5b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -46,9 +46,15 @@
"@babel/runtime" "^7.0.0"
"@atlaskit/pragmatic-drag-and-drop@^1.1.0", "@atlaskit/pragmatic-drag-and-drop@^1.1.10", "@atlaskit/pragmatic-drag-and-drop@^1.1.3":
+<<<<<<< HEAD
+ version "1.1.10"
+ resolved "https://registry.yarnpkg.com/@atlaskit/pragmatic-drag-and-drop/-/pragmatic-drag-and-drop-1.1.10.tgz#b7671bb6329adec6603c1805310a5ec16ff6fb7c"
+ integrity sha512-imiaN7bfZJM92Xq+qgbzIaKgLeHpd56w5/ECrBW1HMIXTRFauLdEo1w6PCcI4k1r18pA19E1mNhSb5+WvhMkOg==
+=======
version "1.1.11"
resolved "https://registry.yarnpkg.com/@atlaskit/pragmatic-drag-and-drop/-/pragmatic-drag-and-drop-1.1.11.tgz#6cadcd0cd54f72598967642fd60f6187ae7612fe"
integrity sha512-oAwMGM68d7PrAHvcgwzJbOtZJKW6BJsc2eDWfVWb7W+lGo8tWDIFdMSmR2K+EczV03lXgdnQbRWDMcOrZ/98mQ==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/runtime" "^7.0.0"
bind-event-listener "^3.0.0"
@@ -61,6 +67,46 @@
dependencies:
default-browser-id "3.0.0"
+<<<<<<< HEAD
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.6.tgz#ab88da19344445c3d8889af2216606d3329f3ef2"
+ integrity sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==
+ dependencies:
+ "@babel/highlight" "^7.24.6"
+ picocolors "^1.0.0"
+
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.6.tgz#b3600217688cabb26e25f8e467019e66d71b7ae2"
+ integrity sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==
+
+"@babel/core@^7.11.1", "@babel/core@^7.18.5", "@babel/core@^7.18.9", "@babel/core@^7.23.0", "@babel/core@^7.24.4":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.6.tgz#8650e0e4b03589ebe886c4e4a60398db0a7ec787"
+ integrity sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==
+ dependencies:
+ "@ampproject/remapping" "^2.2.0"
+ "@babel/code-frame" "^7.24.6"
+ "@babel/generator" "^7.24.6"
+ "@babel/helper-compilation-targets" "^7.24.6"
+ "@babel/helper-module-transforms" "^7.24.6"
+ "@babel/helpers" "^7.24.6"
+ "@babel/parser" "^7.24.6"
+ "@babel/template" "^7.24.6"
+ "@babel/traverse" "^7.24.6"
+ "@babel/types" "^7.24.6"
+ convert-source-map "^2.0.0"
+ debug "^4.1.0"
+ gensync "^1.0.0-beta.2"
+ json5 "^2.2.3"
+ semver "^6.3.1"
+
+"@babel/generator@^7.24.4", "@babel/generator@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.6.tgz#dfac82a228582a9d30c959fe50ad28951d4737a7"
+ integrity sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==
+=======
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
@@ -109,9 +155,30 @@
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/types" "^7.24.7"
+<<<<<<< HEAD
+"@babel/helper-annotate-as-pure@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.6.tgz#517af93abc77924f9b2514c407bbef527fb8938d"
+ integrity sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==
+ dependencies:
+ "@babel/types" "^7.24.6"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.6.tgz#19e9089ee87b0d0928012c83961a8deef4b0223f"
+ integrity sha512-+wnfqc5uHiMYtvRX7qu80Toef8BXeh4HHR1SPeonGb1SKPniNEd4a/nlaJJMv/OIEYvIVavvo0yR7u10Gqz0Iw==
+ dependencies:
+ "@babel/types" "^7.24.6"
+
+"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz#4a51d681f7680043d38e212715e2a7b1ad29cb51"
+ integrity sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==
+=======
"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3"
@@ -135,6 +202,7 @@
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b"
integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/helper-annotate-as-pure" "^7.24.7"
"@babel/helper-environment-visitor" "^7.24.7"
@@ -146,12 +214,36 @@
"@babel/helper-split-export-declaration" "^7.24.7"
semver "^6.3.1"
+<<<<<<< HEAD
+"@babel/helper-create-class-features-plugin@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.6.tgz#c50b86fa1c4ca9b7a890dc21884f097b6c4b5286"
+ integrity sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.24.6"
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-function-name" "^7.24.6"
+ "@babel/helper-member-expression-to-functions" "^7.24.6"
+ "@babel/helper-optimise-call-expression" "^7.24.6"
+ "@babel/helper-replace-supers" "^7.24.6"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"
+ "@babel/helper-split-export-declaration" "^7.24.6"
+ semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.6.tgz#47d382dec0d49e74ca1b6f7f3b81f5968022a3c8"
+ integrity sha512-C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.24.6"
+=======
"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz#be4f435a80dc2b053c76eeb4b7d16dd22cfc89da"
integrity sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==
dependencies:
"@babel/helper-annotate-as-pure" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
regexpu-core "^5.3.1"
semver "^6.3.1"
@@ -166,6 +258,17 @@
lodash.debounce "^4.0.8"
resolve "^1.14.2"
+<<<<<<< HEAD
+"@babel/helper-environment-visitor@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz#ac7ad5517821641550f6698dd5468f8cef78620d"
+ integrity sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==
+
+"@babel/helper-function-name@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz#cebdd063386fdb95d511d84b117e51fc68fec0c8"
+ integrity sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==
+=======
"@babel/helper-environment-visitor@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
@@ -177,10 +280,17 @@
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/template" "^7.24.7"
"@babel/types" "^7.24.7"
+<<<<<<< HEAD
+"@babel/helper-hoist-variables@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz#8a7ece8c26756826b6ffcdd0e3cf65de275af7f9"
+ integrity sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==
+=======
"@babel/helper-hoist-variables@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
@@ -192,10 +302,24 @@
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f"
integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/traverse" "^7.24.7"
"@babel/types" "^7.24.7"
+<<<<<<< HEAD
+"@babel/helper-member-expression-to-functions@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.6.tgz#86084f3e0e4e2169a134754df3870bc7784db71e"
+ integrity sha512-OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg==
+ dependencies:
+ "@babel/types" "^7.24.6"
+
+"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz#65e54ffceed6a268dc4ce11f0433b82cfff57852"
+ integrity sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==
+=======
"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
@@ -219,9 +343,16 @@
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"
integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/types" "^7.24.7"
+<<<<<<< HEAD
+"@babel/helper-module-transforms@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz#22346ed9df44ce84dee850d7433c5b73fab1fe4e"
+ integrity sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==
+=======
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0"
@@ -240,11 +371,43 @@
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765"
integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/helper-member-expression-to-functions" "^7.24.7"
"@babel/helper-optimise-call-expression" "^7.24.7"
+<<<<<<< HEAD
+"@babel/helper-optimise-call-expression@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.6.tgz#f7836e3ccca3dfa02f15d2bc8b794efe75a5256e"
+ integrity sha512-3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA==
+ dependencies:
+ "@babel/types" "^7.24.6"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.6", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz#fa02a32410a15a6e8f8185bcbf608f10528d2a24"
+ integrity sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==
+
+"@babel/helper-remap-async-to-generator@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.6.tgz#c96ceb9846e877d806ce82a1521230ea7e0fc354"
+ integrity sha512-1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.24.6"
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-wrap-function" "^7.24.6"
+
+"@babel/helper-replace-supers@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.6.tgz#3ea87405a2986a49ab052d10e540fe036d747c71"
+ integrity sha512-mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-member-expression-to-functions" "^7.24.6"
+ "@babel/helper-optimise-call-expression" "^7.24.6"
+=======
"@babel/helper-simple-access@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
@@ -292,6 +455,7 @@
"@babel/template" "^7.24.7"
"@babel/traverse" "^7.24.7"
"@babel/types" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/helpers@^7.24.7":
version "7.24.7"
@@ -301,6 +465,58 @@
"@babel/template" "^7.24.7"
"@babel/types" "^7.24.7"
+<<<<<<< HEAD
+"@babel/helper-skip-transparent-expression-wrappers@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.6.tgz#c47e9b33b7ea50d1073e125ebc26661717cb7040"
+ integrity sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q==
+ dependencies:
+ "@babel/types" "^7.24.6"
+
+"@babel/helper-split-export-declaration@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz#e830068f7ba8861c53b7421c284da30ae656d7a3"
+ integrity sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==
+ dependencies:
+ "@babel/types" "^7.24.6"
+
+"@babel/helper-string-parser@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz#28583c28b15f2a3339cfafafeaad42f9a0e828df"
+ integrity sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==
+
+"@babel/helper-validator-identifier@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz#08bb6612b11bdec78f3feed3db196da682454a5e"
+ integrity sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==
+
+"@babel/helper-validator-option@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz#59d8e81c40b7d9109ab7e74457393442177f460a"
+ integrity sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==
+
+"@babel/helper-wrap-function@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.6.tgz#c27af1006e310683fdc76b668a0a1f6003e36217"
+ integrity sha512-f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ==
+ dependencies:
+ "@babel/helper-function-name" "^7.24.6"
+ "@babel/template" "^7.24.6"
+ "@babel/types" "^7.24.6"
+
+"@babel/helpers@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.6.tgz#cd124245299e494bd4e00edda0e4ea3545c2c176"
+ integrity sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==
+ dependencies:
+ "@babel/template" "^7.24.6"
+ "@babel/types" "^7.24.6"
+
+"@babel/highlight@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.6.tgz#6d610c1ebd2c6e061cade0153bf69b0590b7b3df"
+ integrity sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==
+=======
"@babel/highlight@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
@@ -320,10 +536,49 @@
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz#fd059fd27b184ea2b4c7e646868a9a381bbc3055"
integrity sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/helper-plugin-utils" "^7.24.7"
+<<<<<<< HEAD
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.0", "@babel/parser@^7.24.4", "@babel/parser@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.6.tgz#5e030f440c3c6c78d195528c3b688b101a365328"
+ integrity sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==
+
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.6.tgz#283a74ef365b1e954cda6b2724c678a978215e88"
+ integrity sha512-bYndrJ6Ph6Ar+GaB5VAc0JPoP80bQCm4qon6JEzXfRl5QZyQ8Ur1K6k7htxWmPA5z+k7JQvaMUrtXlqclWYzKw==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.6.tgz#f9f5ae4d6fb72f5950262cb6f0b2482c3bc684ef"
+ integrity sha512-iVuhb6poq5ikqRq2XWU6OQ+R5o9wF+r/or9CeUyovgptz0UlnK4/seOQ1Istu/XybYjAhQv1FRSSfHHufIku5Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.6.tgz#ab9be6edfffa127bd5ec4317c76c5af0f8fc7e6c"
+ integrity sha512-c8TER5xMDYzzFcGqOEp9l4hvB7dcbhcGjcLVwxWfe4P5DOafdwjsBJZKsmv+o3aXh7NhopvayQIovHrh2zSRUQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"
+ "@babel/plugin-transform-optional-chaining" "^7.24.6"
+
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.6.tgz#0faf879249ec622d7f1c42eaebf7d11197401b2c"
+ integrity sha512-z8zEjYmwBUHN/pCF3NuWBhHQjJCrd33qAi8MgANfMrAvn72k2cImT8VjK9LJFu4ysOLJqhfkYYb3MvwANRUNZQ==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+=======
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz#468096ca44bbcbe8fcc570574e12eb1950e18107"
@@ -347,6 +602,7 @@
dependencies:
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/helper-plugin-utils" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
version "7.21.0-placeholder-for-preset-env.2"
@@ -388,6 +644,28 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.3"
+<<<<<<< HEAD
+"@babel/plugin-syntax-flow@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.6.tgz#1102a710771326b8e2f0c85ac2aecb6f52eb601e"
+ integrity sha512-gNkksSdV8RbsCoHF9sjVYrHfYACMl/8U32UfUhJ9+84/ASXw8dlx+eHyyF0m6ncQJ9IBSxfuCkB36GJqYdXTOA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-syntax-import-assertions@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.6.tgz#52521c1c1698fc2dd9cf88f7a4dd86d4d041b9e1"
+ integrity sha512-BE6o2BogJKJImTmGpkmOic4V0hlRRxVtzqxiSPa8TIFxyhi4EFjHm08nq1M4STK4RytuLMgnSz0/wfflvGFNOg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-syntax-import-attributes@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.6.tgz#12aba325534129584672920274fefa4dc2d5f68e"
+ integrity sha512-D+CfsVZousPXIdudSII7RGy52+dYRtbyKAZcvtQKq/NpsivyMVduepzcLqG5pMBugtMdedxdC8Ramdpcne9ZWQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+=======
"@babel/plugin-syntax-flow@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.7.tgz#d1759e84dd4b437cf9fae69b4c06c41d7625bfb7"
@@ -408,6 +686,7 @@
integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==
dependencies:
"@babel/helper-plugin-utils" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/plugin-syntax-import-meta@^7.10.4":
version "7.10.4"
@@ -423,12 +702,21 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
+<<<<<<< HEAD
+"@babel/plugin-syntax-jsx@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.6.tgz#bcca2964150437f88f65e3679e3d68762287b9c8"
+ integrity sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+=======
"@babel/plugin-syntax-jsx@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d"
integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==
dependencies:
"@babel/helper-plugin-utils" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
version "7.10.4"
@@ -486,12 +774,21 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
+<<<<<<< HEAD
+"@babel/plugin-syntax-typescript@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.6.tgz#769daf2982d60308bc83d8936eaecb7582463c87"
+ integrity sha512-TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+=======
"@babel/plugin-syntax-typescript@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz#58d458271b4d3b6bb27ee6ac9525acbb259bad1c"
integrity sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==
dependencies:
"@babel/helper-plugin-utils" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
version "7.18.6"
@@ -501,6 +798,426 @@
"@babel/helper-create-regexp-features-plugin" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6"
+<<<<<<< HEAD
+"@babel/plugin-transform-arrow-functions@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.6.tgz#93607d1ef5b81c70af174aff3532d57216367492"
+ integrity sha512-jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-async-generator-functions@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.6.tgz#fa4a9e5c3a7f60f697ba36587b6c41b04f507d84"
+ integrity sha512-VEP2o4iR2DqQU6KPgizTW2mnMx6BG5b5O9iQdrW9HesLkv8GIA8x2daXBQxw1MrsIkFQGA/iJ204CKoQ8UcnAA==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-remap-async-to-generator" "^7.24.6"
+ "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-transform-async-to-generator@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.6.tgz#eb11434b11d73d8c0cf9f71a6f4f1e6ba441df35"
+ integrity sha512-NTBA2SioI3OsHeIn6sQmhvXleSl9T70YY/hostQLveWs0ic+qvbA3fa0kwAwQ0OA/XGaAerNZRQGJyRfhbJK4g==
+ dependencies:
+ "@babel/helper-module-imports" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-remap-async-to-generator" "^7.24.6"
+
+"@babel/plugin-transform-block-scoped-functions@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.6.tgz#975555b5bfa9870b1218da536d1528735f1f8c56"
+ integrity sha512-XNW7jolYHW9CwORrZgA/97tL/k05qe/HL0z/qqJq1mdWhwwCM6D4BJBV7wAz9HgFziN5dTOG31znkVIzwxv+vw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-block-scoping@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.6.tgz#a03ec8a4591c2b43cf7798bc633e698293fda179"
+ integrity sha512-S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-class-properties@^7.22.5", "@babel/plugin-transform-class-properties@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.6.tgz#d9f394e97e88ef905d5a1e5e7a16238621b7982e"
+ integrity sha512-j6dZ0Z2Z2slWLR3kt9aOmSIrBvnntWjMDN/TVcMPxhXMLmJVqX605CBRlcGI4b32GMbfifTEsdEjGjiE+j/c3A==
+ dependencies:
+ "@babel/helper-create-class-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-class-static-block@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.6.tgz#f43f29286f6f0dca33d18fd5033b817d6c3fa816"
+ integrity sha512-1QSRfoPI9RoLRa8Mnakc6v3e0gJxiZQTYrMfLn+mD0sz5+ndSzwymp2hDcYJTyT0MOn0yuWzj8phlIvO72gTHA==
+ dependencies:
+ "@babel/helper-create-class-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.6.tgz#0cc198c02720d4eeb091004843477659c6b37977"
+ integrity sha512-+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.24.6"
+ "@babel/helper-compilation-targets" "^7.24.6"
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-function-name" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-replace-supers" "^7.24.6"
+ "@babel/helper-split-export-declaration" "^7.24.6"
+ globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.6.tgz#7a1765c01cdfe59c320d2d0f37a4dc4aecd14df1"
+ integrity sha512-cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/template" "^7.24.6"
+
+"@babel/plugin-transform-destructuring@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.6.tgz#bdd1a6c90ffb2bfd13b6007b13316eeafc97cb53"
+ integrity sha512-YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-dotall-regex@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.6.tgz#5a6b3148ec5f4f274ff48cebea90565087cad126"
+ integrity sha512-rCXPnSEKvkm/EjzOtLoGvKseK+dS4kZwx1HexO3BtRtgL0fQ34awHn34aeSHuXtZY2F8a1X8xqBBPRtOxDVmcA==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-duplicate-keys@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.6.tgz#2716301227cf7cd4fdadcbe4353ce191f8b3dc8a"
+ integrity sha512-/8Odwp/aVkZwPFJMllSbawhDAO3UJi65foB00HYnK/uXvvCPm0TAXSByjz1mpRmp0q6oX2SIxpkUOpPFHk7FLA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-dynamic-import@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.6.tgz#b477177761d56b15a4ba42a83be31cf72d757acf"
+ integrity sha512-vpq8SSLRTBLOHUZHSnBqVo0AKX3PBaoPs2vVzYVWslXDTDIpwAcCDtfhUcHSQQoYoUvcFPTdC8TZYXu9ZnLT/w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-transform-exponentiation-operator@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.6.tgz#011e9e1a429f91b024af572530873ca571f9ef06"
+ integrity sha512-EemYpHtmz0lHE7hxxxYEuTYOOBZ43WkDgZ4arQ4r+VX9QHuNZC+WH3wUWmRNvR8ECpTRne29aZV6XO22qpOtdA==
+ dependencies:
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-export-namespace-from@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.6.tgz#b64ded74d9afb3db5d47d93996c4df69f15ac97c"
+ integrity sha512-inXaTM1SVrIxCkIJ5gqWiozHfFMStuGbGJAxZFBoHcRRdDP0ySLb3jH6JOwmfiinPwyMZqMBX+7NBDCO4z0NSA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-transform-flow-strip-types@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.6.tgz#dfd9d1c90e74335bc68d82f41ad9224960a4de84"
+ integrity sha512-1l8b24NoCpaQ13Vi6FtLG1nv6kNoi8PWvQb1AYO7GHZDpFfBYc3lbXArx1lP2KRt8b4pej1eWc/zrRmsQTfOdQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-flow" "^7.24.6"
+
+"@babel/plugin-transform-for-of@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.6.tgz#7f31780bd0c582b546372c0c0da9d9d56731e0a2"
+ integrity sha512-n3Sf72TnqK4nw/jziSqEl1qaWPbCRw2CziHH+jdRYvw4J6yeCzsj4jdw8hIntOEeDGTmHVe2w4MVL44PN0GMzg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"
+
+"@babel/plugin-transform-function-name@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.6.tgz#60d1de3f6fd816a3e3bf9538578a64527e1b9c97"
+ integrity sha512-sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q==
+ dependencies:
+ "@babel/helper-compilation-targets" "^7.24.6"
+ "@babel/helper-function-name" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-json-strings@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.6.tgz#a84639180ea1f9001bb5e6dc01921235ab05ad8b"
+ integrity sha512-Uvgd9p2gUnzYJxVdBLcU0KurF8aVhkmVyMKW4MIY1/BByvs3EBpv45q01o7pRTVmTvtQq5zDlytP3dcUgm7v9w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-transform-literals@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.6.tgz#7f44f2871d7a4456030b0540858046f0b7bc6b18"
+ integrity sha512-f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-logical-assignment-operators@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.6.tgz#9cc7baa5629866566562c159dc1eae7569810f33"
+ integrity sha512-EKaWvnezBCMkRIHxMJSIIylzhqK09YpiJtDbr2wsXTwnO0TxyjMUkaw4RlFIZMIS0iDj0KyIg7H7XCguHu/YDA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-transform-member-expression-literals@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.6.tgz#5d3681ca201ac6909419cc51ac082a6ba4c5c756"
+ integrity sha512-9g8iV146szUo5GWgXpRbq/GALTnY+WnNuRTuRHWWFfWGbP9ukRL0aO/jpu9dmOPikclkxnNsjY8/gsWl6bmZJQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-modules-amd@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.6.tgz#09aeac7acb7913496aaaafdc64f40683e0db7e41"
+ integrity sha512-eAGogjZgcwqAxhyFgqghvoHRr+EYRQPFjUXrTYKBRb5qPnAVxOOglaxc4/byHqjvq/bqO2F3/CGwTHsgKJYHhQ==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.6.tgz#1b8269902f25bd91ca6427230d4735ddd1e1283e"
+ integrity sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-simple-access" "^7.24.6"
+
+"@babel/plugin-transform-modules-systemjs@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.6.tgz#c54eb53fe16f9b82d320abd76762d0320e3f9393"
+ integrity sha512-xg1Z0J5JVYxtpX954XqaaAT6NpAY6LtZXvYFCJmGFJWwtlz2EmJoR8LycFRGNE8dBKizGWkGQZGegtkV8y8s+w==
+ dependencies:
+ "@babel/helper-hoist-variables" "^7.24.6"
+ "@babel/helper-module-transforms" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-validator-identifier" "^7.24.6"
+
+"@babel/plugin-transform-modules-umd@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.6.tgz#c4ef8b6d4da230b8dc87e81cd66986728952f89b"
+ integrity sha512-esRCC/KsSEUvrSjv5rFYnjZI6qv4R1e/iHQrqwbZIoRJqk7xCvEUiN7L1XrmW5QSmQe3n1XD88wbgDTWLbVSyg==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.6.tgz#352ee2861ab8705320029f80238cf26a92ba65d5"
+ integrity sha512-6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-new-target@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.6.tgz#fc024294714705113720d5e3dc0f9ad7abdbc289"
+ integrity sha512-f8liz9JG2Va8A4J5ZBuaSdwfPqN6axfWRK+y66fjKYbwf9VBLuq4WxtinhJhvp1w6lamKUwLG0slK2RxqFgvHA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11", "@babel/plugin-transform-nullish-coalescing-operator@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.6.tgz#12b83b3cdfd1cd2066350e36e4fb912ab194545e"
+ integrity sha512-+QlAiZBMsBK5NqrBWFXCYeXyiU1y7BQ/OYaiPAcQJMomn5Tyg+r5WuVtyEuvTbpV7L25ZSLfE+2E9ywj4FD48A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-transform-numeric-separator@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.6.tgz#d9115669cc85aa91fbfb15f88f2226332cf4946a"
+ integrity sha512-6voawq8T25Jvvnc4/rXcWZQKKxUNZcKMS8ZNrjxQqoRFernJJKjE3s18Qo6VFaatG5aiX5JV1oPD7DbJhn0a4Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-transform-object-rest-spread@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.6.tgz#68d763f69955f9e599c405c6c876f5be46b47d8a"
+ integrity sha512-OKmi5wiMoRW5Smttne7BwHM8s/fb5JFs+bVGNSeHWzwZkWXWValR1M30jyXo1s/RaqgwwhEC62u4rFH/FBcBPg==
+ dependencies:
+ "@babel/helper-compilation-targets" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+ "@babel/plugin-transform-parameters" "^7.24.6"
+
+"@babel/plugin-transform-object-super@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.6.tgz#9cbe6f995bed343a7ab8daf0416dac057a9c3e27"
+ integrity sha512-N/C76ihFKlZgKfdkEYKtaRUtXZAgK7sOY4h2qrbVbVTXPrKGIi8aww5WGe/+Wmg8onn8sr2ut6FXlsbu/j6JHg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-replace-supers" "^7.24.6"
+
+"@babel/plugin-transform-optional-catch-binding@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.6.tgz#c81e90a971aad898e56f2b75a358e6c4855aeba3"
+ integrity sha512-L5pZ+b3O1mSzJ71HmxSCmTVd03VOT2GXOigug6vDYJzE5awLI7P1g0wFcdmGuwSDSrQ0L2rDOe/hHws8J1rv3w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-transform-optional-chaining@^7.23.0", "@babel/plugin-transform-optional-chaining@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.6.tgz#3d636b3ed8b5a506f93e4d4675fc95754d7594f5"
+ integrity sha512-cHbqF6l1QP11OkYTYQ+hhVx1E017O5ZcSPXk9oODpqhcAD1htsWG2NpHrrhthEO2qZomLK0FXS+u7NfrkF5aOQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"
+ "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-transform-parameters@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.6.tgz#7aee86dfedd2fc0136fecbe6f7649fc02d86ab22"
+ integrity sha512-ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-private-methods@^7.22.5", "@babel/plugin-transform-private-methods@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.6.tgz#258e1f859a52ff7b30ad556598224c192defcda7"
+ integrity sha512-T9LtDI0BgwXOzyXrvgLTT8DFjCC/XgWLjflczTLXyvxbnSR/gpv0hbmzlHE/kmh9nOvlygbamLKRo6Op4yB6aw==
+ dependencies:
+ "@babel/helper-create-class-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-private-property-in-object@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.6.tgz#59ff09a099f62213112cf348e96b6b11957d1f28"
+ integrity sha512-Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.24.6"
+ "@babel/helper-create-class-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-transform-property-literals@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.6.tgz#243c4faabe811c405e9443059a58e834bf95dfd1"
+ integrity sha512-oARaglxhRsN18OYsnPTpb8TcKQWDYNsPNmTnx5++WOAsUJ0cSC/FZVlIJCKvPbU4yn/UXsS0551CFKJhN0CaMw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-regenerator@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.6.tgz#ed10cf0c13619365e15459f88d1b915ac57ffc24"
+ integrity sha512-SMDxO95I8WXRtXhTAc8t/NFQUT7VYbIWwJCJgEli9ml4MhqUMh4S6hxgH6SmAC3eAQNWCDJFxcFeEt9w2sDdXg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ regenerator-transform "^0.15.2"
+
+"@babel/plugin-transform-reserved-words@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.6.tgz#9eb16cbf339fcea0a46677716c775afb5ef14245"
+ integrity sha512-DcrgFXRRlK64dGE0ZFBPD5egM2uM8mgfrvTMOSB2yKzOtjpGegVYkzh3s1zZg1bBck3nkXiaOamJUqK3Syk+4A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-shorthand-properties@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.6.tgz#ef734ebccc428d2174c7bb36015d0800faf5381e"
+ integrity sha512-xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-spread@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.6.tgz#a56cecbd8617675531d1b79f5b755b7613aa0822"
+ integrity sha512-h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"
+
+"@babel/plugin-transform-sticky-regex@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.6.tgz#1a78127731fea87d954bed193840986a38f04327"
+ integrity sha512-fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-template-literals@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.6.tgz#aaf2ae157acd0e5c9265dba8ac0a439f8d2a6303"
+ integrity sha512-BJbEqJIcKwrqUP+KfUIkxz3q8VzXe2R8Wv8TaNgO1cx+nNavxn/2+H8kp9tgFSOL6wYPPEgFvU6IKS4qoGqhmg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-typeof-symbol@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.6.tgz#3d02da23ebcc8f1982ddcd1f2581cf3ee4e58762"
+ integrity sha512-IshCXQ+G9JIFJI7bUpxTE/oA2lgVLAIK8q1KdJNoPXOpvRaNjMySGuvLfBw/Xi2/1lLo953uE8hyYSDW3TSYig==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-typescript@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.6.tgz#339c6127a783c32e28a5b591e6c666f899b57db0"
+ integrity sha512-H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.24.6"
+ "@babel/helper-create-class-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/plugin-syntax-typescript" "^7.24.6"
+
+"@babel/plugin-transform-unicode-escapes@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.6.tgz#c8ddca8fd5bacece837a4e27bd3b7ed64580d1a8"
+ integrity sha512-bKl3xxcPbkQQo5eX9LjjDpU2xYHeEeNQbOhj0iPvetSzA+Tu9q/o5lujF4Sek60CM6MgYvOS/DJuwGbiEYAnLw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-unicode-property-regex@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.6.tgz#e66297d5d452db0b0be56515e3d0e10b7d33fb32"
+ integrity sha512-8EIgImzVUxy15cZiPii9GvLZwsy7Vxc+8meSlR3cXFmBIl5W5Tn9LGBf7CDKkHj4uVfNXCJB8RsVfnmY61iedA==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-unicode-regex@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.6.tgz#2001e7d87ed709eea145e0b65fb5f93c3c0e225b"
+ integrity sha512-pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.6.tgz#f18b7292222aee85c155258ceb345a146a070a46"
+ integrity sha512-quiMsb28oXWIDK0gXLALOJRXLgICLiulqdZGOaPPd0vRT7fQp74NtdADAVu+D8s00C+0Xs0MxVP0VKF/sZEUgw==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.24.4":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.6.tgz#a5a55bc70e5ff1ed7f872067e2a9d65ff917ad6f"
+ integrity sha512-CrxEAvN7VxfjOG8JNF2Y/eMqMJbZPZ185amwGUBp8D9USK90xQmv7dLdFSa+VbD7fdIqcy/Mfv7WtzG8+/qxKg==
+ dependencies:
+ "@babel/compat-data" "^7.24.6"
+ "@babel/helper-compilation-targets" "^7.24.6"
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-validator-option" "^7.24.6"
+ "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.6"
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.6"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.6"
+ "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.6"
+=======
"@babel/plugin-transform-arrow-functions@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514"
@@ -919,14 +1636,20 @@
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.7"
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7"
"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-class-properties" "^7.12.13"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+<<<<<<< HEAD
+ "@babel/plugin-syntax-import-assertions" "^7.24.6"
+ "@babel/plugin-syntax-import-attributes" "^7.24.6"
+=======
"@babel/plugin-syntax-import-assertions" "^7.24.7"
"@babel/plugin-syntax-import-attributes" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/plugin-syntax-import-meta" "^7.10.4"
"@babel/plugin-syntax-json-strings" "^7.8.3"
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -938,6 +1661,56 @@
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
"@babel/plugin-syntax-top-level-await" "^7.14.5"
"@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+<<<<<<< HEAD
+ "@babel/plugin-transform-arrow-functions" "^7.24.6"
+ "@babel/plugin-transform-async-generator-functions" "^7.24.6"
+ "@babel/plugin-transform-async-to-generator" "^7.24.6"
+ "@babel/plugin-transform-block-scoped-functions" "^7.24.6"
+ "@babel/plugin-transform-block-scoping" "^7.24.6"
+ "@babel/plugin-transform-class-properties" "^7.24.6"
+ "@babel/plugin-transform-class-static-block" "^7.24.6"
+ "@babel/plugin-transform-classes" "^7.24.6"
+ "@babel/plugin-transform-computed-properties" "^7.24.6"
+ "@babel/plugin-transform-destructuring" "^7.24.6"
+ "@babel/plugin-transform-dotall-regex" "^7.24.6"
+ "@babel/plugin-transform-duplicate-keys" "^7.24.6"
+ "@babel/plugin-transform-dynamic-import" "^7.24.6"
+ "@babel/plugin-transform-exponentiation-operator" "^7.24.6"
+ "@babel/plugin-transform-export-namespace-from" "^7.24.6"
+ "@babel/plugin-transform-for-of" "^7.24.6"
+ "@babel/plugin-transform-function-name" "^7.24.6"
+ "@babel/plugin-transform-json-strings" "^7.24.6"
+ "@babel/plugin-transform-literals" "^7.24.6"
+ "@babel/plugin-transform-logical-assignment-operators" "^7.24.6"
+ "@babel/plugin-transform-member-expression-literals" "^7.24.6"
+ "@babel/plugin-transform-modules-amd" "^7.24.6"
+ "@babel/plugin-transform-modules-commonjs" "^7.24.6"
+ "@babel/plugin-transform-modules-systemjs" "^7.24.6"
+ "@babel/plugin-transform-modules-umd" "^7.24.6"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.6"
+ "@babel/plugin-transform-new-target" "^7.24.6"
+ "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.6"
+ "@babel/plugin-transform-numeric-separator" "^7.24.6"
+ "@babel/plugin-transform-object-rest-spread" "^7.24.6"
+ "@babel/plugin-transform-object-super" "^7.24.6"
+ "@babel/plugin-transform-optional-catch-binding" "^7.24.6"
+ "@babel/plugin-transform-optional-chaining" "^7.24.6"
+ "@babel/plugin-transform-parameters" "^7.24.6"
+ "@babel/plugin-transform-private-methods" "^7.24.6"
+ "@babel/plugin-transform-private-property-in-object" "^7.24.6"
+ "@babel/plugin-transform-property-literals" "^7.24.6"
+ "@babel/plugin-transform-regenerator" "^7.24.6"
+ "@babel/plugin-transform-reserved-words" "^7.24.6"
+ "@babel/plugin-transform-shorthand-properties" "^7.24.6"
+ "@babel/plugin-transform-spread" "^7.24.6"
+ "@babel/plugin-transform-sticky-regex" "^7.24.6"
+ "@babel/plugin-transform-template-literals" "^7.24.6"
+ "@babel/plugin-transform-typeof-symbol" "^7.24.6"
+ "@babel/plugin-transform-unicode-escapes" "^7.24.6"
+ "@babel/plugin-transform-unicode-property-regex" "^7.24.6"
+ "@babel/plugin-transform-unicode-regex" "^7.24.6"
+ "@babel/plugin-transform-unicode-sets-regex" "^7.24.6"
+=======
"@babel/plugin-transform-arrow-functions" "^7.24.7"
"@babel/plugin-transform-async-generator-functions" "^7.24.7"
"@babel/plugin-transform-async-to-generator" "^7.24.7"
@@ -986,6 +1759,7 @@
"@babel/plugin-transform-unicode-property-regex" "^7.24.7"
"@babel/plugin-transform-unicode-regex" "^7.24.7"
"@babel/plugin-transform-unicode-sets-regex" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/preset-modules" "0.1.6-no-external-plugins"
babel-plugin-polyfill-corejs2 "^0.4.10"
babel-plugin-polyfill-corejs3 "^0.10.4"
@@ -994,6 +1768,15 @@
semver "^6.3.1"
"@babel/preset-flow@^7.22.15":
+<<<<<<< HEAD
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.24.6.tgz#df09ee46558577bea49bc71d597604c03c9bf7a6"
+ integrity sha512-huoe0T1Qs9fQhMWbmqE/NHUeZbqmHDsN6n/jYvPcUUHfuKiPV32C9i8tDhMbQ1DEKTjbBP7Rjm3nSLwlB2X05g==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-validator-option" "^7.24.6"
+ "@babel/plugin-transform-flow-strip-types" "^7.24.6"
+=======
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.24.7.tgz#eef5cb8e05e97a448fc50c16826f5612fe512c06"
integrity sha512-NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ==
@@ -1001,6 +1784,7 @@
"@babel/helper-plugin-utils" "^7.24.7"
"@babel/helper-validator-option" "^7.24.7"
"@babel/plugin-transform-flow-strip-types" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
version "0.1.6-no-external-plugins"
@@ -1012,6 +1796,17 @@
esutils "^2.0.2"
"@babel/preset-typescript@^7.23.0":
+<<<<<<< HEAD
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.6.tgz#27057470fb981c31338bdb897fc3d9aa0cb7dab2"
+ integrity sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.24.6"
+ "@babel/helper-validator-option" "^7.24.6"
+ "@babel/plugin-syntax-jsx" "^7.24.6"
+ "@babel/plugin-transform-modules-commonjs" "^7.24.6"
+ "@babel/plugin-transform-typescript" "^7.24.6"
+=======
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz#66cd86ea8f8c014855671d5ea9a737139cbbfef1"
integrity sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==
@@ -1021,6 +1816,7 @@
"@babel/plugin-syntax-jsx" "^7.24.7"
"@babel/plugin-transform-modules-commonjs" "^7.24.7"
"@babel/plugin-transform-typescript" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@babel/register@^7.22.15":
version "7.24.6"
@@ -1039,6 +1835,46 @@
integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+<<<<<<< HEAD
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.6.tgz#5b76eb89ad45e2e4a0a8db54c456251469a3358e"
+ integrity sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==
+ dependencies:
+ regenerator-runtime "^0.14.0"
+
+"@babel/template@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.6.tgz#048c347b2787a6072b24c723664c8d02b67a44f9"
+ integrity sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==
+ dependencies:
+ "@babel/code-frame" "^7.24.6"
+ "@babel/parser" "^7.24.6"
+ "@babel/types" "^7.24.6"
+
+"@babel/traverse@^7.18.9", "@babel/traverse@^7.24.1", "@babel/traverse@^7.24.6":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.6.tgz#0941ec50cdeaeacad0911eb67ae227a4f8424edc"
+ integrity sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==
+ dependencies:
+ "@babel/code-frame" "^7.24.6"
+ "@babel/generator" "^7.24.6"
+ "@babel/helper-environment-visitor" "^7.24.6"
+ "@babel/helper-function-name" "^7.24.6"
+ "@babel/helper-hoist-variables" "^7.24.6"
+ "@babel/helper-split-export-declaration" "^7.24.6"
+ "@babel/parser" "^7.24.6"
+ "@babel/types" "^7.24.6"
+ debug "^4.3.1"
+ globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.18.9", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.6", "@babel/types@^7.4.4":
+ version "7.24.6"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.6.tgz#ba4e1f59870c10dc2fa95a274ac4feec23b21912"
+ integrity sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==
+ dependencies:
+ "@babel/helper-string-parser" "^7.24.6"
+ "@babel/helper-validator-identifier" "^7.24.6"
+=======
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"
integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==
@@ -1077,6 +1913,7 @@
dependencies:
"@babel/helper-string-parser" "^7.24.7"
"@babel/helper-validator-identifier" "^7.24.7"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
to-fast-properties "^2.0.0"
@@ -2067,9 +2904,15 @@
integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
"@opentelemetry/context-async-hooks@^1.24.1":
+<<<<<<< HEAD
+ version "1.24.1"
+ resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.24.1.tgz#1db7116d78f60e993e0d337bd497885a53deba1a"
+ integrity sha512-R5r6DO4kgEOVBxFXhXjwospLQkv+sYxwCfjvoZBe7Zm6KKXAV9kDSJhi/D1BweowdZmO+sdbENLs374gER8hpQ==
+=======
version "1.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.25.0.tgz#bc3dcb1302b34b0f56047dd0d0f56b33013f657f"
integrity sha512-sBW313mnMyFg0cp/40BRzrZBWG+581s2j5gIsa5fgGadswyILk4mNFATsqrCOpAx945RDuZ2B7ThQLgor9OpfA==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@opentelemetry/[email protected]":
version "1.24.1"
@@ -2078,6 +2921,8 @@
dependencies:
"@opentelemetry/semantic-conventions" "1.24.1"
+<<<<<<< HEAD
+=======
"@opentelemetry/[email protected]", "@opentelemetry/core@^1.1.0", "@opentelemetry/core@^1.24.1", "@opentelemetry/core@^1.8.0":
version "1.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.25.0.tgz#ad034f5c2669f589bd703bfbbaa38b51f8504053"
@@ -2085,6 +2930,7 @@
dependencies:
"@opentelemetry/semantic-conventions" "1.25.0"
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
"@opentelemetry/[email protected]":
version "0.36.1"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.36.1.tgz#4ef93ade4c7224213d9e4411190c22d753166a18"
@@ -4417,9 +5263,15 @@
"@types/node" "*"
"@types/node@*", "@types/node@^20.5.2":
+<<<<<<< HEAD
+ version "20.14.1"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.1.tgz#2434dbcb1f039e31f2c0e9969da93f52cf6348f3"
+ integrity sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==
+=======
version "20.14.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"
integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
undici-types "~5.26.4"
@@ -5100,14 +5952,20 @@ ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^8.0.0, ajv@^8.6.0, ajv@^8.9.0:
+<<<<<<< HEAD
+ version "8.15.0"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.15.0.tgz#d918c661e3e820bbbc65a320e182ee56a1aa978a"
+ integrity sha512-15BTtQUOsSrmHCy+B4VnAiJAJxJ8IFgu6fcjFQF3jQYZ78nLSQthlFg4ehp+NLIyfvFgOlxNsjKIEhydtFPVHQ==
+=======
version "8.16.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4"
integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
fast-deep-equal "^3.1.3"
+ fast-uri "^2.3.0"
json-schema-traverse "^1.0.0"
require-from-string "^2.0.2"
- uri-js "^4.4.1"
ansi-escapes@^6.2.0:
version "6.2.1"
@@ -5718,9 +6576,15 @@ camelcase-css@^2.0.1:
integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599:
+<<<<<<< HEAD
+ version "1.0.30001627"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001627.tgz#8071c42d468e06ed2fb2c545efe79a663fd326ab"
+ integrity sha512-4zgNiB8nTyV/tHhwZrFs88ryjls/lHiqFhrxCW4qSTeuRByBVnPYpDInchOIySWknznucaf31Z4KYqjfbrecVw==
+=======
version "1.0.30001628"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001628.tgz#90b6cd85ddc2e9f831de0225f4ca5a130c8d8222"
integrity sha512-S3BnR4Kh26TBxbi5t5kpbcUlLJb9lhtDXISDPwOfI+JoC+ik0QksvkZtUVyikw3hjnkgkMPSJ8oIM9yMm9vflA==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
capital-case@^1.0.4:
version "1.0.4"
@@ -6759,9 +7623,15 @@ ejs@^3.1.10, ejs@^3.1.6:
jake "^10.8.5"
electron-to-chromium@^1.4.668:
+<<<<<<< HEAD
+ version "1.4.789"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.789.tgz#fec941cb753ee139da562a5a8ff31fc3e828b411"
+ integrity sha512-0VbyiaXoT++Fi2vHGo2ThOeS6X3vgRCWrjPeO2FeIAWL6ItiSJ9BqlH8LfCXe3X1IdcG+S0iLoNaxQWhfZoGzQ==
+=======
version "1.4.790"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.790.tgz#2a3a5509593745c5d65d8acd66b308f2a25da041"
integrity sha512-eVGeQxpaBYbomDBa/Mehrs28MdvCXfJmEFzaMFsv8jH/MJDLIylJN81eTJ5kvx7B7p18OiPK0BkC06lydEy63A==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
emoji-picker-react@^4.5.16:
version "4.9.4"
@@ -7608,6 +8478,11 @@ fast-levenshtein@^2.0.6:
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+fast-uri@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.3.0.tgz#bdae493942483d299e7285dcb4627767d42e2793"
+ integrity sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==
+
fastq@^1.6.0:
version "1.17.1"
resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
@@ -8876,9 +9751,15 @@ jackspeak@^2.3.5:
"@pkgjs/parseargs" "^0.11.0"
jackspeak@^3.1.2:
+<<<<<<< HEAD
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.2.3.tgz#33e8c44f7858d199fc5684f4ab62d1fd873eb10d"
+ integrity sha512-htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw==
+=======
version "3.4.0"
resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a"
integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
"@isaacs/cliui" "^8.0.2"
optionalDependencies:
@@ -10741,9 +11622,15 @@ postgres-range@^1.1.1:
integrity sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==
posthog-js@^1.131.3:
+<<<<<<< HEAD
+ version "1.136.5"
+ resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.136.5.tgz#df89ec9990fe3509799b516a97c30a948464eecf"
+ integrity sha512-jLmR9HX7/zR/EfJ+7Fl6ivvBKJdmaFiB8mhdEITIPWpXVgGRvp3u5JuvlNXPW9r1pfux8qoPJCtsqHP+uv73gw==
+=======
version "1.136.8"
resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.136.8.tgz#4baef2abd3c697cc18a9f936d0a2aa8d7553b3d6"
integrity sha512-R3NtFXoBv5bbm0nRNbjdKfCVS9UCHJf/EbBbDVcfqj4DaS1ovVSZ7wmx4Uj6SSQFwDBSRh6xePSVq8XW3AVPOw==
+>>>>>>> 59fdd611e4b840993e93fc53c89a75a3787f248d
dependencies:
fflate "^0.4.8"
preact "^10.19.3"
@@ -13252,7 +14139,7 @@ upper-case@^2.0.2:
dependencies:
tslib "^2.0.3"
-uri-js@^4.2.2, uri-js@^4.4.1:
+uri-js@^4.2.2:
version "4.4.1"
resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==