diff --git a/__snapshots__/navbar--default.png b/__snapshots__/navbar--default.png index bbd86c5..3ae5af1 100644 Binary files a/__snapshots__/navbar--default.png and b/__snapshots__/navbar--default.png differ diff --git a/__snapshots__/navbar--nip-07-exists.png b/__snapshots__/navbar--nip-07-exists.png index 4dcce3e..f217754 100644 Binary files a/__snapshots__/navbar--nip-07-exists.png and b/__snapshots__/navbar--nip-07-exists.png differ diff --git a/__snapshots__/navbar--no-nip-07.png b/__snapshots__/navbar--no-nip-07.png index 6e05587..f217754 100644 Binary files a/__snapshots__/navbar--no-nip-07.png and b/__snapshots__/navbar--no-nip-07.png differ diff --git a/__snapshots__/navbar.test.js.snap b/__snapshots__/navbar.test.js.snap index d455adf..a14465d 100644 --- a/__snapshots__/navbar.test.js.snap +++ b/__snapshots__/navbar.test.js.snap @@ -1,29 +1,30 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Navbar Default smoke-test 1`] = ` -
-
-
-
-

- - git - - - together - - - .xyz - -

-
-
-
- Sign up +
+
+
+
+
+
+
+

+ + git + + + workshop + + + .net + +

+
+
+
+ Sign up +
-
@@ -31,26 +32,30 @@ exports[`Navbar Default smoke-test 1`] = ` `; exports[`Navbar NIP07Exists smoke-test 1`] = ` -
-
-
-
-

- - git - - - together - - - .xyz - -

-
-
- +
+
+
+
+
+
+
+

+ + git + + + workshop + + + .net + +

+
+
+ +
@@ -58,29 +63,30 @@ exports[`Navbar NIP07Exists smoke-test 1`] = ` `; exports[`Navbar NoNIP07 smoke-test 1`] = ` -
-
-
-
-

- - git - - - together - - - .xyz - -

-
-
-
- Sign up +
+
+
+
+
+
+
+

+ + git + + + workshop + + + .net + +

+
+
+
+ Sign up +
-
diff --git a/__snapshots__/prs-header--short-details.png b/__snapshots__/prs-header--short-details.png index 786109c..f2c2345 100644 Binary files a/__snapshots__/prs-header--short-details.png and b/__snapshots__/prs-header--short-details.png differ diff --git a/__snapshots__/prs-header.test.js.snap b/__snapshots__/prs-header.test.js.snap index 68eea12..034d688 100644 --- a/__snapshots__/prs-header.test.js.snap +++ b/__snapshots__/prs-header.test.js.snap @@ -1,26 +1,30 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`PRs/Header Author Loading smoke-test 1`] = ` -
-
- short title -
-
- -
- opened 3 months ago -
-
-
+
+
+
+
+ short title +
+
+ +
+ opened 3 months ago +
+
+
+
+
@@ -28,94 +32,110 @@ exports[`PRs/Header Author Loading smoke-test 1`] = ` `; exports[`PRs/Header Long Details smoke-test 1`] = ` -
-
- rather long title that goes on and on and on and on and on and on... -
-
- -
- opened a minute ago -
-
- DanConwayDev +
+
+
+
+ rather long title that goes on and on and on and on and on and on... +
+
+ +
+ opened a minute ago +
+
+ DanConwayDev +
+
`; exports[`PRs/Header Long and No Spaces smoke-test 1`] = ` -
-
- LongNameLongNameLongNameLongNameLongNameLongNameLongNameLongNameL... -
-
- -
- opened 3 months ago -
-
- DanConwayDev +
+
+
+
+ LongNameLongNameLongNameLongNameLongNameLongNameLongNameLongNameL... +
+
+ +
+ opened 3 months ago +
+
+ DanConwayDev +
+
`; exports[`PRs/Header Short Details smoke-test 1`] = ` -
-
- short title -
-
- -
- opened 7 days ago -
-
- DanConwayDev +
+
+
+
+ short title +
+
+ +
+ opened 7 days ago +
+
+ DanConwayDev +
+
`; exports[`PRs/Header loading smoke-test 1`] = ` -
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/__snapshots__/repo-header--loading.png b/__snapshots__/repo-header--loading.png index 4cf01f5..8b6f3cd 100644 Binary files a/__snapshots__/repo-header--loading.png and b/__snapshots__/repo-header--loading.png differ diff --git a/__snapshots__/repo-header--long-name.png b/__snapshots__/repo-header--long-name.png index 4a775b0..7401253 100644 Binary files a/__snapshots__/repo-header--long-name.png and b/__snapshots__/repo-header--long-name.png differ diff --git a/__snapshots__/repo-header--no-name.png b/__snapshots__/repo-header--no-name.png index 44db13e..b9daccd 100644 Binary files a/__snapshots__/repo-header--no-name.png and b/__snapshots__/repo-header--no-name.png differ diff --git a/__snapshots__/repo-header--short-name.png b/__snapshots__/repo-header--short-name.png index a90509f..9871681 100644 Binary files a/__snapshots__/repo-header--short-name.png and b/__snapshots__/repo-header--short-name.png differ diff --git a/__snapshots__/repo-header.test.js.snap b/__snapshots__/repo-header.test.js.snap index 2041769..bb9659d 100644 --- a/__snapshots__/repo-header.test.js.snap +++ b/__snapshots__/repo-header.test.js.snap @@ -1,46 +1,46 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Repo/Header Long Name smoke-test 1`] = ` -
+
-
-

