Skip to content

Commit db066d6

Browse files
Merge pull request #1984 from QueryaHub/issue/1984-querya-icons
feat(frontend): QueryaIcon set for tree and chrome
2 parents c2f1c0b + f51108c commit db066d6

18 files changed

Lines changed: 453 additions & 101 deletions

‎apps/tauri/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"codemirror": "^6.0.2",
3030
"lodash": "^4.18.1",
3131
"marked": "^4.3.0",
32+
"material-symbols": "^0.49.0",
3233
"pinia": "^3.0.3",
3334
"react": "^18.3.1",
3435
"react-dom": "^18.3.1",

‎apps/tauri/pnpm-lock.yaml‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/tauri/src/main.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { createApp } from "vue";
22
import { createPinia } from "pinia";
33
import App from "./App.vue";
4+
import "material-symbols/rounded.css";
45
import "./styles/base.css";
56
import { initTheme } from "./theme/queryaTheme";
67
import {

‎apps/tauri/src/ui/ConnectionHome.vue‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { useShellNavStore } from "../stores/shellNav";
1111
import { useObjectTreeStore } from "../stores/objectTree";
1212
import QueryaButton from "./QueryaButton.vue";
1313
import SqlWorkspace from "./SqlWorkspace.vue";
14+
import { QueryaIcon } from "./icons";
1415
import ErdView from "./erd/ErdView.vue";
1516
1617
const connections = useConnectionsStore();
@@ -182,7 +183,9 @@ function openRelation(o: { id: string; name: string; kind: string; schema?: stri
182183
data-testid="home-overview"
183184
>
184185
<header class="head">
185-
<div class="mark" aria-hidden="true">▣</div>
186+
<div class="mark" aria-hidden="true">
187+
<QueryaIcon name="database" :size="22" />
188+
</div>
186189
<div class="titles">
187190
<div class="title-row">
188191
<h1>{{ conn.name }}</h1>
@@ -205,7 +208,7 @@ function openRelation(o: { id: string; name: string; kind: string; schema?: stri
205208
<template v-if="isPostgres">
206209
<section class="chips" aria-label="Database info">
207210
<div class="chip">
208-
<span class="chip-ico" aria-hidden="true">⌂</span>
211+
<QueryaIcon class="chip-ico" name="server" :size="16" />
209212
<div class="chip-body">
210213
<span class="chip-l">Host</span>
211214
<span class="chip-v"
@@ -214,21 +217,21 @@ function openRelation(o: { id: string; name: string; kind: string; schema?: stri
214217
</div>
215218
</div>
216219
<div class="chip">
217-
<span class="chip-ico" aria-hidden="true">▤</span>
220+
<QueryaIcon class="chip-ico" name="database" :size="16" />
218221
<div class="chip-body">
219222
<span class="chip-l">Database</span>
220223
<span class="chip-v">{{ conn.database || "—" }}</span>
221224
</div>
222225
</div>
223226
<div class="chip">
224-
<span class="chip-ico" aria-hidden="true">☺</span>
227+
<QueryaIcon class="chip-ico" name="user" :size="16" />
225228
<div class="chip-body">
226229
<span class="chip-l">User</span>
227230
<span class="chip-v">{{ conn.user || "—" }}</span>
228231
</div>
229232
</div>
230233
<div class="chip">
231-
<span class="chip-ico" aria-hidden="true">▦</span>
234+
<QueryaIcon class="chip-ico" name="tableGroup" :size="16" />
232235
<div class="chip-body">
233236
<span class="chip-l">Schemas / tables</span>
234237
<span class="chip-v"
@@ -250,28 +253,28 @@ function openRelation(o: { id: string; name: string; kind: string; schema?: stri
250253
aria-label="Database info"
251254
>
252255
<div class="chip">
253-
<span class="chip-ico" aria-hidden="true">ⓘ</span>
256+
<QueryaIcon class="chip-ico" name="info" :size="16" />
254257
<div class="chip-body">
255258
<span class="chip-l">SQLite Version</span>
256259
<span class="chip-v">{{ overview?.version || "—" }}</span>
257260
</div>
258261
</div>
259262
<div class="chip">
260-
<span class="chip-ico" aria-hidden="true">▤</span>
263+
<QueryaIcon class="chip-ico" name="hardDrive" :size="16" />
261264
<div class="chip-body">
262265
<span class="chip-l">Database Size</span>
263266
<span class="chip-v">{{ sizeLabel }}</span>
264267
</div>
265268
</div>
266269
<div class="chip">
267-
<span class="chip-ico" aria-hidden="true">▦</span>
270+
<QueryaIcon class="chip-ico" name="grid" :size="16" />
268271
<div class="chip-body">
269272
<span class="chip-l">Pages / Page Size</span>
270273
<span class="chip-v">{{ pagesLabel }}</span>
271274
</div>
272275
</div>
273276
<div class="chip">
274-
<span class="chip-ico" aria-hidden="true">↺</span>
277+
<QueryaIcon class="chip-ico" name="refresh" :size="16" />
275278
<div class="chip-body">
276279
<span class="chip-l">Journal Mode</span>
277280
<span class="chip-v">{{ overview?.journal_mode || "—" }}</span>
@@ -281,7 +284,7 @@ function openRelation(o: { id: string; name: string; kind: string; schema?: stri
281284

282285
<section class="tables-card">
283286
<div class="card-head">
284-
<span class="card-ico" aria-hidden="true">▦</span>
287+
<QueryaIcon class="card-ico" name="tableGroup" :size="16" />
285288
<h2>Tables</h2>
286289
<span class="count">{{ tables.length }}</span>
287290
<span v-if="views.length" class="count muted"
@@ -300,7 +303,7 @@ function openRelation(o: { id: string; name: string; kind: string; schema?: stri
300303
:title="`Open ${o.name}`"
301304
@click="openRelation(o)"
302305
>
303-
<span class="t-ico" aria-hidden="true">▥</span>
306+
<QueryaIcon class="t-ico" name="table" :size="13" />
304307
{{ o.name }}
305308
</button>
306309
<button
@@ -311,7 +314,7 @@ function openRelation(o: { id: string; name: string; kind: string; schema?: stri
311314
:title="`Open ${o.name}`"
312315
@click="openRelation(o)"
313316
>
314-
<span class="t-ico" aria-hidden="true">◇</span>
317+
<QueryaIcon class="t-ico" name="view" :size="13" />
315318
{{ o.name }}
316319
</button>
317320
</div>

‎apps/tauri/src/ui/ConnectionsPanel.vue‎

Lines changed: 52 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
import { computed, onUnmounted, ref } from "vue";
33
import { storeToRefs } from "pinia";
44
import { useShellStore } from "../stores/shell";
5-
import {
6-
useConnectionsStore,
7-
type LiveConnection,
8-
} from "../stores/connections";
5+
import { useConnectionsStore } from "../stores/connections";
96
import { useFoldersStore } from "../stores/folders";
107
import {
118
isPgSchemaToolFolder,
@@ -16,6 +13,7 @@ import { useQueryaMotion } from "../motion";
1613
import SplitHandle from "./SplitHandle.vue";
1714
import QueryaContextMenu, { type CtxItem } from "./QueryaContextMenu.vue";
1815
import SqlObjectTreeNodes from "./SqlObjectTreeNodes.vue";
16+
import { QueryaIcon, QueryaDriverIcon } from "./icons";
1917
2018
const emit = defineEmits<{
2119
newConnection: [];
@@ -242,11 +240,6 @@ function filteredRootsFor(connId: string) {
242240
return tree.filteredRootsFor(connId);
243241
}
244242
245-
function driverGlyph(c: LiveConnection): string {
246-
if (c.mock) return "◈";
247-
if (c.driver === "postgres") return "◇";
248-
return "▤";
249-
}
250243
251244
onUnmounted(() => {
252245
dragging.value = false;
@@ -301,9 +294,16 @@ onUnmounted(() => {
301294
:aria-label="`Expand ${row.folder.name}`"
302295
@click="onFolderExpand(row.folder.id, $event)"
303296
>
304-
{{ row.folder.expanded || row.forceOpen ? "▾" : "▸" }}
297+
<QueryaIcon
298+
:name="
299+
row.folder.expanded || row.forceOpen
300+
? 'chevronDown'
301+
: 'chevronRight'
302+
"
303+
:size="12"
304+
/>
305305
</button>
306-
<span class="folder-ico" aria-hidden="true">▣</span>
306+
<QueryaIcon class="folder-ico" name="folder" :size="14" />
307307
<span class="folder-name">{{ row.folder.name }}</span>
308308
<span class="count-sm">{{ row.children.length }}</span>
309309
</div>
@@ -338,17 +338,23 @@ onUnmounted(() => {
338338
"
339339
@click="onConnExpand(c.id, $event)"
340340
>
341-
{{ nav.isExpanded(c.id) ? "▾" : "▸" }}
341+
<QueryaIcon
342+
:name="nav.isExpanded(c.id) ? 'chevronDown' : 'chevronRight'"
343+
:size="12"
344+
/>
342345
</button>
343346
<button
344347
type="button"
345348
class="conn-main"
346349
@click="onConnClick(c.id)"
347350
@dblclick="onConnExpand(c.id, $event)"
348351
>
349-
<span class="glyph" aria-hidden="true">{{
350-
driverGlyph(c)
351-
}}</span>
352+
<QueryaDriverIcon
353+
class="glyph"
354+
:driver="c.driver"
355+
:mock="!!c.mock"
356+
:size="14"
357+
/>
352358
<span class="conn-name">{{ c.name }}</span>
353359
<span class="conn-meta">
354360
{{ c.driver
@@ -370,7 +376,7 @@ onUnmounted(() => {
370376
aria-label="Refresh"
371377
@click="tree.refresh(c.id)"
372378
>
373-
↻
379+
<QueryaIcon name="refresh" :size="12" />
374380
</button>
375381
</div>
376382
<input
@@ -432,17 +438,23 @@ onUnmounted(() => {
432438
"
433439
@click="onConnExpand(c.id, $event)"
434440
>
435-
{{ nav.isExpanded(c.id) ? "▾" : "▸" }}
441+
<QueryaIcon
442+
:name="nav.isExpanded(c.id) ? 'chevronDown' : 'chevronRight'"
443+
:size="12"
444+
/>
436445
</button>
437446
<button
438447
type="button"
439448
class="conn-main"
440449
@click="onConnClick(c.id)"
441450
@dblclick="onConnExpand(c.id, $event)"
442451
>
443-
<span class="glyph" aria-hidden="true">{{
444-
driverGlyph(c)
445-
}}</span>
452+
<QueryaDriverIcon
453+
class="glyph"
454+
:driver="c.driver"
455+
:mock="!!c.mock"
456+
:size="14"
457+
/>
446458
<span class="conn-name">{{ c.name }}</span>
447459
<span class="conn-meta">
448460
{{ c.driver }}<template v-if="c.mock"> · demo</template>
@@ -463,7 +475,7 @@ onUnmounted(() => {
463475
aria-label="Refresh"
464476
@click="tree.refresh(c.id)"
465477
>
466-
↻
478+
<QueryaIcon name="refresh" :size="12" />
467479
</button>
468480
</div>
469481
<input
@@ -611,8 +623,7 @@ onUnmounted(() => {
611623
}
612624
613625
.folder-ico {
614-
font-size: 12px;
615-
line-height: 1;
626+
color: var(--q-muted-foreground);
616627
}
617628
618629
.folder-name {
@@ -626,24 +637,28 @@ onUnmounted(() => {
626637
627638
.chev {
628639
width: 18px;
640+
height: 18px;
629641
flex: 0 0 18px;
642+
display: inline-flex;
643+
align-items: center;
644+
justify-content: center;
630645
appearance: none;
631646
border: 0;
632647
background: transparent;
633648
color: var(--q-muted-foreground);
634649
cursor: pointer;
635-
font-size: 10px;
636-
line-height: 1;
637650
padding: 0;
638651
}
639652
640653
.conn-main {
641654
flex: 1;
642655
min-width: 0;
643-
display: flex;
644-
flex-direction: column;
645-
align-items: flex-start;
646-
gap: 1px;
656+
display: grid;
657+
grid-template-columns: auto 1fr;
658+
grid-template-rows: auto auto;
659+
column-gap: 8px;
660+
row-gap: 1px;
661+
align-items: center;
647662
appearance: none;
648663
border: 0;
649664
background: transparent;
@@ -653,20 +668,21 @@ onUnmounted(() => {
653668
padding: 5px 6px;
654669
border-radius: var(--q-radius-control);
655670
cursor: pointer;
656-
position: relative;
657671
}
658672
659673
.conn-main .glyph {
660-
position: absolute;
661-
left: 6px;
662-
top: 8px;
663-
font-size: 10px;
674+
grid-row: 1 / span 2;
664675
color: var(--q-muted-foreground);
665676
}
666677
667-
.conn-main .conn-name,
678+
.conn-main .conn-name {
679+
grid-column: 2;
680+
grid-row: 1;
681+
}
682+
668683
.conn-main .conn-meta {
669-
padding-left: 16px;
684+
grid-column: 2;
685+
grid-row: 2;
670686
}
671687
672688
.conn-main:hover {

‎apps/tauri/src/ui/NewConnectionDialog.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { computed, nextTick, onUnmounted, ref, watch } from "vue";
44
// template and make `v-if="open"` always truthy (Save connected, dialog stuck).
55
import { open as pickSqliteFile } from "@tauri-apps/plugin-dialog";
66
import QueryaButton from "./QueryaButton.vue";
7+
import { QueryaIcon } from "./icons";
78
89
export type BuiltInDriverId =
910
| "postgresql"
@@ -328,7 +329,7 @@ onUnmounted(() => window.removeEventListener("keydown", onKey, true));
328329
below.
329330
</p>
330331
<label class="search">
331-
<span class="search-ico" aria-hidden="true">⌕</span>
332+
<QueryaIcon class="search-ico" name="search" :size="14" />
332333
<input
333334
ref="searchEl"
334335
v-model="search"

0 commit comments

Comments
 (0)