π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
fix: admin app redirections
sriram veeraghanta40560109b58e
diff --git a/.eslintrc.js b/.eslintrc.jsindex c229c09526..b1a019e351 100644--- a/.eslintrc.js+++ b/.eslintrc.js@@ -4,7 +4,7 @@ module.exports = {extends: ["custom"],settings: {next: {- rootDir: ["web/", "space/"],+ rootDir: ["web/", "space/", "admin/"],},},};diff --git a/admin/.env.example b/admin/.env.exampleindex a86a8b4fba..fdeb05c4d7 100644--- a/admin/.env.example+++ b/admin/.env.example@@ -1,5 +1,3 @@NEXT_PUBLIC_API_BASE_URL=""-NEXT_PUBLIC_ADMIN_BASE_URL=""-NEXT_PUBLIC_SPACE_BASE_URL=""-NEXT_PUBLIC_WEB_BASE_URL=""-NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"\ No newline at end of file+NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"+NEXT_PUBLIC_WEB_BASE_URL=""\ No newline at end of filediff --git a/admin/app/ai/components/ai-config-form.tsx b/admin/app/ai/components/ai-config-form.tsxindex d61eb9ed94..fda70611c2 100644--- a/admin/app/ai/components/ai-config-form.tsx+++ b/admin/app/ai/components/ai-config-form.tsx@@ -6,7 +6,7 @@ import { IFormattedInstanceConfiguration, TInstanceAIConfigurationKeys } from "@// componentsimport { ControllerInput, TControllerInputFormField } from "components/common";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";type IInstanceAIForm = {config: IFormattedInstanceConfiguration;diff --git a/admin/app/ai/page.tsx b/admin/app/ai/page.tsxindex 71af4a5ba9..5d002ca55b 100644--- a/admin/app/ai/page.tsx+++ b/admin/app/ai/page.tsx@@ -7,7 +7,7 @@ import { Loader } from "@plane/ui";import { PageHeader } from "@/components/core";import { InstanceAIForm } from "./components";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";const InstanceAIPage = observer(() => {// storediff --git a/admin/app/authentication/components/email-config-switch.tsx b/admin/app/authentication/components/email-config-switch.tsxindex 0958b3c424..9c23901fef 100644--- a/admin/app/authentication/components/email-config-switch.tsx+++ b/admin/app/authentication/components/email-config-switch.tsx@@ -3,7 +3,7 @@import React from "react";import { observer } from "mobx-react-lite";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// uiimport { ToggleSwitch } from "@plane/ui";// typesdiff --git a/admin/app/authentication/components/password-config-switch.tsx b/admin/app/authentication/components/password-config-switch.tsxindex 92428e494d..ce33cd3294 100644--- a/admin/app/authentication/components/password-config-switch.tsx+++ b/admin/app/authentication/components/password-config-switch.tsx@@ -3,7 +3,7 @@import React from "react";import { observer } from "mobx-react-lite";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// uiimport { ToggleSwitch } from "@plane/ui";// typesdiff --git a/admin/app/authentication/github/components/github-config-form.tsx b/admin/app/authentication/github/components/github-config-form.tsxindex 22eb11ff4e..43d2205757 100644--- a/admin/app/authentication/github/components/github-config-form.tsx+++ b/admin/app/authentication/github/components/github-config-form.tsx@@ -2,7 +2,7 @@ import { FC, useState } from "react";import { useForm } from "react-hook-form";import Link from "next/link";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// uiimport { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";// componentsdiff --git a/admin/app/authentication/github/components/root.tsx b/admin/app/authentication/github/components/root.tsxindex 742462c3b9..d820bc8a24 100644--- a/admin/app/authentication/github/components/root.tsx+++ b/admin/app/authentication/github/components/root.tsx@@ -4,7 +4,7 @@ import React from "react";import Link from "next/link";import { observer } from "mobx-react-lite";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// uiimport { ToggleSwitch, getButtonStyling } from "@plane/ui";// iconsdiff --git a/admin/app/authentication/github/page.tsx b/admin/app/authentication/github/page.tsxindex 6470f812af..893762d472 100644--- a/admin/app/authentication/github/page.tsx+++ b/admin/app/authentication/github/page.tsx@@ -11,7 +11,7 @@ import { PageHeader } from "@/components/core";import { AuthenticationMethodCard } from "../components";import { InstanceGithubConfigForm } from "./components";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// helpersimport { resolveGeneralTheme } from "@/helpers/common.helper";// iconsdiff --git a/admin/app/authentication/google/components/google-config-form.tsx b/admin/app/authentication/google/components/google-config-form.tsxindex 42cea78fd5..f070216940 100644--- a/admin/app/authentication/google/components/google-config-form.tsx+++ b/admin/app/authentication/google/components/google-config-form.tsx@@ -2,7 +2,7 @@ import { FC, useState } from "react";import { useForm } from "react-hook-form";import Link from "next/link";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// uiimport { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";// componentsdiff --git a/admin/app/authentication/google/components/root.tsx b/admin/app/authentication/google/components/root.tsxindex 6b287476dd..5432c95bf9 100644--- a/admin/app/authentication/google/components/root.tsx+++ b/admin/app/authentication/google/components/root.tsx@@ -4,7 +4,7 @@ import React from "react";import Link from "next/link";import { observer } from "mobx-react-lite";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// uiimport { ToggleSwitch, getButtonStyling } from "@plane/ui";// iconsdiff --git a/admin/app/authentication/google/page.tsx b/admin/app/authentication/google/page.tsxindex f7fa6e6434..9b02842afe 100644--- a/admin/app/authentication/google/page.tsx+++ b/admin/app/authentication/google/page.tsx@@ -10,7 +10,7 @@ import { PageHeader } from "@/components/core";import { AuthenticationMethodCard } from "../components";import { InstanceGoogleConfigForm } from "./components";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// iconsimport GoogleLogo from "@/public/logos/google-logo.svg";diff --git a/admin/app/authentication/page.tsx b/admin/app/authentication/page.tsxindex 59e4056082..0685924683 100644--- a/admin/app/authentication/page.tsx+++ b/admin/app/authentication/page.tsx@@ -14,7 +14,7 @@ import { GoogleConfiguration } from "./google/components";import { GithubConfiguration } from "./github/components";import { PageHeader } from "@/components/core";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// helpersimport { resolveGeneralTheme } from "@/helpers/common.helper";// imagesdiff --git a/admin/app/email/components/email-config-form.tsx b/admin/app/email/components/email-config-form.tsxindex 38b50d50f7..50c8671325 100644--- a/admin/app/email/components/email-config-form.tsx+++ b/admin/app/email/components/email-config-form.tsx@@ -1,7 +1,7 @@import React, { FC, useMemo, useState } from "react";import { useForm } from "react-hook-form";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// uiimport { Button, CustomSelect, TOAST_TYPE, setToast } from "@plane/ui";// componentsdiff --git a/admin/app/email/page.tsx b/admin/app/email/page.tsxindex a3b0bed596..6ffebc904d 100644--- a/admin/app/email/page.tsx+++ b/admin/app/email/page.tsx@@ -7,7 +7,7 @@ import { Loader } from "@plane/ui";import { PageHeader } from "@/components/core";import { InstanceEmailForm } from "./components";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";const InstanceEmailPage = observer(() => {// storediff --git a/admin/app/general/components/general-config-form.tsx b/admin/app/general/components/general-config-form.tsxindex f45876419c..5e360e0481 100644--- a/admin/app/general/components/general-config-form.tsx+++ b/admin/app/general/components/general-config-form.tsx@@ -6,7 +6,7 @@ import { Button, Input, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";// componentsimport { ControllerInput } from "components/common";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";export interface IGeneralConfigurationForm {instance: IInstance["instance"];diff --git a/admin/app/general/page.tsx b/admin/app/general/page.tsxindex 10429c1c9a..accaf01d12 100644--- a/admin/app/general/page.tsx+++ b/admin/app/general/page.tsx@@ -5,7 +5,7 @@ import { observer } from "mobx-react-lite";import { PageHeader } from "@/components/core";import { GeneralConfigurationForm } from "./components";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";const GeneralPage = observer(() => {const { instance, instanceAdmins } = useInstance();diff --git a/admin/app/image/components/image-config-form.tsx b/admin/app/image/components/image-config-form.tsxindex 722051878b..1779468fa8 100644--- a/admin/app/image/components/image-config-form.tsx+++ b/admin/app/image/components/image-config-form.tsx@@ -5,7 +5,7 @@ import { IFormattedInstanceConfiguration, TInstanceImageConfigurationKeys } from// componentsimport { ControllerInput } from "components/common";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";type IInstanceImageConfigForm = {config: IFormattedInstanceConfiguration;diff --git a/admin/app/image/page.tsx b/admin/app/image/page.tsxindex 68572c519f..cbf4a8f4d2 100644--- a/admin/app/image/page.tsx+++ b/admin/app/image/page.tsx@@ -7,7 +7,7 @@ import { Loader } from "@plane/ui";import { PageHeader } from "@/components/core";import { InstanceImageConfigForm } from "./components";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";const InstanceImagePage = observer(() => {// storediff --git a/admin/app/layout.tsx b/admin/app/layout.tsxindex d991f9d82c..3352cbfaec 100644--- a/admin/app/layout.tsx+++ b/admin/app/layout.tsx@@ -7,6 +7,8 @@ import { StoreProvider } from "@/lib/store-context";import { AppWrapper } from "@/lib/wrappers";// constantsimport { SITE_NAME, SITE_DESCRIPTION, SITE_URL, TWITTER_USER_NAME, SITE_KEYWORDS, SITE_TITLE } from "@/constants/seo";+// helpers+import { ASSET_PREFIX } from "@/helpers/common.helper";// stylesimport "./globals.css";@@ -14,35 +16,31 @@ interface RootLayoutProps {children: ReactNode;}-const RootLayout = ({ children, ...pageProps }: RootLayoutProps) => {- const prefix = "/god-mode/";-- return (- <html lang="en">- <head>- <title>{SITE_TITLE}</title>- <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}`} />- <link rel="apple-touch-icon" sizes="180x180" href={`${prefix}favicon/apple-touch-icon.png`} />- <link rel="icon" type="image/png" sizes="32x32" href={`${prefix}favicon/favicon-32x32.png`} />- <link rel="icon" type="image/png" sizes="16x16" href={`${prefix}favicon/favicon-16x16.png`} />- <link rel="manifest" href={`${prefix}site.webmanifest.json`} />- <link rel="shortcut icon" href={`${prefix}favicon/favicon.ico`} />- </head>- <body className={`antialiased`}>- <StoreProvider {...pageProps}>- <ThemeProvider themes={["light", "dark"]} defaultTheme="system" enableSystem>- <AppWrapper>{children}</AppWrapper>- </ThemeProvider>- </StoreProvider>- </body>- </html>- );-};+const RootLayout = ({ children, ...pageProps }: RootLayoutProps) => (+ <html lang="en">+ <head>+ <title>{SITE_TITLE}</title>+ <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}`} />+ <link rel="apple-touch-icon" sizes="180x180" href={`${ASSET_PREFIX}/favicon/apple-touch-icon.png`} />+ <link rel="icon" type="image/png" sizes="32x32" href={`${ASSET_PREFIX}/favicon/favicon-32x32.png`} />+ <link rel="icon" type="image/png" sizes="16x16" href={`${ASSET_PREFIX}/favicon/favicon-16x16.png`} />+ <link rel="manifest" href={`${ASSET_PREFIX}/site.webmanifest.json`} />+ <link rel="shortcut icon" href={`${ASSET_PREFIX}/favicon/favicon.ico`} />+ </head>+ <body className={`antialiased`}>+ <StoreProvider {...pageProps}>+ <ThemeProvider themes={["light", "dark"]} defaultTheme="system" enableSystem>+ <AppWrapper>{children}</AppWrapper>+ </ThemeProvider>+ </StoreProvider>+ </body>+ </html>+);export default RootLayout;diff --git a/admin/components/admin-sidebar/help-section.tsx b/admin/components/admin-sidebar/help-section.tsxindex ba8f2cba55..8b3f5baeb1 100644--- a/admin/components/admin-sidebar/help-section.tsx+++ b/admin/components/admin-sidebar/help-section.tsx@@ -7,7 +7,7 @@ import { Transition } from "@headlessui/react";import { ExternalLink, FileText, HelpCircle, MoveLeft } from "lucide-react";import { DiscordIcon, GithubIcon, Tooltip } from "@plane/ui";// hooks-import { useInstance, useTheme } from "@/hooks";+import { useInstance, useTheme } from "@/hooks/store";// assetsimport packageJson from "package.json";diff --git a/admin/components/admin-sidebar/root.tsx b/admin/components/admin-sidebar/root.tsxindex 3b754d8b2f..6547699244 100644--- a/admin/components/admin-sidebar/root.tsx+++ b/admin/components/admin-sidebar/root.tsx@@ -3,7 +3,7 @@import { FC, useEffect, useRef } from "react";import { observer } from "mobx-react-lite";// hooks-import { useTheme } from "@/hooks";+import { useTheme } from "@/hooks/store";import useOutsideClickDetector from "hooks/use-outside-click-detector";// componentsimport { HelpSection, SidebarMenu, SidebarDropdown } from "@/components/admin-sidebar";diff --git a/admin/components/admin-sidebar/sidebar-dropdown.tsx b/admin/components/admin-sidebar/sidebar-dropdown.tsxindex 68212464e6..f248f852f1 100644--- a/admin/components/admin-sidebar/sidebar-dropdown.tsx+++ b/admin/components/admin-sidebar/sidebar-dropdown.tsx@@ -7,7 +7,7 @@ import { LogOut, UserCog2, Palette } from "lucide-react";import { Menu, Transition } from "@headlessui/react";import { Avatar } from "@plane/ui";// hooks-import { useTheme, useUser } from "@/hooks";+import { useTheme, useUser } from "@/hooks/store";// helpersimport { API_BASE_URL, cn } from "@/helpers/common.helper";// servicesdiff --git a/admin/components/admin-sidebar/sidebar-menu-hamburger-toogle.tsx b/admin/components/admin-sidebar/sidebar-menu-hamburger-toogle.tsxindex ba00afa7f6..d6ed655411 100644--- a/admin/components/admin-sidebar/sidebar-menu-hamburger-toogle.tsx+++ b/admin/components/admin-sidebar/sidebar-menu-hamburger-toogle.tsx@@ -3,7 +3,7 @@import { FC } from "react";import { observer } from "mobx-react-lite";// hooks-import { useTheme } from "@/hooks";+import { useTheme } from "@/hooks/store";// iconsimport { Menu } from "lucide-react";diff --git a/admin/components/admin-sidebar/sidebar-menu.tsx b/admin/components/admin-sidebar/sidebar-menu.tsxindex e7111aea22..dfb4100511 100644--- a/admin/components/admin-sidebar/sidebar-menu.tsx+++ b/admin/components/admin-sidebar/sidebar-menu.tsx@@ -6,7 +6,7 @@ import { observer } from "mobx-react-lite";import { Image, BrainCog, Cog, Lock, Mail } from "lucide-react";import { Tooltip } from "@plane/ui";// hooks-import { useTheme } from "@/hooks";+import { useTheme } from "@/hooks/store";// helpersimport { cn } from "@/helpers/common.helper";diff --git a/admin/components/new-user-popup.tsx b/admin/components/new-user-popup.tsxindex d17e99d5ea..6b4cea340c 100644--- a/admin/components/new-user-popup.tsx+++ b/admin/components/new-user-popup.tsx@@ -9,7 +9,7 @@ import { Button, getButtonStyling } from "@plane/ui";// helpersimport { resolveGeneralTheme } from "helpers/common.helper";// hooks-import { useInstance, useTheme } from "@/hooks";+import { useInstance, useTheme } from "@/hooks/store";// iconsimport TakeoffIconLight from "/public/logos/takeoff-icon-light.svg";import TakeoffIconDark from "/public/logos/takeoff-icon-dark.svg";diff --git a/admin/helpers/common.helper.ts b/admin/helpers/common.helper.tsindex 3bf03024bb..e7aae0698f 100644--- a/admin/helpers/common.helper.ts+++ b/admin/helpers/common.helper.ts@@ -1,7 +1,16 @@import { clsx, type ClassValue } from "clsx";import { twMerge } from "tailwind-merge";-export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ? process.env.NEXT_PUBLIC_API_BASE_URL : "";+export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || "";++export const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "";++export const SPACE_BASE_URL = process.env.NEXT_PUBLIC_SPACE_BASE_URL || "";+export const SPACE_BASE_PATH = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "";++export const WEB_BASE_URL = process.env.NEXT_PUBLIC_WEB_BASE_URL || "";++export const ASSET_PREFIX = ADMIN_BASE_PATH;export const cn = (...inputs: ClassValue[]) => twMerge(clsx(inputs));diff --git a/admin/hooks/index.ts b/admin/hooks/index.tsdeleted file mode 100644index 273970eda1..0000000000--- a/admin/hooks/index.ts+++ /dev/null@@ -1,6 +0,0 @@-export * from "./use-outside-click-detector";--// store-hooks-export * from "./store/use-theme";-export * from "./store/use-instance";-export * from "./store/use-user";diff --git a/admin/hooks/store/index.ts b/admin/hooks/store/index.tsnew file mode 100644index 0000000000..7447064da7--- /dev/null+++ b/admin/hooks/store/index.ts@@ -0,0 +1,3 @@+export * from "./use-theme";+export * from "./use-instance";+export * from "./use-user";diff --git a/admin/lib/wrappers/app-wrapper.tsx b/admin/lib/wrappers/app-wrapper.tsxindex 6be1cec246..aa6e263305 100644--- a/admin/lib/wrappers/app-wrapper.tsx+++ b/admin/lib/wrappers/app-wrapper.tsx@@ -4,11 +4,11 @@ import { FC, ReactNode, useEffect, Suspense } from "react";import { observer } from "mobx-react-lite";import { SWRConfig } from "swr";// hooks-import { useTheme, useUser } from "@/hooks";+import { useTheme, useUser } from "@/hooks/store";// uiimport { Toast } from "@plane/ui";// constants-import { SWR_CONFIG } from "constants/swr-config";+import { SWR_CONFIG } from "@/constants/swr-config";// helpersimport { resolveGeneralTheme } from "helpers/common.helper";diff --git a/admin/lib/wrappers/auth-wrapper.tsx b/admin/lib/wrappers/auth-wrapper.tsxindex 75e7c2accd..00f947047b 100644--- a/admin/lib/wrappers/auth-wrapper.tsx+++ b/admin/lib/wrappers/auth-wrapper.tsx@@ -6,7 +6,7 @@ import { observer } from "mobx-react-lite";import useSWR from "swr";import { Spinner } from "@plane/ui";// hooks-import { useInstance, useUser } from "@/hooks";+import { useInstance, useUser } from "@/hooks/store";// helpersimport { EAuthenticationPageType } from "@/helpers";diff --git a/admin/lib/wrappers/instance-wrapper.tsx b/admin/lib/wrappers/instance-wrapper.tsxindex da02992aa3..6ee1dc247d 100644--- a/admin/lib/wrappers/instance-wrapper.tsx+++ b/admin/lib/wrappers/instance-wrapper.tsx@@ -10,7 +10,7 @@ import { DefaultLayout } from "@/layouts";// componentsimport { InstanceNotReady } from "@/components/instance";// hooks-import { useInstance } from "@/hooks";+import { useInstance } from "@/hooks/store";// helpersimport { EInstancePageType } from "@/helpers";@@ -28,6 +28,9 @@ export const InstanceWrapper: FC<TInstanceWrapper> = observer((props) => {const { isLoading: isSWRLoading } = useSWR("INSTANCE_INFORMATION", () => fetchInstanceInfo(), {revalidateOnFocus: false,+ revalidateIfStale: false,+ revalidateOnReconnect: false,+ errorRetryCount: 0,});if (isSWRLoading || isLoading)@@ -37,6 +40,10 @@ export const InstanceWrapper: FC<TInstanceWrapper> = observer((props) => {</div>);+ if (!instance) {+ return <>Something went wrong</>;+ }+if (instance?.instance?.is_setup_done === false && authEnabled === "1")return (<DefaultLayout withoutBackground>diff --git a/admin/package.json b/admin/package.jsonindex 6a63ea9372..936c612bb4 100644--- a/admin/package.json+++ b/admin/package.json@@ -4,7 +4,7 @@"private": true,"scripts": {"dev": "turbo run develop",- "develop": "next dev --port 3333",+ "develop": "next dev --port 3001","build": "next build","preview": "next build && next start","start": "next start",diff --git a/admin/services/instance.service.ts b/admin/services/instance.service.tsindex 519adc9f29..109b52e446 100644--- a/admin/services/instance.service.ts+++ b/admin/services/instance.service.ts@@ -1,8 +1,8 @@-import { APIService } from "services/api.service";// typesimport type { IFormattedInstanceConfiguration, IInstance, IInstanceAdmin, IInstanceConfiguration } from "@plane/types";// helpers-import { API_BASE_URL } from "helpers/common.helper";+import { API_BASE_URL } from "@/helpers/common.helper";+import { APIService } from "@/services/api.service";export class InstanceService extends APIService {constructor() {diff --git a/space/helpers/common.helper.ts b/space/helpers/common.helper.tsindex 085b34dc2b..f39cddc0ee 100644--- a/space/helpers/common.helper.ts+++ b/space/helpers/common.helper.ts@@ -1,6 +1,12 @@import { clsx, type ClassValue } from "clsx";import { twMerge } from "tailwind-merge";-export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ?? "";+export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || "";++export const SPACE_BASE_PATH = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "";++export const WEB_BASE_URL = process.env.NEXT_PUBLIC_WEB_BASE_URL || "";++export const ASSET_PREFIX = SPACE_BASE_PATH;export const cn = (...inputs: ClassValue[]) => twMerge(clsx(inputs));diff --git a/space/package.json b/space/package.jsonindex d27a231092..a10d190d23 100644--- a/space/package.json+++ b/space/package.json@@ -4,9 +4,9 @@"private": true,"scripts": {"dev": "turbo run develop",- "develop": "next dev -p 4000",+ "develop": "next dev -p 3002","build": "next build",- "start": "next start -p 4000",+ "start": "next start","lint": "next lint","export": "next export"},diff --git a/space/pages/onboarding/index.tsx b/space/pages/onboarding/index.tsxindex 8318f03467..5c0b45e24f 100644--- a/space/pages/onboarding/index.tsx+++ b/space/pages/onboarding/index.tsx@@ -9,6 +9,7 @@ import { Avatar } from "@plane/ui";import { OnBoardingForm } from "@/components/accounts/onboarding-form";// helpersimport { EPageTypes } from "@/helpers/authentication.helper";+import { ASSET_PREFIX } from "@/helpers/common.helper";// hooksimport { useUser, useUserProfile } from "@/hooks/store";// wrappers@@ -17,8 +18,6 @@ import { AuthWrapper } from "@/lib/wrappers";import ProfileSetupDark from "public/onboarding/profile-setup-dark.svg";import ProfileSetup from "public/onboarding/profile-setup.svg";-const imagePrefix = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "";-const OnBoardingPage = observer(() => {// routerconst router = useRouter();@@ -60,7 +59,7 @@ const OnBoardingPage = observer(() => {<div className="flex w-full items-center justify-between font-semibold "><div className="flex items-center gap-x-2"><Image- src={`${imagePrefix}/plane-logos/blue-without-text.png`}+ src={`${ASSET_PREFIX}/plane-logos/blue-without-text.png`}height={30}width={30}alt="Plane Logo"diff --git a/web/Dockerfile.web b/web/Dockerfile.webindex 3326fc7511..71debdc3db 100644--- a/web/Dockerfile.web+++ b/web/Dockerfile.web@@ -36,13 +36,13 @@ ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URLARG NEXT_PUBLIC_ADMIN_BASE_URL=""ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL-ARG NEXT_PUBLIC_ADMIN_BASE_PATH=""+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATHARG NEXT_PUBLIC_SPACE_BASE_URL=""ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL-ARG NEXT_PUBLIC_SPACE_BASE_PATH=""+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATHENV NEXT_TELEMETRY_DISABLED 1@@ -71,13 +71,13 @@ ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URLARG NEXT_PUBLIC_ADMIN_BASE_URL=""ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL-ARG NEXT_PUBLIC_ADMIN_BASE_PATH=""+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATHARG NEXT_PUBLIC_SPACE_BASE_URL=""ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL-ARG NEXT_PUBLIC_SPACE_BASE_PATH=""+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATHENV NEXT_TELEMETRY_DISABLED 1diff --git a/web/components/instance/not-ready-view.tsx b/web/components/instance/not-ready-view.tsxindex 83528445da..d1dd436f82 100644--- a/web/components/instance/not-ready-view.tsx+++ b/web/components/instance/not-ready-view.tsx@@ -1,20 +1,14 @@import { FC } from "react";-import { observer } from "mobx-react";import Image from "next/image";import { Button } from "@plane/ui";// helpersimport { ADMIN_BASE_URL, ADMIN_BASE_PATH } from "@/helpers/common.helper";-// hooks-// import { useInstance } from "@/hooks/store";// imagesimport PlaneTakeOffImage from "@/public/plane-takeoff.png";import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.png";-export const InstanceNotReady: FC = observer(() => {- // hooks- // const { instance } = useInstance();-- const GOD_MODE_URL = encodeURI(ADMIN_BASE_URL + ADMIN_BASE_PATH + "setup/?auth_enabled=0");+export const InstanceNotReady: FC = () => {+ const GOD_MODE_URL = encodeURI(ADMIN_BASE_URL + ADMIN_BASE_PATH + "/setup/?auth_enabled=0");return (<div className="relative h-screen max-h-max w-full overflow-hidden overflow-y-auto flex flex-col">@@ -48,4 +42,4 @@ export const InstanceNotReady: FC = observer(() => {</div></div>);-});+};