✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.
Revert "remove supabase session check from _app"
AykutSaraccf40763f4781
diff --git a/src/components/GoogleAnalytics/index.tsx b/src/components/GoogleAnalytics/index.tsxindex c340d5a6..a627e2c7 100644--- a/src/components/GoogleAnalytics/index.tsx+++ b/src/components/GoogleAnalytics/index.tsx@@ -5,7 +5,7 @@ import ReactGA from "react-ga";const isDevelopment = process.env.NODE_ENV === "development";const GA_TRACKING_ID = process.env.NEXT_PUBLIC_GA_ID;-ReactGA.initialize(GA_TRACKING_ID, { testMode: isDevelopment, useExistingGa: true });+ReactGA.initialize(GA_TRACKING_ID, { testMode: isDevelopment });const GoogleAnalytics: React.FC = () => {if (isDevelopment) return null;diff --git a/src/hooks/useCheckSession.ts b/src/hooks/useCheckSession.tsdeleted file mode 100644index 3ae3eb33..00000000--- a/src/hooks/useCheckSession.ts+++ /dev/null@@ -1,19 +0,0 @@-import React from "react";-import { supabase } from "src/lib/api/supabase";-import useUser from "src/store/useUser";--export const useCheckSession = () => {- const [hasSession, setHasSession] = React.useState(false);- const setSession = useUser(state => state.setSession);-- React.useEffect(() => {- supabase.auth.getSession().then(({ data: { session } }) => {- if (session) {- setSession(session);- setHasSession(true);- } else setHasSession(false);- });- }, [setSession]);-- return { hasSession };-};diff --git a/src/layout/Navbar/index.tsx b/src/layout/Navbar/index.tsxindex 5541e2e7..b4231f79 100644--- a/src/layout/Navbar/index.tsx+++ b/src/layout/Navbar/index.tsx@@ -3,6 +3,7 @@ import Link from "next/link";import styled from "styled-components";import { Button } from "@mantine/core";import { FaStar } from "react-icons/fa";+import useUser from "src/store/useUser";import { JSONCrackLogo } from "../JsonCrackLogo";const StyledNavbarWrapper = styled.div`@@ -43,6 +44,8 @@ const Right = styled.div``;export const Navbar = () => {+ const isAuthenticated = useUser(state => state.isAuthenticated);+return (<StyledNavbarWrapper><StyledNavbar>@@ -86,11 +89,13 @@ export const Navbar = () => {>Star us on GitHub</Button>- <Link href="/sign-in" prefetch={false}>- <Button variant="light" radius="md" className="hide-mobile">- Sign In- </Button>- </Link>+ {!isAuthenticated && (+ <Link href="/sign-in" prefetch={false}>+ <Button variant="light" radius="md" className="hide-mobile">+ Sign In+ </Button>+ </Link>+ )}<Link href="/editor" prefetch={false}><Button color="pink" radius="md">Editordiff --git a/src/pages/_app.tsx b/src/pages/_app.tsxindex 619f5941..53d82b5e 100644--- a/src/pages/_app.tsx+++ b/src/pages/_app.tsx@@ -4,10 +4,13 @@ import dynamic from "next/dynamic";import { useRouter } from "next/router";import { StyleSheetManager, ThemeProvider } from "styled-components";import { MantineProvider, MantineThemeOverride } from "@mantine/core";+import { SessionContextProvider, Session } from "@supabase/auth-helpers-react";import { pageview } from "react-ga";import { monaSans } from "src/constants/fonts";import GlobalStyle from "src/constants/globalStyle";import { lightTheme } from "src/constants/theme";+import { supabase } from "src/lib/api/supabase";+import useUser from "src/store/useUser";const Toaster = dynamic(() => import("react-hot-toast").then(c => c.Toaster));const ExternalMode = dynamic(() => import("src/layout/ExternalMode"));@@ -21,8 +24,20 @@ const mantineTheme: MantineThemeOverride = {primaryShade: 8,};-function JsonCrack({ Component, pageProps }: AppProps) {+function JsonCrack({+ Component,+ pageProps,+}: AppProps<{+ initialSession: Session;+}>) {const router = useRouter();+ const setSession = useUser(state => state.setSession);++ React.useEffect(() => {+ supabase.auth.getSession().then(({ data: { session } }) => {+ if (session) setSession(session);+ });+ }, [setSession]);React.useEffect(() => {const handleRouteChange = (url: string) => {@@ -37,7 +52,7 @@ function JsonCrack({ Component, pageProps }: AppProps) {}, [router.events]);return (- <>+ <SessionContextProvider supabaseClient={supabase}><GoogleAnalytics /><StyleSheetManager><ThemeProvider theme={lightTheme}>@@ -63,7 +78,7 @@ function JsonCrack({ Component, pageProps }: AppProps) {</MantineProvider></ThemeProvider></StyleSheetManager>- </>+ </SessionContextProvider>);}diff --git a/src/pages/editor.tsx b/src/pages/editor.tsxindex b8d1670d..dd525f51 100644--- a/src/pages/editor.tsx+++ b/src/pages/editor.tsx@@ -5,7 +5,6 @@ import { useRouter } from "next/router";import styled from "styled-components";import { BottomBar } from "src/containers/Editor/BottomBar";import { Tools } from "src/containers/Editor/LiveEditor/Tools";-import { useCheckSession } from "src/hooks/useCheckSession";import { EditorWrapper } from "src/layout/EditorWrapper";import { Loading } from "src/layout/Loading";import useFile from "src/store/useFile";@@ -30,9 +29,8 @@ export const StyledEditorWrapper = styled.div`const EditorPage: React.FC = () => {const { query, isReady } = useRouter();- const loading = useJson(state => state.loading);const checkEditorSession = useFile(state => state.checkEditorSession);- useCheckSession();+ const loading = useJson(state => state.loading);React.useEffect(() => {if (isReady) checkEditorSession(query?.json);diff --git a/src/pages/index.tsx b/src/pages/index.tsxindex b243d6d9..17674f2f 100644--- a/src/pages/index.tsx+++ b/src/pages/index.tsx@@ -202,7 +202,7 @@ const HeroSection = () => (const StatsBanner = () => (<StyledStatsWrapper>- <Group spacing="xl" style={{ flex: 1 }}>+ <Group spacing="xl"><Stack spacing="0"><Text fw="bolder" fz="1.6rem">24.5K@@ -228,7 +228,7 @@ const StatsBanner = () => (</Text></Stack></Group>- <Stack ml={60} style={{ flex: 1 }}>+ <Stack ml={60}><Text maw={800} fz="0.9rem">JSON Crack is an open-source project with a GPL-3 license. By subscribing to our premiumplan, you can help us continue developing and maintaining it, also enjoy the benefits.diff --git a/src/pages/reset-password.tsx b/src/pages/reset-password.tsxindex dcec6c50..796993a3 100644--- a/src/pages/reset-password.tsx+++ b/src/pages/reset-password.tsx@@ -3,8 +3,8 @@ import Head from "next/head";import Link from "next/link";import { useRouter } from "next/router";import { PaperProps, Button, Group, Paper, Stack, TextInput, Text, Anchor } from "@mantine/core";+import { useSession } from "@supabase/auth-helpers-react";import { toast } from "react-hot-toast";-import { useCheckSession } from "src/hooks/useCheckSession";import { Footer } from "src/layout/Footer";import { JSONCrackLogo } from "src/layout/JsonCrackLogo";import { Navbar } from "src/layout/Navbar";@@ -65,13 +65,13 @@ export function AuthenticationForm(props: PaperProps) {);}-const ResetPassword = () => {+const SignIn = () => {const { isReady, push } = useRouter();- const { hasSession } = useCheckSession();+ const session = useSession();React.useEffect(() => {- if (hasSession) push("/editor");- }, [isReady, hasSession, push]);+ if (session) push("/editor");+ }, [isReady, session, push]);return (<div>@@ -88,4 +88,4 @@ const ResetPassword = () => {);};-export default ResetPassword;+export default SignIn;diff --git a/src/pages/sign-in.tsx b/src/pages/sign-in.tsxindex 23d664a3..11f7c8f4 100644--- a/src/pages/sign-in.tsx+++ b/src/pages/sign-in.tsx@@ -17,9 +17,9 @@ import {} from "@mantine/core";import { useForm } from "@mantine/form";import { useToggle, upperFirst } from "@mantine/hooks";+import { useSession } from "@supabase/auth-helpers-react";import { toast } from "react-hot-toast";import { AiOutlineGithub, AiOutlineGoogle } from "react-icons/ai";-import { useCheckSession } from "src/hooks/useCheckSession";import { Footer } from "src/layout/Footer";import { JSONCrackLogo } from "src/layout/JsonCrackLogo";import { Navbar } from "src/layout/Navbar";@@ -267,12 +267,12 @@ function ResetPassword(props: PaperProps) {const SignIn = () => {const { isReady, push, query } = useRouter();- const { hasSession } = useCheckSession();+ const session = useSession();const isPasswordReset = query?.type === "recovery" && !query?.error;React.useEffect(() => {- if (hasSession) push("/editor");- }, [isReady, hasSession, push]);+ if (session) push("/editor");+ }, [isReady, session, push]);return (<div>