github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from dakshesh14/main

Browse Source 
fix: redirection from index page
This commit is contained in:
Vihar Kurama 2022-11-25 13:29:21 +05:30 committed by GitHub
commit a8bd5751f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contexts/user.context.tsx
View File

@ -131,7 +131,7 @@ export const UserProvider = ({ children }: { children: ReactElement }) => {
<UserContext.Provider <UserContext.Provider
value={{ value={{
user: error ? undefined : data, user: error ? undefined : data,
isUserLoading: !(!!data || !!error), isUserLoading: Boolean(data === undefined && error === undefined),
mutateUser: mutate, mutateUser: mutate,
activeWorkspace: workspaceError ? undefined : activeWorkspace, activeWorkspace: workspaceError ? undefined : activeWorkspace,
mutateWorkspaces: mutateWorkspaces, mutateWorkspaces: mutateWorkspaces,

2
package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "trello-clone", "name": "plane",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {

4
pages/index.tsx
View File

@ -10,7 +10,9 @@ const Home: NextPage = () => {
const { user, isUserLoading, activeWorkspace, workspaces } = useUser(); const { user, isUserLoading, activeWorkspace, workspaces } = useUser();
if (!isUserLoading && !user) router.push("/signin"); useEffect(() => {
if (!isUserLoading && (!user || user === null)) router.push("/signin");
}, [isUserLoading, user, router]);
useEffect(() => { useEffect(() => {
if (!activeWorkspace && workspaces?.length === 0) router.push("/invitations"); if (!activeWorkspace && workspaces?.length === 0) router.push("/invitations");