Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

update default button colors

Guy Ben-Aharonb45b61492e30
diff --git a/src/assets/star-us.gif b/src/assets/star-us.gif
new file mode 100644
index 00000000..a27026f8
Binary files /dev/null and b/src/assets/star-us.gif differ
diff --git a/src/components/button/button-variants.tsx b/src/components/button/button-variants.tsx
index 38da6bc2..c3dfada3 100644
--- a/src/components/button/button-variants.tsx
+++ b/src/components/button/button-variants.tsx
@@ -6,7 +6,7 @@ export const buttonVariants = cva(
variants: {
variant: {
default:
- 'bg-primary text-primary-foreground shadow hover:bg-primary/90',
+ 'bg-pink-600 text-primary-foreground shadow hover:bg-pink-500',
destructive:
'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
outline:
diff --git a/src/context/dialog-context/dialog-context.tsx b/src/context/dialog-context/dialog-context.tsx
index 152e8009..eca539c6 100644
--- a/src/context/dialog-context/dialog-context.tsx
+++ b/src/context/dialog-context/dialog-context.tsx
@@ -37,6 +37,10 @@ export interface DialogContext {
params: Omit<TableSchemaDialogProps, 'dialog'>
) => void;
closeTableSchemaDialog: () => void;
+
+ // Star us dialog
+ openStarUsDialog: () => void;
+ closeStarUsDialog: () => void;
}
export const dialogContext = createContext<DialogContext>({
@@ -54,4 +58,6 @@ export const dialogContext = createContext<DialogContext>({
closeImportDatabaseDialog: emptyFn,
openTableSchemaDialog: emptyFn,
closeTableSchemaDialog: emptyFn,
+ openStarUsDialog: emptyFn,
+ closeStarUsDialog: emptyFn,
});
diff --git a/src/context/dialog-context/dialog-provider.tsx b/src/context/dialog-context/dialog-provider.tsx
index 79c4be1e..b8128f5a 100644
--- a/src/context/dialog-context/dialog-provider.tsx
+++ b/src/context/dialog-context/dialog-provider.tsx
@@ -14,6 +14,7 @@ import { ImportDatabaseDialog } from '@/dialogs/import-database-dialog/import-da
import type { TableSchemaDialogProps } from '@/dialogs/table-schema-dialog/table-schema-dialog';
import { TableSchemaDialog } from '@/dialogs/table-schema-dialog/table-schema-dialog';
import { emptyFn } from '@/lib/utils';
+import { StarUsDialog } from '@/dialogs/star-us-dialog/star-us-dialog';
export const DialogProvider: React.FC<React.PropsWithChildren> = ({
children,
@@ -40,6 +41,7 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
const [alertParams, setAlertParams] = useState<BaseAlertDialogProps>({
title: '',
});
+ const [openStarUsDialog, setOpenStarUsDialog] = useState(false);
const openExportSQLDialogHandler: DialogContext['openExportSQLDialog'] =
useCallback(
@@ -100,6 +102,8 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
setOpenImportDatabaseDialog(false),
openTableSchemaDialog: openTableSchemaDialogHandler,
closeTableSchemaDialog: () => setOpenTableSchemaDialog(false),
+ openStarUsDialog: () => setOpenStarUsDialog(true),
+ closeStarUsDialog: () => setOpenStarUsDialog(false),
}}
>
{children}
@@ -121,6 +125,7 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
dialog={{ open: openTableSchemaDialog }}
{...tableSchemaDialogParams}
/>
+ <StarUsDialog dialog={{ open: openStarUsDialog }} />
</dialogContext.Provider>
);
};
diff --git a/src/context/local-config-context/local-config-context.tsx b/src/context/local-config-context/local-config-context.tsx
index 3d20f57b..99b4c6cd 100644
--- a/src/context/local-config-context/local-config-context.tsx
+++ b/src/context/local-config-context/local-config-context.tsx
@@ -23,6 +23,12 @@ export interface LocalConfigContext {
setHideMultiSchemaNotification: (
hideMultiSchemaNotification: boolean
) => void;
+
+ githubRepoOpened: boolean;
+ setGithubRepoOpened: (githubRepoOpened: boolean) => void;
+
+ starUsDialogLastOpen: number;
+ setStarUsDialogLastOpen: (lastOpen: number) => void;
}
export const LocalConfigContext = createContext<LocalConfigContext>({
@@ -40,4 +46,10 @@ export const LocalConfigContext = createContext<LocalConfigContext>({
hideMultiSchemaNotification: false,
setHideMultiSchemaNotification: emptyFn,
+
+ githubRepoOpened: false,
+ setGithubRepoOpened: emptyFn,
+
+ starUsDialogLastOpen: 0,
+ setStarUsDialogLastOpen: emptyFn,
});
diff --git a/src/context/local-config-context/local-config-provider.tsx b/src/context/local-config-context/local-config-provider.tsx
index 3553ae25..07f3a6df 100644
--- a/src/context/local-config-context/local-config-provider.tsx
+++ b/src/context/local-config-context/local-config-provider.tsx
@@ -7,6 +7,9 @@ const themeKey = 'theme';
const scrollActionKey = 'scroll_action';
const schemasFilterKey = 'schemas_filter';
const showCardinalityKey = 'show_cardinality';
+const hideMultiSchemaNotificationKey = 'hide_multi_schema_notification';
+const githubRepoOpenedKey = 'github_repo_opened';
+const starUsDialogLastOpenKey = 'star_us_dialog_last_open';
export const LocalConfigProvider: React.FC<React.PropsWithChildren> = ({
children,
@@ -31,13 +34,33 @@ export const LocalConfigProvider: React.FC<React.PropsWithChildren> = ({
const [hideMultiSchemaNotification, setHideMultiSchemaNotification] =
React.useState<boolean>(
- (localStorage.getItem('hide_multi_schema_notification') ||
+ (localStorage.getItem(hideMultiSchemaNotificationKey) ||
'false') === 'true'
);
+ const [githubRepoOpened, setGithubRepoOpened] = React.useState<boolean>(
+ (localStorage.getItem(githubRepoOpenedKey) || 'false') === 'true'
+ );
+
+ const [starUsDialogLastOpen, setStarUsDialogLastOpen] =
+ React.useState<number>(
+ parseInt(localStorage.getItem(starUsDialogLastOpenKey) || '0')
+ );
+
+ useEffect(() => {
+ localStorage.setItem(
+ starUsDialogLastOpenKey,
+ starUsDialogLastOpen.toString()
+ );
+ }, [starUsDialogLastOpen]);
+
+ useEffect(() => {
+ localStorage.setItem(githubRepoOpenedKey, githubRepoOpened.toString());
+ }, [githubRepoOpened]);
+
useEffect(() => {
localStorage.setItem(
- 'hide_multi_schema_notification',
+ hideMultiSchemaNotificationKey,
hideMultiSchemaNotification.toString()
);
}, [hideMultiSchemaNotification]);
@@ -71,6 +94,10 @@ export const LocalConfigProvider: React.FC<React.PropsWithChildren> = ({
setShowCardinality,
hideMultiSchemaNotification,
setHideMultiSchemaNotification,
+ setGithubRepoOpened,
+ githubRepoOpened,
+ starUsDialogLastOpen,
+ setStarUsDialogLastOpen,
}}
>
{children}
diff --git a/src/dialogs/export-sql-dialog/export-sql-dialog.tsx b/src/dialogs/export-sql-dialog/export-sql-dialog.tsx
index 06a33af3..8e2d87e6 100644
--- a/src/dialogs/export-sql-dialog/export-sql-dialog.tsx
+++ b/src/dialogs/export-sql-dialog/export-sql-dialog.tsx
@@ -166,7 +166,7 @@ export const ExportSQLDialog: React.FC<ExportSQLDialogProps> = ({
<DialogFooter className="flex !justify-between gap-2">
<div />
<DialogClose asChild>
- <Button type="button">
+ <Button type="button" variant="secondary">
{t('export_sql_dialog.close')}
</Button>
</DialogClose>
diff --git a/src/dialogs/star-us-dialog/star-us-dialog.tsx b/src/dialogs/star-us-dialog/star-us-dialog.tsx
new file mode 100644
index 00000000..1650ff9a
--- /dev/null
+++ b/src/dialogs/star-us-dialog/star-us-dialog.tsx
@@ -0,0 +1,69 @@
+import React, { useCallback, useEffect } from 'react';
+import { useDialog } from '@/hooks/use-dialog';
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from '@/components/dialog/dialog';
+import { Button } from '@/components/button/button';
+import StarUs from '@/assets/star-us.gif';
+import type { BaseDialogProps } from '../common/base-dialog-props';
+import { useTranslation } from 'react-i18next';
+import { ZoomableImage } from '@/components/zoomable-image/zoomable-image';
+import { useLocalConfig } from '@/hooks/use-local-config';
+
+export interface StarUsDialogProps extends BaseDialogProps {}
+
+export const StarUsDialog: React.FC<StarUsDialogProps> = ({ dialog }) => {
+ const { t } = useTranslation();
+ const { setGithubRepoOpened } = useLocalConfig();
+
+ useEffect(() => {
+ if (!dialog.open) return;
+ }, [dialog.open]);
+ const { closeStarUsDialog } = useDialog();
+
+ const handleConfirm = useCallback(() => {
+ setGithubRepoOpened(true);
+ window.open('https://github.com/chartdb/chartdb', '_blank');
+ }, [setGithubRepoOpened]);
+
+ return (
+ <Dialog
+ {...dialog}
+ onOpenChange={(open) => {
+ if (!open) {
+ closeStarUsDialog();
+ }
+ }}
+ >
+ <DialogContent className="flex flex-col" showClose>
+ <DialogHeader>
+ <DialogTitle>{t('star_us_dialog.title')}</DialogTitle>
+ <DialogDescription>
+ {t('star_us_dialog.description')}
+ </DialogDescription>
+ </DialogHeader>
+ <div className="flex">
+ <ZoomableImage src={StarUs} />
+ </div>
+ <DialogFooter className="flex gap-1 md:justify-between">
+ <DialogClose asChild>
+ <Button variant="secondary">
+ {t('star_us_dialog.close')}
+ </Button>
+ </DialogClose>
+ <DialogClose asChild>
+ <Button onClick={handleConfirm}>
+ {t('star_us_dialog.confirm')}
+ </Button>
+ </DialogClose>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index 4e343aa7..b7a34ad9 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -285,6 +285,14 @@ export const en = {
confirm: 'Change',
},
+ star_us_dialog: {
+ title: 'Help us improve!',
+ description:
+ "Would you like to star us on GitHub? It's just a click away!",
+ close: 'Not now',
+ confirm: 'Of course!',
+ },
+
relationship_type: {
one_to_one: 'One to One',
one_to_many: 'One to Many',
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index 8b4dd54a..ce2e9484 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -277,6 +277,14 @@ export const es: LanguageTranslation = {
confirm: 'Cambiar',
},
+ star_us_dialog: {
+ title: '¡Ayúdanos a mejorar!',
+ description:
+ '¿Te gusta ChartDB? Por favor, danos una estrella en GitHub.',
+ close: 'Ahora no',
+ confirm: '¡Claro!',
+ },
+
multiple_schemas_alert: {
title: 'Múltiples Esquemas',
description:
diff --git a/src/pages/editor-page/editor-page.tsx b/src/pages/editor-page/editor-page.tsx
index 1c9e2242..0ac1df65 100644
--- a/src/pages/editor-page/editor-page.tsx
+++ b/src/pages/editor-page/editor-page.tsx
@@ -30,13 +30,16 @@ import { ToastAction } from '@/components/toast/toast';
import { useLocalConfig } from '@/hooks/use-local-config';
import { useTranslation } from 'react-i18next';
+const OPEN_STAR_US_AFTER_SECONDS = 30;
+const SHOW_STAR_US_AGAIN_AFTER_DAYS = 1;
+
export const EditorPage: React.FC = () => {
const { loadDiagram, currentDiagram, schemas, filteredSchemas } =
useChartDB();
const { isSidePanelShowed, hideSidePanel, openSelectSchema } = useLayout();
const { resetRedoStack, resetUndoStack } = useRedoUndoStack();
const { showLoader, hideLoader } = useFullScreenLoader();
- const { openCreateDiagramDialog } = useDialog();
+ const { openCreateDiagramDialog, openStarUsDialog } = useDialog();
const { diagramId } = useParams<{ diagramId: string }>();
const { config, updateConfig } = useConfig();
const navigate = useNavigate();
@@ -44,8 +47,13 @@ export const EditorPage: React.FC = () => {
const { isXl } = useBreakpoint('xl');
const { isMd: isDesktop } = useBreakpoint('md');
const [initialDiagram, setInitialDiagram] = useState<Diagram | undefined>();
- const { hideMultiSchemaNotification, setHideMultiSchemaNotification } =
- useLocalConfig();
+ const {
+ hideMultiSchemaNotification,
+ setHideMultiSchemaNotification,
+ starUsDialogLastOpen,
+ setStarUsDialogLastOpen,
+ githubRepoOpened,
+ } = useLocalConfig();
const { toast } = useToast();
const { t } = useTranslation();
@@ -99,6 +107,27 @@ export const EditorPage: React.FC = () => {
updateConfig,
]);
+ useEffect(() => {
+ if (!currentDiagram?.id || githubRepoOpened) {
+ return;
+ }
+
+ if (
+ new Date().getTime() - starUsDialogLastOpen >
+ 1000 * 60 * 60 * 24 * SHOW_STAR_US_AGAIN_AFTER_DAYS
+ ) {
+ const lastOpen = new Date().getTime();
+ setStarUsDialogLastOpen(lastOpen);
+ setTimeout(openStarUsDialog, OPEN_STAR_US_AFTER_SECONDS * 1000);
+ }
+ }, [
+ currentDiagram?.id,
+ githubRepoOpened,
+ openStarUsDialog,
+ setStarUsDialogLastOpen,
+ starUsDialogLastOpen,
+ ]);
+
const lastDiagramId = useRef<string>('');
useEffect(() => {