Skip to content

Commit 9a4b598

Browse files
letstriletstri
committed
Merge branch 'main' of https://github.com/wannabespace/conar into feat/index-page
2 parents 4a6aee5 + d56b5fe commit 9a4b598

41 files changed

Lines changed: 2113 additions & 1760 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/desktop/src/components/connection-details.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export function ConnectionDetails({ className, connectionString, type }: { class
99
const [showPassword, setShowPassword] = useState(false)
1010

1111
return (
12-
<table className={cn('text-xs font-mono w-full border-collapse', className)}>
12+
<table className={cn('w-full border-collapse font-mono text-xs', className)}>
1313
<tbody>
1414
<tr>
1515
<td className="py-1 pr-4 text-muted-foreground">Type</td>
@@ -25,7 +25,12 @@ export function ConnectionDetails({ className, connectionString, type }: { class
2525
<td data-mask>
2626
<button
2727
type="button"
28-
className="p-1 rounded-md hover:bg-accent/50 translate-y-0.4 cursor-pointer mr-2 inline-block [&_svg]:size-3"
28+
className="
29+
mr-2 inline-block translate-y-0.5 cursor-pointer rounded-md
30+
p-1
31+
hover:bg-accent/50
32+
[&_svg]:size-3
33+
"
2934
onClick={() => setShowPassword(!showPassword)}
3035
>
3136
{showPassword ? <RiEyeOffLine /> : <RiEyeLine />}

‎apps/desktop/src/components/info-table.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export function InfoTable({ data }: { data: { name: string, value: ReactNode }[]
66
{data.filter(({ value }) => value !== null && value !== undefined).map(({ name, value }) => (
77
<div key={name} className="flex items-center gap-2">
88
<span className="font-semibold text-muted-foreground/80 min-w-[60px]">{name}</span>
9-
<span className="text-foreground font-mono px-1.5 py-0.5 rounded bg-accent/40">{value}</span>
9+
<span className="text-foreground font-mono px-1.5 py-0.5 rounded-sm bg-accent/40">{value}</span>
1010
</div>
1111
))}
1212
</div>

‎apps/desktop/src/components/stepper.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function Stepper<T extends string>({
2222

2323
export function StepperList({ children }: { children: React.ReactNode }) {
2424
return (
25-
<div className="flex mb-6 -mx-4 justify-between relative h-10 before:absolute before:-z-10 before:inset-0 before:top-1/2 before:-translate-y-1/2 before:h-0.5 before:w-full before:bg-gradient-to-r before:from-transparent before:via-slate-300 before:to-transparent">
25+
<div className="flex mb-6 -mx-4 justify-between relative h-10 before:absolute before:-z-10 before:inset-0 before:top-1/2 before:-translate-y-1/2 before:h-0.5 before:w-full before:bg-linear-to-r before:from-transparent before:via-slate-300 before:to-transparent">
2626
{children}
2727
</div>
2828
)

‎apps/desktop/src/components/table/filters.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function FilterValueSelector({
137137
}
138138
}}
139139
/>
140-
<div className="flex flex-col gap-4 px-4 py-4 text-sm">
140+
<div className="flex flex-col gap-4 p-4 text-sm">
141141
<div className="flex flex-col gap-2">
142142
<div className="flex items-center gap-1">
143143
<span className="text-muted-foreground">Filtering</span>
@@ -165,7 +165,7 @@ function FilterValueSelector({
165165
{' '}
166166
<span>
167167
Use
168-
<kbd className="rounded border bg-muted px-1.5 py-0.5 text-xs">%</kbd>
168+
<kbd className="rounded-sm border bg-muted px-1.5 py-0.5 text-xs">%</kbd>
169169
{' '}
170170
as wildcard
171171
</span>
@@ -182,7 +182,7 @@ function FilterValueSelector({
182182
<span>
183183
Separate multiple values with commas
184184
{' '}
185-
<kbd className="rounded border bg-muted px-1.5 py-0.5 text-xs">,</kbd>
185+
<kbd className="rounded-sm border bg-muted px-1.5 py-0.5 text-xs">,</kbd>
186186
</span>
187187
</div>
188188
)}
@@ -197,7 +197,7 @@ function FilterValueSelector({
197197
<span>
198198
Separate range values with
199199
{' '}
200-
<kbd className="rounded border bg-muted px-1.5 py-0.5 text-xs">AND</kbd>
200+
<kbd className="rounded-sm border bg-muted px-1.5 py-0.5 text-xs">AND</kbd>
201201
</span>
202202
</div>
203203
)}

‎apps/desktop/src/components/table/header.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export function TableHeader({
6767

6868
return (
6969
<div
70-
className={cn('sticky top-0 z-10 border-y bg-background h-8 has-[[data-footer]]:h-12 w-fit min-w-full', className)}
70+
className={cn('sticky top-0 z-10 border-y bg-background h-8 has-data-footer:h-12 w-fit min-w-full', className)}
7171
style={{ width: `${tableWidth}px`, ...style }}
7272
{...props}
7373
>

‎apps/desktop/src/entities/database/components/query-logger.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ function Log({ query, className, database }: { query: SqlLog, className?: string
144144
<div className="space-y-2">
145145
<Label>Values</Label>
146146
<pre className={`
147-
overflow-x-auto rounded bg-accent/50 p-2 font-mono text-xs
147+
overflow-x-auto rounded-sm bg-accent/50 p-2 font-mono text-xs
148148
`}
149149
>
150150
{formatValues(query.values)}
@@ -168,7 +168,7 @@ function Log({ query, className, database }: { query: SqlLog, className?: string
168168
<div className="space-y-2">
169169
<Label className="text-destructive">Error</Label>
170170
<pre className={`
171-
overflow-x-auto rounded bg-red-50 p-2 font-mono text-xs
171+
overflow-x-auto rounded-sm bg-red-50 p-2 font-mono text-xs
172172
text-red-700
173173
dark:bg-red-950 dark:text-red-300
174174
`}

‎apps/desktop/src/entities/database/components/table-cell-content.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ export function TableCellContent({
1313
return (
1414
<div
1515
className={cn(
16-
'flex items-center gap-1 h-full text-xs truncate p-2 font-mono cursor-default select-none',
17-
'rounded-md transition-ring duration-100 ring-2 ring-inset ring-transparent',
16+
`
17+
flex h-full cursor-default items-center gap-1 truncate rounded-md p-2
18+
font-mono text-xs ring-2 ring-transparent duration-100 select-none
19+
ring-inset
20+
`,
1821
(value === null || value === '') && 'text-muted-foreground/50',
1922
position === 'first' && 'pl-4',
2023
position === 'last' && 'pr-4',

‎apps/desktop/src/routeTree.gen.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,18 @@ const ProtectedDatabaseIdDefinitionsConstraintsIndexRoute =
9797
} as any)
9898

9999
export interface FileRoutesByFullPath {
100-
'/auth': typeof AuthRoute
101100
'/': typeof ProtectedIndexRoute
101+
'/auth': typeof AuthRoute
102102
'/database/$id': typeof ProtectedDatabaseIdRouteWithChildren
103-
'/create': typeof ProtectedCreateIndexRoute
103+
'/create/': typeof ProtectedCreateIndexRoute
104104
'/database/$id/definitions': typeof ProtectedDatabaseIdDefinitionsRouteWithChildren
105-
'/database/$id/settings': typeof ProtectedDatabaseIdSettingsIndexRoute
106-
'/database/$id/sql': typeof ProtectedDatabaseIdSqlIndexRoute
107-
'/database/$id/table': typeof ProtectedDatabaseIdTableIndexRoute
108-
'/database/$id/visualizer': typeof ProtectedDatabaseIdVisualizerIndexRoute
109-
'/database/$id/definitions/constraints': typeof ProtectedDatabaseIdDefinitionsConstraintsIndexRoute
110-
'/database/$id/definitions/enums': typeof ProtectedDatabaseIdDefinitionsEnumsIndexRoute
111-
'/database/$id/definitions/indexes': typeof ProtectedDatabaseIdDefinitionsIndexesIndexRoute
105+
'/database/$id/settings/': typeof ProtectedDatabaseIdSettingsIndexRoute
106+
'/database/$id/sql/': typeof ProtectedDatabaseIdSqlIndexRoute
107+
'/database/$id/table/': typeof ProtectedDatabaseIdTableIndexRoute
108+
'/database/$id/visualizer/': typeof ProtectedDatabaseIdVisualizerIndexRoute
109+
'/database/$id/definitions/constraints/': typeof ProtectedDatabaseIdDefinitionsConstraintsIndexRoute
110+
'/database/$id/definitions/enums/': typeof ProtectedDatabaseIdDefinitionsEnumsIndexRoute
111+
'/database/$id/definitions/indexes/': typeof ProtectedDatabaseIdDefinitionsIndexesIndexRoute
112112
}
113113
export interface FileRoutesByTo {
114114
'/auth': typeof AuthRoute
@@ -143,18 +143,18 @@ export interface FileRoutesById {
143143
export interface FileRouteTypes {
144144
fileRoutesByFullPath: FileRoutesByFullPath
145145
fullPaths:
146-
| '/auth'
147146
| '/'
147+
| '/auth'
148148
| '/database/$id'
149-
| '/create'
149+
| '/create/'
150150
| '/database/$id/definitions'
151-
| '/database/$id/settings'
152-
| '/database/$id/sql'
153-
| '/database/$id/table'
154-
| '/database/$id/visualizer'
155-
| '/database/$id/definitions/constraints'
156-
| '/database/$id/definitions/enums'
157-
| '/database/$id/definitions/indexes'
151+
| '/database/$id/settings/'
152+
| '/database/$id/sql/'
153+
| '/database/$id/table/'
154+
| '/database/$id/visualizer/'
155+
| '/database/$id/definitions/constraints/'
156+
| '/database/$id/definitions/enums/'
157+
| '/database/$id/definitions/indexes/'
158158
fileRoutesByTo: FileRoutesByTo
159159
to:
160160
| '/auth'
@@ -203,7 +203,7 @@ declare module '@tanstack/react-router' {
203203
'/_protected': {
204204
id: '/_protected'
205205
path: ''
206-
fullPath: ''
206+
fullPath: '/'
207207
preLoaderRoute: typeof ProtectedRouteImport
208208
parentRoute: typeof rootRouteImport
209209
}
@@ -217,7 +217,7 @@ declare module '@tanstack/react-router' {
217217
'/_protected/create/': {
218218
id: '/_protected/create/'
219219
path: '/create'
220-
fullPath: '/create'
220+
fullPath: '/create/'
221221
preLoaderRoute: typeof ProtectedCreateIndexRouteImport
222222
parentRoute: typeof ProtectedRoute
223223
}
@@ -238,49 +238,49 @@ declare module '@tanstack/react-router' {
238238
'/_protected/database/$id/visualizer/': {
239239
id: '/_protected/database/$id/visualizer/'
240240
path: '/visualizer'
241-
fullPath: '/database/$id/visualizer'
241+
fullPath: '/database/$id/visualizer/'
242242
preLoaderRoute: typeof ProtectedDatabaseIdVisualizerIndexRouteImport
243243
parentRoute: typeof ProtectedDatabaseIdRoute
244244
}
245245
'/_protected/database/$id/table/': {
246246
id: '/_protected/database/$id/table/'
247247
path: '/table'
248-
fullPath: '/database/$id/table'
248+
fullPath: '/database/$id/table/'
249249
preLoaderRoute: typeof ProtectedDatabaseIdTableIndexRouteImport
250250
parentRoute: typeof ProtectedDatabaseIdRoute
251251
}
252252
'/_protected/database/$id/sql/': {
253253
id: '/_protected/database/$id/sql/'
254254
path: '/sql'
255-
fullPath: '/database/$id/sql'
255+
fullPath: '/database/$id/sql/'
256256
preLoaderRoute: typeof ProtectedDatabaseIdSqlIndexRouteImport
257257
parentRoute: typeof ProtectedDatabaseIdRoute
258258
}
259259
'/_protected/database/$id/settings/': {
260260
id: '/_protected/database/$id/settings/'
261261
path: '/settings'
262-
fullPath: '/database/$id/settings'
262+
fullPath: '/database/$id/settings/'
263263
preLoaderRoute: typeof ProtectedDatabaseIdSettingsIndexRouteImport
264264
parentRoute: typeof ProtectedDatabaseIdRoute
265265
}
266266
'/_protected/database/$id/definitions/indexes/': {
267267
id: '/_protected/database/$id/definitions/indexes/'
268268
path: '/indexes'
269-
fullPath: '/database/$id/definitions/indexes'
269+
fullPath: '/database/$id/definitions/indexes/'
270270
preLoaderRoute: typeof ProtectedDatabaseIdDefinitionsIndexesIndexRouteImport
271271
parentRoute: typeof ProtectedDatabaseIdDefinitionsRoute
272272
}
273273
'/_protected/database/$id/definitions/enums/': {
274274
id: '/_protected/database/$id/definitions/enums/'
275275
path: '/enums'
276-
fullPath: '/database/$id/definitions/enums'
276+
fullPath: '/database/$id/definitions/enums/'
277277
preLoaderRoute: typeof ProtectedDatabaseIdDefinitionsEnumsIndexRouteImport
278278
parentRoute: typeof ProtectedDatabaseIdDefinitionsRoute
279279
}
280280
'/_protected/database/$id/definitions/constraints/': {
281281
id: '/_protected/database/$id/definitions/constraints/'
282282
path: '/constraints'
283-
fullPath: '/database/$id/definitions/constraints'
283+
fullPath: '/database/$id/definitions/constraints/'
284284
preLoaderRoute: typeof ProtectedDatabaseIdDefinitionsConstraintsIndexRouteImport
285285
parentRoute: typeof ProtectedDatabaseIdDefinitionsRoute
286286
}

‎apps/desktop/src/routes/_protected/database/$id/definitions.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ function SideTabsLayout() {
4141

4242
return (
4343
<div className={`
44-
bg-background flex h-full w-full overflow-hidden rounded-lg border
44+
flex size-full overflow-hidden rounded-lg border bg-background
4545
`}
4646
>
4747
<aside className="w-56 flex-none border-r p-4">
48-
<h2 className="text-muted-foreground mb-4 px-2 text-sm font-semibold">
48+
<h2 className="mb-4 px-2 text-sm font-semibold text-muted-foreground">
4949
Tabs
5050
</h2>
5151

‎apps/desktop/src/routes/_protected/database/$id/sql/-components/chat/chat-message-tools.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ const CONTENT: { [K in Exclude<ToolUIPart['type'], typeof SKIP_CONTENT_TOOLS[num
212212
className="size-3 shrink-0"
213213
/>
214214
<span className={`
215-
overflow-hidden font-medium text-ellipsis
216-
whitespace-nowrap
215+
truncate font-medium
216+
217217
group-hover:text-primary
218218
`}
219219
>

0 commit comments

Comments
 (0)