From e5f90e20b806bbf54165d51316cb24b823c1f6cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Tue, 8 Oct 2024 10:21:04 +0200 Subject: [PATCH] Add create issue view --- src/App.svelte | 3 + src/components/Border.svelte | 2 +- src/components/Button.svelte | 83 ++++++++++----- src/components/TextInput.svelte | 75 ++++++++++++++ src/components/Textarea.svelte | 107 +++++++++++++++++++ src/lib/router.ts | 1 + src/lib/router/definitions.ts | 24 ++--- src/views/repo/CreateIssue.svelte | 166 ++++++++++++++++++++++++++++++ src/views/repo/Issues.svelte | 27 ++++- src/views/repo/router.ts | 55 ++++++++-- 10 files changed, 488 insertions(+), 55 deletions(-) create mode 100644 src/components/TextInput.svelte create mode 100644 src/components/Textarea.svelte create mode 100644 src/views/repo/CreateIssue.svelte diff --git a/src/App.svelte b/src/App.svelte index 8c88e2d4c..d3e1e4cf3 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -12,6 +12,7 @@ import { unreachable } from "@app/lib/utils"; import AuthenticationError from "@app/views/AuthenticationError.svelte"; + import CreateIssue from "@app/views/repo/CreateIssue.svelte"; import Home from "@app/views/Home.svelte"; import Issue from "@app/views/repo/Issue.svelte"; import Issues from "@app/views/repo/Issues.svelte"; @@ -63,6 +64,8 @@ {:else if $activeRouteStore.resource === "home"} +{:else if $activeRouteStore.resource === "repo.createIssue"} + {:else if $activeRouteStore.resource === "repo.issue"} {:else if $activeRouteStore.resource === "repo.issues"} diff --git a/src/components/Border.svelte b/src/components/Border.svelte index b28ba7d02..6b1f4984d 100644 --- a/src/components/Border.svelte +++ b/src/components/Border.svelte @@ -154,7 +154,7 @@ class="container" {onclick} role="button" - tabindex="0" + tabindex={onclick !== undefined ? 0 : -1} {style} style:min-height={styleMinHeight} style:height={styleHeight}> diff --git a/src/components/Button.svelte b/src/components/Button.svelte index e686daba0..3ef60bc3b 100644 --- a/src/components/Button.svelte +++ b/src/components/Button.svelte @@ -1,6 +1,7 @@ + + + + + { + focussed = true; + }} + on:blur={() => { + focussed = false; + }} + bind:this={inputElement} + type="text" + {name} + {placeholder} + {disabled} + bind:value + autocomplete="off" + spellcheck="false" + on:input + on:click + on:change /> + diff --git a/src/components/Textarea.svelte b/src/components/Textarea.svelte new file mode 100644 index 000000000..c0438867c --- /dev/null +++ b/src/components/Textarea.svelte @@ -0,0 +1,107 @@ + + + + + + + diff --git a/src/lib/router.ts b/src/lib/router.ts index 3c0b6bcec..504dbd0ca 100644 --- a/src/lib/router.ts +++ b/src/lib/router.ts @@ -123,6 +123,7 @@ export function routeToPath(route: Route): string { } else if (route.resource === "authenticationError") { return "/authenticationError"; } else if ( + route.resource === "repo.createIssue" || route.resource === "repo.issue" || route.resource === "repo.issues" || route.resource === "repo.patch" || diff --git a/src/lib/router/definitions.ts b/src/lib/router/definitions.ts index 49d723466..ec6c2688b 100644 --- a/src/lib/router/definitions.ts +++ b/src/lib/router/definitions.ts @@ -1,19 +1,11 @@ import type { Config } from "@bindings/Config"; import type { RepoInfo } from "@bindings/RepoInfo"; -import type { - LoadedRepoIssueRoute, - LoadedRepoIssuesRoute, - LoadedRepoPatchRoute, - LoadedRepoPatchesRoute, - RepoIssueRoute, - RepoIssuesRoute, - RepoPatchRoute, - RepoPatchesRoute, -} from "@app/views/repo/router"; +import type { LoadedRepoRoute, RepoRoute } from "@app/views/repo/router"; import { invoke } from "@tauri-apps/api/core"; import { + loadCreateIssue, loadIssue, loadIssues, loadPatch, @@ -45,19 +37,13 @@ export type Route = | AuthenticationErrorRoute | BootingRoute | HomeRoute - | RepoIssueRoute - | RepoIssuesRoute - | RepoPatchRoute - | RepoPatchesRoute; + | RepoRoute; export type LoadedRoute = | AuthenticationErrorRoute | BootingRoute | LoadedHomeRoute - | LoadedRepoIssueRoute - | LoadedRepoIssuesRoute - | LoadedRepoPatchRoute - | LoadedRepoPatchesRoute; + | LoadedRepoRoute; export async function loadRoute( route: Route, @@ -69,6 +55,8 @@ export async function loadRoute( return { resource: "home", params: { repos, config } }; } else if (route.resource === "repo.issue") { return loadIssue(route); + } else if (route.resource === "repo.createIssue") { + return loadCreateIssue(route); } else if (route.resource === "repo.issues") { return loadIssues(route); } else if (route.resource === "repo.patch") { diff --git a/src/views/repo/CreateIssue.svelte b/src/views/repo/CreateIssue.svelte new file mode 100644 index 000000000..3fd8fc426 --- /dev/null +++ b/src/views/repo/CreateIssue.svelte @@ -0,0 +1,166 @@ + + + + + + + + + + +
+ + {project.data.name} +
+ + + + Issues + + + New Issue +
+ + + +
+ +
+ Issues +
+
+ {project.meta.issues.open + project.meta.issues.closed} +
+
+
+ +
+ {#each issues as sidebarIssue} + +
+
+ +
+ + + +
+ + {/each} +
+
+ +
+
+ +
+