Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions apps/space/app/compat/next/image.tsx

This file was deleted.

23 changes: 0 additions & 23 deletions apps/space/app/compat/next/link.tsx

This file was deleted.

14 changes: 0 additions & 14 deletions apps/space/ce/components/editor/embeds/mentions/root.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions apps/space/ce/components/issue-layouts/root.tsx

This file was deleted.

16 changes: 0 additions & 16 deletions apps/space/ce/components/navbar/index.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions apps/space/ce/hooks/store/index.ts

This file was deleted.

11 changes: 0 additions & 11 deletions apps/space/ce/hooks/store/use-published-view.ts

This file was deleted.

14 changes: 0 additions & 14 deletions apps/space/ce/store/root.store.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* See the LICENSE file for details.
*/

import Link from "next/link";

type Props = {
isSignUp?: boolean;
};
Expand All @@ -16,13 +14,13 @@ export function TermsAndConditions(props: Props) {
<span className="flex items-center justify-center py-6">
<p className="text-center text-13 whitespace-pre-line text-secondary">
{isSignUp ? "By creating an account" : "By signing in"}, you agree to our{" \n"}
<Link href="https://plane.so/legals/terms-and-conditions" target="_blank" rel="noopener noreferrer">
<a href="https://plane.so/legals/terms-and-conditions" target="_blank" rel="noopener noreferrer">
<span className="text-13 font-medium underline hover:cursor-pointer">Terms of Service</span>
</Link>{" "}
</a>{" "}
and{" "}
<Link href="https://plane.so/legals/privacy-policy" target="_blank" rel="noopener noreferrer">
<a href="https://plane.so/legals/privacy-policy" target="_blank" rel="noopener noreferrer">
<span className="text-13 font-medium underline hover:cursor-pointer">Privacy Policy</span>
</Link>
</a>
{"."}
</p>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,17 @@
* See the LICENSE file for details.
*/

// plane web imports
import type { TEditorMentionComponentProps } from "@/plane-web/components/editor/embeds/mentions";
import { EditorAdditionalMentionsRoot } from "@/plane-web/components/editor/embeds/mentions";
import type { TCallbackMentionComponentProps } from "@plane/editor";
// local components
import { EditorUserMention } from "./user";

export function EditorMentionsRoot(props: TEditorMentionComponentProps) {
export function EditorMentionsRoot(props: TCallbackMentionComponentProps) {
const { entity_identifier, entity_name } = props;

switch (entity_name) {
case "user_mention":
return <EditorUserMention id={entity_identifier} />;
default:
return <EditorAdditionalMentionsRoot {...props} />;
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { getEditorFileHandlers } from "@/helpers/editor.helper";
// hooks
import { useParseEditorContent } from "@/hooks/use-parse-editor-content";
// plane web imports
import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
import { useEditorFlagging } from "@/hooks/use-editor-flagging";
// local imports
import { EditorMentionsRoot } from "./embeds/mentions";
import { IssueCommentToolbar } from "./toolbar";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { getEditorFileHandlers } from "@/helpers/editor.helper";
import { useMember } from "@/hooks/store/use-member";
import { useParseEditorContent } from "@/hooks/use-parse-editor-content";
// plane web imports
import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
import { useEditorFlagging } from "@/hooks/use-editor-flagging";
// local imports
import { EditorMentionsRoot } from "./embeds/mentions";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import type { MutableRefObject } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { Link } from "react-router";
import { useParams, useSearchParams } from "next/navigation";
// plane types
import { Tooltip } from "@plane/propel/tooltip";
Expand Down Expand Up @@ -93,7 +93,7 @@ export const KanbanIssueBlock = observer(function KanbanIssueBlock(props: IssueB
<div className={cn("group/kanban-block relative p-1.5")}>
<div
className={cn(
"relative block w-full rounded-lg border border-strong border-subtle bg-layer-2 text-13 transition-all hover:bg-layer-2-hover",
"relative block w-full rounded-lg border border-subtle bg-layer-2 text-13 transition-all hover:bg-layer-2-hover",
{
"border-accent-strong hover:border-accent-strong": getIsIssuePeeked(issue.id),
}
Expand All @@ -102,7 +102,7 @@ export const KanbanIssueBlock = observer(function KanbanIssueBlock(props: IssueB
<Link
id={getIssueBlockId(issueId, groupId, subGroupId)}
className="w-full"
href={`?${queryParam}`}
to={`?${queryParam}`}
onClick={handleIssuePeekOverview}
>
<KanbanIssueDetailsBlock issue={issue} displayProperties={displayProperties} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { useRef } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { Link } from "react-router";
import { useParams, useSearchParams } from "next/navigation";
// plane types
import { Tooltip } from "@plane/propel/tooltip";
Expand Down Expand Up @@ -75,7 +75,7 @@ export const IssueBlock = observer(function IssueBlock(props: IssueBlockProps) {

<Link
id={`issue-${issue.id}`}
href={`?${queryParam}`}
to={`?${queryParam}`}
onClick={handleIssuePeekOverview}
className="w-full cursor-pointer truncate text-13 text-primary"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { Fragment, useEffect, useState } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { Link } from "react-router";
import { usePathname, useSearchParams } from "next/navigation";
import { usePopper } from "react-popper";
import { LogOut } from "lucide-react";
Expand Down Expand Up @@ -118,7 +118,7 @@ export const UserAvatar = observer(function UserAvatar() {
</div>
) : (
<div className="flex-shrink-0">
<Link href={`/?next_path=${pathName}?${queryParam}`}>
<Link to={`/?next_path=${pathName}?${queryParam}`}>
<Button variant="secondary">Sign in</Button>
</Link>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { observer } from "mobx-react";
import Link from "next/link";
import { Link } from "react-router";
import { usePathname } from "next/navigation";
import { Lock } from "lucide-react";
// plane imports
Expand Down Expand Up @@ -62,7 +62,7 @@ export const PeekOverviewIssueActivity = observer(function PeekOverviewIssueActi
<Lock className="size-3 shrink-0" />
Sign in to add your comment
</p>
<Link href={`/?next_path=${pathname}`}>
<Link to={`/?next_path=${pathname}`}>
<Button variant="primary">Sign in</Button>
</Link>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
*/

import React from "react";
import Link from "next/link";
import { Link } from "react-router";
import { PlaneLockup } from "@plane/propel/icons";

export function AuthHeader() {
return (
<div className="sticky top-0 flex w-full flex-shrink-0 items-center justify-between gap-6">
<Link href="/">
<Link to="/">
<PlaneLockup height={20} width={95} className="text-primary" />
</Link>
</div>
Expand Down
7 changes: 0 additions & 7 deletions apps/space/core/components/issues/navbar/index.ts

This file was deleted.

7 changes: 0 additions & 7 deletions apps/space/ee/components/issue-layouts/root.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions apps/space/ee/components/navbar/index.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions apps/space/ee/hooks/store/index.ts

This file was deleted.

7 changes: 0 additions & 7 deletions apps/space/ee/store/root.store.ts

This file was deleted.

10 changes: 5 additions & 5 deletions apps/space/helpers/authentication.helper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* See the LICENSE file for details.
*/

import Link from "next/link";
import { Link } from "react-router";
// helpers
import { SUPPORT_EMAIL } from "@plane/constants";

Expand Down Expand Up @@ -130,7 +130,7 @@ const errorCodeMessages: {
Your account is already registered.&nbsp;
<Link
className="font-medium underline underline-offset-4 transition-all hover:font-bold"
href={`/sign-in${email ? `?email=${encodeURIComponent(email)}` : ``}`}
to={`/sign-in${email ? `?email=${encodeURIComponent(email)}` : ``}`}
>
Sign In
</Link>
Expand Down Expand Up @@ -172,7 +172,7 @@ const errorCodeMessages: {
No account found.&nbsp;
<Link
className="font-medium underline underline-offset-4 transition-all hover:font-bold"
href={`/${email ? `?email=${encodeURIComponent(email)}` : ``}`}
to={`/${email ? `?email=${encodeURIComponent(email)}` : ``}`}
>
Create one
</Link>
Expand Down Expand Up @@ -317,7 +317,7 @@ const errorCodeMessages: {
message: () => (
<div>
Admin user already exists.&nbsp;
<Link className="font-medium underline underline-offset-4 transition-all hover:font-bold" href={`/admin`}>
<Link className="font-medium underline underline-offset-4 transition-all hover:font-bold" to={`/admin`}>
Sign In
</Link>
&nbsp;now.
Expand All @@ -329,7 +329,7 @@ const errorCodeMessages: {
message: () => (
<div>
Admin user does not exist.&nbsp;
<Link className="font-medium underline underline-offset-4 transition-all hover:font-bold" href={`/admin`}>
<Link className="font-medium underline underline-offset-4 transition-all hover:font-bold" to={`/admin`}>
Sign In
</Link>
&nbsp;now.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { observer } from "mobx-react";
import Link from "next/link";
import { Link } from "react-router";
import { useTheme } from "next-themes";
import useSWR from "swr";
// plane imports
Expand Down Expand Up @@ -52,7 +52,7 @@ export const InstanceProvider = observer(function InstanceProvider({ children }:
<div className="flex h-screen w-full flex-col overflow-hidden overflow-y-auto">
<div className="z-50 container mx-auto flex h-[110px] flex-shrink-0 items-center justify-between gap-5 px-5 lg:px-0">
<div className="flex items-center gap-x-2 py-10">
<Link href={`${SPACE_BASE_PATH}/`}>
<Link to={`${SPACE_BASE_PATH}/`}>
<PlaneLockup className="h-7 w-auto text-primary" />
</Link>
</div>
Expand Down
Loading
Loading