From 40c619f722085dce6ea5f3a6aa0173045b54c058 Mon Sep 17 00:00:00 2001 From: ChanatpakornD Date: Sun, 28 Jan 2024 20:01:18 +0700 Subject: [PATCH 1/6] feat:fetch octokit --- package.json | 1 + pnpm-lock.yaml | 13 +++++++++++ src/components/member/Members.svelte | 26 +++++++++++++++++++++ src/components/member/ProfileCard.svelte | 23 ++++++++++++++++++ src/components/member/ProfileSection.svelte | 0 src/components/member/types.ts | 6 +++++ src/pages/index.astro | 16 +++++++++++++ 7 files changed, 85 insertions(+) create mode 100644 src/components/member/Members.svelte create mode 100644 src/components/member/ProfileCard.svelte create mode 100644 src/components/member/ProfileSection.svelte create mode 100644 src/components/member/types.ts diff --git a/package.json b/package.json index e1aef79..b23f2d0 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@astrojs/tailwind": "5.1.0", "@fontsource-variable/space-grotesk": "5.0.16", "@fontsource/noto-sans-thai-looped": "5.0.8", + "@octokit/types": "12.4.0", "astro": "4.2.1", "sharp": "0.33.2", "tailwindcss": "3.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 78c09b7..b079e57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,6 +20,9 @@ dependencies: '@fontsource/noto-sans-thai-looped': specifier: 5.0.8 version: 5.0.8 + '@octokit/types': + specifier: 12.4.0 + version: 12.4.0 astro: specifier: 4.2.1 version: 4.2.1(typescript@5.3.3) @@ -1010,6 +1013,16 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.16.0 + /@octokit/openapi-types@19.1.0: + resolution: {integrity: sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==} + dev: false + + /@octokit/types@12.4.0: + resolution: {integrity: sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==} + dependencies: + '@octokit/openapi-types': 19.1.0 + dev: false + /@pkgjs/parseargs@0.11.0: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} diff --git a/src/components/member/Members.svelte b/src/components/member/Members.svelte new file mode 100644 index 0000000..c5d4cbe --- /dev/null +++ b/src/components/member/Members.svelte @@ -0,0 +1,26 @@ + + +
+
+

Members

