Skip to content

✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.

styling improvements

AykutSaracc31816b055a1
diff --git a/src/containers/Toolbar/index.tsx b/src/containers/Toolbar/index.tsx
index d24febc5..c18d71a0 100644
--- a/src/containers/Toolbar/index.tsx
+++ b/src/containers/Toolbar/index.tsx
@@ -1,10 +1,10 @@
import React from "react";
-import { Text, Flex, Group, Indicator, Select } from "@mantine/core";
-import { useSessionStorage } from "@mantine/hooks";
+import { Text, Flex, Group, Select, Indicator } from "@mantine/core";
+import { useLocalStorage } from "@mantine/hooks";
import toast from "react-hot-toast";
import { AiOutlineFullscreen } from "react-icons/ai";
-import { AiFillGift } from "react-icons/ai";
import { FiDownload } from "react-icons/fi";
+import { MdChevronRight } from "react-icons/md";
import { SearchInput } from "src/containers/Toolbar/SearchInput";
import { FileFormat } from "src/enums/file.enum";
import { JSONCrackLogo } from "src/layout/JsonCrackLogo";
@@ -38,7 +38,7 @@ export const Toolbar = ({ isWidget = false }: ToolbarProps) => {
const setVisible = useModal(state => state.setVisible);
const setFormat = useFile(state => state.setFormat);
const format = useFile(state => state.format);
- const [seenPremium, setSeenPremium] = useSessionStorage({
+ const [seenPremium, setSeenPremium] = useLocalStorage({
key: "seenPremium",
defaultValue: false,
});
@@ -81,32 +81,20 @@ export const Toolbar = ({ isWidget = false }: ToolbarProps) => {
)}
<Group gap="xs" justify="right" w="100%" style={{ flexWrap: "nowrap" }}>
{!isWidget && (
- <Styles.StyledToolElement
- onClick={() => {
- setSeenPremium(true);
- setVisible("upgrade")(true);
- gaEvent("Toolbar", "click upgrade premium");
- }}
- >
- <Indicator
- size={5}
- color="green"
- position="top-start"
- processing
- disabled={seenPremium}
+ <Indicator color="blue" size="6" offset={6} processing disabled={seenPremium}>
+ <Styles.StyledToolElement
+ onClick={() => {
+ setSeenPremium(true);
+ window.open("https://jsoncrack.com/premium", "_blank");
+ gaEvent("Toolbar", "click upgrade premium");
+ }}
>
- <Text
- display="flex"
- c="teal"
- fz="xs"
- fw={600}
- style={{ textAlign: "center", gap: 4 }}
- >
- <AiFillGift size="18" />
- Try Premium
+ <Text fw={800} fz="xs">
+ Upgrade
</Text>
- </Indicator>
- </Styles.StyledToolElement>
+ <MdChevronRight size="16" />
+ </Styles.StyledToolElement>
+ </Indicator>
)}
<SearchInput />
diff --git a/src/containers/Toolbar/styles.ts b/src/containers/Toolbar/styles.ts
index 7d984659..f1eb4078 100644
--- a/src/containers/Toolbar/styles.ts
+++ b/src/containers/Toolbar/styles.ts
@@ -21,7 +21,9 @@ export const StyledTools = styled.div`
`;
export const StyledToolElement = styled.button<{ $hide?: boolean }>`
- display: ${({ $hide }) => ($hide ? "none" : "grid")};
+ display: ${({ $hide }) => ($hide ? "none" : "flex")};
+ align-items: center;
+ gap: 4px;
place-content: center;
font-size: 12px;
background: none;
diff --git a/src/modules/GraphView/NotSupported.tsx b/src/modules/GraphView/NotSupported.tsx
index 3b18bb20..47482845 100644
--- a/src/modules/GraphView/NotSupported.tsx
+++ b/src/modules/GraphView/NotSupported.tsx
@@ -3,6 +3,7 @@ import { Button, Title } from "@mantine/core";
import styled from "styled-components";
import { MdChevronRight } from "react-icons/md";
import { JSONCrackLogo } from "src/layout/JsonCrackLogo";
+import useModal from "src/store/useModal";
const StyledNotSupported = styled.div`
position: relative;
@@ -154,11 +155,13 @@ const StyledContent = styled.div`
`;
export const NotSupported = () => {
+ const setVisible = useModal(state => state.setVisible);
+
return (
<StyledNotSupported>
<StyledContent>
<Title mb="lg" style={{ pointerEvents: "none" }}>
- <JSONCrackLogo fontSize="4rem" style={{ color: "black" }} />
+ <JSONCrackLogo fontSize="4rem" style={{ color: "gray" }} />
</Title>
<StyledInfo>
Upgrade to premium for larger data size support. The free version is incapable of handling
@@ -166,15 +169,13 @@ export const NotSupported = () => {
</StyledInfo>
<Button
- component="a"
- href="/premium"
- target="_blank"
mt="lg"
size="lg"
fw="bolder"
color="green"
radius="md"
rightSection={<MdChevronRight size="24" />}
+ onClick={() => setVisible("upgrade")(true)}
>
Upgrade Premium
</Button>
diff --git a/src/modules/GraphView/index.tsx b/src/modules/GraphView/index.tsx
index a49ddf9d..39fba44d 100644
--- a/src/modules/GraphView/index.tsx
+++ b/src/modules/GraphView/index.tsx
@@ -1,6 +1,5 @@
import React from "react";
-import { LoadingOverlay, Dialog, Group, Button, Text } from "@mantine/core";
-import { useSessionStorage } from "@mantine/hooks";
+import { LoadingOverlay } from "@mantine/core";
import styled from "styled-components";
import debounce from "lodash.debounce";
import { Space } from "react-zoomable-ui";
@@ -11,7 +10,6 @@ import useToggleHide from "src/hooks/useToggleHide";
import { CustomNode } from "src/modules/GraphView/CustomNode";
import useGraph from "src/modules/GraphView/stores/useGraph";
import useConfig from "src/store/useConfig";
-import useModal from "src/store/useModal";
import { CustomEdge } from "./CustomEdge";
import { NotSupported } from "./NotSupported";
@@ -139,18 +137,12 @@ const GraphCanvas = ({ isWidget }: GraphProps) => {
const SUPPORTED_LIMIT = 400;
export const GraphView = ({ isWidget = false }: GraphProps) => {
- const setVisible = useModal(state => state.setVisible);
const setViewPort = useGraph(state => state.setViewPort);
const viewPort = useGraph(state => state.viewPort);
const aboveSupportedLimit = useGraph(state => state.nodes.length > SUPPORTED_LIMIT);
const loading = useGraph(state => state.loading);
const gesturesEnabled = useConfig(state => state.gesturesEnabled);
const rulersEnabled = useConfig(state => state.rulersEnabled);
- const [isDialogClosed, setDialogClosed] = useSessionStorage({
- key: "graph-size-dialog",
- defaultValue: false,
- getInitialValueInEffect: false,
- });
const callback = React.useCallback(() => {
const canvas = document.querySelector(".jsoncrack-canvas") as HTMLDivElement | null;
@@ -198,37 +190,6 @@ export const GraphView = ({ isWidget = false }: GraphProps) => {
>
<GraphCanvas isWidget={isWidget} />
</Space>
- {!isWidget && (
- <Dialog
- opened={!isDialogClosed}
- size="lg"
- radius="md"
- withBorder
- position={{
- right: 15,
- bottom: 40,
- }}
- onClose={() => setDialogClosed(true)}
- >
- <Text size="sm" fw={500}>
- Need way more power over your data? Explore Premium Editor.
- </Text>
- <Group justify="right" mt="sm">
- <Button variant="default" onClick={() => setDialogClosed(true)}>
- Close
- </Button>
- <Button
- color="green"
- onClick={() => {
- setVisible("upgrade")(true);
- setDialogClosed(true);
- }}
- >
- Explore
- </Button>
- </Group>
- </Dialog>
- )}
</StyledEditorWrapper>
</>
);