✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.
feat: update structure
AykutSaracac0de4ee4c27
diff --git a/src/layout/EditorMantine/index.tsx b/src/layout/EditorMantine/index.tsxdeleted file mode 100644index e488ad70..00000000--- a/src/layout/EditorMantine/index.tsx+++ /dev/null@@ -1,58 +0,0 @@-import React from "react";-import { ThemeProvider } from "styled-components";-import { MantineProvider } from "@mantine/core";-import { monaSans } from "src/constants/customFonts";-import { lightTheme, darkTheme } from "src/constants/theme";-import useStored from "src/store/useStored";--export const EditorMantine: React.FC<{ children: React.ReactNode }> = ({ children }) => {- const lightmode = useStored(state => state.lightmode);-- return (- <ThemeProvider theme={lightmode ? lightTheme : darkTheme}>- <MantineProvider- withCSSVariables- withGlobalStyles- withNormalizeCSS- theme={{- colorScheme: lightmode ? "light" : "dark",- fontFamily: monaSans.style.fontFamily,- headings: {- fontFamily: monaSans.style.fontFamily,- },- components: {- Divider: {- styles: () => ({- root: {- borderTopColor: "#4D4D4D !important",- },- }),- },- Modal: {- styles: theme => ({- title: {- fontWeight: 700,- },- header: {- backgroundColor: theme.colorScheme === "dark" ? "#36393E" : "#FFFFFF",- },- body: {- backgroundColor: theme.colorScheme === "dark" ? "#36393E" : "#FFFFFF",- },- }),- },- Button: {- styles: () => ({- inner: {- fontWeight: 700,- },- }),- },- },- }}- >- {children}- </MantineProvider>- </ThemeProvider>- );-};diff --git a/src/layout/EditorWrapper/index.tsx b/src/layout/EditorWrapper/index.tsxnew file mode 100644index 00000000..f87f807a--- /dev/null+++ b/src/layout/EditorWrapper/index.tsx@@ -0,0 +1,72 @@+import React from "react";+import { ThemeProvider } from "styled-components";+import { MantineProvider, MantineThemeOverride } from "@mantine/core";+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";+import { monaSans } from "src/constants/customFonts";+import { lightTheme, darkTheme } from "src/constants/theme";+import useStored from "src/store/useStored";++const queryClient = new QueryClient({+ defaultOptions: {+ queries: {+ refetchOnWindowFocus: false,+ retry: false,+ },+ },+});++const mantineTheme: MantineThemeOverride = {+ fontFamily: monaSans.style.fontFamily,+ headings: {+ fontFamily: monaSans.style.fontFamily,+ },+ components: {+ Divider: {+ styles: () => ({+ root: {+ borderTopColor: "#4D4D4D !important",+ },+ }),+ },+ Modal: {+ styles: theme => ({+ title: {+ fontWeight: 700,+ },+ header: {+ backgroundColor: theme.colorScheme === "dark" ? "#36393E" : "#FFFFFF",+ },+ body: {+ backgroundColor: theme.colorScheme === "dark" ? "#36393E" : "#FFFFFF",+ },+ }),+ },+ Button: {+ styles: () => ({+ inner: {+ fontWeight: 700,+ },+ }),+ },+ },+};++export const EditorWrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => {+ const lightmode = useStored(state => state.lightmode);++ return (+ <ThemeProvider theme={lightmode ? lightTheme : darkTheme}>+ <MantineProvider+ theme={{+ colorScheme: lightmode ? "light" : "dark",+ ...mantineTheme,+ }}+ withCSSVariables+ withGlobalStyles+ withNormalizeCSS+ >+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>+ </MantineProvider>+ </ThemeProvider>+ );+};diff --git a/src/layout/ExternalMode/index.tsx b/src/layout/ExternalMode/index.tsxindex 275997e7..848e77a5 100644--- a/src/layout/ExternalMode/index.tsx+++ b/src/layout/ExternalMode/index.tsx@@ -38,6 +38,8 @@ const StyledTitle = styled.div``;const isExternal = () => {+ if (typeof window === "undefined") return true;+if (window.location.pathname.includes("widget")) return false;if (window.location.host !== "jsoncrack.com") return true;return false;diff --git a/src/layout/ModalController/index.tsx b/src/layout/ModalController/index.tsxindex 0822eb00..0706f2b7 100644--- a/src/layout/ModalController/index.tsx+++ b/src/layout/ModalController/index.tsx@@ -3,7 +3,7 @@ import { ModalProps } from "@mantine/core";import * as Modals from "src/containers/Modals";import { Modal } from "src/containers/Modals";import useModal from "src/store/useModal";-import { EditorMantine } from "../EditorMantine";+import { EditorWrapper } from "../EditorWrapper";type ModalComponent = { key: Modal; component: React.FC<ModalProps> };@@ -28,14 +28,14 @@ const ModalController = () => {const modalStates = useModal(state => modalComponents.map(modal => state[modal.key]));return (- <EditorMantine>+ <EditorWrapper>{modalComponents.map(({ key, component }, index) => {const ModalComponent = component;const opened = modalStates[index];return <ModalComponent key={key} opened={opened} onClose={() => setVisible(key)(false)} />;})}- </EditorMantine>+ </EditorWrapper>);};diff --git a/src/pages/_app.tsx b/src/pages/_app.tsxindex b19259ed..9855de59 100644--- a/src/pages/_app.tsx+++ b/src/pages/_app.tsx@@ -2,69 +2,51 @@ import React from "react";import type { AppProps } from "next/app";import dynamic from "next/dynamic";import { ThemeProvider } from "styled-components";-import { MantineProvider } from "@mantine/core";-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";+import { MantineProvider, MantineThemeOverride } from "@mantine/core";import { monaSans } from "src/constants/customFonts";import GlobalStyle from "src/constants/globalStyle";import { lightTheme } from "src/constants/theme";const Toaster = dynamic(() => import("react-hot-toast").then(c => c.Toaster));const ExternalMode = dynamic(() => import("src/layout/ExternalMode"));-const GoogleAnalytics = dynamic(() => import("src/components/GoogleAnalytics"));const ModalController = dynamic(() => import("src/layout/ModalController"));+const GoogleAnalytics = dynamic(() => import("src/components/GoogleAnalytics"));-const queryClient = new QueryClient({- defaultOptions: {- queries: {- refetchOnWindowFocus: false,- retry: false,- },- },-});+const mantineTheme: MantineThemeOverride = {+ colorScheme: "light",+ fontFamily: monaSans.style.fontFamily,+ headings: { fontFamily: monaSans.style.fontFamily },+ primaryShade: 8,+};function JsonCrack({ Component, pageProps }: AppProps) {- const [isReady, setReady] = React.useState(false);-- React.useEffect(() => setReady(true), []);-- if (isReady)- return (- <QueryClientProvider client={queryClient}>- <GoogleAnalytics />- <ThemeProvider theme={lightTheme}>- <GlobalStyle />- <MantineProvider- withGlobalStyles- withNormalizeCSS- withCSSVariables- theme={{- colorScheme: "light",- fontFamily: monaSans.style.fontFamily,- headings: { fontFamily: monaSans.style.fontFamily },- primaryShade: 8,+ return (+ <>+ <GoogleAnalytics />+ <ThemeProvider theme={lightTheme}>+ <GlobalStyle />+ <MantineProvider theme={mantineTheme} withGlobalStyles withNormalizeCSS withCSSVariables>+ <Component {...pageProps} />+ <ModalController />+ <Toaster+ position="top-right"+ containerStyle={{+ top: 40,+ right: 6,+ fontSize: 14,+ }}+ toastOptions={{+ style: {+ background: "#4D4D4D",+ color: "#B9BBBE",+ },}}- >- <Component {...pageProps} />- <ModalController />- <Toaster- position="top-right"- containerStyle={{- top: 40,- right: 6,- fontSize: 14,- }}- toastOptions={{- style: {- background: "#4D4D4D",- color: "#B9BBBE",- },- }}- />- <ExternalMode />- </MantineProvider>- </ThemeProvider>- </QueryClientProvider>- );+ />+ <ExternalMode />+ </MantineProvider>+ </ThemeProvider>+ </>+ );}export default JsonCrack;diff --git a/src/pages/editor.tsx b/src/pages/editor.tsxindex 1de7947b..7edb5321 100644--- a/src/pages/editor.tsx+++ b/src/pages/editor.tsx@@ -6,7 +6,7 @@ import styled from "styled-components";import { defaultJson } from "src/constants/data";import { BottomBar } from "src/containers/Editor/BottomBar";import { Tools } from "src/containers/Editor/LiveEditor/Tools";-import { EditorMantine } from "src/layout/EditorMantine";+import { EditorWrapper } from "src/layout/EditorWrapper";import { Loading } from "src/layout/Loading";import useFile from "src/store/useFile";import useJson from "src/store/useJson";@@ -51,7 +51,7 @@ const EditorPage: React.FC = () => {if (loading) return <Loading message="Fetching JSON from cloud..." />;return (- <EditorMantine>+ <EditorWrapper><StyledEditorWrapper><Head><title>Editor | JSON Crack</title>@@ -65,7 +65,7 @@ const EditorPage: React.FC = () => {</StyledPageWrapper><BottomBar /></StyledEditorWrapper>- </EditorMantine>+ </EditorWrapper>);};diff --git a/src/pages/widget.tsx b/src/pages/widget.tsxindex b1caff07..6bfa2655 100644--- a/src/pages/widget.tsx+++ b/src/pages/widget.tsx@@ -5,7 +5,7 @@ import { ThemeProvider } from "styled-components";import toast from "react-hot-toast";import { darkTheme, lightTheme } from "src/constants/theme";import { Tools } from "src/containers/Editor/LiveEditor/Tools";-import { EditorMantine } from "src/layout/EditorMantine";+import { EditorWrapper } from "src/layout/EditorWrapper";import useFile from "src/store/useFile";import useGraph from "src/store/useGraph";@@ -57,12 +57,12 @@ const WidgetPage = () => {}, [setContents, setDirection, theme]);return (- <EditorMantine>+ <EditorWrapper><ThemeProvider theme={theme === "dark" ? darkTheme : lightTheme}><Tools isWidget /><Graph isWidget /></ThemeProvider>- </EditorMantine>+ </EditorWrapper>);};diff --git a/src/store/useUser.ts b/src/store/useUser.tsindex aba5fd3a..f82852d5 100644--- a/src/store/useUser.ts+++ b/src/store/useUser.ts@@ -59,9 +59,9 @@ const useUser = create<UserStates & UserActions>()(set => ({},login: user => set({ user: user as unknown as User, isAuthenticated: true }),checkSession: async () => {- // if (isDevelopment) {- // return set({ user: devUser as User, isAuthenticated: true, premium: true });- // }+ if (isDevelopment) {+ return set({ user: devUser as User, isAuthenticated: true, premium: true });+ }const currentSession = altogic.auth.getSession();