From 3bd13196d9ba59e081ce67dcde18427a592b5094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Wed, 23 Aug 2023 13:03:34 +0200 Subject: [PATCH] Add icons to browser file tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rūdolfs Ošiņš --- src/components/Icon.svelte | 353 ++++++++++--------- src/views/projects/Source/Tree/File.svelte | 12 +- src/views/projects/Source/Tree/Folder.svelte | 27 +- tests/e2e/hashRouter.spec.ts | 6 +- tests/e2e/historyRouter.spec.ts | 6 +- tests/e2e/project.spec.ts | 48 +-- 6 files changed, 254 insertions(+), 198 deletions(-) diff --git a/src/components/Icon.svelte b/src/components/Icon.svelte index 0d2776fc9..1930957fc 100644 --- a/src/components/Icon.svelte +++ b/src/components/Icon.svelte @@ -20,6 +20,9 @@ | "ellipsis" | "exclamation" | "exclamation-circle" + | "file" + | "folder" + | "folder-open" | "fork" | "gear" | "issue" @@ -27,8 +30,7 @@ | "moon" | "network" | "patch" - | "sun" - | "twitter"; + | "sun";
+
+ +
{name}
diff --git a/src/views/projects/Source/Tree/Folder.svelte b/src/views/projects/Source/Tree/Folder.svelte index 79ee58720..8e71c0976 100644 --- a/src/views/projects/Source/Tree/Folder.svelte +++ b/src/views/projects/Source/Tree/Folder.svelte @@ -7,6 +7,7 @@ import Link from "@app/components/Link.svelte"; import File from "./File.svelte"; + import Icon from "@app/components/Icon.svelte"; export let baseUrl: BaseUrl; export let currentPath: string; @@ -43,7 +44,7 @@ cursor: pointer; padding: 0.25rem; margin: 0.125rem 0; - color: var(--color-foreground-6); + color: var(--color-foreground-5); user-select: none; line-height: 1.5rem; white-space: nowrap; @@ -60,23 +61,35 @@ .container { padding-left: 0.5rem; - margin: 0; + margin: 0 0 0 0.5rem; } .loading { display: inline-block; padding: 0.5rem 0; } + .icon-container { + display: flex; + justify-content: center; + align-items: center; + }
- {name}/ +
+ {#if expanded} + + {:else} + + {/if} +
+ {name}
-
- {#if expanded} +{#if expanded} +
{#await tree} {:then tree} @@ -112,5 +125,5 @@ {/each} {/if} {/await} - {/if} -
+
+{/if} diff --git a/tests/e2e/hashRouter.spec.ts b/tests/e2e/hashRouter.spec.ts index 680a3bc3d..34c735865 100644 --- a/tests/e2e/hashRouter.spec.ts +++ b/tests/e2e/hashRouter.spec.ts @@ -99,7 +99,7 @@ test.describe("project page navigation", () => { await page.getByText(".hidden").click(); await expect(page).toHaveURL(`${projectTreeURL}/.hidden`); - await page.getByText("bin/").click(); + await page.getByText("bin").click(); await page.getByText("true").click(); await expect(page).toHaveURL(`${projectTreeURL}/bin/true`); @@ -126,7 +126,7 @@ test.describe("project page navigation", () => { await page.getByText(".hidden").click(); await expect(page).toHaveURL(`${projectTreeURL}/tree/.hidden`); - await page.getByText("bin/").click(); + await page.getByText("bin").click(); await page.getByText("true").click(); await expect(page).toHaveURL(`${projectTreeURL}/tree/bin/true`); @@ -150,7 +150,7 @@ test.describe("project page navigation", () => { await page.getByText(".hidden").click(); await expect(page).toHaveURL(`${projectTreeURL}/.hidden`); - await page.getByText("bin/").click(); + await page.getByText("bin").click(); await page.getByText("true").click(); await expect(page).toHaveURL(`${projectTreeURL}/bin/true`); diff --git a/tests/e2e/historyRouter.spec.ts b/tests/e2e/historyRouter.spec.ts index 071918fa6..f373a98df 100644 --- a/tests/e2e/historyRouter.spec.ts +++ b/tests/e2e/historyRouter.spec.ts @@ -99,7 +99,7 @@ test.describe("project page navigation", () => { await page.getByText(".hidden").click(); await expect(page).toHaveURL(`${projectTreeURL}/.hidden`); - await page.getByText("bin/").click(); + await page.getByText("bin").click(); await page.getByText("true").click(); await expect(page).toHaveURL(`${projectTreeURL}/bin/true`); @@ -126,7 +126,7 @@ test.describe("project page navigation", () => { await page.getByText(".hidden").click(); await expect(page).toHaveURL(`${projectTreeURL}/tree/.hidden`); - await page.getByText("bin/").click(); + await page.getByText("bin").click(); await page.getByText("true").click(); await expect(page).toHaveURL(`${projectTreeURL}/tree/bin/true`); @@ -150,7 +150,7 @@ test.describe("project page navigation", () => { await page.getByText(".hidden").click(); await expect(page).toHaveURL(`${projectTreeURL}/.hidden`); - await page.getByText("bin/").click(); + await page.getByText("bin").click(); await page.getByText("true").click(); await expect(page).toHaveURL(`${projectTreeURL}/bin/true`); diff --git a/tests/e2e/project.spec.ts b/tests/e2e/project.spec.ts index b1ecb1adb..e5b335529 100644 --- a/tests/e2e/project.spec.ts +++ b/tests/e2e/project.spec.ts @@ -82,14 +82,14 @@ test("show source tree at specific revision", async ({ page }) => { await expect(page.getByTitle("Current branch")).toContainText( "335dd6dc89b535a4a31e9422c803199bb6b0a09a", ); - await expect(page.locator(".source-tree")).toHaveText("bin/ src/"); + await expect(page.locator(".source-tree")).toHaveText("bin src"); await expectCounts({ commits: 2, contributors: 1 }, page); }); test("source file highlighting", async ({ page }) => { await page.goto(sourceBrowsingUrl); - await page.getByText("src/").click(); + await page.getByText("src").click(); await page.getByText("true.c").click(); await expect(page.getByText("return")).toHaveCSS( @@ -125,15 +125,15 @@ test("navigate deep file hierarchies", async ({ page }) => { const sourceTree = page.locator(".source-tree"); - await sourceTree.getByText("deep/").click(); - await sourceTree.getByText("directory/").click(); - await sourceTree.getByText("hierarchy/").click(); - await sourceTree.getByText("is/").click(); - await sourceTree.getByText("entirely/").click(); - await sourceTree.getByText("possible/").click(); - await sourceTree.getByText("in/").nth(1).click(); - await sourceTree.getByText("git/").click(); - await sourceTree.getByText("repositories/").click(); + await sourceTree.getByText("deep").click(); + await sourceTree.getByText("directory").click(); + await sourceTree.getByText("hierarchy").click(); + await sourceTree.getByText("is").click(); + await sourceTree.getByText("entirely").click(); + await sourceTree.getByText("possible").click(); + await sourceTree.getByText("in").nth(1).click(); + await sourceTree.getByText("git").click(); + await sourceTree.getByText("repositories").click(); await sourceTree.getByText(".gitkeep").click(); await expect( page.getByText("0801ace Add a deeply nested directory tree"), @@ -146,15 +146,15 @@ test("navigate deep file hierarchies", async ({ page }) => { const sourceTree = page.locator(".source-tree"); - await expect(sourceTree.getByText("deep/")).toBeVisible(); - await expect(sourceTree.getByText("directory/")).toBeVisible(); - await expect(sourceTree.getByText("hierarchy/")).toBeVisible(); - await expect(sourceTree.getByText("is/")).toBeVisible(); - await expect(sourceTree.getByText("entirely/")).toBeVisible(); - await expect(sourceTree.getByText("possible/")).toBeVisible(); - await expect(sourceTree.getByText("in/").nth(1)).toBeVisible(); - await expect(sourceTree.getByText("git/")).toBeVisible(); - await expect(sourceTree.getByText("repositories/")).toBeVisible(); + await expect(sourceTree.getByText("deep")).toBeVisible(); + await expect(sourceTree.getByText("directory")).toBeVisible(); + await expect(sourceTree.getByText("hierarchy")).toBeVisible(); + await expect(sourceTree.getByText("is")).toBeVisible(); + await expect(sourceTree.getByText("entirely")).toBeVisible(); + await expect(sourceTree.getByText("possible")).toBeVisible(); + await expect(sourceTree.getByText("in").nth(1)).toBeVisible(); + await expect(sourceTree.getByText("git").nth(1)).toBeVisible(); + await expect(sourceTree.getByText("repositories")).toBeVisible(); await expect(sourceTree.getByText(".gitkeep")).toBeVisible(); await expect( @@ -167,7 +167,7 @@ test("files with special characters in the filename", async ({ page }) => { await page.goto(sourceBrowsingUrl); const sourceTree = page.locator(".source-tree"); - await sourceTree.getByText("special/").click(); + await sourceTree.getByText("special").click(); await sourceTree.getByText("+plus+").click(); await expect(page.locator(".file-name")).toContainText("+plus"); @@ -209,7 +209,7 @@ test("files with special characters in the filename", async ({ page }) => { test("binary files", async ({ page }) => { await page.goto(sourceBrowsingUrl); - await page.getByText("bin/").click(); + await page.getByText("bin").click(); await page.getByText("true").click(); await expect(page.getByText("Binary content")).toBeVisible(); @@ -218,7 +218,7 @@ test("binary files", async ({ page }) => { test("empty files", async ({ page }) => { await page.goto(sourceBrowsingUrl); - await page.getByText("special/").click(); + await page.getByText("special").click(); await page.getByText("_underscore_").click(); await expect(page.getByText("Empty file")).toBeVisible(); @@ -403,7 +403,7 @@ test.describe("browser error handling", () => { await page.goto(sourceBrowsingUrl); const sourceTree = page.locator(".source-tree"); - await sourceTree.getByText("src/").click(); + await sourceTree.getByText("src").click(); await expect(page.getByText("Not able to expand directory")).toBeVisible(); });