From d39fee871d00d4e87406859db9b5df1fe9bf8078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= <rudolfs@osins.org>
Date: Tue, 8 Aug 2023 14:50:58 +0200
Subject: [PATCH] Move project view into App.svelte
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
---
 src/App.svelte                 | 53 ++++++++++++++++++++++++++++++++--
 src/views/projects/View.svelte | 39 -------------------------
 2 files changed, 51 insertions(+), 41 deletions(-)
 delete mode 100644 src/views/projects/View.svelte

diff --git a/src/App.svelte b/src/App.svelte
index adee27e45..37ce8fe7c 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -10,9 +10,16 @@
   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";
-  import Projects from "@app/views/projects/View.svelte";
+  import Issue from "@app/views/projects/Issue.svelte";
+  import Issues from "@app/views/projects/Issues.svelte";
+  import NewIssue from "@app/views/projects/Issue/New.svelte";
   import Nodes from "@app/views/nodes/View.svelte";
+  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 LoadError from "@app/components/LoadError.svelte";
@@ -68,7 +75,49 @@
     {:else if $activeRouteStore.resource === "session"}
       <Session activeRoute={$activeRouteStore} />
     {:else if $activeRouteStore.resource === "projects"}
-      <Projects {...$activeRouteStore.params} />
+      {#if $activeRouteStore.params.view.resource === "tree"}
+        <Browser
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else if $activeRouteStore.params.view.resource === "history"}
+        <History
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else if $activeRouteStore.params.view.resource === "commit"}
+        <Commit
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else if $activeRouteStore.params.view.resource === "issues"}
+        <Issues
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else if $activeRouteStore.params.view.resource === "newIssue"}
+        <NewIssue
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else if $activeRouteStore.params.view.resource === "issue"}
+        <Issue
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else if $activeRouteStore.params.view.resource === "patches"}
+        <Patches
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else if $activeRouteStore.params.view.resource === "patch"}
+        <Patch
+          {...$activeRouteStore.params.view}
+          baseUrl={$activeRouteStore.params.baseUrl}
+          project={$activeRouteStore.params.project} />
+      {:else}
+        {unreachable($activeRouteStore.params.view)}
+      {/if}
     {:else if $activeRouteStore.resource === "booting"}
       <Loading />
     {:else if $activeRouteStore.resource === "loadError"}
diff --git a/src/views/projects/View.svelte b/src/views/projects/View.svelte
deleted file mode 100644
index 0b15828be..000000000
--- a/src/views/projects/View.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-<script lang="ts">
-  import type { BaseUrl, Project } from "@httpd-client";
-  import type { ProjectLoadedView } from "@app/views/projects/router";
-
-  import { unreachable } from "@app/lib/utils";
-
-  import Browser from "./Browser.svelte";
-  import Commit from "./Commit.svelte";
-  import History from "./History.svelte";
-  import Issue from "./Issue.svelte";
-  import Issues from "./Issues.svelte";
-  import NewIssue from "./Issue/New.svelte";
-  import Patch from "./Patch.svelte";
-  import Patches from "./Patches.svelte";
-
-  export let baseUrl: BaseUrl;
-  export let project: Project;
-  export let view: ProjectLoadedView;
-</script>
-
-{#if view.resource === "tree"}
-  <Browser {...view} {baseUrl} {project} />
-{:else if view.resource === "history"}
-  <History {...view} {baseUrl} {project} />
-{:else if view.resource === "commit"}
-  <Commit {...view} {baseUrl} {project} />
-{:else if view.resource === "issues"}
-  <Issues {...view} {baseUrl} {project} />
-{:else if view.resource === "newIssue"}
-  <NewIssue {...view} {baseUrl} {project} />
-{:else if view.resource === "issue"}
-  <Issue {...view} {baseUrl} {project} />
-{:else if view.resource === "patches"}
-  <Patches {...view} {baseUrl} {project} />
-{:else if view.resource === "patch"}
-  <Patch {...view} {baseUrl} {project} />
-{:else}
-  {unreachable(view)}
-{/if}