+
+
+ {#if !OrgMembers ||OrgMembers.length === 0} +

No Public Members found...

+ {:else} + {#each OrgMembers as member} + + {/each} + {/if} +
+
+
+
diff --git a/src/components/member/ProfileCard.svelte b/src/components/member/ProfileCard.svelte new file mode 100644 index 0000000..ba5b367 --- /dev/null +++ b/src/components/member/ProfileCard.svelte @@ -0,0 +1,23 @@ + + +
+ +
diff --git a/src/components/member/ProfileSection.svelte b/src/components/member/ProfileSection.svelte new file mode 100644 index 0000000..e69de29 diff --git a/src/components/member/types.ts b/src/components/member/types.ts new file mode 100644 index 0000000..3e4357a --- /dev/null +++ b/src/components/member/types.ts @@ -0,0 +1,6 @@ +import type { Endpoints } from "@octokit/types"; + +export type OrgMember = + Endpoints["GET /orgs/{org}/public_members"]["response"]["data"][number]; + +export type GitHubUser = Pick; diff --git a/src/pages/index.astro b/src/pages/index.astro index 03aa83b..8667258 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -3,6 +3,21 @@ import Layout from "@/layouts/Layout.astro"; import ISDLogo from "@/assets/isd_logo.svg"; import { Image } from "astro:assets"; +import Members from "@/components/member/Members.svelte"; + +const fetchOrgMembers = async () => { + try { + const res = await fetch( + "https://api.github.com/orgs/isd-sgcu/public_members", + ); + const data = await res.json(); + return data; + } catch (err) { + console.error(err); + } +}; +const orgMembers= await fetchOrgMembers(); +console.log(orgMembers); --- @@ -48,6 +63,7 @@ import { Image } from "astro:assets"; อบจ. และองค์กรต่าง ๆ ในจุฬาฯ เพื่อพัฒนาระบบเว็บไซต์ แอปพลิเคชัน และระบบสารสนเทศอื่น ๆ ที่อำนวยความสะดวก และเป็นประโยชน์ต่อนิสิตจุฬาฯ

+
From db5c7aaa22ecb5e96125bbb0e391b20b81c4974c Mon Sep 17 00:00:00 2001 From: ChanatpakornD Date: Mon, 29 Jan 2024 16:38:53 +0700 Subject: [PATCH 2/6] feat: members --- src/components/member/Members.svelte | 41 +++++++++++++-------- src/components/member/ProfileCard.svelte | 18 +++++++-- src/components/member/ProfileSection.svelte | 0 src/pages/index.astro | 11 +++--- 4 files changed, 47 insertions(+), 23 deletions(-) delete mode 100644 src/components/member/ProfileSection.svelte diff --git a/src/components/member/Members.svelte b/src/components/member/Members.svelte index c5d4cbe..6415d5f 100644 --- a/src/components/member/Members.svelte +++ b/src/components/member/Members.svelte @@ -5,22 +5,33 @@
-
-

Members

-
-
- {#if !OrgMembers ||OrgMembers.length === 0} -

No Public Members found...

- {:else} - {#each OrgMembers as member} - - {/each} - {/if} +
+
+

Members

+
+
+ {#if !OrgMembers || OrgMembers.length === 0} +

No Public Members found...

+ {:else} + {#each OrgMembers as member} + + {/each} + {/if} +
+ + +
diff --git a/src/components/member/ProfileCard.svelte b/src/components/member/ProfileCard.svelte index ba5b367..b616b87 100644 --- a/src/components/member/ProfileCard.svelte +++ b/src/components/member/ProfileCard.svelte @@ -5,14 +5,19 @@
-
+
+ + diff --git a/src/components/member/ProfileSection.svelte b/src/components/member/ProfileSection.svelte deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/index.astro b/src/pages/index.astro index 8667258..fa44279 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -16,8 +16,7 @@ const fetchOrgMembers = async () => { console.error(err); } }; -const orgMembers= await fetchOrgMembers(); -console.log(orgMembers); +const orgMembers = await fetchOrgMembers(); --- @@ -33,7 +32,9 @@ console.log(orgMembers); >
-

Information System

+

Information System

Development

logo
-
+ From 5a6587afa20615f0d731cf6443e1407703328c07 Mon Sep 17 00:00:00 2001 From: ChanatpakornD Date: Mon, 29 Jan 2024 17:29:55 +0700 Subject: [PATCH 3/6] feat: desktop animation and ring --- src/pages/index.astro | 27 +++++++++++++++------------ tailwind.config.mjs | 6 ++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/pages/index.astro b/src/pages/index.astro index fa44279..565f84d 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -21,34 +21,37 @@ const orgMembers = await fetchOrgMembers();
+ - -

Information System

- Development -

+ + + +

Information System

+ Development +

Date: Mon, 29 Jan 2024 20:05:22 +0700 Subject: [PATCH 4/6] refactor: home animation --- src/pages/index.astro | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/index.astro b/src/pages/index.astro index 565f84d..f47f5c8 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -25,24 +25,24 @@ const orgMembers = await fetchOrgMembers(); >
From 5ff868fabcf49428f39a803d847812ac63a3ede8 Mon Sep 17 00:00:00 2001 From: ChanatpakornD Date: Mon, 29 Jan 2024 20:41:54 +0700 Subject: [PATCH 5/6] refactor: camel case --- src/components/member/Members.svelte | 8 ++++--- src/components/member/RightTick.svelte | 30 ++++++++++++++++++++++++++ src/pages/index.astro | 13 +++++------ 3 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 src/components/member/RightTick.svelte diff --git a/src/components/member/Members.svelte b/src/components/member/Members.svelte index 6415d5f..2ebc26a 100644 --- a/src/components/member/Members.svelte +++ b/src/components/member/Members.svelte @@ -1,7 +1,8 @@
@@ -12,10 +13,10 @@

Members

- {#if !OrgMembers || OrgMembers.length === 0} + {#if !members || members.length === 0}

No Public Members found...

{:else} - {#each OrgMembers as member} + {#each members as member} All members +
diff --git a/src/components/member/RightTick.svelte b/src/components/member/RightTick.svelte new file mode 100644 index 0000000..86f5b29 --- /dev/null +++ b/src/components/member/RightTick.svelte @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/src/pages/index.astro b/src/pages/index.astro index f47f5c8..68943d8 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -17,6 +17,7 @@ const fetchOrgMembers = async () => { } }; const orgMembers = await fetchOrgMembers(); +console.log(orgMembers); --- @@ -25,24 +26,24 @@ const orgMembers = await fetchOrgMembers(); >
@@ -69,5 +70,5 @@ const orgMembers = await fetchOrgMembers();

- + From d3c77da4797255c820d5ed48fe4f0a58325ed176 Mon Sep 17 00:00:00 2001 From: ChanatpakornD Date: Mon, 29 Jan 2024 20:43:32 +0700 Subject: [PATCH 6/6] refactor: del console log --- src/pages/index.astro | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/index.astro b/src/pages/index.astro index 68943d8..2046ca6 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -17,7 +17,6 @@ const fetchOrgMembers = async () => { } }; const orgMembers = await fetchOrgMembers(); -console.log(orgMembers); ---