Skip to content

Commit 4655191

Browse files
LPX55LPX55
committed
Merge branch 'main' into dev3
2 parents b7c1d01 + bc2d1e5 commit 4655191

26 files changed

+1050
-44
lines changed

‎.vscode/evmos-docs.code-workspace

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"folders": [
3+
{
4+
"path": ".."
5+
},
6+
{
7+
"path": "..\\..\\sanity"
8+
}
9+
],
10+
"settings": {}
11+
}

‎components/SigneeTabs.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Box from '@mui/material/Box';
77
import ValTable from './ValTable'
88
import CommunityTable from './CommunityTable'
99
import { ThemeProvider, createTheme, styled } from '@mui/material/styles';
10+
import Skeleton from '@mui/material/Skeleton';
1011

1112
function TabPanel(props) {
1213
const { children, value, index, ...other } = props;
@@ -39,7 +40,7 @@ function TabPanel(props) {
3940
};
4041
}
4142
export default function ColorTabs() {
42-
const [value, setValue] = React.useState(1);
43+
const [value, setValue] = React.useState(0);
4344

4445
const handleChange = (event, newValue) => {
4546
setValue(newValue);
@@ -71,7 +72,8 @@ export default function ColorTabs() {
7172
<CommunityTable />
7273
</TabPanel>
7374
<TabPanel value={value} index={2}>
74-
<h3 sx={{letterSpacing: '1px', ms: 1}}>Governance Council and Contributors</h3>
75+
<Typography component={'h3'} sx={{letterSpacing: '1px', mb: '40px'}}>Governance Council and Contributors (WIP)</Typography>
76+
<Skeleton variant="rectangular" width={'100%'} height={600} />
7577
</TabPanel>
7678

7779
</Box>

‎next.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
const withNextra = require('nextra')({
22
theme: 'nextra-theme-docs',
33
themeConfig: './theme.config.js',
4-
unstable_staticImage: true
4+
unstable_staticImage: true,
5+
forcedTheme: 'dark',
6+
57
})
68
module.exports = withNextra({
79
i18n: {
810
locales: ['en', 'ko'],
911
defaultLocale: 'en',
1012
},
13+
pageExtensions: ['mdx', 'md', 'jsx', 'js', 'tsx', 'ts']
1114
})

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
"dependencies": {
1515
"@emotion/react": "^11.10.4",
1616
"@emotion/styled": "^11.10.4",
17+
"@mdx-js/loader": "^2.1.3",
1718
"@mui/material": "^5.10.3",
1819
"@mui/x-data-grid": "^5.17.0",
1920
"@mui/x-date-pickers": "^5.0.0",
21+
"@next/mdx": "^12.2.5",
2022
"jsonpath-plus": "^7.0.0",
2123
"moment": "^2.29.4",
2224
"next": "^12.1.0",

‎pages/_app.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import '../public/style.css'
2-
import { useState, useEffect } from 'react'
2+
import {useState, useEffect} from 'react';
33
import ReactDOM from 'react-dom'
44
import { ThemeProvider, createTheme } from '@mui/material/styles';
55
import CssBaseline from '@mui/material/CssBaseline';
@@ -34,10 +34,10 @@ export default function Nextra({ Component, pageProps }) {
3434

3535
const getLayout = Component.getLayout || (page => page)
3636
return getLayout(
37-
<ThemeProvider theme={darkTheme}>
38-
<CssBaseline />
39-
<Component {...pageProps}
40-
/>
41-
</ThemeProvider>
37+
<ThemeProvider theme={darkTheme}>
38+
<CssBaseline />
39+
<Component {...pageProps}
40+
/>
41+
</ThemeProvider>
4242
)
4343
}

‎pages/_document.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Script from 'next/script'
33

44
export default function Document() {
55
return (
6-
<Html>
6+
<Html className='dark'>
77
<Head>
88
<link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,500&display=swap" rel="stylesheet" />
99
</Head>
@@ -13,7 +13,7 @@ export default function Document() {
1313
<Script
1414
id="theme-darker"
1515
lang="javascript"
16-
strategy="beforeInteractive"
16+
strategy="afterInteractive"
1717
dangerouslySetInnerHTML={{
1818
__html: `if (!window.localStorage.getItem("theme_default")) {
1919
window.localStorage.setItem("theme", "dark");

‎pages/constitution.en.mdx renamed to ‎pages/constitution/index.en.mdx

File renamed without changes.

‎pages/constitution.ko.mdx renamed to ‎pages/constitution/index.ko.mdx

File renamed without changes.

‎pages/constitution/meta.en.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"index": "The Constitution",
3+
"ratification": "Constitution Status"
4+
}

‎pages/constitution/meta.ko.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"index": "The Constitution",
3+
"ratification": "Constitution Status"
4+
}

‎pages/ratification.en.mdx renamed to ‎pages/constitution/ratification.en.mdx

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import Bleed from 'nextra-theme-docs/bleed'
2-
import { CardGrid, TwitterButton, SaleBanner } from '../components/Cards'
2+
import { CardGrid, TwitterButton, SaleBanner } from '../../components/Cards'
33
import UM_Table, { Irow } from 'react-tailwind-table'
4-
import SigneeTabs from '../components/SigneeTabs'
5-
import BufferChart from '../components/BufferChart'
6-
import CircularProgressWithLabel from '../components/CircleChart'
4+
import SigneeTabs from '../../components/SigneeTabs'
5+
import BufferChart from '../../components/BufferChart'
6+
import CircularProgressWithLabel from '../../components/CircleChart'
77
import styles from './ratification.module.css'
88
import Card from '@mui/material/Card';
99
import CardContent from '@mui/material/CardContent';
10-
import RatificationGrid from '../components/FourColGrid'
10+
import RatificationGrid from '../../components/FourColGrid'
1111

1212

1313
# Evmos DAO Constitution Status
@@ -31,4 +31,18 @@ The [Interim Constitution](/constitution) was ratified on the 31st of August, 20
3131
<SigneeTabs />
3232
</Bleed>
3333

34+
## Next Steps
3435

36+
The currently adopted version of our Constitution was passed as a temporary placeholder. While the core contents, concepts, and principles will likely remain, there is work to be done in other areas such as definitions, the Community Bill of Rights, formatting, etc.
37+
38+
### Bill of Rights
39+
40+
WIP
41+
42+
### Validator Code of Conduct
43+
44+
WIP
45+
46+
### Community Code of Conduct
47+
48+
WIP

‎pages/constitution/ratification.ko.mdx

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import Bleed from 'nextra-theme-docs/bleed'
2+
import { CardGrid, TwitterButton, SaleBanner } from '../../components/Cards'
3+
import UM_Table, { Irow } from 'react-tailwind-table'
4+
import SigneeTabs from '../../components/SigneeTabs'
5+
import BufferChart from '../../components/BufferChart'
6+
import CircularProgressWithLabel from '../../components/CircleChart'
7+
import styles from './ratification.module.css'
8+
import Card from '@mui/material/Card';
9+
import CardContent from '@mui/material/CardContent';
10+
import RatificationGrid from '../../components/FourColGrid'
11+
12+
13+
# Evmos DAO Constitution Status
14+
15+
## Proposal & Status
16+
17+
The [Interim Constitution](/constitution) was ratified on the 31st of August, 2022 at 19:21 UTC by the following:
18+
19+
<RatificationGrid />
20+
21+
<section className={styles.lineContainer}>
22+
<CircularProgressWithLabel value={33} size={80} color="success" />
23+
<BufferChart amount={98.55} bufferAmount={98.64} color="success" />
24+
<CircularProgressWithLabel value={77} size={80} />
25+
</section>
26+
27+
28+
## <p className={styles.founderspage}>The Founding Members of **Evmos DAO**</p>
29+
30+
<Bleed>
31+
<SigneeTabs />
32+
</Bleed>
33+
34+
## Next Steps
35+
36+
The currently adopted version of our Constitution was passed as a temporary placeholder. While the core contents, concepts, and principles will likely remain, there is work to be done in other areas such as definitions, the Community Bill of Rights, formatting, etc.
37+
38+
### Bill of Rights
39+
40+
WIP
41+
42+
### Validator Code of Conduct
43+
44+
WIP
45+
46+
### Community Code of Conduct
47+
48+
WIP

‎pages/ratification.module.css renamed to ‎pages/constitution/ratification.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
letter-spacing: 2px;
3030
}
3131

32-
.founderspage span.anchor-icon {
32+
.dark .founderspage .anchor-icon {
3333
display: none;
3434
}
3535
.founderspage span.anchor-icon:hover {

‎pages/governance/framework/meta.en.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"overview": "Framework Overview"
3+
}

‎pages/governance/framework/meta.ko.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"overview": "Framework Overview"
3+
}

‎pages/governance/framework/overview.en.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Evmos DAO Governance
2+
3+
## WIP
4+
5+
## WIP

‎pages/governance/framework/overview.ko.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Evmos DAO Governance
2+
3+
## WIP
4+
5+
## WIP

‎pages/governance/meta.ko.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
"index": "Governance Overview",
33
"proposals": "Proposal Framework",
44
"voting": "Voting and Delegations"
5-
6-
}
5+
}
76

‎pages/governance/proposals/definitions.en.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ If your proposal type is not listed below, you do not need to include a tag.
8181
- **Protocol Incentives**: `[ECP-EVM-#]`
8282
- **ERC20 Registration**: `[ECP-ERC-#]`
8383

84-
Alongside the proposal type identification, you must also include the Proposal Phase as denoted by: `[P1]`, `[P2]`, `[P3]`, `[P4]`, `[PASSED]`, `[REJECTED]`, `[DEFERRED]`
84+
Alongside the proposal type identification, you must also include the Proposal Phase as denoted by: `[P1]`, `[P2]`, `[P3]`, `[P4]`, `[PASSED]`, `[REJECTED]`, `[DEFERRED]`

‎pages/governance/proposals/overview.en.mdx

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Proposals & Proposal Types
2+
3+
## Evmos Community Proposals (ECPs)
4+
5+
ECPs are standardized proposals subject to voting that (once enacted) regulate and define the behavior of the Evmos DAO's Governance system, and provides a funding mechanism for special projects and workstreams.
6+
7+
## The Evmos Community Proposal Framework (ECP-1)
8+
9+
ECP-1 defines the Evmos Community Proposal (ECP) Framework for all subsequent ECPs to utilize. This ECP is the foundational ECP that provides the necessary templates, processes, and guidelines for working within the framework and defines the key roles required for the operation of the ECPs Process.
10+
11+
### ECP-1: Component Summary
12+
13+
**1. Definitions of the ECP Framework** - *Defines core concepts of the ECP Framework and the different types of proposals.*
14+
15+
**2. The ECP Lifecycle** - *Defines the formal stages in the lifecycle of proposals from conception to approval, rejection, or deferral.*
16+
17+
**3. ECP Replacement Process** - *Defines the replacement and amendment process for ECPs.*
18+
19+
**4. Governance Facilitation Role** - *Defines the responsibilities and enforcement powers reserved to the Governance Council of Evmos DAO.*
20+
21+
## Proposal Types
22+
23+
### On-Chain Proposals
24+
25+
WIP
26+
27+
### Off-Chain Proposals
28+
29+
WIP

‎pages/governance/proposals/overview.ko.mdx

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Proposals & Proposal Types
2+
3+
## Evmos Community Proposals (ECPs)
4+
5+
ECPs are standardized proposals subject to voting that (once enacted) regulate and define the behavior of the Evmos DAO's Governance system, and provides a funding mechanism for special projects and workstreams.
6+
7+
## The Evmos Community Proposal Framework (ECP-1)
8+
9+
ECP-1 defines the Evmos Community Proposal (ECP) Framework for all subsequent ECPs to utilize. This ECP is the foundational ECP that provides the necessary templates, processes, and guidelines for working within the framework and defines the key roles required for the operation of the ECPs Process.
10+
11+
### ECP-1: Component Summary
12+
13+
**1. Definitions of the ECP Framework** - *Defines core concepts of the ECP Framework and the different types of proposals.*
14+
15+
**2. The ECP Lifecycle** - *Defines the formal stages in the lifecycle of proposals from conception to approval, rejection, or deferral.*
16+
17+
**3. ECP Replacement Process** - *Defines the replacement and amendment process for ECPs.*
18+
19+
**4. Governance Facilitation Role** - *Defines the responsibilities and enforcement powers reserved to the Governance Council of Evmos DAO.*
20+
21+
## Proposal Types
22+
23+
### On-Chain Proposals
24+
25+
WIP
26+
27+
### Off-Chain Proposals
28+
29+
WIP

‎pages/meta.ko.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"index": "소개",
2+
"index": "Evmos DAO 소개",
33
"constitution": "Evmos DAO 헌법 선언문",
44
"ratification": "Constitution Ratification",
55
"governance": "Evmos Governance"

‎pages/ratification.ko.mdx

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎public/style.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,8 +1034,8 @@ a code {
10341034
border-radius: .25rem;
10351035
padding: .5rem;
10361036
text-align: left;
1037-
font-size: 1rem;
1038-
line-height: 1.5rem;
1037+
font-size: 0.8rem;
1038+
line-height: 1.3rem;
10391039
--tw-text-opacity: 1;
10401040
color: rgba(113, 128, 150, var(--tw-text-opacity));
10411041
text-decoration: none;

‎theme.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import Script from 'next/script'
6363
prevLinks: true,
6464
nextLinks: true,
6565
darkMode: true,
66+
floatTOC: false,
6667
unstable_staticImage: true,
6768
footer: true,
6869
floatTOC: false,

0 commit comments

Comments
 (0)