✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.
refactor
AykutSarac18e3f69ae80a
diff --git a/public/assets/pacman.png b/public/assets/pacman.pngnew file mode 100644index 00000000..7c1b0ab2Binary files /dev/null and b/public/assets/pacman.png differdiff --git a/public/assets/tetris.png b/public/assets/tetris.pngnew file mode 100644index 00000000..ded0a72aBinary files /dev/null and b/public/assets/tetris.png differdiff --git a/src/containers/Modals/AccountModal/index.tsx b/src/containers/Modals/AccountModal/index.tsxindex c1f51dea..98d151e8 100644--- a/src/containers/Modals/AccountModal/index.tsx+++ b/src/containers/Modals/AccountModal/index.tsx@@ -55,7 +55,7 @@ export const AccountModal: React.FC<ModalProps> = ({ opened, onClose }) => {gradient={{ from: "teal", to: "lime", deg: 105 }}leftSection={<IoRocketSharp />}onClick={() => {- setVisible("premium")(true);+ setVisible("upgrade")(true);gaEvent("Account Modal", "click upgrade premium");}}>diff --git a/src/containers/Modals/CancelPremiumModal/index.tsx b/src/containers/Modals/CancelPremiumModal/index.tsxdeleted file mode 100644index 9af8633f..00000000--- a/src/containers/Modals/CancelPremiumModal/index.tsx+++ /dev/null@@ -1,157 +0,0 @@-import React from "react";-import type { ModalProps } from "@mantine/core";-import {- Modal,- Group,- Button,- Divider,- Text,- Anchor,- List,- Checkbox,- TextInput,-} from "@mantine/core";-import { toast } from "react-hot-toast";-import { supabase } from "src/lib/api/supabase";-import useModal from "src/store/useModal";-import useUser from "src/store/useUser";--export const CancelPremiumModal: React.FC<ModalProps> = ({ opened, onClose }) => {- const user = useUser(state => state.user?.user_metadata);- const [cancelling, setCancelling] = React.useState(false);- const [reasons, setReasons] = React.useState<number[]>([]);- const [textReason, setTextReason] = React.useState("");- const showFeedback = useModal(state => state.setVisible("review"));-- const username = user?.full_name || user?.display_name || user?.name;-- const cancelSub = async () => {- try {- setCancelling(true);- const { data: user } = await supabase.auth.getSession();- if (!user) {- throw new Error("Couldn't fetch user details, please contact: [email protected]");- }-- const { error: lmError } = await supabase.functions.invoke("lemonsqueezy", {- method: "DELETE",- body: { jwt: user.session?.access_token },- });-- if (lmError) {- throw new Error(- "An error occured while cancelling subscription, please contact: [email protected]"- );- }-- const { error: feedbackError } = await supabase.from("cancel_feedback").insert({- email: user.session?.user.email,- text_reason: textReason,- reasons,- });-- if (feedbackError) {- throw new Error(feedbackError.message);- }-- toast.success("Cancelled premium plan!");- showFeedback(true);- onClose();- } catch (err) {- if (err instanceof Error) {- toast.error(err.message);- }-- console.error(err);- } finally {- setCancelling(false);- }- };-- return (- <Modal title="PREMIUM" opened={opened} onClose={onClose} centered>- <Text fz="lg" fw="bold" pb="md">- {username}, are you sure you want to cancel?- </Text>- <Text fz="sm" pb="lg">- If you cancel, you will lose access to premium features and existing pricing. Your plan will- remain active until the end of the current billing cycle.- </Text>- <Text fz="sm" fw="bold">- Why are you cancelling your plan?- </Text>- <List icon={<></>} pb="lg">- <List.Item>- <Checkbox- checked={reasons.includes(1)}- onChange={e => {- if (e.target.checked) {- setReasons([...reasons, 1]);- } else {- setReasons(reasons.filter(r => r !== 1));- }- }}- label="The software is too difficult to use."- />- </List.Item>- <List.Item>- <Checkbox- checked={reasons.includes(2)}- onChange={e => {- if (e.target.checked) {- setReasons([...reasons, 2]);- } else {- setReasons(reasons.filter(r => r !== 2));- }- }}- label="I'm not satisfied with its performance."- />- </List.Item>- <List.Item>- <Checkbox- checked={reasons.includes(3)}- onChange={e => {- if (e.target.checked) {- setReasons([...reasons, 3]);- } else {- setReasons(reasons.filter(r => r !== 3));- }- }}- label="Features I need are missing."- />- </List.Item>- <List.Item>- <Checkbox- checked={reasons.includes(4)}- onChange={e => {- if (e.target.checked) {- setReasons([...reasons, 4]);- } else {- setReasons(reasons.filter(r => r !== 4));- }- }}- label="I don't use the app enough."- />- </List.Item>- </List>- <TextInput- value={textReason}- onChange={e => setTextReason(e.currentTarget.value)}- placeholder="Give more details about your reason..."- pb="lg"- />- <Anchor fz="xs" target="_blank" href="https://patreon.com/herowand">- Click here to cancel if you are Patreon member- </Anchor>- <Divider py="xs" />- <Group justify="right">- <Button color="red" variant="outline" onClick={onClose}>- Never mind, keep premium- </Button>- <Button onClick={cancelSub} loading={cancelling} color="red">- Cancel Plan- </Button>- </Group>- </Modal>- );-};diff --git a/src/containers/Modals/NodeModal/index.tsx b/src/containers/Modals/NodeModal/index.tsxindex f3ffa3f3..a69d6da6 100644--- a/src/containers/Modals/NodeModal/index.tsx+++ b/src/containers/Modals/NodeModal/index.tsx@@ -35,7 +35,7 @@ export const NodeModal: React.FC<ModalProps> = ({ opened, onClose }) => {</Stack><ButtononClick={() => {- setVisible("premium")(true);+ setVisible("upgrade")(true);gaEvent("Node Modal", "edit");}}rightSection={<VscLock strokeWidth={0.5} />}diff --git a/src/containers/Modals/PremiumModal/index.tsx b/src/containers/Modals/PremiumModal/index.tsxdeleted file mode 100644index 5c09d916..00000000--- a/src/containers/Modals/PremiumModal/index.tsx+++ /dev/null@@ -1,71 +0,0 @@-import React from "react";-import Link from "next/link";-import type { ModalProps } from "@mantine/core";-import { Modal, Title, Flex, Button, Stack, List, ThemeIcon, Divider } from "@mantine/core";-import { BsCheck } from "react-icons/bs";-import { MdChevronRight } from "react-icons/md";-import { gaEvent } from "src/lib/utils/gaEvent";--export const PremiumModal: React.FC<ModalProps> = ({ opened, onClose }) => {- return (- <Modal title="Upgrade Plan" size="auto" opened={opened} onClose={onClose} centered zIndex={202}>- <Flex gap="lg" justify="center" px="md">- <Stack gap="xs">- <Title order={3}>Free</Title>- <Button variant="outline" color="dark.2" size="md">- Your current plan- </Button>- <List- mt="xs"- spacing="xs"- size="sm"- center- icon={- <ThemeIcon color="dark.6" size={20} radius="xl">- <BsCheck size="1rem" />- </ThemeIcon>- }- >- <List.Item>Limited capability visualization</List.Item>- <List.Item>Store/Share up to 15 files</List.Item>- </List>- </Stack>- <Divider color="gray" orientation="vertical" />- <Stack gap="xs">- <Title order={3}>Premium</Title>- <Button- onClick={() => gaEvent("Premium Modal", "click upgrade premium")}- component={Link}- prefetch={false}- href="/pricing"- target="_blank"- variant="filled"- color="teal"- size="md"- rightSection={<MdChevronRight size="24" />}- >- Start 1 Day Free Trial- </Button>- <List- mt="xs"- spacing="xs"- size="sm"- center- icon={- <ThemeIcon color="teal" size={20} radius="xl">- <BsCheck size="1rem" />- </ThemeIcon>- }- >- <List.Item>5X Faster visualizations, no lagging</List.Item>- <List.Item>Accurate and compact graphs</List.Item>- <List.Item>Edit data through visualizations</List.Item>- <List.Item>Visualize data up to 5 MBs</List.Item>- <List.Item>Compare data on graphs</List.Item>- <List.Item>Save & share up to 200 files</List.Item>- </List>- </Stack>- </Flex>- </Modal>- );-};diff --git a/src/containers/Modals/UpgradeModal/index.tsx b/src/containers/Modals/UpgradeModal/index.tsxnew file mode 100644index 00000000..cf1850ea--- /dev/null+++ b/src/containers/Modals/UpgradeModal/index.tsx@@ -0,0 +1,116 @@+import React from "react";+import type { ModalProps } from "@mantine/core";+import {+ Button,+ Image,+ Radio,+ Modal,+ Text,+ Stack,+ Tooltip,+ Flex,+ Badge,+ Divider,+ CheckIcon,+} from "@mantine/core";+import { gaEvent } from "src/lib/utils/gaEvent";+import { PRICING } from "src/pages/pricing";+import useUser from "src/store/useUser";++const overlayLinks = {+ monthly:+ "https://herowand.lemonsqueezy.com/buy/ce30521f-c7cc-44f3-9435-995d3260ba22?embed=1&media=0&logo=0&desc=0&discount=0&enabled=67805",+ annual:+ "https://herowand.lemonsqueezy.com/buy/577928ea-fb09-4076-9307-3e5931b35ad0?embed=1&media=0&logo=0&desc=0&discount=0&enabled=82417",+};++export const UpgradeModal: React.FC<ModalProps> = ({ opened, onClose }) => {+ const [plan, setPlan] = React.useState<string>("annual");+ const user = useUser(state => state.user);++ const handleSelect = () => {+ const link = new URL(overlayLinks[plan]);++ if (user?.email) {+ link.searchParams.append("checkout[email]", user.email);+ }++ if (user?.user_metadata.display_name) {+ link.searchParams.append("checkout[name]", user.user_metadata.display_name);+ }++ gaEvent("Premium Modal", "click select", plan);+ window.open(link.toString(), "_blank");+ };++ return (+ <Modal size="md" opened={opened} onClose={onClose} centered zIndex={202}>+ <Flex justify="center" gap="xl" mx="auto">+ <Image src="./assets/pacman.png" radius="md" w={100} alt="green tetris block" />+ <Image src="./assets/tetris.png" radius="md" w={100} alt="yellow tetris block" />+ </Flex>+ <Text fw="bold" fz="xl" ta="center" my="lg">+ Unlock even more features!+ </Text>+ <Text fz="sm">+ We've developed a new editor for individuals & professionals who deal with data on a+ regular basis.+ </Text>+ <Text mt="xs" fz="sm">+ Upgrade your plan and take advantage of improved speed, enhanced readability, and a more+ compact design.+ </Text>++ <Radio.Group+ value={plan}+ onChange={setPlan}+ mt="md"+ label="Choose one:"+ description="You will start with a 1 day free trial"+ >+ <Stack mt="xs" gap="xs">+ <Flex align="center" justify="space-between">+ <Radio+ icon={CheckIcon}+ value="annual"+ label={+ <Flex align="center" w="100%" justify="space-between">+ <Text>1 Year</Text>+ <Badge ml="xs" size="xs" color="green">+ Save 16%+ </Badge>+ </Flex>+ }+ />+ <Text c="dimmed" fz="sm">+ US${PRICING.ANNUAL * 12}+ </Text>+ </Flex>+ <Flex align="center" justify="space-between">+ <Radio icon={CheckIcon} value="monthly" label={<Text>1 Month</Text>} />+ <Text c="dimmed" fz="sm">+ US${PRICING.MONTHLY}+ </Text>+ </Flex>+ </Stack>+ </Radio.Group>++ <Divider my="xs" />+ <Flex justify="space-between">+ <Button color="gray" variant="subtle" onClick={onClose}>+ Back+ </Button>+ <Tooltip+ label="You will be taken to the checkout screen"+ position="bottom"+ fz="xs"+ withArrow+ >+ <Button onClick={handleSelect} color="blue" px="xl">+ Select+ </Button>+ </Tooltip>+ </Flex>+ </Modal>+ );+};diff --git a/src/containers/Modals/index.ts b/src/containers/Modals/index.tsindex bc7135a6..359aef72 100644--- a/src/containers/Modals/index.ts+++ b/src/containers/Modals/index.ts@@ -6,10 +6,9 @@ export { AccountModal } from "./AccountModal";export { NodeModal } from "./NodeModal";export { ShareModal } from "./ShareModal";export { LoginModal } from "./LoginModal";-export { PremiumModal } from "./PremiumModal";+export { UpgradeModal } from "./UpgradeModal";export { JWTModal } from "./JWTModal";export { SchemaModal } from "./SchemaModal";-export { CancelPremiumModal } from "./CancelPremiumModal";export { ReviewModal } from "./ReviewModal";export { JQModal } from "./JQModal";export { TypeModal } from "./TypeModal";@@ -23,10 +22,9 @@ type Modal =| "node"| "share"| "login"- | "premium"+ | "upgrade"| "jwt"| "schema"- | "cancelPremium"| "review"| "jq"| "type";diff --git a/src/containers/Toolbar/ToolsMenu.tsx b/src/containers/Toolbar/ToolsMenu.tsxindex 48c38375..3b8e937a 100644--- a/src/containers/Toolbar/ToolsMenu.tsx+++ b/src/containers/Toolbar/ToolsMenu.tsx@@ -26,7 +26,7 @@ export const ToolsMenu = () => {leftSection={<MdCompare />}rightSection={<VscLock />}onClick={() => {- setVisible("premium")(true);+ setVisible("upgrade")(true);gaEvent("Tools Menu", "open", "Compare Data");}}>diff --git a/src/containers/Toolbar/index.tsx b/src/containers/Toolbar/index.tsxindex 74333589..4f78c4bb 100644--- a/src/containers/Toolbar/index.tsx+++ b/src/containers/Toolbar/index.tsx@@ -80,7 +80,7 @@ export const Toolbar: React.FC<{ isWidget?: boolean }> = ({ isWidget = false })<Styles.StyledToolElementonClick={() => {setSeenPremium(true);- setVisible("premium")(true);+ setVisible("upgrade")(true);gaEvent("Toolbar", "click upgrade premium");}}>@@ -99,7 +99,7 @@ export const Toolbar: React.FC<{ isWidget?: boolean }> = ({ isWidget = false })style={{ textAlign: "center", gap: 4 }}><AiFillGift size="18" />- Start 1 Day Free Trial+ Get Premium!</Text></Indicator></Styles.StyledToolElement>diff --git a/src/containers/Views/GraphView/PremiumView.tsx b/src/containers/Views/GraphView/NotSupported.tsxsimilarity index 75%rename from src/containers/Views/GraphView/PremiumView.tsxrename to src/containers/Views/GraphView/NotSupported.tsxindex 8553a44a..2440debe 100644--- a/src/containers/Views/GraphView/PremiumView.tsx+++ b/src/containers/Views/GraphView/NotSupported.tsx@@ -5,8 +5,9 @@ import styled from "styled-components";import { MdChevronRight } from "react-icons/md";import { JSONCrackLogo } from "src/layout/JsonCrackLogo";import { gaEvent } from "src/lib/utils/gaEvent";+import useModal from "src/store/useModal";-const StyledPremiumView = styled.div`+const StyledNotSupported = styled.div`position: relative;display: flex;flex-direction: column;@@ -155,38 +156,41 @@ const StyledContent = styled.div`z-index: 1;`;-export const PremiumView = () => (- <StyledPremiumView>- <StyledContent>- <Title mb="lg" style={{ pointerEvents: "none" }}>- <JSONCrackLogo fontSize="4rem" />- </Title>- <StyledInfo>- Free version is not optimized to handle data of this size. Try the premium version for more- features and capabilities.- </StyledInfo>-- <Button- onClick={() => gaEvent("Premium View", "click upgrade premium")}- component={Link}- prefetch={false}- href="/pricing"- mt="lg"- size="lg"- fw="bolder"- color="green"- radius="xl"- target="_blank"- rightSection={<MdChevronRight size="24" />}- >- Start 1 Day Free Trial- </Button>- </StyledContent>-- <div className="glowing">- <span></span>- <span></span>- <span></span>- </div>- </StyledPremiumView>-);+export const NotSupported = () => {+ const setVisible = useModal(state => state.setVisible);++ return (+ <StyledNotSupported>+ <StyledContent>+ <Title mb="lg" style={{ pointerEvents: "none" }}>+ <JSONCrackLogo fontSize="4rem" />+ </Title>+ <StyledInfo>+ Free version is not optimized to handle data of this size. Try the premium version for+ more features and capabilities.+ </StyledInfo>++ <Button+ onClick={() => {+ gaEvent("Premium View", "click upgrade premium");+ setVisible("upgrade")(true);+ }}+ mt="lg"+ size="lg"+ fw="bolder"+ color="green"+ radius="xl"+ rightSection={<MdChevronRight size="24" />}+ >+ Start Free Trial+ </Button>+ </StyledContent>++ <div className="glowing">+ <span></span>+ <span></span>+ <span></span>+ </div>+ </StyledNotSupported>+ );+};diff --git a/src/containers/Views/GraphView/index.tsx b/src/containers/Views/GraphView/index.tsxindex 279e6c43..5ffec67f 100644--- a/src/containers/Views/GraphView/index.tsx+++ b/src/containers/Views/GraphView/index.tsx@@ -11,7 +11,7 @@ import useToggleHide from "src/hooks/useToggleHide";import useConfig from "src/store/useConfig";import useGraph from "src/store/useGraph";import { CustomEdge } from "./CustomEdge";-import { PremiumView } from "./PremiumView";+import { NotSupported } from "./NotSupported";interface GraphProps {isWidget?: boolean;@@ -166,7 +166,7 @@ export const Graph = ({ isWidget = false }: GraphProps) => {}, 300);if (aboveSupportedLimit) {- return <PremiumView />;+ return <NotSupported />;}return (diff --git a/src/layout/ModalController/index.tsx b/src/layout/ModalController/index.tsxindex 1e55dfb7..531e57f1 100644--- a/src/layout/ModalController/index.tsx+++ b/src/layout/ModalController/index.tsx@@ -12,13 +12,12 @@ const modalComponents: ModalComponent[] = [{ key: "download", component: Modals.DownloadModal },{ key: "cloud", component: Modals.CloudModal },{ key: "account", component: Modals.AccountModal },- { key: "premium", component: Modals.PremiumModal },+ { key: "upgrade", component: Modals.UpgradeModal },{ key: "login", component: Modals.LoginModal },{ key: "share", component: Modals.ShareModal },{ key: "jwt", component: Modals.JWTModal },{ key: "node", component: Modals.NodeModal },{ key: "schema", component: Modals.SchemaModal },- { key: "cancelPremium", component: Modals.CancelPremiumModal },{ key: "review", component: Modals.ReviewModal },{ key: "jq", component: Modals.JQModal },{ key: "type", component: Modals.TypeModal },diff --git a/src/pages/_document.tsx b/src/pages/_document.tsxindex f7f64308..b43810e3 100644--- a/src/pages/_document.tsx+++ b/src/pages/_document.tsx@@ -65,7 +65,7 @@ class MyDocument extends Document {__html: 'window.lemonSqueezyAffiliateConfig = { store: "herowand" };',}}/>- <Script src="https://lmsqueezy.com/affiliate.js" strategy="afterInteractive"></Script>+ <Script src="https://lmsqueezy.com/affiliate.js" strategy="afterInteractive" /></body></Html>);diff --git a/src/pages/pricing.tsx b/src/pages/pricing.tsxindex 9508474f..8afaf57b 100644--- a/src/pages/pricing.tsx+++ b/src/pages/pricing.tsx@@ -18,9 +18,13 @@ import { AiOutlineInfoCircle } from "react-icons/ai";import { VscArrowRight } from "react-icons/vsc";import Layout from "src/layout/Layout";import { gaEvent } from "src/lib/utils/gaEvent";-import useUser from "src/store/useUser";-const purchaseLinks = {+export const PRICING = {+ MONTHLY: 6,+ ANNUAL: 5,+};++export const purchaseLinks = {monthly:"https://herowand.lemonsqueezy.com/checkout/buy/ce30521f-c7cc-44f3-9435-995d3260ba22?enabled=67805",annual:@@ -48,14 +52,8 @@ const StyledPaper = styled(Paper)``;export const PricingCards = () => {- const email = useUser(state => state.user?.email);const [isMonthly, setIsMonthly] = React.useState(true);- const paymentURL = (url: string) => {- if (email) url += `?checkout[email]=${email}`;- return url;- };-return (<Stack component="section" id="pricing" gap="0" align="center"><Center my="lg">@@ -156,7 +154,7 @@ export const PricingCards = () => {<Flex gap="xs" align="baseline"><Text fz={32} fw="bold" c="dark">- ${isMonthly ? "6" : "5"}+ ${isMonthly ? PRICING.MONTHLY : PRICING.ANNUAL}</Text><Text fz="sm" fw={500} c="gray.8">/ month@@ -173,7 +171,7 @@ export const PricingCards = () => {<Buttoncomponent="a"onClick={() => gaEvent("Pricing", "click upgrade premium")}- href={paymentURL(isMonthly ? purchaseLinks.monthly : purchaseLinks.annual)}+ href={isMonthly ? purchaseLinks.monthly : purchaseLinks.annual}target="_blank"size="lg"radius="md"diff --git a/src/store/useModal.ts b/src/store/useModal.tsindex a100c556..2650f034 100644--- a/src/store/useModal.ts+++ b/src/store/useModal.ts@@ -19,10 +19,9 @@ const initialStates: ModalState = {node: false,share: false,login: false,- premium: false,+ upgrade: false,jwt: false,schema: false,- cancelPremium: false,review: false,jq: false,type: false,