diff --git a/app/layout.tsx b/app/layout.tsx index f24c362..4d53e6f 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -27,17 +27,16 @@ const Layout = ({ children }: any) => ( title: 'solutions', target: '', }, - { - link: '/validator', - title: 'validator', - target: '', - }, - 'divider', { link: '/research', title: 'research', target: '', }, + { + link: '/validator', + title: 'validator', + target: '', + }, ]} showMenuButton={true} showMobileTitle={true} @@ -59,22 +58,17 @@ const Layout = ({ children }: any) => ( target: '', title: 'solutions', }, - { - link: 'validator', - target: '', - title: 'validator', - }, { link: 'research', target: '', title: 'research', }, - 'divider', { - link: 'https://chora.blog', - target: '_blank', - title: 'chora blog', + link: 'validator', + target: '', + title: 'validator', }, + 'divider', { link: 'https://chora.io', target: '_blank', @@ -104,16 +98,16 @@ const Layout = ({ children }: any) => ( target: '', title: 'solutions', }, - { - link: '/validator', - target: '', - title: 'validator', - }, { link: '/research', target: '', title: 'research', }, + { + link: '/validator', + target: '', + title: 'validator', + }, ], }, { diff --git a/app/page.tsx b/app/page.tsx index 210be42..69956d0 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -48,6 +48,16 @@ const HomePage = () => { {'learn more'} +

{'research'}

+

+ { + 'Chora Studio is researching distributed systems, governance frameworks, and tools for decentralized monitoring, reporting, and verification.' + } +

+ + {'learn more'} + +

{'validator'}

{'Chora Studio operates Chora Validator on '} diff --git a/app/products/page.module.css b/app/products/page.module.css index f2f7e2f..0fc453f 100644 --- a/app/products/page.module.css +++ b/app/products/page.module.css @@ -2,6 +2,10 @@ composes: page from 'chora/styles/page.css'; } +.banner { + composes: banner from 'chora/styles/main.css'; +} + .content { composes: content-full from 'chora/styles/main.css'; } diff --git a/app/products/page.tsx b/app/products/page.tsx index 5b9b6c1..3d66b10 100644 --- a/app/products/page.tsx +++ b/app/products/page.tsx @@ -9,9 +9,13 @@ export const metadata: Metadata = { const ProductsPage = () => { return (

+
+
+

{'products'}

+
+
-

{'products'}

{'Chora Studio is stewarding '} diff --git a/app/research/[id]/page.tsx b/app/research/[id]/page.tsx index c2ef814..9f66fb8 100644 --- a/app/research/[id]/page.tsx +++ b/app/research/[id]/page.tsx @@ -5,30 +5,30 @@ import { getDoc, getDocs } from '@utils' import styles from './page.module.css' export const metadata: Metadata = { - title: 'chora blog | news', + title: 'chora studio | research', } export const generateStaticParams = () => { return getDocs() } -const PostPage = async ({ params }: any) => { - const post = await getDoc(params.id) +const DocumentPage = async ({ params }: any) => { + const doc = await getDoc(params.id) return (

-

{post.date}

-

{post.title}

-

{`by ${post.author}`}

+

{doc.date}

+

{doc.title}

+

{`by ${doc.author}`}

-
+
) } -export default PostPage +export default DocumentPage diff --git a/app/research/page.tsx b/app/research/page.tsx index 30a4602..f025ccb 100644 --- a/app/research/page.tsx +++ b/app/research/page.tsx @@ -6,14 +6,14 @@ import { getDocs } from '@utils' import styles from './page.module.css' export const metadata: Metadata = { - title: 'chora blog | research', + title: 'chora studio | research', } -async function getPosts() { - const allPosts = getDocs().filter((p) => p.tags.includes('research')) +async function getResearch() { + const allDocs = getDocs().filter((p) => p.tags.includes('research')) - // sort posts by date - return allPosts.sort((a, b) => { + // sort docs by date + return allDocs.sort((a, b) => { if (a.date < b.date) { return 1 } else { @@ -23,7 +23,7 @@ async function getPosts() { } const ResearchPage = async () => { - const posts = await getPosts() + const docs = await getResearch() return (
@@ -33,11 +33,11 @@ const ResearchPage = async () => {
- {!posts.length ? ( + {!docs.length ? (

{'coming soon...'}

) : (