@@ -39,27 +33,38 @@ const ResearchPage = async () => {
'Chora Studio is researching decentralized protocols and agentic systems with a special interest in privacy-preserving technologies.'
}
+ {!artifacts.length ? (
+
)
}
diff --git a/app/services/page.module.css b/app/services/page.module.css
index 0fc453f..91e597a 100644
--- a/app/services/page.module.css
+++ b/app/services/page.module.css
@@ -1,11 +1,11 @@
.page {
- composes: page from 'chora/styles/page.css';
+ composes: page from '../../styles/page.css';
}
.banner {
- composes: banner from 'chora/styles/main.css';
+ composes: banner from '../../styles/banner.css';
}
.content {
- composes: content-full from 'chora/styles/main.css';
+ composes: content-full from '../../styles/content.css';
}
diff --git a/app/validator/page.module.css b/app/validator/page.module.css
index ca6b896..0f90d9e 100644
--- a/app/validator/page.module.css
+++ b/app/validator/page.module.css
@@ -1,19 +1,19 @@
.page {
- composes: page from 'chora/styles/page.css';
+ composes: page from '../../styles/page.css';
}
.banner {
- composes: banner from 'chora/styles/main.css';
+ composes: banner from '../../styles/banner.css';
}
.content {
- composes: content-full from 'chora/styles/main.css';
+ composes: content-full from '../../styles/content.css';
+}
+
+.content h2 {
+ margin: 0.5em 0;
}
.content ul {
- margin: 1em 1em 2em;
-}
-
-.content li {
- margin: 1em;
+ margin: 0.5em 0 2em 0;
}
diff --git a/app/validator/page.tsx b/app/validator/page.tsx
index e4f9515..a2b8815 100644
--- a/app/validator/page.tsx
+++ b/app/validator/page.tsx
@@ -86,7 +86,7 @@ const ValidatorPage = () => {
{'regen'}
{
- 'Chora Validator is running a validator node and a full node with public API endpoints. Chora Validator is also running a testnet validator node on Regen Redwood (the stable test network for Regen). Chora Validator is committed to offsetting energy costs with carbon credits issued on Regen.'
+ 'Chora Validator is running a validator node and a full node with public API endpoints. Chora Validator is also running a testnet validator node on Regen Redwood (the stable test network for Regen).'
}
diff --git a/assets/font/UFL.txt b/assets/font/UFL.txt
new file mode 100644
index 0000000..6e722c8
--- /dev/null
+++ b/assets/font/UFL.txt
@@ -0,0 +1,96 @@
+-------------------------------
+UBUNTU FONT LICENCE Version 1.0
+-------------------------------
+
+PREAMBLE
+This licence allows the licensed fonts to be used, studied, modified and
+redistributed freely. The fonts, including any derivative works, can be
+bundled, embedded, and redistributed provided the terms of this licence
+are met. The fonts and derivatives, however, cannot be released under
+any other licence. The requirement for fonts to remain under this
+licence does not require any document created using the fonts or their
+derivatives to be published under this licence, as long as the primary
+purpose of the document is not to be a vehicle for the distribution of
+the fonts.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this licence and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Original Version" refers to the collection of Font Software components
+as received under this licence.
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to
+a new environment.
+
+"Copyright Holder(s)" refers to all individuals and companies who have a
+copyright ownership of the Font Software.
+
+"Substantially Changed" refers to Modified Versions which can be easily
+identified as dissimilar to the Font Software by users of the Font
+Software comparing the Original Version with the Modified Version.
+
+To "Propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification and with or without charging
+a redistribution fee), making available to the public, and in some
+countries other activities as well.
+
+PERMISSION & CONDITIONS
+This licence does not grant any rights under trademark law and all such
+rights are reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to propagate the Font Software, subject to
+the below conditions:
+
+1) Each copy of the Font Software must contain the above copyright
+notice and this licence. These can be included either as stand-alone
+text files, human-readable headers or in the appropriate machine-
+readable metadata fields within text or binary files as long as those
+fields can be easily viewed by the user.
+
+2) The font name complies with the following:
+(a) The Original Version must retain its name, unmodified.
+(b) Modified Versions which are Substantially Changed must be renamed to
+avoid use of the name of the Original Version or similar names entirely.
+(c) Modified Versions which are not Substantially Changed must be
+renamed to both (i) retain the name of the Original Version and (ii) add
+additional naming elements to distinguish the Modified Version from the
+Original Version. The name of such Modified Versions must be the name of
+the Original Version, with "derivative X" where X represents the name of
+the new work, appended to that name.
+
+3) The name(s) of the Copyright Holder(s) and any contributor to the
+Font Software shall not be used to promote, endorse or advertise any
+Modified Version, except (i) as required by this licence, (ii) to
+acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
+their explicit written permission.
+
+4) The Font Software, modified or unmodified, in part or in whole, must
+be distributed entirely under this licence, and must not be distributed
+under any other licence. The requirement for fonts to remain under this
+licence does not affect any document created using the Font Software,
+except any version of the Font Software extracted from a document
+created using the Font Software may only be distributed under this
+licence.
+
+TERMINATION
+This licence becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
diff --git a/assets/font/Ubuntu-Bold.ttf b/assets/font/Ubuntu-Bold.ttf
new file mode 100644
index 0000000..4af149a
Binary files /dev/null and b/assets/font/Ubuntu-Bold.ttf differ
diff --git a/assets/font/Ubuntu-BoldItalic.ttf b/assets/font/Ubuntu-BoldItalic.ttf
new file mode 100644
index 0000000..a68afb6
Binary files /dev/null and b/assets/font/Ubuntu-BoldItalic.ttf differ
diff --git a/assets/font/Ubuntu-Italic.ttf b/assets/font/Ubuntu-Italic.ttf
new file mode 100644
index 0000000..b022726
Binary files /dev/null and b/assets/font/Ubuntu-Italic.ttf differ
diff --git a/assets/font/Ubuntu-Light.ttf b/assets/font/Ubuntu-Light.ttf
new file mode 100644
index 0000000..0e9f90d
Binary files /dev/null and b/assets/font/Ubuntu-Light.ttf differ
diff --git a/assets/font/Ubuntu-LightItalic.ttf b/assets/font/Ubuntu-LightItalic.ttf
new file mode 100644
index 0000000..2e007de
Binary files /dev/null and b/assets/font/Ubuntu-LightItalic.ttf differ
diff --git a/assets/font/Ubuntu-Medium.ttf b/assets/font/Ubuntu-Medium.ttf
new file mode 100644
index 0000000..5296045
Binary files /dev/null and b/assets/font/Ubuntu-Medium.ttf differ
diff --git a/assets/font/Ubuntu-MediumItalic.ttf b/assets/font/Ubuntu-MediumItalic.ttf
new file mode 100644
index 0000000..5dc193d
Binary files /dev/null and b/assets/font/Ubuntu-MediumItalic.ttf differ
diff --git a/assets/font/Ubuntu-Regular.ttf b/assets/font/Ubuntu-Regular.ttf
new file mode 100644
index 0000000..dbb834a
Binary files /dev/null and b/assets/font/Ubuntu-Regular.ttf differ
diff --git a/assets/images/chora_dark.png b/assets/images/chora_dark.png
new file mode 100644
index 0000000..caca714
Binary files /dev/null and b/assets/images/chora_dark.png differ
diff --git a/assets/images/chora_dark_background.png b/assets/images/chora_dark_background.png
new file mode 100644
index 0000000..aa1fa6b
Binary files /dev/null and b/assets/images/chora_dark_background.png differ
diff --git a/assets/images/chora_dark_icon.png b/assets/images/chora_dark_icon.png
new file mode 100644
index 0000000..b977249
Binary files /dev/null and b/assets/images/chora_dark_icon.png differ
diff --git a/assets/images/chora_dark_large.png b/assets/images/chora_dark_large.png
new file mode 100644
index 0000000..3328a11
Binary files /dev/null and b/assets/images/chora_dark_large.png differ
diff --git a/assets/images/chora_dark_small.png b/assets/images/chora_dark_small.png
new file mode 100644
index 0000000..ef8eed7
Binary files /dev/null and b/assets/images/chora_dark_small.png differ
diff --git a/assets/images/chora_light.png b/assets/images/chora_light.png
new file mode 100644
index 0000000..df0aef6
Binary files /dev/null and b/assets/images/chora_light.png differ
diff --git a/assets/images/chora_light_background.png b/assets/images/chora_light_background.png
new file mode 100644
index 0000000..20fc1cd
Binary files /dev/null and b/assets/images/chora_light_background.png differ
diff --git a/assets/images/chora_light_icon.png b/assets/images/chora_light_icon.png
new file mode 100644
index 0000000..de0d3f4
Binary files /dev/null and b/assets/images/chora_light_icon.png differ
diff --git a/assets/images/chora_light_large.png b/assets/images/chora_light_large.png
new file mode 100644
index 0000000..04a6cd4
Binary files /dev/null and b/assets/images/chora_light_large.png differ
diff --git a/assets/images/chora_light_small.png b/assets/images/chora_light_small.png
new file mode 100644
index 0000000..9258977
Binary files /dev/null and b/assets/images/chora_light_small.png differ
diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico
new file mode 100644
index 0000000..7fa4473
Binary files /dev/null and b/assets/images/favicon.ico differ
diff --git a/package.json b/package.json
index d6fc584..194f31a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
"clean": "rm -rf .next dist node_modules"
},
"dependencies": {
- "chora": "npm:@chora-io/chora@v0.1.0-beta12",
"gray-matter": "^4",
"next": "^14",
"react": "^18",
diff --git a/research b/research
index d16e431..d5efdcc 160000
--- a/research
+++ b/research
@@ -1 +1 @@
-Subproject commit d16e431f8436968a5cc38d1fc039e7ae1753fc18
+Subproject commit d5efdcc152b8fd8a0eafb17eca0b1e682d3f8865
diff --git a/styles/banner.css b/styles/banner.css
new file mode 100644
index 0000000..6eba31c
--- /dev/null
+++ b/styles/banner.css
@@ -0,0 +1,86 @@
+/* banner */
+
+.banner {
+ align-items: center;
+ display: flex;
+ font-size: 1.5em;
+ justify-content: center;
+ min-height: 10vh;
+ padding: 2em 0;
+ text-align: center;
+}
+
+@media (max-width: 850px) {
+ .banner {
+ font-size: 1em;
+ }
+}
+
+.banner h1 {
+ font-size: 1.75em;
+ margin-top: 2.5%;
+ padding: 0.15em 0;
+}
+
+@media (max-width: 850px) {
+ .banner h1 {
+ padding: 0.1em 0 !important;
+ }
+}
+
+.banner p {
+ padding: 0.2em 0;
+}
+
+@media (max-width: 850px) {
+ .banner p {
+ padding: 0.15em 0 !important;
+ }
+}
+
+.banner p > i {
+ color: var(--color-theme);
+}
+
+/* banner-full */
+
+.banner-full {
+ composes: banner;
+ min-height: calc(100vh - var(--header-height));
+ padding: 0;
+}
+
+.banner-full > div {
+ margin-bottom: calc(1% + var(--header-height));
+}
+
+/* banner-document */
+
+.banner-document {
+ composes: banner;
+ font-size: 1em;
+}
+
+.banner-document h1 {
+ color: var(--color-theme);
+ font-size: 1.5em;
+ margin: 0.5em 0;
+}
+
+@media (max-width: 850px) {
+ .banner-document h1 {
+ font-size: 1.25em;
+ }
+}
+
+.banner-document h2,
+.banner-document h3 {
+ color: var(--color-text);
+ font-size: 1em;
+ font-weight: 300;
+ opacity: 0.8;
+}
+
+.banner-document h3 {
+ margin-top: 1em;
+}
diff --git a/styles/content.css b/styles/content.css
new file mode 100644
index 0000000..b3af414
--- /dev/null
+++ b/styles/content.css
@@ -0,0 +1,73 @@
+/* content */
+
+.content {
+ align-items: center;
+ background: var(--background-primary);
+ display: flex;
+ font-size: 1.2em;
+ justify-content: center;
+}
+
+@media (max-width: 850px) {
+ .content {
+ font-size: 1em;
+ padding: 0 2em;
+ }
+}
+
+.content > div {
+ display: block;
+ max-width: 650px;
+ padding: 2em 0 4em 0;
+}
+
+@media (max-width: 850px) {
+ .content > div {
+ padding: 1em 0 2em 0;
+ }
+}
+
+.content > div > h1 {
+ font-size: 1.8em;
+ padding: 0.5em 0;
+}
+
+.content > div > h2 {
+ padding: 0.25em 0;
+}
+
+@media (max-width: 850px) {
+ .content > div > h2 {
+ padding-bottom: 0;
+ }
+}
+
+.content > div > p {
+ padding: 1em 0;
+}
+
+.content > div > a {
+ display: block;
+}
+
+.content ul {
+ list-style-position: inside;
+}
+
+.content li {
+ line-height: 1.75;
+}
+
+.content hr {
+ border: 1px solid var(--box-shadow-color);
+ border-bottom-width: 0;
+ box-shadow: 0 0 1px var(--box-shadow-color);
+ margin: 5vh 0;
+}
+
+/* content-full */
+
+.content-full {
+ composes: content;
+ min-height: calc(100vh - var(--header-height) - var(--footer-height));
+}
diff --git a/styles/page.css b/styles/page.css
new file mode 100644
index 0000000..efb2492
--- /dev/null
+++ b/styles/page.css
@@ -0,0 +1,61 @@
+/* page */
+
+.page {
+ margin-top: var(--header-height);
+ min-height: calc(100vh - var(--header-height) - var(--footer-height));
+}
+
+/* page-center */
+
+.page-center {
+ composes: page;
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ text-align: center;
+}
+
+.page-center > div {
+ margin-bottom: 10vh;
+}
+
+/* page-center-not-found */
+
+.page-center-not-found {
+ composes: page-center;
+ background: var(--background-primary);
+}
+
+@media (max-width: 850px) {
+ .page-center-not-found {
+ padding: 0 1.5em;
+ }
+}
+
+.page-center-not-found h1 {
+ color: var(--color-theme);
+ font-size: 3em;
+ margin-bottom: 0.25em;
+}
+
+@media (max-width: 850px) {
+ .page-center-not-found h1 {
+ font-size: 2em;
+ }
+}
+
+.page-center-not-found h2 {
+ font-size: 2em;
+ font-weight: 300;
+ margin-bottom: 0.5em;
+}
+
+@media (max-width: 850px) {
+ .page-center-not-found h2 {
+ font-size: 1.25em;
+ }
+}
+
+.page-center-not-found p {
+ font-style: italic;
+}
diff --git a/utils/getDoc.ts b/utils/getArtifact.ts
similarity index 76%
rename from utils/getDoc.ts
rename to utils/getArtifact.ts
index f47047d..c4ede08 100644
--- a/utils/getDoc.ts
+++ b/utils/getArtifact.ts
@@ -4,10 +4,10 @@ import matter from 'gray-matter'
import { remark } from 'remark'
import html from 'remark-html'
-const docsDirectory = path.join(process.cwd(), 'research/docs')
+const root = path.join(process.cwd(), 'research')
-export async function getDoc(id: string) {
- const fullPath = path.join(docsDirectory, `${id}.md`)
+export async function getArtifact(dir: string, id: string) {
+ const fullPath = path.join(root, dir, `${id}.md`)
// read file contents
const fileContents = fs.readFileSync(fullPath, 'utf8')
diff --git a/utils/getDocs.ts b/utils/getArtifacts.ts
similarity index 50%
rename from utils/getDocs.ts
rename to utils/getArtifacts.ts
index 9d708ae..33f3d80 100644
--- a/utils/getDocs.ts
+++ b/utils/getArtifacts.ts
@@ -2,14 +2,19 @@ import fs from 'fs'
import path from 'path'
import matter from 'gray-matter'
-const docsDirectory = path.join(process.cwd(), 'research/docs')
+const root = path.join(process.cwd(), 'research')
-export const getDocs = () => {
- const fileNames = fs.readdirSync(docsDirectory)
- return fileNames.map((fileName) => {
- // set id and full path
+export const getArtifacts = (dir: string) => {
+ const fileNames = fs.readdirSync(root + '/' + dir)
+
+ const filtered = fileNames.filter((fileName) => fileName.includes(`.md`))
+
+ return filtered.map((fileName) => {
+ // set id
const id = fileName.replace(/\.md$/, '')
- const fullPath = path.join(docsDirectory, fileName)
+
+ // set full path
+ const fullPath = path.join(root, dir, fileName)
// read file contents
const fileContents = fs.readFileSync(fullPath, 'utf8')
diff --git a/utils/index.ts b/utils/index.ts
index 8165489..bed4bcc 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -1,2 +1,2 @@
-export { getDoc } from './getDoc'
-export { getDocs } from './getDocs'
+export { getArtifact } from './getArtifact'
+export { getArtifacts } from './getArtifacts'