Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui): add tool tip and update codeblock style #11

Merged
merged 3 commits into from
Jun 20, 2024
Merged

feat(ui): add tool tip and update codeblock style #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ad38a0
chore: Add JetBrains Mono font
DGCP3 Jun 20, 2024
c84a27b
feat(ui): add tool tip and update codeblock style
DGCP3 Jun 20, 2024
1c86e56
chore: Format code abd remove lock file
DGCP3 Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="/icon.svg" type="image/svg+xml" />
<title>SQLite Studio</title>

<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap"
rel="stylesheet"
/>
</head>

<body>
Expand Down
1 change: 1 addition & 0 deletions ui/src/components/editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const Editor: FunctionComponent<Props> = ({ value, onChange }) => {
top: 20,
bottom: 20,
},
fontFamily: "JetBrains Mono",
cursorStyle: "block",
automaticLayout: true,
readOnly: onChange === undefined,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@
@apply border-border;
}
body {
@apply bg-background text-foreground;
@apply bg-background text-foreground font-mono;
}
}
48 changes: 42 additions & 6 deletions ui/src/routes/index.lazy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import { createFileRoute } from "@tanstack/react-router";
import { createLazyFileRoute } from "@tanstack/react-router";
import {
DatabaseZap,
Table as TableIcon,
TextSearch,
Workflow,
} from "lucide-react";
import { Bar, BarChart, ResponsiveContainer, XAxis, YAxis } from "recharts";
import {
Bar,
BarChart,
ResponsiveContainer,
Tooltip,
TooltipProps,
XAxis,
YAxis,
} from "recharts";

import { fetchOverview } from "@/api";
import {
Expand All @@ -17,8 +25,12 @@ import {
} from "@/components/ui/card";
import { Skeleton } from "@/components/ui/skeleton";
import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
import {
NameType,
ValueType,
} from "recharts/types/component/DefaultTooltipContent";

export const Route = createFileRoute("/")({
export const Route = createLazyFileRoute("/")({
component: Index,
loader: () => fetchOverview(),
pendingComponent: IndexSkeleton,
Expand Down Expand Up @@ -93,7 +105,7 @@ function Index() {
</Card>
</div>

<div className="grid gap-4 lg:grid-cols-2 xl:grid-cols-7">
<div className="grid gap-8 lg:grid-cols-2 xl:grid-cols-7">
<Card className="xl:col-span-4">
<CardHeader>
<CardTitle>Rows Per Table</CardTitle>
Expand Down Expand Up @@ -177,7 +189,7 @@ type TheBarChartProps = {
}[];
};

const compactrer = Intl.NumberFormat("en-US", {
const compactNumberFormatter = Intl.NumberFormat("en-US", {
notation: "compact",
maximumFractionDigits: 1,
});
Expand All @@ -198,14 +210,15 @@ export function TheBarChart({ counts }: TheBarChartProps) {
fontSize={12}
tickLine={false}
axisLine={false}
tickFormatter={(number) => compactrer.format(number)}
tickFormatter={(number) => compactNumberFormatter.format(number)}
/>
<Bar
dataKey="count"
fill="currentColor"
radius={[4, 4, 0, 0]}
className="fill-primary"
/>
<Tooltip content={<CustomTooltip />} cursor={{ fill: "#00ffa61e" }} />
</BarChart>
</ResponsiveContainer>
);
Expand Down Expand Up @@ -233,3 +246,26 @@ function IndexSkeleton() {
</>
);
}

function CustomTooltip({
active,
payload,
label,
}: TooltipProps<ValueType, NameType>) {
if (!active || !payload || !payload.length) return null;

return (
<Card className="p-3">
<CardContent className="p-0">
<div className="font-bold"># {payload[0]?.value?.toLocaleString()}</div>
<p className="text-xs text-muted-foreground">
Table <span className="text-primary font-semibold">{label}</span> have{" "}
<span className="text-primary font-semibold">
{compactNumberFormatter.format(payload[0]?.value as number)}
</span>{" "}
rows.
</p>
</CardContent>
</Card>
);
}
8 changes: 7 additions & 1 deletion ui/src/routes/tables.lazy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function Tables() {
{data.tables.map((n, i) => (
<TabsTrigger key={i} value={i.toString()}>
<Link search={{ table: n.name }}>
{n.name} ({n.count.toLocaleString()})
{n.name} [{n.count.toLocaleString()}]
</Link>
</TabsTrigger>
))}
Expand Down Expand Up @@ -140,6 +140,12 @@ function Table({ name }: Props) {
language="sql"
theme={currentTheme === "dark" ? CodeDarkTheme : undefined}
showLineNumbers={false}
customStyle={{
FontFace: "JetBrains Mono",
padding: "10px",
backgroundColor: currentTheme === "dark" ? "#091813" : "#f5faf9",
borderRadius: "10px",
}}
/>
</Card>

Expand Down
3 changes: 3 additions & 0 deletions ui/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ module.exports = {
],
prefix: "",
theme: {
fontFamily: {
mono: ["JetBrains Mono"],
},
container: {
center: true,
padding: "2rem",
Expand Down
Loading