- Long Name that goes on and on and on and on a... -

-
+ + Long Name that goes on and on and on and on a... +
`; exports[`Repo/Header No Name smoke-test 1`] = ` -
+
-
-

- Untitled -

-
+ + Untitled +
`; exports[`Repo/Header Short Name smoke-test 1`] = ` -
+
-
-

- Short Name -

-
+ + Short Name +
`; exports[`Repo/Header loading smoke-test 1`] = ` -
+
-
-
+
+
diff --git a/src/lib/components/Container.svelte b/src/lib/components/Container.svelte new file mode 100644 index 0000000..a38fc86 --- /dev/null +++ b/src/lib/components/Container.svelte @@ -0,0 +1,13 @@ + + +
+ {#if no_wrap} + + {:else} +
+ +
+ {/if} +
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte index 4088740..457512b 100644 --- a/src/lib/components/Navbar.svelte +++ b/src/lib/components/Navbar.svelte @@ -1,23 +1,27 @@ -
-
+
+
-
-

- git - together - .xyz +
+
+

+ gitworkshop.net

-
+
{#if !nip07plugin} -
Sign up
+
Sign up
+ {:else} + {/if} -
-

+
diff --git a/src/lib/components/prs/PRHeader.svelte b/src/lib/components/prs/PRHeader.svelte index 716d77d..cb0fdb9 100644 --- a/src/lib/components/prs/PRHeader.svelte +++ b/src/lib/components/prs/PRHeader.svelte @@ -6,6 +6,7 @@ import relativeTime from "dayjs/plugin/relativeTime"; import { summary_defaults } from "./type"; import { getName } from "../users/type"; + import Container from "../Container.svelte"; dayjs.extend(relativeTime); export let { title, id, repo_id, comments, author, created_at, loading } = @@ -25,49 +26,51 @@
- {#if loading} -
-
-
-
-
-
+ + {#if loading} +
+
+
+
+
+
+
-
- {:else} -
- {short_title} -
-
- -
- opened {created_at_ago} + {:else} +
+ {short_title}
-
- {#if author.loading} -
- {:else} - {author_name} - {/if} +
+ +
+ opened {created_at_ago} +
+
+ {#if author.loading} +
+ {:else} + {author_name} + {/if} +
-
- {/if} + {/if} +
diff --git a/src/lib/components/repo/RepoHeader.svelte b/src/lib/components/repo/RepoHeader.svelte index f6c9b29..ae02ec8 100644 --- a/src/lib/components/repo/RepoHeader.svelte +++ b/src/lib/components/repo/RepoHeader.svelte @@ -5,6 +5,7 @@ -
-
-
- {#if loading} -
- {:else} -

{short_name}

- {/if} -
-
+
+ + {#if loading} +
+
+
+ {:else} + {short_name} + {/if} +
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index b2df61c..753dfe1 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -5,6 +5,4 @@ -
- -
+ diff --git a/src/routes/repo/[repo_id]/+page.svelte b/src/routes/repo/[repo_id]/+page.svelte index 64c5e9d..a7626e9 100644 --- a/src/routes/repo/[repo_id]/+page.svelte +++ b/src/routes/repo/[repo_id]/+page.svelte @@ -3,6 +3,7 @@ import OpenPRs from "$lib/wrappers/OpenPRs.svelte"; import { ensureSelectedRepo, selected_repo } from "$lib/stores/repo"; import RepoHeader from "$lib/components/repo/RepoHeader.svelte"; + import Container from "$lib/components/Container.svelte"; export let data: { repo_id: string }; let repo_id = data.repo_id; @@ -11,11 +12,14 @@ -
-
- -
-
- + + +
+
+ +
+
-
+ diff --git a/src/routes/repo/[repo_id]/pr/[pr_id]/+page.svelte b/src/routes/repo/[repo_id]/pr/[pr_id]/+page.svelte index 8e2b224..bec21ec 100644 --- a/src/routes/repo/[repo_id]/pr/[pr_id]/+page.svelte +++ b/src/routes/repo/[repo_id]/pr/[pr_id]/+page.svelte @@ -9,6 +9,7 @@ import RepoHeader from "$lib/components/repo/RepoHeader.svelte"; import Thread from "$lib/wrappers/Thread.svelte"; import PrDetails from "$lib/components/prs/PRDetails.svelte"; + import Container from "$lib/components/Container.svelte"; export let data: { repo_id: string; @@ -25,24 +26,26 @@ -
-
-
- {$selected_pr_full.summary.descritpion} + +
+
+
+ {$selected_pr_full.summary.descritpion} +
+ {#if $selected_pr_full.pr_event} + + {/if}
- {#if $selected_pr_full.pr_event} -
-
- +
-
+ diff --git a/tailwind.config.js b/tailwind.config.js index d671735..d21d7d6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,15 +1,21 @@ /** @type {import('tailwindcss').Config} */ + + export default { - content: [ './src/**/*.{svelte,js,ts}' ], + content: ['./src/**/*.{svelte,js,ts}'], theme: { - extend: {}, + extend: { + colors: { + "base-400": "#16171e", + }, + }, }, - plugins: [ + plugins: [ require('@tailwindcss/typography'), require('daisyui'), ], daisyui: { - themes: [ 'dracula'], + themes: ['dracula'], } }