Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use server components #10

Merged
merged 1 commit into from
Feb 21, 2024
Merged

use server components #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/app/projects/getGitHubRepos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
export default async function getGitHubRepos() {
const res = await fetch('https://api.github.com/graphql', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Authorization': `bearer ${process.env.NEXT_PUBLIC_GITHUB_AUTH}`,
},
body: JSON.stringify({
query: `
query myOrgRepos($queryString: String!) {
search(query: $queryString, type: REPOSITORY, first: 100) {
repositoryCount
edges {
node {
... on Repository {
name
description
homepageUrl
repositoryTopics(first: 5) {
nodes {
topic {
name
}
}
}
}
}
}
}
}
`,
variables: {
queryString: "org:ibm-client-engineering sort:updated",
},
}),
});

return res.json();
}
36 changes: 36 additions & 0 deletions src/app/projects/getTitles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// tries to find the title custom property for each repo to replace the name

const { Octokit, App } = require("@octokit/core");

// Octokit.js
// https://github.com/octokit/core.js#readme
const octokit = new Octokit({
auth: `bearer ${process.env.NEXT_PUBLIC_GITHUB_AUTH}`
})

export default async function getTitles(nodes) {
// get custom properties to update titles
for (let i = 0; i < nodes.length; i++) {
try {
const res = await octokit.request('GET /repos/{owner}/{repo}/properties/values', {
owner: 'ibm-client-engineering',
repo: nodes[i].name,
headers: {
'X-GitHub-Api-Version': '2022-11-28'
}
})

for (let j = 0; j < res.data.length; j++)
if (res.data[j].property_name == 'Title') {
// replace name with title if custom prop exists
nodes[i].name = res.data[j].value;
continue;
}
}
catch (error) {
console.log(error);
}
}
return nodes;
}

141 changes: 29 additions & 112 deletions src/app/projects/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,36 @@ import { Grid, Column, Search } from "@carbon/react";
import React, { useEffect, useState } from "react";
import ProjectsTiles from "./ProjectsTiles";
import Loading from "@carbon/react/lib/components/Loading";
import getGitHubRepos from "./getGitHubRepos";
import getTitles from "./getTitles";


const { Octokit, App } = require("@octokit/core");

// Octokit.js
// https://github.com/octokit/core.js#readme
const octokit = new Octokit({
auth: `bearer ${process.env.NEXT_PUBLIC_GITHUB_AUTH}`
})

var nodes = [];
var titles = [];

// filters repos, adds topics and sets up titles array to query the custom properties
function extractRepos(queryResult) {
var obj = queryResult.data.search.edges;
let i=0;
let i = 0;

// only save the ones that have a homepageUrl
for (const [, value] of Object.entries(obj)) {
var homepageUrl = value.node.homepageUrl;
var repoTopics = value.node.repositoryTopics;

if (homepageUrl != null && homepageUrl != "")
{
nodes.push(value.node);
titles.push(nodes[i].name);
if (homepageUrl != null && homepageUrl != "") {
nodes.push(value.node);

nodes[i].repositoryTopics = [];
for (const [, value3] of Object.entries(repoTopics)){
for (const [, value4] of Object.entries(value3)){
nodes[i].repositoryTopics.push(value4.topic.name);
}
nodes[i].repositoryTopics = [];
for (const [, value3] of Object.entries(repoTopics)) {
for (const [, value4] of Object.entries(value3)) {
nodes[i].repositoryTopics.push(value4.topic.name);
}
i++;
}
i++;
}
}
}

// tries to find the title custom property for each repo to replace the name
async function replaceTitles() {
// get custom properties to update titles
for (let i = 0; i < titles.length; i++) {
try {
const res = await octokit.request('GET /repos/{owner}/{repo}/properties/values', {
owner: 'ibm-client-engineering',
repo: titles[i],
headers: {
'X-GitHub-Api-Version': '2022-11-28'
}
})

for (let j = 0; j < res.data.length; j++)
if (res.data[j].property_name == 'Title')
{
// replace name with title if custom prop exists
nodes[i].name = res.data[j].value;
continue;
}
}
catch (error) {
console.log(error);
}
}
}

function ProjectsPage() {
const [repoData, setRepoData] = useState([]);
const [loading, setLoading] = useState(true);
Expand All @@ -95,91 +59,44 @@ function ProjectsPage() {
}

useEffect(() => {
async function getGitHubRepos() {
async function pageLoad() {
setLoading(true);
var result;
try {
const res = await fetch('https://api.github.com/graphql', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Authorization': `bearer ${process.env.NEXT_PUBLIC_GITHUB_AUTH}`,
},
body: JSON.stringify({
query: `
query myOrgRepos($queryString: String!) {
search(query: $queryString, type: REPOSITORY, first: 100) {
repositoryCount
edges {
node {
... on Repository {
name
description
homepageUrl
repositoryTopics(first: 5) {
nodes {
topic {
name
}
}
}
}
}
}
}
}
`,
variables: {
queryString: "org:ibm-client-engineering sort:updated",
},
}),
})
// when res (response) is valid, turn it into a json
result = await res.json();

// once we have the json from the result, we can parse the data
extractRepos(result);
await replaceTitles();
//if (nodes != repoData)
setRepoData(nodes);
setLoading(false);
}
catch (error) {
console.log(`ERROR: ${error}`)
}
extractRepos(await getGitHubRepos());
setRepoData(await getTitles(nodes));
setLoading(false);

};

getGitHubRepos();
pageLoad();

}, []);

if (loading || repoData.length == 0)
return (
<Grid fullWidth narrow>
<Column className="banner-container" lg={16} md={8} sm={4}>
<Column className="banner-title-container" lg={8} md={4} sm={2}>
<p className="banner-title">Projects</p>
<Search className="banner-search" size="lg" placeholder="Find a project" labelText="Search" closeButtonLabelText="Clear search input"/>
</Column>
<Column className="banner-image-container" lg={8} md={4} sm={2}>
</Column>
<Column className="banner-title-container" lg={8} md={4} sm={2}>
<p className="banner-title">Projects</p>
<Search className="banner-search" size="lg" placeholder="Find a project" labelText="Search" closeButtonLabelText="Clear search input" />
</Column>
<Column className="banner-image-container" lg={8} md={4} sm={2}>
</Column>
</Column>
<Column lg={16} md={8} sm={4} className="repoTiles">
<Loading/>
<Loading />
</Column>
</Grid>
);
else {
return (
<Grid fullWidth narrow>
<Column className="banner-container" lg={16} md={8} sm={4}>
<Column className="banner-title-container" lg={8} md={4} sm={2}>
<p className="banner-title">Projects</p>
<Search className="banner-search" size="lg" placeholder="Find a project" labelText="Search" closeButtonLabelText="Clear search input" onChange={searchProjects}/>
</Column>
<Column className="banner-image-container" lg={8} md={4} sm={2}>
</Column>
<Column className="banner-title-container" lg={8} md={4} sm={2}>
<p className="banner-title">Projects</p>
<Search className="banner-search" size="lg" placeholder="Find a project" labelText="Search" closeButtonLabelText="Clear search input" onChange={searchProjects} />
</Column>
<Column className="banner-image-container" lg={8} md={4} sm={2}>
</Column>
</Column>
<Column lg={16} md={8} sm={2} className="repoTiles">
<ProjectsTiles data={repoData}></ProjectsTiles>
Expand Down
Loading