diff --git a/docs/src/components/AnswerNumber.astro b/docs/src/components/AnswerNumber.astro deleted file mode 100644 index ff4fb50..0000000 --- a/docs/src/components/AnswerNumber.astro +++ /dev/null @@ -1,15 +0,0 @@ ---- -const { challengeNumber } = Astro.props; -const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+label:"${challengeNumber}"+label:"answer"&per_page=1`); -const { total_count } = await response.json(); ---- - -{total_count ?
Answered by {total_count} people
: null } - - diff --git a/docs/src/components/ChallengeFooter.astro b/docs/src/components/ChallengeFooter.astro index 8d8feec..a47fa2d 100644 --- a/docs/src/components/ChallengeFooter.astro +++ b/docs/src/components/ChallengeFooter.astro @@ -2,6 +2,7 @@ import VideoButton from './VideoButton.astro'; import ClipboardCopy from './ClipboardCopy.astro'; import { getEntry } from 'astro:content'; +import AnsweredUser from './github/AnsweredUser.svelte'; const { lang } = Astro.props; const { author, challengeNumber, title, blogLink, videoLink, command } = Astro.props.entry.data; @@ -11,27 +12,6 @@ const authorLink = `https://github.com/tomalaforge/angular-challenges/pulls?q=la const communityLink = `https://github.com/tomalaforge/angular-challenges/pulls?q=label%3A${challengeNumber}+label%3Aanswer+sort%3Areactions-%2B1-desc`; const npxCommand = `npx nx serve ${command}`; -let items = []; -let page = 1; -let error = false; -try { -while (true) { - const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+label:"${challengeNumber}"+label:"answer"&per_page=100&page=${page}`); - if (!response.ok) { - throw new Error('Network response was not ok'); - } - const { items: new_items, total_count } = await response.json(); - if (!new_items || new_items.length === 0) break; - items.push(...new_items); - - if(total_count < page * 100) break; - - page++; -} -} catch (e) { - error = true; -} - ---
@@ -71,7 +51,7 @@ while (true) {
- ❖ {items.length > 0 ? items.length : ''} {data['challenge.footer.communityAnswers']}* + ❖ {data['challenge.footer.communityAnswers']}* @@ -92,20 +72,7 @@ while (true) { }
-{error ? null : -
-
Answered by
- {(items ?? []).map((item) => ( - - ))} -
} +
* {data['challenge.footer.upvoteAnswer']} @@ -131,16 +98,5 @@ while (true) { margin-top: 3rem; } - - .solution-container { - margin-top: 3rem; - display: flex; - flex-wrap: wrap; - gap: 0.5rem; - - img { - border-radius: 50%; - } - } diff --git a/docs/src/components/Content.astro b/docs/src/components/Content.astro index c468b84..c45759d 100644 --- a/docs/src/components/Content.astro +++ b/docs/src/components/Content.astro @@ -6,7 +6,7 @@ import Author from './Author.astro'; import ChallengeFooter from './ChallengeFooter.astro'; import CommentSection from './CommentSection.astro'; import ContributorsFooter from './ContributorsFooter.astro'; -import AnswerNumber from './AnswerNumber.astro'; +import AnswerNumber from './github/AnswerNumber.svelte'; const { lang } = Astro.props; const { data } = await getEntry('i18n', lang); @@ -18,7 +18,7 @@ const renderCommentSection = !Astro.props.entry.data.noCommentSection; { challengeNumber ?
{ author ? : null} - +
:null} diff --git a/docs/src/components/GitHubStats.svelte b/docs/src/components/GitHubStats.svelte new file mode 100644 index 0000000..133cac1 --- /dev/null +++ b/docs/src/components/GitHubStats.svelte @@ -0,0 +1,62 @@ + + +{#if !error && !loading} +
+ + +
{stargazersCount}
+ + +
+ +
{forksCount}
+
+
+{/if} + + diff --git a/docs/src/components/SiteTitle.astro b/docs/src/components/SiteTitle.astro index 4a3ef71..64177d9 100644 --- a/docs/src/components/SiteTitle.astro +++ b/docs/src/components/SiteTitle.astro @@ -1,17 +1,6 @@ --- -import { getEntry } from 'astro:content'; -import type { Props } from '@astrojs/starlight/props'; import Default from '@astrojs/starlight/components/SiteTitle.astro'; -import MyIcon from './MyIcon.astro'; -const { challengeNumber } = Astro.props.entry.data; -const { lang } = Astro.props; -const { data } = await getEntry('i18n', lang); - -const response = await fetch(`https://api.github.com/repos/tomalaforge/angular-challenges`); -const { stargazers_count, forks } = await response.json(); - - - +import GitHubStats from './GitHubStats.svelte'; --- @@ -19,34 +8,6 @@ const { stargazers_count, forks } = await response.json(); -
- - -
{stargazers_count}
- + -
- -
{forks}
-
-
- diff --git a/docs/src/components/github/AnswerNumber.svelte b/docs/src/components/github/AnswerNumber.svelte new file mode 100644 index 0000000..bc798b7 --- /dev/null +++ b/docs/src/components/github/AnswerNumber.svelte @@ -0,0 +1,15 @@ + + +{#if isLoaded} +
Answered by {$totalCount} people
+{/if} + + diff --git a/docs/src/components/github/AnsweredUser.svelte b/docs/src/components/github/AnsweredUser.svelte new file mode 100644 index 0000000..5b17567 --- /dev/null +++ b/docs/src/components/github/AnsweredUser.svelte @@ -0,0 +1,66 @@ + + +{#if $isLoaded} +
+
Answered by
+ {#each $data as { user }} + + {/each} +
+{/if} + + diff --git a/docs/src/components/github/github-store.ts b/docs/src/components/github/github-store.ts new file mode 100644 index 0000000..8103c23 --- /dev/null +++ b/docs/src/components/github/github-store.ts @@ -0,0 +1,13 @@ +import { derived, writable } from 'svelte/store'; + +export const count = writable(0); + +export const isLoading = writable(true); +export const error = writable(false); +export const data = writable([]); +export const totalCount = writable(0); + +export const isLoaded = derived( + [isLoading, error], + ([$isLoading, $error]) => !$isLoading && !$error, +);