Various updates

liquity · Apr 24, 2024 · 3b878ae · 3b878ae
1 parent bc1b9f8
commit 3b878ae
Show file tree

Hide file tree

Showing 37 changed files with 984 additions and 169 deletions.
diff --git a/frontend/app/package.json b/frontend/app/package.json
@@ -20,6 +20,7 @@
  "@tanstack/react-query": "^5.31.0",
  "dnum": "^2.11.0",
  "focus-trap-react": "^10.2.3",
+ "geist": "^1.3.0",
  "next": "14.2.2",
  "react": "^18",
  "react-dom": "^18",

diff --git a/frontend/app/src/app/layout.tsx b/frontend/app/src/app/layout.tsx
@@ -1,4 +1,4 @@
-// All global CSS should be imported from here, for easier maintenance
+// All global styles should be imported here for easier maintenance
 import "@liquity2/uikit/index.css";
 
 import type { Metadata } from "next";
@@ -10,23 +10,21 @@ import { Config } from "@/src/comps/Config/Config";
 import { ConfigModal } from "@/src/comps/ConfigModal/ConfigModal";
 import { Ethereum } from "@/src/comps/Ethereum/Ethereum";
 import { UiKit } from "@liquity2/uikit";
-import { Inter } from "next/font/google";
-
-const inter = Inter({ subsets: ["latin"] });
+import { GeistSans } from "geist/font/sans";
 
 export const metadata: Metadata = {
- title: "Bold",
+ title: "Liquity v2",
  icons: "/favicon.svg",
 };
 
 export default function Layout({
  children,
-}: Readonly<{
+}: {
  children: ReactNode;
-}>) {
+}) {
  return (
  <html lang="en">
- <body className={inter.className}>
+ <body className={GeistSans.className}>
  <UiKit>
  <Config>
  <Ethereum>

diff --git a/frontend/app/src/index.css b/frontend/app/src/index.css
diff --git a/frontend/uikit-gallery/next.config.mjs b/frontend/uikit-gallery/next.config.mjs
@@ -1,6 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
  output: "export",
+ reactStrictMode: false,
 };
 
 export default nextConfig;
diff --git a/frontend/uikit-gallery/package.json b/frontend/uikit-gallery/package.json
@@ -10,17 +10,19 @@
  "lint": "next lint",
  "panda-codegen": "panda codegen --silent",
  "start": "next start",
- "static-build": "pnpm cosmos-export && pnpm next build && cp -r ./out/_next ./cosmos-export && cp -r ./out/cosmos ./cosmos-export"
+ "static-build": "cd ../uikit && pnpm build && cd - && pnpm cosmos-export && pnpm next build && cp -r ./out/_next ./cosmos-export && cp -r ./out/cosmos ./cosmos-export"
  },
  "dependencies": {
  "@liquity2/uikit": "workspace:*",
  "@react-spring/web": "^9.7.3",
+ "dnum": "^2.11.0",
+ "geist": "^1.3.0",
  "next": "14.0.4",
  "react": "^18",
  "react-cosmos-core": "^6.1.1",
  "react-cosmos-plugin-boolean-input": "^6.1.1",
  "react-dom": "^18",
- "ts-pattern": "^5.0.8"
+ "ts-pattern": "^5.1.1"
  },
  "devDependencies": {
  "@pandacss/dev": "^0.37.2",

diff --git a/frontend/uikit-gallery/src/Button/1. Primary.fixture.tsx b/frontend/uikit-gallery/src/Button/1. Primary.fixture.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { ButtonFixture } from "./shared";
+
+export default function Fixture() {
+ return <ButtonFixture defaultMode="primary" />;
+}
diff --git a/frontend/uikit-gallery/src/Button/2. Secondary.fixture.tsx b/frontend/uikit-gallery/src/Button/2. Secondary.fixture.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { ButtonFixture } from "./shared";
+
+export default function Fixture() {
+ return <ButtonFixture defaultMode="secondary" />;
+}
diff --git a/frontend/uikit-gallery/src/Button/3. Positive.fixture.tsx b/frontend/uikit-gallery/src/Button/3. Positive.fixture.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { ButtonFixture } from "./shared";
+
+export default function Fixture() {
+ return <ButtonFixture defaultMode="positive" />;
+}
diff --git a/frontend/uikit-gallery/src/Button/4. Negative.fixture.tsx b/frontend/uikit-gallery/src/Button/4. Negative.fixture.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { ButtonFixture } from "./shared";
+
+export default function Fixture() {
+ return <ButtonFixture defaultMode="negative" />;
+}
diff --git a/...tend/uikit-gallery/src/Button.fixture.tsx → frontend/uikit-gallery/src/Button/shared.tsx b/...tend/uikit-gallery/src/Button.fixture.tsx → frontend/uikit-gallery/src/Button/shared.tsx
@@ -3,11 +3,15 @@
 import { Button } from "@liquity2/uikit";
 import { useFixtureInput, useFixtureSelect } from "react-cosmos/client";
 
-export default function ButtonFixture() {
+export function ButtonFixture({
+ defaultMode,
+}: {
+ defaultMode: "primary" | "secondary" | "positive" | "negative";
+}) {
  const [label] = useFixtureInput("label", "Button");
  const [mode] = useFixtureSelect("mode", {
  options: ["primary", "secondary", "positive", "negative"],
- defaultValue: "secondary",
+ defaultValue: defaultMode,
  });
  const [size] = useFixtureSelect("size", {
  options: ["medium", "large"],
@@ -19,7 +23,7 @@ export default function ButtonFixture() {
  style={{
  display: "flex",
  justifyContent: "center",
- width: "100%",
+ width: 608,
  padding: 16,
  }}
  >

diff --git a/frontend/uikit-gallery/src/InputField/1. Deposit.fixture.tsx b/frontend/uikit-gallery/src/InputField/1. Deposit.fixture.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { InputFieldFixture } from "./shared";
+
+export default function Fixture() {
+ return <InputFieldFixture fixture="deposit" />;
+}
diff --git a/frontend/uikit-gallery/src/InputField/2. Borrow.fixture.tsx b/frontend/uikit-gallery/src/InputField/2. Borrow.fixture.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { InputFieldFixture } from "./shared";
+
+export default function Fixture() {
+ return <InputFieldFixture fixture="borrow" />;
+}
diff --git a/frontend/uikit-gallery/src/InputField/3. Interest.fixture.tsx b/frontend/uikit-gallery/src/InputField/3. Interest.fixture.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { InputFieldFixture } from "./shared";
+
+export default function Fixture() {
+ return <InputFieldFixture fixture="interest" />;
+}
diff --git a/frontend/uikit-gallery/src/InputField/icon-bold.svg b/frontend/uikit-gallery/src/InputField/icon-bold.svg
diff --git a/frontend/uikit-gallery/src/InputField/icon-eth.svg b/frontend/uikit-gallery/src/InputField/icon-eth.svg