From 997c5ce59f213d49bd1016985a63cfe633648dc8 Mon Sep 17 00:00:00 2001 From: Rob Gordon Date: Mon, 10 Jul 2023 21:10:59 -0400 Subject: [PATCH] Update Roadmap Page --- api/_lib/_linear.ts | 38 -------------------------------------- api/package.json | 1 - api/roadmap.ts | 9 +++------ app/src/pages/Roadmap.tsx | 22 ---------------------- pnpm-lock.yaml | 36 +----------------------------------- 5 files changed, 4 insertions(+), 102 deletions(-) delete mode 100644 api/_lib/_linear.ts diff --git a/api/_lib/_linear.ts b/api/_lib/_linear.ts deleted file mode 100644 index 8ec7a639e..000000000 --- a/api/_lib/_linear.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { marked } from "marked"; - -import { IssueConnection, LinearClient } from "@linear/sdk"; - -const linear = new LinearClient({ - apiKey: process.env.LINEAR_API_KEY, -}); - -export async function getIssues() { - let initialIssues: IssueConnection["nodes"]; - if (process.env.NODE_ENV === "development") { - initialIssues = (require("../_fixtures/issues.json") as IssueConnection) - .nodes; - } else { - initialIssues = await getLinearIssues(); - } - - const issues = initialIssues.map((issue) => { - return { - title: issue.title, - description: marked.parse(issue.description ?? ""), - }; - }); - - return issues; -} - -async function getLinearIssues() { - const ff = await linear.team("FF"); - const issues = await ff.issues({ - first: 10, - filter: { - // priority: { lte: 2, neq: 0 } - state: { name: { eq: "Todo" } }, - }, - }); - return issues.nodes; -} diff --git a/api/package.json b/api/package.json index a20cfca1e..2d70abfae 100644 --- a/api/package.json +++ b/api/package.json @@ -11,7 +11,6 @@ "author": "", "license": "ISC", "dependencies": { - "@linear/sdk": "^2.0.0", "@notionhq/client": "^0.4.13", "@octokit/core": "^4.2.0", "@sendgrid/mail": "^7.4.6", diff --git a/api/roadmap.ts b/api/roadmap.ts index f25072919..9c3a620e8 100644 --- a/api/roadmap.ts +++ b/api/roadmap.ts @@ -1,11 +1,8 @@ import { VercelRequest, VercelResponse } from "@vercel/node"; -import { getIssues } from "./_lib/_linear"; + import { getAreasOfResearchHtml } from "./_lib/_notion"; export default async function handler(req: VercelRequest, res: VercelResponse) { - const [issues, areasOfResearch] = await Promise.all([ - getIssues(), - getAreasOfResearchHtml(), - ]); - res.status(200).json({ issues, areasOfResearch }); + const areasOfResearch = await getAreasOfResearchHtml(); + res.status(200).json({ areasOfResearch }); } diff --git a/app/src/pages/Roadmap.tsx b/app/src/pages/Roadmap.tsx index 686c9a53e..a55265477 100644 --- a/app/src/pages/Roadmap.tsx +++ b/app/src/pages/Roadmap.tsx @@ -14,22 +14,6 @@ export default function Roadmap() { return ( - {data && data.issues.length > 0 && ( -
- Active Tasks -
- {data.issues.map((issue) => ( -
-

{issue.title}

-
-
- ))} -
-
- )}
Areas of Research {data && ( @@ -43,15 +27,9 @@ export default function Roadmap() { ); } -type Issue = { - title: string; - description: string; -}; - async function getRoadmap() { const roadmap = await axios.get("/api/roadmap"); return roadmap.data as { - issues: Issue[]; areasOfResearch: string; }; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 38beb9375..c8ce1f90d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,9 +17,6 @@ importers: api: dependencies: - '@linear/sdk': - specifier: ^2.0.0 - version: 2.0.0 '@notionhq/client': specifier: ^0.4.13 version: 0.4.13 @@ -2410,14 +2407,6 @@ packages: resolution: {integrity: sha512-PVDhLAlr+B4Xb7e+1wozBUWmXa6BFU8xUPR/W/E+TsQhPS1qkAdAsJ25keEnFrcePSnXHrOsh3tiFbEToOzV9w==} dev: false - /@graphql-typed-document-node/core@3.1.1(graphql@15.8.0): - resolution: {integrity: sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==} - peerDependencies: - graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - dependencies: - graphql: 15.8.0 - dev: false - /@humanwhocodes/config-array@0.10.7: resolution: {integrity: sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==} engines: {node: '>=10.10.0'} @@ -2976,17 +2965,6 @@ packages: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} dev: false - /@linear/sdk@2.0.0: - resolution: {integrity: sha512-IYBjjgT4br6LfJVW1xztC9X3UVM+a+IqaE4kYw1z9nadw9osdlEZGdovPDC+CBTx5p88XSTKGAls5HAJEa2ZMg==} - engines: {node: '>=12.x', yarn: 1.x} - dependencies: - '@graphql-typed-document-node/core': 3.1.1(graphql@15.8.0) - graphql: 15.8.0 - isomorphic-unfetch: 3.1.0 - transitivePeerDependencies: - - encoding - dev: false - /@lingui/babel-plugin-extract-messages@3.14.0(typescript@4.8.4): resolution: {integrity: sha512-4lcDgVdjYiObuFdDwnAG3jJxS+d3YLq4i7qywlHgjIqteKUH01S3paJRXhZaPvLGl56HarSq0kt8Pymxw8lOrA==} engines: {node: '>=10.0.0'} @@ -9601,6 +9579,7 @@ packages: /graphql@15.8.0: resolution: {integrity: sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==} engines: {node: '>= 10.x'} + dev: true /gray-matter@4.0.3: resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} @@ -10306,15 +10285,6 @@ packages: - encoding dev: false - /isomorphic-unfetch@3.1.0: - resolution: {integrity: sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==} - dependencies: - node-fetch: 2.6.7 - unfetch: 4.2.0 - transitivePeerDependencies: - - encoding - dev: false - /istanbul-lib-coverage@3.2.0: resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==} engines: {node: '>=8'} @@ -15252,10 +15222,6 @@ packages: has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 - /unfetch@4.2.0: - resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==} - dev: false - /unicode-canonical-property-names-ecmascript@2.0.0: resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} engines: {node: '>=4'}