diff --git a/src/App.svelte b/src/App.svelte index 2a77415c1..30fb3c1bf 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -10,7 +10,6 @@ import LoadingBar from "./App/LoadingBar.svelte"; import ModalPortal from "./App/ModalPortal.svelte"; - import Browser from "@app/views/projects/Browser.svelte"; import Commit from "@app/views/projects/Commit.svelte"; import History from "@app/views/projects/History.svelte"; import Home from "@app/views/home/Index.svelte"; @@ -21,6 +20,7 @@ import Patch from "@app/views/projects/Patch.svelte"; import Patches from "@app/views/projects/Patches.svelte"; import Session from "@app/views/session/Index.svelte"; + import Source from "@app/views/projects/Source.svelte"; import LoadError from "@app/components/LoadError.svelte"; import Loading from "@app/components/Loading.svelte"; @@ -76,8 +76,8 @@ {:else if $activeRouteStore.resource === "session"} - {:else if $activeRouteStore.resource === "project.tree"} - + {:else if $activeRouteStore.resource === "project.source"} + {:else if $activeRouteStore.resource === "project.history"} {:else if $activeRouteStore.resource === "project.commit"} diff --git a/src/App/Header/Search.svelte b/src/App/Header/Search.svelte index 15e219ac7..10de7d76b 100644 --- a/src/App/Header/Search.svelte +++ b/src/App/Header/Search.svelte @@ -49,7 +49,7 @@ if (searchResult.results.length === 1) { const { project, baseUrl } = searchResult.results[0]; void router.push({ - resource: "project.tree", + resource: "project.source", project: project.id, node: baseUrl, }); diff --git a/src/App/Header/SearchResultsModal.svelte b/src/App/Header/SearchResultsModal.svelte index 6e8c2389c..62a663cae 100644 --- a/src/App/Header/SearchResultsModal.svelte +++ b/src/App/Header/SearchResultsModal.svelte @@ -37,7 +37,7 @@ diff --git a/src/lib/router.ts b/src/lib/router.ts index 0883a35d8..4874d6a4e 100644 --- a/src/lib/router.ts +++ b/src/lib/router.ts @@ -127,7 +127,7 @@ function setTitle(loadedRoute: LoadedRoute) { title.push("Page not found"); title.push("Radicle"); } else if ( - loadedRoute.resource === "project.tree" || + loadedRoute.resource === "project.source" || loadedRoute.resource === "project.history" || loadedRoute.resource === "project.commit" || loadedRoute.resource === "project.issue" || @@ -244,7 +244,7 @@ export function routeToPath(route: Route): string { } else if (route.resource === "loadError") { return ""; } else if ( - route.resource === "project.tree" || + route.resource === "project.source" || route.resource === "project.history" || route.resource === "project.commit" || route.resource === "project.issues" || diff --git a/src/lib/router/definitions.ts b/src/lib/router/definitions.ts index 730073a55..6825b31c7 100644 --- a/src/lib/router/definitions.ts +++ b/src/lib/router/definitions.ts @@ -56,7 +56,7 @@ export async function loadRoute(route: Route): Promise { } else if (route.resource === "home") { return await loadHomeRoute(); } else if ( - route.resource === "project.tree" || + route.resource === "project.source" || route.resource === "project.history" || route.resource === "project.commit" || route.resource === "project.issues" || diff --git a/src/views/home/Index.svelte b/src/views/home/Index.svelte index 89463d8a1..1715d792e 100644 --- a/src/views/home/Index.svelte +++ b/src/views/home/Index.svelte @@ -70,7 +70,7 @@
diff --git a/src/views/nodes/View.svelte b/src/views/nodes/View.svelte index 0fd3c69cc..4e38e6e37 100644 --- a/src/views/nodes/View.svelte +++ b/src/views/nodes/View.svelte @@ -120,7 +120,7 @@
diff --git a/src/views/projects/Commit/CommitTeaser.svelte b/src/views/projects/Commit/CommitTeaser.svelte index e0b8379fc..0855b791f 100644 --- a/src/views/projects/Commit/CommitTeaser.svelte +++ b/src/views/projects/Commit/CommitTeaser.svelte @@ -132,7 +132,7 @@ title="Browse the repository at this point in the history"> diff --git a/src/views/projects/Readme.svelte b/src/views/projects/Readme.svelte index 96712ea6c..1aa72e49e 100644 --- a/src/views/projects/Readme.svelte +++ b/src/views/projects/Readme.svelte @@ -23,7 +23,7 @@ // Markdown. linkBaseUrl = new URL( routeToPath({ - resource: "project.tree", + resource: "project.source", project: projectId, node: baseUrl, peer, diff --git a/src/views/projects/Browser.svelte b/src/views/projects/Source.svelte similarity index 98% rename from src/views/projects/Browser.svelte rename to src/views/projects/Source.svelte index 9a9da10cd..946e51ed9 100644 --- a/src/views/projects/Browser.svelte +++ b/src/views/projects/Source.svelte @@ -48,7 +48,7 @@ remote, selected: remote.id === peer, route: { - resource: "project.tree", + resource: "project.source", node: baseUrl, project: project.id, peer: remote.id, @@ -58,7 +58,7 @@ $: branchesWithRoute = branches.map(name => ({ name, route: { - resource: "project.tree", + resource: "project.source", node: baseUrl, project: project.id, peer, diff --git a/src/views/projects/SourceBrowser/FileDiff.svelte b/src/views/projects/SourceBrowser/FileDiff.svelte index f14ccdfa4..aa900c74d 100644 --- a/src/views/projects/SourceBrowser/FileDiff.svelte +++ b/src/views/projects/SourceBrowser/FileDiff.svelte @@ -339,7 +339,7 @@
{ const api = new HttpdClient(route.node); try { - if (route.resource === "project.tree") { + if (route.resource === "project.source") { return loadTreeView(route); } else if (route.resource === "project.history") { return loadHistoryView(route); @@ -391,7 +391,7 @@ async function loadTreeView( loadBlob(api, project.id, commit, path), ]); return { - resource: "project.tree", + resource: "project.source", params: { baseUrl: route.node, project, @@ -620,7 +620,7 @@ export function resolveProjectRoute( if (!content || content === "tree") { return { - resource: "project.tree", + resource: "project.source", node, project, peer, @@ -736,7 +736,7 @@ export function projectRouteToPath(route: ProjectRoute): string { const pathSegments = [node, route.project]; - if (route.resource === "project.tree") { + if (route.resource === "project.source") { if (route.peer) { pathSegments.push("remotes", route.peer); } @@ -837,7 +837,7 @@ function patchRouteToPath(route: ProjectPatchRoute): string { export function projectTitle(loadedRoute: ProjectLoadedRoute) { const title: string[] = []; - if (loadedRoute.resource === "project.tree") { + if (loadedRoute.resource === "project.source") { title.push(loadedRoute.params.project.name); title.push(loadedRoute.params.project.description); } else if (loadedRoute.resource === "project.commit") { diff --git a/tests/unit/router.test.ts b/tests/unit/router.test.ts index 5c217d2eb..163cc946e 100644 --- a/tests/unit/router.test.ts +++ b/tests/unit/router.test.ts @@ -29,7 +29,7 @@ describe("route invariant when parsed", () => { }); test("projects.tree", () => { expectParsingInvariant({ - resource: "project.tree", + resource: "project.source", node, project: "rad:zKtT7DmF9H34KkvcKj9PHW19WzjT", route: "", @@ -38,7 +38,7 @@ describe("route invariant when parsed", () => { test("projects.tree with peer", () => { expectParsingInvariant({ - resource: "project.tree", + resource: "project.source", node, project: "PROJECT", peer: "PEER", @@ -48,7 +48,7 @@ describe("route invariant when parsed", () => { test("projects.tree with peer and revision", () => { const route: Route = { - resource: "project.tree", + resource: "project.source", node, project: "PROJECT", peer: "PEER", @@ -63,7 +63,7 @@ describe("route invariant when parsed", () => { test("projects.tree with peer and revision and path", () => { const route: Route = { - resource: "project.tree", + resource: "project.source", node, project: "PROJECT", peer: "PEER", @@ -264,7 +264,7 @@ describe("pathToRoute", () => { expectPathToRoute( "/nodes/willow.radicle.garden/rad:zKtT7DmF9H34KkvcKj9PHW19WzjT/", { - resource: "project.tree", + resource: "project.source", node: { hostname: "willow.radicle.garden", scheme: "http", @@ -280,7 +280,7 @@ describe("pathToRoute", () => { expectPathToRoute( "/nodes/willow.radicle.garden/rad:zKtT7DmF9H34KkvcKj9PHW19WzjT", { - resource: "project.tree", + resource: "project.source", node: { hostname: "willow.radicle.garden", scheme: "http",