diff --git a/app/globals.css b/app/globals.css index 98f6280..80937a4 100644 --- a/app/globals.css +++ b/app/globals.css @@ -1,5 +1 @@ -@import 'chora/styles/main.css'; - -.dark-theme { - composes: dark-theme from 'chora/styles/main.css'; -} +@import 'chora/styles/globals.css'; diff --git a/app/layout.tsx b/app/layout.tsx index 9fe1463..db95b16 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,10 +1,8 @@ 'use client' +import { Footer, Header } from 'chora/components' import { ThemeContextProvider } from 'chora/contexts' -import Footer from '@components/Footer' -import Header from '@components/Header' - import './globals.css' const Layout = ({ children }: any) => ( @@ -12,9 +10,102 @@ const Layout = ({ children }: any) => (
-
+
{children} -
diff --git a/app/page.tsx b/app/page.tsx index 738e7cb..94b9798 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,7 +1,6 @@ +import { Background } from 'chora/components' import { Metadata } from 'next' -import Background from '@components/Background' - import styles from './page.module.css' export const metadata: Metadata = { diff --git a/bun.lockb b/bun.lockb index 89c5a31..81e655e 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/components/Background.module.css b/components/Background.module.css deleted file mode 100644 index 6dbaaf7..0000000 --- a/components/Background.module.css +++ /dev/null @@ -1,17 +0,0 @@ -.background { - align-items: center; - display: flex; - height: 100vh; - justify-content: center; - position: fixed; - width: 100vw; - z-index: -1; -} - -.background { - background: var(--background-primary); -} - -.background img { - scale: 65%; -} diff --git a/components/Background.tsx b/components/Background.tsx deleted file mode 100644 index ab081b3..0000000 --- a/components/Background.tsx +++ /dev/null @@ -1,21 +0,0 @@ -'use client' - -import { ThemeContext } from 'chora/contexts' -import darkBackground from 'chora/assets/images/chora_dark.png' -import lightBackground from 'chora/assets/images/chora_light.png' -import Image from 'next/image' -import { useContext } from 'react' - -import styles from './Background.module.css' - -const Background = () => { - const { darkTheme } = useContext(ThemeContext) - - return ( -
- chora -
- ) -} - -export default Background diff --git a/components/Footer.module.css b/components/Footer.module.css deleted file mode 100644 index d03285e..0000000 --- a/components/Footer.module.css +++ /dev/null @@ -1,55 +0,0 @@ -/* footer */ - -.footer { - background: var(--background-primary); - box-shadow: var(--box-shadow); - height: var(--footer-height); - width: 100vw; -} - -.footer > div { - align-items: center; - display: flex; - height: inherit; - justify-content: center; - margin: 0 1em; -} - -/* title */ - -.title { - margin: 0 4em; -} - -.title img { - display: block; - height: 120px; - margin: 0 auto 1em auto; - width: 120px; -} - -.title h4 { - display: block; -} - -/* list */ - -.list { - font-size: 0.95em; - height: 160px; - margin: 0 3em; - min-width: 140px; -} - -.list h3 { - margin-bottom: 1em; -} - -.list ul { - list-style: inside; - margin: 0 0.5em; -} - -.list li { - margin: 0.75em 0; -} diff --git a/components/Footer.tsx b/components/Footer.tsx deleted file mode 100644 index 7adc9e5..0000000 --- a/components/Footer.tsx +++ /dev/null @@ -1,96 +0,0 @@ -'use client' - -import { ThemeContext } from 'chora/contexts' -import choraLogoDark from 'chora/assets//images/chora_dark_small.png' -import choraLogoLight from 'chora/assets//images/chora_light_small.png' -import Image from 'next/image' -import Link from 'next/link' -import { useContext } from 'react' - -import styles from './Footer.module.css' - -const Footer = () => { - const { darkTheme } = useContext(ThemeContext) - - return ( -
-
{darkTheme?.toString()}
-
-
- chora -

{'© 2023 Chora Studio, LLC'}

-
-
-

{'chora studio'}

-
    -
  • - - {'blog ↗'} - -
  • -
  • - {'products'} -
  • -
  • - {'solutions'} -
  • -
  • - {'validator'} -
  • -
-
-
-

{'chora protocol'}

-
    -
  • - - {'chora applications ↗'} - -
  • -
  • - - {'chora documentation ↗'} - -
  • -
  • - - {'chora repositories ↗'} - -
  • -
-
-
-

{'chora validator'}

-
    -
  • - - {'regen ↗'} - -
  • -
  • - - {'regen-redwood ↗'} - -
  • -
  • - - {'chora-testnet ↗'} - -
  • -
-
-
-
- ) -} - -export default Footer diff --git a/components/Header.module.css b/components/Header.module.css deleted file mode 100644 index 259f1c6..0000000 --- a/components/Header.module.css +++ /dev/null @@ -1,74 +0,0 @@ -/* header */ - -.header { - background: var(--background-primary); - box-shadow: var(--box-shadow); - height: var(--header-height); - position: fixed; - width: 100vw; - z-index: 1; -} - -.header > div { - display: flex; - height: inherit; - justify-content: space-between; - margin: 0 1em; -} - -.header button { - background: none; -} - -/* title */ - -.title { - align-items: center; - display: flex; - justify-content: center; - margin: 0 2em; -} - -.title a { - align-items: center; - display: flex; - justify-content: center; -} - -.title img { - height: 40px; - width: 40px; -} - -.title div { - color: var(--color-text); - font-size: 22px; - margin-left: 12px; -} - -/* menu */ - -.menu { - display: flex; - height: var(--header-height); - margin-right: 3em; -} - -.menu ul { - align-items: center; - display: flex; - justify-content: center; - list-style: none inside none; - margin: 0 2em; -} - -.menu li { - margin: 0.75em; -} - -/* divider */ - -.divider { - color: var(--color-theme); - padding: 0; -} diff --git a/components/Header.tsx b/components/Header.tsx deleted file mode 100644 index ab3a8f7..0000000 --- a/components/Header.tsx +++ /dev/null @@ -1,65 +0,0 @@ -'use client' - -import { ThemeContext } from 'chora/contexts' -import ThemeButton from 'chora/components/ThemeButton' -import choraLogoDark from 'chora/assets/images/chora_dark_small.png' -import choraLogoLight from 'chora/assets/images/chora_light_small.png' -import Image from 'next/image' -import Link from 'next/link' -import { useContext } from 'react' - -import styles from './Header.module.css' - -const Header = () => { - const { darkTheme, setDarkTheme } = useContext(ThemeContext) - - const toggleTheme = () => { - if (darkTheme) { - setDarkTheme(false) - } else { - setDarkTheme(true) - } - } - - return ( -
-
{darkTheme?.toString()}
-
-
- - chora studio -
- {'chora '} - {'studio'} -
- -
-
-
    -
  • - {'products'} -
  • -
  • - {'solutions'} -
  • -
  • - {'validator'} -
  • -
  • {'|'}
  • -
  • - - {'blog ↗'} - -
  • -
- -
-
-
- ) -} - -export default Header diff --git a/package.json b/package.json index 7576907..b0e8283 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,9 @@ "clean": "rm -rf .next dist node_modules" }, "dependencies": { - "chora": "npm:@chora-io/chora@v0.1.0-alpha2", - "cosmos": "npm:@chora-io/cosmos@v0.1.0-alpha2", + "@keplr-wallet/proto-types": "^0.12", + "chora": "npm:@chora-io/chora@v0.1.0-alpha8", + "cosmos": "npm:@chora-io/cosmos@v0.1.0-alpha8", "next": "^14", "react": "^18", "react-dom": "^18" diff --git a/tsconfig.json b/tsconfig.json index 9317f54..9ca4887 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,10 +18,7 @@ { "name": "next" } - ], - "paths": { - "@components/*": ["components/*"] - } + ] }, "include": [ "next-env.d.ts",