diff --git a/apps/space/components/accounts/github-login-button.tsx b/apps/space/components/accounts/github-login-button.tsx index 4ba47b421..e9b30ab73 100644 --- a/apps/space/components/accounts/github-login-button.tsx +++ b/apps/space/components/accounts/github-login-button.tsx @@ -5,8 +5,8 @@ import { useRouter } from "next/router"; // next-themes import { useTheme } from "next-themes"; // images -import githubBlackImage from "/public/logos/github-black.png"; -import githubWhiteImage from "/public/logos/github-white.png"; +import githubBlackImage from "public/logos/github-black.svg"; +import githubWhiteImage from "public/logos/github-white.svg"; export interface GithubLoginButtonProps { handleSignIn: React.Dispatch; diff --git a/apps/space/components/accounts/onboarding-form.tsx b/apps/space/components/accounts/onboarding-form.tsx index c40465b3f..6b842757c 100644 --- a/apps/space/components/accounts/onboarding-form.tsx +++ b/apps/space/components/accounts/onboarding-form.tsx @@ -61,7 +61,7 @@ export const OnBoardingForm: React.FC = observer(({ user }) => { .updateMe(payload) .then((response) => { userStore.setCurrentUser(response); - router.push(next_path?.toString() || "/"); + router.push(next_path?.toString() || "/", next_path?.toString() || "/"); setToastAlert({ type: "success", title: "Success!", diff --git a/apps/space/components/issues/board-views/kanban/block.tsx b/apps/space/components/issues/board-views/kanban/block.tsx index 07375fe36..40f6576be 100644 --- a/apps/space/components/issues/board-views/kanban/block.tsx +++ b/apps/space/components/issues/board-views/kanban/block.tsx @@ -24,6 +24,7 @@ export const IssueListBlock = observer(({ issue }: { issue: IIssue }) => { const handleBlockClick = () => { issueDetailStore.setPeekId(issue.id); router.replace( + `/[workspace_slug]/[project_slug]`, { pathname: `/${workspace_slug?.toString()}/${project_slug}`, query: { @@ -31,7 +32,6 @@ export const IssueListBlock = observer(({ issue }: { issue: IIssue }) => { peekId: issue.id, }, }, - undefined, { shallow: true } ); // router.push(`/${workspace_slug?.toString()}/${project_slug}?board=${board?.toString()}&peekId=${issue.id}`); diff --git a/apps/space/components/issues/board-views/list/block.tsx b/apps/space/components/issues/board-views/list/block.tsx index a4b1ad2b8..54a0fe8b0 100644 --- a/apps/space/components/issues/board-views/list/block.tsx +++ b/apps/space/components/issues/board-views/list/block.tsx @@ -26,6 +26,7 @@ export const IssueListBlock: FC<{ issue: IIssue }> = observer((props) => { const handleBlockClick = () => { issueDetailStore.setPeekId(issue.id); router.replace( + `/[workspace_slug]/[project_slug]`, { pathname: `/${workspace_slug?.toString()}/${project_slug}`, query: { @@ -33,7 +34,6 @@ export const IssueListBlock: FC<{ issue: IIssue }> = observer((props) => { peekId: issue.id, }, }, - undefined, { shallow: true } ); // router.push(`/${workspace_slug?.toString()}/${project_slug}?board=${board?.toString()}&peekId=${issue.id}`); diff --git a/apps/space/components/issues/navbar/index.tsx b/apps/space/components/issues/navbar/index.tsx index 83d79f349..974fbe03b 100644 --- a/apps/space/components/issues/navbar/index.tsx +++ b/apps/space/components/issues/navbar/index.tsx @@ -41,7 +41,7 @@ const IssueNavbar = observer(() => { if (board) { projectStore.setActiveBoard(board.toString()); } else { - router.push(`/${workspace_slug}/${project_slug}?board=list`); + router.push(`/[workspace_slug]/[project_slug]?board=list`, `/${workspace_slug}/${project_slug}?board=list`); projectStore.setActiveBoard("list"); } } diff --git a/apps/space/components/issues/peek-overview/layout.tsx b/apps/space/components/issues/peek-overview/layout.tsx index abb76db48..7300b7efe 100644 --- a/apps/space/components/issues/peek-overview/layout.tsx +++ b/apps/space/components/issues/peek-overview/layout.tsx @@ -42,7 +42,8 @@ export const IssuePeekOverview: React.FC = observer((props) => { board, }, }, - undefined, + // eslint-disable-next-line turbo/no-undeclared-env-vars + `/${workspace_slug?.toString()}/${project_slug}`, { shallow: true } ); }; diff --git a/apps/space/layouts/project-layout.tsx b/apps/space/layouts/project-layout.tsx index 2147e845e..87c87a091 100644 --- a/apps/space/layouts/project-layout.tsx +++ b/apps/space/layouts/project-layout.tsx @@ -3,6 +3,7 @@ import Image from "next/image"; // mobx import { observer } from "mobx-react-lite"; +import planeLogo from "public/plane-logo.svg" // components import IssueNavbar from "components/issues/navbar"; @@ -13,10 +14,10 @@ const ProjectLayout = ({ children }: { children: React.ReactNode }) => (
{children}
- +
- plane logo + plane logo
Powered by Plane Deploy diff --git a/apps/space/pages/404.tsx b/apps/space/pages/404.tsx index d10d95fb9..f8f67e000 100644 --- a/apps/space/pages/404.tsx +++ b/apps/space/pages/404.tsx @@ -1,12 +1,13 @@ // next imports import Image from "next/image"; +import notFoundImage from "public/404.svg" const Custom404Error = () => (
- 404- Page not found + 404- Page not found
Oops! Something went wrong.
diff --git a/apps/space/pages/[workspace_slug]/index.tsx b/apps/space/pages/[workspace_slug]/index.tsx index c35662f5a..a844c0763 100644 --- a/apps/space/pages/[workspace_slug]/index.tsx +++ b/apps/space/pages/[workspace_slug]/index.tsx @@ -1,5 +1,3 @@ -"use client"; - const WorkspaceProjectPage = () => (
Plane Workspace Space
); diff --git a/apps/space/pages/_app.tsx b/apps/space/pages/_app.tsx index 3bfdf5930..9e0d01ac0 100644 --- a/apps/space/pages/_app.tsx +++ b/apps/space/pages/_app.tsx @@ -25,11 +25,11 @@ function MyApp({ Component, pageProps }: AppProps) { - - - - - + + + + + diff --git a/apps/space/pages/index.tsx b/apps/space/pages/index.tsx index 26949d76b..48b41e368 100644 --- a/apps/space/pages/index.tsx +++ b/apps/space/pages/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from "react"; import Image from "next/image"; import { useRouter } from "next/router"; // assets -import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.png"; +import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.svg"; // mobx import { observer } from "mobx-react-lite"; import { useMobxStore } from "lib/mobx/store-provider"; @@ -35,10 +35,10 @@ const HomePage = () => { userStore.setCurrentUser(response?.user); if (!isOnboarded) { - router.push(`/onboarding?next_path=${next_path}`); + router.push(`/onboarding?next_path=${next_path}`, `/onboarding?next_path=${next_path}`); return; } - router.push(next_path.toString()); + router.push(next_path.toString(), next_path.toString()); }; const handleGoogleSignIn = async ({ clientId, credential }: any) => { diff --git a/apps/space/pages/onboarding/index.tsx b/apps/space/pages/onboarding/index.tsx index 10adb1d18..1d2f19519 100644 --- a/apps/space/pages/onboarding/index.tsx +++ b/apps/space/pages/onboarding/index.tsx @@ -1,8 +1,7 @@ import React, { useEffect } from "react"; import Image from "next/image"; // assets -import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.png"; -import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.svg"; +import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.svg"; // mobx import { observer } from "mobx-react-lite"; import { useMobxStore } from "lib/mobx/store-provider"; diff --git a/apps/space/pages/project-not-published/index.tsx b/apps/space/pages/project-not-published/index.tsx index 82a2ff5da..24a6372b6 100644 --- a/apps/space/pages/project-not-published/index.tsx +++ b/apps/space/pages/project-not-published/index.tsx @@ -1,12 +1,13 @@ // next imports import Image from "next/image"; +import projectNotPublishedImage from "public/project-not-published.svg" const CustomProjectNotPublishedError = () => (
- 404- Page not found + 404- Page not found
Oops! The page you{`'`}re looking for isn{`'`}t live at the moment. diff --git a/apps/space/public/logos/github-black.png b/apps/space/public/logos/github-black.png deleted file mode 100644 index 7a7a82474..000000000 Binary files a/apps/space/public/logos/github-black.png and /dev/null differ diff --git a/apps/space/public/logos/github-black.svg b/apps/space/public/logos/github-black.svg new file mode 100644 index 000000000..ad04a798e --- /dev/null +++ b/apps/space/public/logos/github-black.svg @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/apps/space/public/logos/github-square.png b/apps/space/public/logos/github-square.png deleted file mode 100644 index 527ba79f2..000000000 Binary files a/apps/space/public/logos/github-square.png and /dev/null differ diff --git a/apps/space/public/logos/github-square.svg b/apps/space/public/logos/github-square.svg new file mode 100644 index 000000000..a7836db8f --- /dev/null +++ b/apps/space/public/logos/github-square.svg @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/apps/space/public/logos/github-white.png b/apps/space/public/logos/github-white.png deleted file mode 100644 index dbb2b578c..000000000 Binary files a/apps/space/public/logos/github-white.png and /dev/null differ diff --git a/apps/space/public/logos/github-white.svg b/apps/space/public/logos/github-white.svg new file mode 100644 index 000000000..90fe34d8b --- /dev/null +++ b/apps/space/public/logos/github-white.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/apps/space/public/plane-logo.svg b/apps/space/public/plane-logo.svg new file mode 100644 index 000000000..11179417c --- /dev/null +++ b/apps/space/public/plane-logo.svg @@ -0,0 +1,94 @@ + + + + diff --git a/apps/space/public/plane-logo.webp b/apps/space/public/plane-logo.webp deleted file mode 100644 index 52e7c98da..000000000 Binary files a/apps/space/public/plane-logo.webp and /dev/null differ diff --git a/apps/space/public/plane-logos/blue-without-text.png b/apps/space/public/plane-logos/blue-without-text.png deleted file mode 100644 index ea94aec79..000000000 Binary files a/apps/space/public/plane-logos/blue-without-text.png and /dev/null differ diff --git a/apps/space/public/plane-logos/blue-without-text.svg b/apps/space/public/plane-logos/blue-without-text.svg new file mode 100644 index 000000000..715aee503 --- /dev/null +++ b/apps/space/public/plane-logos/blue-without-text.svg @@ -0,0 +1,15 @@ + + + + + + + + + +