Skip to content

Commit 9c56fd7

Browse files
committed
Remove page cards and change page title
1 parent 4274857 commit 9c56fd7

File tree

7 files changed

+71
-91
lines changed

7 files changed

+71
-91
lines changed

src/Exceptionless.Web/ClientApp/src/lib/features/shared/api/api.svelte.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FetchClient, FetchClientProvider, getCurrentProvider } from '@exceptionless/fetchclient';
22

3-
export const DEFAULT_LIMIT = 10;
3+
export const DEFAULT_LIMIT = 20;
44

55
/**
66
* Represents the default timezone offset based on the user's local time.

src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/automatic-refresh-indicator-button.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
{#if canRefresh}
1616
<div class="inline-flex h-6">
17-
<Live liveTitle={refreshButtonTitle} class="ml-3 size-3 motion-safe:animate-none" />
17+
<Live liveTitle={refreshButtonTitle} class="ml-2 size-2 motion-safe:animate-none" />
1818
</div>
1919
{:else}
2020
<Button variant="ghost" size="icon" onclick={refresh} title={refreshButtonTitle}>
21-
<Live live={false} notLiveTitle={refreshButtonTitle} class="size-3 motion-safe:animate-none" />
21+
<Live live={false} notLiveTitle={refreshButtonTitle} class="size-2 motion-safe:animate-none" />
2222
</Button>
2323
{/if}

src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/data-table/data-table-body.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<div class="rounded-md border">
4646
<Table.Root>
47-
<Table.Header>
47+
<Table.Header class="bg-card">
4848
{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
4949
<Table.Row>
5050
{#each headerGroup.headers as header (header.id)}

src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/data-table/data-table-toolbar.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import type { Snippet } from 'svelte';
88
99
import DataTableViewOptions from './data-table-view-options.svelte';
10+
import AutomaticRefreshIndicatorButton from '$comp/automatic-refresh-indicator-button.svelte';
1011
1112
interface Props {
1213
children: Snippet;
@@ -20,6 +21,7 @@
2021
<div class="flex flex-1 flex-wrap items-center gap-x-2 gap-y-2">
2122
{@render children()}
2223
<div class="ml-auto flex">
24+
<AutomaticRefreshIndicatorButton canRefresh={true} refresh={() => Promise.resolve()} />
2325
<DataTableViewOptions {table} />
2426
</div>
2527
</div>

src/Exceptionless.Web/ClientApp/src/routes/(app)/+page.svelte

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -197,36 +197,27 @@
197197
</script>
198198

199199
<div class="flex flex-col space-y-4">
200-
<Card.Root>
201-
<Card.Header>
202-
<Card.Title class="text-2xl"
203-
>Events
204-
<AutomaticRefreshIndicatorButton {canRefresh} refresh={loadData} /></Card.Title
205-
></Card.Header
206-
>
207-
<Card.Content>
208-
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
209-
{#snippet toolbarChildren()}
210-
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
211-
<OrganizationDefaultsFacetedFilterBuilder />
212-
</FacetedFilter.Root>
213-
{/snippet}
214-
{#snippet footerChildren()}
215-
<div class="h-9 min-w-[140px]">
216-
{#if table.getSelectedRowModel().flatRows.length}
217-
<EventsBulkActionsDropdownMenu {table} />
218-
{/if}
219-
</div>
220-
221-
<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
222-
<div class="flex items-center space-x-6 lg:space-x-8">
223-
<DataTable.PageCount {table} />
224-
<DataTable.Pagination {table} />
225-
</div>
226-
{/snippet}
227-
</EventsDataTable>
228-
</Card.Content>
229-
</Card.Root>
200+
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
201+
{#snippet toolbarChildren()}
202+
<div class="text-lg font-medium pr-2">Events</div>
203+
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
204+
<OrganizationDefaultsFacetedFilterBuilder />
205+
</FacetedFilter.Root>
206+
{/snippet}
207+
{#snippet footerChildren()}
208+
<div class="h-9 min-w-[140px]">
209+
{#if table.getSelectedRowModel().flatRows.length}
210+
<EventsBulkActionsDropdownMenu {table} />
211+
{/if}
212+
</div>
213+
214+
<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
215+
<div class="flex items-center space-x-6 lg:space-x-8">
216+
<DataTable.PageCount {table} />
217+
<DataTable.Pagination {table} />
218+
</div>
219+
{/snippet}
220+
</EventsDataTable>
230221
</div>
231222

232223
<Sheet.Root onOpenChange={() => (selectedEventId = null)} open={!!selectedEventId}>

src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -208,32 +208,25 @@
208208
</script>
209209

210210
<div class="flex flex-col space-y-4">
211-
<Card.Root
212-
><Card.Header>
213-
<Card.Title class="text-2xl">Issues <AutomaticRefreshIndicatorButton {canRefresh} refresh={loadData} /></Card.Title>
214-
</Card.Header><Card.Content>
215-
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
216-
{#snippet toolbarChildren()}
217-
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
218-
<OrganizationDefaultsFacetedFilterBuilder />
219-
</FacetedFilter.Root>
220-
{/snippet}
221-
{#snippet footerChildren()}
222-
<div class="h-9 min-w-[140px]">
223-
{#if table.getSelectedRowModel().flatRows.length}
224-
<TableStacksBulkActionsDropdownMenu {table} />
225-
{/if}
226-
</div>
227-
228-
<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
229-
<div class="flex items-center space-x-6 lg:space-x-8">
230-
<DataTable.PageCount {table} />
231-
<DataTable.Pagination {table} />
232-
</div>
233-
{/snippet}
234-
</EventsDataTable>
235-
</Card.Content>
236-
</Card.Root>
211+
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
212+
{#snippet toolbarChildren()}
213+
<div class="text-lg font-medium pr-2">Issues</div>
214+
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
215+
<OrganizationDefaultsFacetedFilterBuilder />
216+
</FacetedFilter.Root>
217+
{/snippet}
218+
{#snippet footerChildren()}
219+
<div class="h-9 min-w-[140px]">
220+
<TableStacksBulkActionsDropdownMenu {table} />
221+
</div>
222+
223+
<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
224+
<div class="flex items-center space-x-6 lg:space-x-8">
225+
<DataTable.PageCount {table} />
226+
<DataTable.Pagination {table} />
227+
</div>
228+
{/snippet}
229+
</EventsDataTable>
237230
</div>
238231

239232
<Sheet.Root onOpenChange={() => (selectedStackId = undefined)} open={eventsQuery.isSuccess}>

src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -213,37 +213,31 @@
213213
});
214214
</script>
215215

216-
<Card.Root
217-
><Card.Header>
218-
<Card.Title class="text-2xl">Event Stream</Card.Title>
219-
</Card.Header>
220-
<Card.Content>
221-
<DataTable.Root>
222-
<DataTable.Toolbar {table}>
223-
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
224-
<OrganizationDefaultsFacetedFilterBuilder includeDateFacets={false} />
225-
</FacetedFilter.Root>
226-
</DataTable.Toolbar>
227-
<DataTable.Body rowClick={rowclick} {table}>
228-
{#if clientStatus.isLoading}
229-
<DelayedRender>
230-
<DataTable.Loading {table} />
231-
</DelayedRender>
232-
{:else}
233-
<DataTable.Empty {table} />
234-
{/if}
235-
</DataTable.Body>
236-
<DataTable.Footer {table}>
237-
<div class="flex w-full items-center justify-center space-x-4">
238-
<DataTable.PageSize bind:value={queryParams.limit!} {table} />
239-
<div class="text-center">
240-
<ErrorMessage message={clientResponse?.problem?.errors.general} />
241-
</div>
242-
</div>
243-
</DataTable.Footer>
244-
</DataTable.Root>
245-
</Card.Content></Card.Root
246-
>
216+
<DataTable.Root>
217+
<DataTable.Toolbar {table}>
218+
<div class="text-lg font-medium pr-2">Event Stream</div>
219+
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
220+
<OrganizationDefaultsFacetedFilterBuilder includeDateFacets={false} />
221+
</FacetedFilter.Root>
222+
</DataTable.Toolbar>
223+
<DataTable.Body rowClick={rowclick} {table}>
224+
{#if clientStatus.isLoading}
225+
<DelayedRender>
226+
<DataTable.Loading {table} />
227+
</DelayedRender>
228+
{:else}
229+
<DataTable.Empty {table} />
230+
{/if}
231+
</DataTable.Body>
232+
<DataTable.Footer {table}>
233+
<div class="flex w-full items-center justify-center space-x-4">
234+
<DataTable.PageSize bind:value={queryParams.limit!} {table} />
235+
<div class="text-center">
236+
<ErrorMessage message={clientResponse?.problem?.errors.general} />
237+
</div>
238+
</div>
239+
</DataTable.Footer>
240+
</DataTable.Root>
247241

248242
<Sheet.Root onOpenChange={() => (selectedEventId = null)} open={!!selectedEventId}>
249243
<Sheet.Content class="w-full overflow-y-auto sm:max-w-full md:w-5/6">

0 commit comments

Comments
 (0)