From f11441473a1f88f1429ab00281773fabea6e8b8f Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 15:25:10 +0100 Subject: [PATCH 01/12] init --- docs/vercel/src/Index.svelte | 81 ++++++++++++++++++++++++++++------- docs/vercel/typings/yaml.d.ts | 2 + 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index e95cb0458..90e1f15da 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -1,20 +1,27 @@
- {#if tag_name && html_url} + {#if tagName && htmlUrl} {/if}

Onefetch

@@ -61,14 +82,30 @@ Suggestions and PRs are welcome at github.com/o2sh/onefetch

-

Languages ({languages.length})

- {#each languages as language} +

Languages ({$filteredLanguages.length})

+ + + +
+ {#each languageTypes as type} + + {/each} +
+ + {#each $filteredLanguages as language} + chip={language.colors.chip} /> {/each} @@ -82,4 +119,16 @@ text-align: center; padding: 0.5rem 0; } + + .checkbox-group { + margin-top: 1.5rem; + display: flex; + flex-wrap: wrap; + gap: 10px; + text-transform: capitalize; + } + + .show { + display: none; + } diff --git a/docs/vercel/typings/yaml.d.ts b/docs/vercel/typings/yaml.d.ts index fc71246ac..f9e7d7c57 100644 --- a/docs/vercel/typings/yaml.d.ts +++ b/docs/vercel/typings/yaml.d.ts @@ -6,10 +6,12 @@ declare module '*/languages.yaml' { } export interface Language { + name: string; type: string; ascii: string; colors: LanguageColors; } export type Languages = Record; + export type Language = Language; } From 0800a6f9a4c114e562b5680b7a1c350a80d5ec59 Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 15:48:59 +0100 Subject: [PATCH 02/12] format --- docs/vercel/src/Index.svelte | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index 90e1f15da..455651193 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -22,20 +22,6 @@ Object.values(data as Languages).map(({ type }) => type) ); - onMount(async () => { - try { - const response = await fetch( - 'https://api.github.com/repos/o2sh/onefetch/releases/latest' - ); - const data = await response.json(); - - tagName = data.tag_name; - htmlUrl = data.html_url; - } catch (error) { - console.error('Error:', error); - } - }); - const filter = writable({ checkboxes: [] as string[], }); @@ -49,6 +35,20 @@ } return filtered; }); + + onMount(async () => { + try { + const response = await fetch( + 'https://api.github.com/repos/o2sh/onefetch/releases/latest' + ); + const data = await response.json(); + + tagName = data.tag_name; + htmlUrl = data.html_url; + } catch (error) { + console.error('Error:', error); + } + });
From a4a6c91a87b6783475db4c9e2fc7f55ce021bfbb Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 16:52:30 +0100 Subject: [PATCH 03/12] improve styling --- docs/vercel/src/Index.svelte | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index 455651193..b65347ec8 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -82,9 +82,11 @@ Suggestions and PRs are welcome at github.com/o2sh/onefetch

-

Languages ({$filteredLanguages.length})

- - +
+

Languages ({$filteredLanguages.length})

+ +
{#each languageTypes as type} @@ -120,6 +122,19 @@ padding: 0.5rem 0; } + .title { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 3rem; + margin-bottom: 1.5rem; + } + + .title h3 { + margin-bottom: 0; + margin-top: 0; + } + .checkbox-group { margin-top: 1.5rem; display: flex; From c1b199cea095b1204196f268df71552a16a5feb8 Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 17:19:07 +0100 Subject: [PATCH 04/12] add help text --- docs/vercel/src/Index.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index b65347ec8..c9a0661e6 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -99,6 +99,10 @@ {type} {/each} + N.B. By default, onefetch will only account for markup and programming + types, use + --type flag to configure.
{#each $filteredLanguages as language} @@ -140,6 +144,8 @@ display: flex; flex-wrap: wrap; gap: 10px; + } + .checkbox-group label { text-transform: capitalize; } From b195a216daec1df747a6b0c84bf0c7cdbb057487 Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 17:22:15 +0100 Subject: [PATCH 05/12] add break line --- docs/vercel/src/Index.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index c9a0661e6..f2b4228f4 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -145,6 +145,7 @@ flex-wrap: wrap; gap: 10px; } + .checkbox-group label { text-transform: capitalize; } From 5adba27ee779c4886bf476d3e18307c8519bff31 Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 17:25:19 +0100 Subject: [PATCH 06/12] fix help text --- docs/vercel/src/Index.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index f2b4228f4..20c6c3954 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -100,8 +100,8 @@ {/each} N.B. By default, onefetch will only account for markup and programming - types, use + >Note: By default, onefetch will only recognize markup and programming + types. Use the --type flag to configure. From d6406374db19afca4f6212b97ffd90df1dc3051d Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 20:32:18 +0100 Subject: [PATCH 07/12] review --- docs/vercel/src/Index.svelte | 42 +++++++++++++++++------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index 20c6c3954..52d366822 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -37,17 +37,13 @@ }); onMount(async () => { - try { - const response = await fetch( - 'https://api.github.com/repos/o2sh/onefetch/releases/latest' - ); - const data = await response.json(); + const response = await fetch( + 'https://api.github.com/repos/o2sh/onefetch/releases/latest' + ); + const data = await response.json(); - tagName = data.tag_name; - htmlUrl = data.html_url; - } catch (error) { - console.error('Error:', error); - } + tagName = data.tag_name; + htmlUrl = data.html_url; }); @@ -88,17 +84,19 @@ >Filter by type -
- {#each languageTypes as type} - - {/each} +
+
+ {#each languageTypes as type} + + {/each} +
Note: By default, onefetch will only recognize markup and programming types. Use the @@ -150,7 +148,7 @@ text-transform: capitalize; } - .show { + .hide { display: none; } From 487ee5dcd9b2f77ab5659661a34fbf8f28623b9d Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 20:33:21 +0100 Subject: [PATCH 08/12] rename variable --- docs/vercel/src/Index.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index 52d366822..077243659 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -7,7 +7,7 @@ let tagName: string; let htmlUrl: string; - let menuOpen: boolean; + let showMenu: boolean; const languages: Language[] = Object.entries(data as Languages).map( ([name, { type, ascii, colors }]) => ({ @@ -80,11 +80,11 @@

Languages ({$filteredLanguages.length})

-
-
+
{#each languageTypes as type}
Note: By default, onefetch will only recognize markup and programming - types. Use the + >Note: By default, onefetch will only recognize programming + and markup types. Use the --type flag to configure.
From 1bbffcb5b5bf4ea24288b4e4a6ded9f9c7c0e751 Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 21:16:00 +0100 Subject: [PATCH 10/12] styling --- docs/vercel/src/Index.svelte | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index 9bdaf22c7..96d8034be 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -134,9 +134,6 @@ .checkbox-group { margin-top: 1.5rem; - display: flex; - flex-wrap: wrap; - gap: 10px; } .checkbox-group label { From acc7ecab8e253dcaf37aec5ad1db57d73dcaa0c4 Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 23:08:28 +0100 Subject: [PATCH 11/12] show filter by default --- docs/vercel/src/Index.svelte | 61 ++++++++++++------------------------ 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index 96d8034be..38a26d1bf 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -7,7 +7,6 @@ let tagName: string; let htmlUrl: string; - let showMenu: boolean; const languages: Language[] = Object.entries(data as Languages).map( ([name, { type, ascii, colors }]) => ({ @@ -72,32 +71,29 @@ Suggestions and PRs are welcome at github.com/o2sh/onefetch

-
-

Languages ({$filteredLanguages.length})

- -
-
-
- {#each languageTypes as type} - - {/each} -
- Note: By default, onefetch will only recognize programming - and markup types. Use the - --type flag to configure. +

Languages ({$filteredLanguages.length})

+ + Filter by type + +
+ {#each languageTypes as type} + + {/each}
+ Note: By default, onefetch will only recognize programming + and markup types. Use the + --type flag to configure. + {#each $filteredLanguages as language} From c5e6fba1b862b832e4875c3c648b473292e180a1 Mon Sep 17 00:00:00 2001 From: o2sh Date: Sun, 10 Dec 2023 23:34:37 +0100 Subject: [PATCH 12/12] fix css --- docs/vercel/src/Index.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/vercel/src/Index.svelte b/docs/vercel/src/Index.svelte index 38a26d1bf..60852e5a1 100644 --- a/docs/vercel/src/Index.svelte +++ b/docs/vercel/src/Index.svelte @@ -119,6 +119,10 @@ margin-top: 1.5rem; } + .checkbox-group label { + width: fit-content; + } + .checkbox-group label { text-transform: capitalize; }