Skip to content

Commit a06c5ad

Browse files
authored
Merge pull request #55 from zecrypt-io/feature/ananducv/consistancy-fixes-2
duplicate sort elements being displayed over table header in accounts fix
2 parents a34aa57 + 2cf26a6 commit a06c5ad

File tree

4 files changed

+12
-32
lines changed

4 files changed

+12
-32
lines changed

packages/frontend-web/app/globals.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
}
6565
}
6666

67+
/* Hide default sort UI in account table headers */
68+
.accounts-table-header th::after {
69+
display: none !important;
70+
}
71+
6772
/* CSS property for animation */
6873
@property --angle {
6974
syntax: "<angle>";

packages/frontend-web/components/accounts-content.tsx

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -285,43 +285,19 @@ export function AccountsContent() {
285285
</div>
286286
) : (
287287
<Table>
288-
<TableHeader>
288+
<TableHeader className="accounts-table-header">
289289
<TableRow>
290290
<TableHead className="w-[200px]">
291-
<div className="flex items-center">
292-
{translate("account", "accounts")}
293-
<SortButton
294-
field="title"
295-
sortConfig={sortConfig}
296-
setSortConfig={setSortConfig}
297-
label={translate("account", "accounts")}
298-
/>
299-
</div>
291+
{translate("account", "accounts")}
300292
</TableHead>
301293
<TableHead>
302-
<div className="flex items-center">
303-
{translate("username", "accounts")}
304-
<SortButton
305-
field="username"
306-
sortConfig={sortConfig}
307-
setSortConfig={setSortConfig}
308-
label={translate("username", "accounts")}
309-
/>
310-
</div>
294+
{translate("username", "accounts")}
311295
</TableHead>
312296
<TableHead>{translate("password", "accounts")}</TableHead>
313297
<TableHead>{translate("website", "accounts")}</TableHead>
314298
<TableHead>{translate("tags", "accounts")}</TableHead>
315299
<TableHead>
316-
<div className="flex items-center">
317-
{translate("last_modified", "accounts")}
318-
<SortButton
319-
field="updated_at"
320-
sortConfig={sortConfig}
321-
setSortConfig={setSortConfig}
322-
label={translate("last_modified", "accounts")}
323-
/>
324-
</div>
300+
{translate("last_modified", "accounts")}
325301
</TableHead>
326302
<TableHead className="text-right">{translate("actions", "accounts")}</TableHead>
327303
</TableRow>

packages/frontend-web/messages/de/common.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,8 @@
596596
"expires": "Läuft ab",
597597
"expired": "Abgelaufen",
598598
"expiring_soon": "Läuft bald ab",
599-
"licenses": {
600-
"add_a_tag": "Tag hinzufügen",
601-
"date_created": "Erstellungsdatum"
602-
}
599+
"add_a_tag": "Tag hinzufügen",
600+
"date_created": "Erstellungsdatum"
603601
},
604602
"wifi": {
605603
"wifi_networks": "WLAN-Netzwerke",

packages/frontend-web/messages/en/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
"update_api_key": "Update API Key",
101101
"manage_your_software_licenses": "Manage your software licenses and keys",
102102
"date_created": "Date Created",
103+
"add_a_tag": "Add a tag",
103104
"licenses": {
104105
"licenses": "Software Licenses",
105106
"add_license": "Add License",

0 commit comments

Comments
 (0)