Skip to content

Commit

Permalink
Merge branch 'main' into aria_labels_enhacement
Browse files Browse the repository at this point in the history
  • Loading branch information
cbr7 authored May 22, 2024
2 parents 2a45e4b + d147e0f commit d207993
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 432 deletions.
2 changes: 1 addition & 1 deletion packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@podman-desktop/ui-svelte": "0.0.202405151307-049db19",
"@podman-desktop/ui-svelte": "0.0.202405161455-87413f6",
"@sveltejs/vite-plugin-svelte": "3.1.0",
"@tailwindcss/typography": "^0.5.13",
"@testing-library/dom": "^10.1.0",
Expand Down
25 changes: 11 additions & 14 deletions packages/frontend/src/Homepage.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ import { router } from 'tinro';
import type { BootcBuildInfo } from '/@shared/src/models/bootc';
import NavPage from './lib/upstream/NavPage.svelte';
import { faTrash } from '@fortawesome/free-solid-svg-icons';
import Table from './lib/upstream/Table.svelte';
import { Column, Row } from './lib/upstream/table';
import BootcColumnActions from './lib/BootcColumnActions.svelte';
import { bootcClient } from './api/client';
import SimpleColumn from './lib/upstream/SimpleColumn.svelte';
import BootcStatus from './lib/BootcStatus.svelte';
import { searchPattern, filtered } from './stores/historyInfo';
import DiskImageIcon from './lib/DiskImageIcon.svelte';
import FilteredEmptyScreen from './lib/upstream/FilteredEmptyScreen.svelte';
import BootcEmptyScreen from './lib/BootcEmptyScreen.svelte';
import BootcFolderColumn from './lib/BootcFolderColumn.svelte';
import BootcImageColumn from './lib/BootcImageColumn.svelte';
import { Button } from '@podman-desktop/ui-svelte';
import { Button, Table, TableColumn, TableRow, TableSimpleColumn } from '@podman-desktop/ui-svelte';
// Search functionality
export let searchTerm = '';
Expand Down Expand Up @@ -59,27 +56,27 @@ let selectedItemsNumber: number;
let table: Table;
// COLUMNS
let statusColumn = new Column<BootcBuildInfo>('Status', {
let statusColumn = new TableColumn<BootcBuildInfo>('Status', {
align: 'center',
width: '70px',
renderer: BootcStatus,
});
let imageColumn = new Column<BootcBuildInfo>('Image', {
let imageColumn = new TableColumn<BootcBuildInfo>('Image', {
width: '2fr',
renderer: BootcImageColumn,
comparator: (a, b) => a.image.localeCompare(b.image),
});
let typeColumn = new Column<BootcBuildInfo, string>('Type', {
let typeColumn = new TableColumn<BootcBuildInfo, string>('Type', {
renderMapping: object => object.type.join(),
renderer: SimpleColumn,
renderer: TableSimpleColumn,
comparator: (a, b) => a.type.join().localeCompare(b.type.join()),
});
let archColumn = new Column<BootcBuildInfo, string>('Arch', {
let archColumn = new TableColumn<BootcBuildInfo, string>('Arch', {
renderMapping: object => object.arch ?? '',
renderer: SimpleColumn,
renderer: TableSimpleColumn,
comparator: (a, b) => {
if (a.arch && b.arch) {
return a.arch.localeCompare(b.arch);
Expand All @@ -90,21 +87,21 @@ let archColumn = new Column<BootcBuildInfo, string>('Arch', {
},
});
let folderColumn = new Column<BootcBuildInfo>('Folder', {
let folderColumn = new TableColumn<BootcBuildInfo>('Folder', {
renderer: BootcFolderColumn,
comparator: (a, b) => a.folder.localeCompare(b.folder),
});
const columns: Column<BootcBuildInfo, BootcBuildInfo | string>[] = [
const columns: TableColumn<BootcBuildInfo, BootcBuildInfo | string>[] = [
statusColumn,
imageColumn,
typeColumn,
archColumn,
folderColumn,
new Column<BootcBuildInfo>('Actions', { align: 'right', renderer: BootcColumnActions, overflow: true }),
new TableColumn<BootcBuildInfo>('Actions', { align: 'right', renderer: BootcColumnActions, overflow: true }),
];
const row = new Row<BootcBuildInfo>({
const row = new TableRow<BootcBuildInfo>({
selectable: _build => true,
});
</script>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/lib/upstream/FormPage.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { lastPage } from './stores/breadcrumb';
import { router } from 'tinro';
import Link from './Link.svelte';
import LinearProgress from './LinearProgress.svelte';
import { LinearProgress } from '@podman-desktop/ui-svelte';
export let title: string;
export let showBreadcrumb = true;
Expand Down
56 changes: 0 additions & 56 deletions packages/frontend/src/lib/upstream/LinearProgress.svelte

This file was deleted.

2 changes: 1 addition & 1 deletion packages/frontend/src/lib/upstream/NavPage.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import SearchInput from './SearchInput.svelte';
import { SearchInput } from '@podman-desktop/ui-svelte';
export let title: string;
export let searchTerm = '';
Expand Down
32 changes: 0 additions & 32 deletions packages/frontend/src/lib/upstream/SearchInput.svelte

This file was deleted.

7 changes: 0 additions & 7 deletions packages/frontend/src/lib/upstream/SimpleColumn.svelte

This file was deleted.

Loading

0 comments on commit d207993

Please sign in to comment.