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.

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

feat(tutorial): complete step 3 #243

Open
wants to merge 1 commit into
base: v11-next-step-3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added .yarn/install-state.gz
Binary file not shown.
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
4 changes: 2 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {};

module.exports = nextConfig
module.exports = nextConfig;
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
},
"dependencies": {
"@carbon/react": "^1.35.0",
"@octokit/core": "4.2.0",
"eslint": "8.44.0",
"eslint-config-next": "13.4.9",
"next": "13.4.9",
Expand Down
2 changes: 1 addition & 1 deletion src/app/globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
.cds--content {
margin-top: 3rem;
padding: 0;
// background: var(--cds-background);
// background: var(--cds-background);
}

.cds--content .cds--css-grid {
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
@mixin landing-page-background() {
background-color: $layer-01;
position: relative;
}
}
2 changes: 1 addition & 1 deletion src/app/home/_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
.cds--subgrid--wide {
//fix needed to keep the subgrid from scrolling horizontally
margin-right: 1rem;
}
}
6 changes: 3 additions & 3 deletions src/app/layout.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import './globals.scss'
import './globals.scss';

import { Providers } from './providers';

export const metadata = {
title: 'Carbon + Next 13',
description: 'IBM Carbon Tutorial with NextJS 13',
}
};

export default function RootLayout({ children }) {
return (
Expand All @@ -14,5 +14,5 @@ export default function RootLayout({ children }) {
<Providers>{children}</Providers>
</body>
</html>
)
);
}
2 changes: 1 addition & 1 deletion src/app/page.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import LandingPage from "./home/page";
import LandingPage from './home/page';

export default function Page() {
return <LandingPage />;
Expand Down
14 changes: 6 additions & 8 deletions src/app/providers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'use client'
'use client';

import { Content, Theme } from '@carbon/react';

Expand All @@ -7,12 +7,10 @@ import TutorialHeader from '@/components/TutorialHeader/TutorialHeader';
export function Providers({ children }) {
return (
<div>
<Theme theme="g100">
<TutorialHeader />
</Theme>
<Content>
{children}
</Content>
<Theme theme="g100">
<TutorialHeader />
</Theme>
<Content>{children}</Content>
</div>
)
);
}
7 changes: 6 additions & 1 deletion src/app/repos/RepoTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ import {
} from '@carbon/react';

const RepoTable = ({ rows, headers }) => {
const getRowDescription = (rowId) => {
const row = rows.find(({ id }) => id === rowId);
return row ? row.description : '';
};

return (
<DataTable
rows={rows}
Expand Down Expand Up @@ -51,7 +56,7 @@ const RepoTable = ({ rows, headers }) => {
))}
</TableExpandRow>
<TableExpandedRow colSpan={headers.length + 1}>
<p>Row description</p>
<p>{getRowDescription(row.id)}</p>
</TableExpandedRow>
</React.Fragment>
))}
Expand Down
2 changes: 1 addition & 1 deletion src/app/repos/_repo-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
.repo-page__r1 {
padding-top: $spacing-05;
padding-bottom: $spacing-05;
}
}
128 changes: 96 additions & 32 deletions src/app/repos/page.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,43 @@
'use client';

import RepoTable from './RepoTable';
import { Column, Grid } from '@carbon/react';
import {
Link,
DataTableSkeleton,
Pagination,
Grid,
Column,
} from '@carbon/react';

import React, { useEffect, useState } from 'react';
import { Octokit } from '@octokit/core';

const octokitClient = new Octokit({});

const LinkList = ({ url, homepageUrl }) => (
<ul style={{ display: 'flex' }}>
<li>
<Link href={url}>GitHub</Link>
</li>
{homepageUrl && (
<li>
<span>&nbsp;|&nbsp;</span>
<Link href={homepageUrl}>Homepage</Link>
</li>
)}
</ul>
);

const getRowItems = (rows) =>
rows.map((row) => ({
...row,
key: row.id,
stars: row.stargazers_count,
issueCount: row.open_issues_count,
createdAt: new Date(row.created_at).toLocaleDateString(),
updatedAt: new Date(row.updated_at).toLocaleDateString(),
links: <LinkList url={row.html_url} homepageUrl={row.homepage} />,
}));

const headers = [
{
Expand Down Expand Up @@ -30,41 +66,69 @@ const headers = [
},
];

const rows = [
{
id: '1',
name: 'Repo 1',
createdAt: 'Date',
updatedAt: 'Date',
issueCount: '123',
stars: '456',
links: 'Links',
},
{
id: '2',
name: 'Repo 2',
createdAt: 'Date',
updatedAt: 'Date',
issueCount: '123',
stars: '456',
links: 'Links',
},
{
id: '3',
name: 'Repo 3',
createdAt: 'Date',
updatedAt: 'Date',
issueCount: '123',
stars: '456',
links: 'Links',
},
];

function RepoPage() {
const [firstRowIndex, setFirstRowIndex] = useState(0);
const [currentPageSize, setCurrentPageSize] = useState(10);
const [loading, setLoading] = useState(true);
const [error, setError] = useState();
const [rows, setRows] = useState([]);

useEffect(() => {
async function getCarbonRepos() {
const res = await octokitClient.request('GET /orgs/{org}/repos', {
org: 'carbon-design-system',
per_page: 75,
sort: 'updated',
direction: 'desc',
});

if (res.status === 200) {
setRows(getRowItems(res.data));
} else {
setError('Error obtaining repository data');
}
setLoading(false);
}

getCarbonRepos();
}, []);

if (loading) {
return (
<Grid className="repo-page">
<Column lg={16} md={8} sm={4} className="repo-page__r1">
<DataTableSkeleton
columnCount={headers.length + 1}
rowCount={10}
headers={headers}
/>
</Column>
</Grid>
);
}

// If we're here, we've got our data!
return (
<Grid className="repo-page">
<Column lg={16} md={8} sm={4} className="repo-page__r1">
<RepoTable headers={headers} rows={rows} />
<RepoTable
headers={headers}
rows={rows.slice(firstRowIndex, firstRowIndex + currentPageSize)}
/>
<Pagination
totalItems={rows.length}
backwardText="Previous page"
forwardText="Next page"
pageSize={currentPageSize}
pageSizes={[5, 10, 15, 25]}
itemsPerPageText="Items per page"
onChange={({ page, pageSize }) => {
if (pageSize !== currentPageSize) {
setCurrentPageSize(pageSize);
}
setFirstRowIndex(pageSize * (page - 1));
}}
/>
</Column>
</Grid>
);
Expand Down
8 changes: 4 additions & 4 deletions src/components/TutorialHeader/TutorialHeader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use client";
'use client';

import {
Header,
Expand All @@ -13,10 +13,10 @@ import {
SideNav,
SideNavItems,
HeaderSideNavItems,
} from "@carbon/react";
import { Switcher, Notification, UserAvatar } from "@carbon/icons-react";
} from '@carbon/react';
import { Switcher, Notification, UserAvatar } from '@carbon/icons-react';

import Link from "next/link";
import Link from 'next/link';

const TutorialHeader = () => (
<HeaderContainer
Expand Down
2 changes: 1 addition & 1 deletion src/components/TutorialHeader/_tutorial-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
.action-icons {
display: none;
}
}
}
Loading