feat: copy shadcn fonts

unionlabs · May 28, 2024 · 9c30209 · 9c30209
1 parent 1e21ffe
commit 9c30209
Show file tree

Hide file tree

Showing 19 changed files with 55 additions and 81 deletions.
diff --git a/app/app.nix b/app/app.nix
@@ -9,7 +9,7 @@
     {
       packages = {
         app = unstablePkgs.buildNpmPackage {
-          npmDepsHash = "sha256-zFdqEtIDPQZzvaX1B14oG88foKK9nDU9q/TjsFW1itM=";
+          npmDepsHash = "sha256-6wpFPjk7dsLt5Ssu2i3fx3C0+URQIG/skJnQDPKsBbo=";
           src = ./.;
           sourceRoot = "app";
           npmFlags = [ "--legacy-peer-deps" ];

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -42,7 +42,7 @@
     "uint8array-extras": "^1.1.0",
     "valibot": "^0.30.0",
     "vaul-svelte": "^0.3.1",
-    "viem": "^2.12.5"
+    "viem": "^2.13.1"
   },
   "devDependencies": {
     "@0no-co/graphqlsp": "^1.12.5",
@@ -96,7 +96,7 @@
     "typescript": "^5.4.5",
     "unplugin-icons": "^0.19.0",
     "unplugin-turbo-console": "^1.8.6",
-    "vite": "^5.2.11",
+    "vite": "^5.2.12",
     "vite-plugin-inspect": "^0.8.4",
     "vite-plugin-tailwind-purgecss": "^0.3.3",
     "vitest": "^1.6.0"

diff --git a/app/src/app.html b/app/src/app.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" data-theme="dark" class="dark font-mono scroll-smooth max-h-screen">
+<html lang="en" data-theme="dark" class="dark scroll-smooth max-h-screen">
 
 <head>
   <meta charset="utf-8" />

diff --git a/app/src/lib/components/connect/connect.svelte b/app/src/lib/components/connect/connect.svelte
@@ -32,7 +32,7 @@ let collapsibleOpen = true
       builders={[builder]}
       on:click={() => (sheetOpen = !sheetOpen)}
       class={cn(
-        'truncate space-x-2 px-4 text-lg w-full min-w-[165px] hover:bg-cyan-300/80',
+        'truncate space-x-2 px-2.5 text-lg w-full min-w-[165px] hover:bg-cyan-300/80',
         ($sepoliaStore.connectionStatus === 'connected' ||
           $cosmosStore.connectionStatus === 'connected') &&
           'border-cyan-300/50',

diff --git a/app/src/lib/queries/block.ts b/app/src/lib/queries/block.ts
@@ -1,7 +1,7 @@
 import { createQuery } from "@tanstack/svelte-query"
 
-export function blockHeightQuery() {
-  return createQuery({
+export const blockHeightQuery = () =>
+  createQuery({
     queryKey: ["block-height", "union"],
     queryFn: async () => {
       const response = await fetch("https://rpc.testnet.bonlulu.uno/block")
@@ -18,4 +18,3 @@ export function blockHeightQuery() {
     refetchInterval: 6_000,
     refetchOnWindowFocus: false
   })
-}
diff --git a/app/src/lib/queries/ibc.ts b/app/src/lib/queries/ibc.ts
diff --git a/app/src/lib/queries/union-uno.ts b/app/src/lib/queries/union-uno.ts
@@ -4,15 +4,30 @@ export const unionToUnionTransfersQuery = graphql(/* GraphQL */ `
   query UnionToUnionTransfers($address: String!, $limit: Int! = 5) {
     v0_transfers(
         limit: $limit,
-        where: { _or: [{ sender: { _eq: $address }}, { recipient: { _eq: $address }}]}
+        where: { _or: [{ sender: { _eq: $address }}, { receiver: { _eq: $address }}]}
     ) {
       sender
-      recipient
-      amount
-      denom
-      height
-      chain_id
-      transaction_hash
+      receiver
+      source_port
+      source_time
+      source_height
+      source_channel
+      source_sequence
+      source_chain_id
+      source_block_hash
+      source_transaction_hash
+      source_transaction_index
+      source_timeout_timestamp
+      destination_port
+      destination_time
+      destination_height
+      destination_channel
+      destination_sequence
+      destination_chain_id
+      destination_block_hash
+      destination_transaction_hash
+      destination_transaction_index
+      destination_timeout_timestamp
     }
   }
 `)
diff --git a/app/src/routes/faucet/+page.svelte b/app/src/routes/faucet/+page.svelte
@@ -153,7 +153,7 @@ $: newTransfers =
             class={cn(
               'peer',
               submissionStatus === 'submitting' && 'animate-pulse',
-              'sm:text-md text-xs w-full h-10 sm:h-11 disabled:opacity-90 disabled:bg-stone-950',
+              'font-mono sm:text-md text-xs w-full h-10 sm:h-11 disabled:opacity-90 disabled:bg-stone-950',
               'rounded-md border border-slate-800 bg-neutral-950 p-3.5 text-slate-100 transition-colors placeholder:select-none placeholder:text-neutral-600 focus:border-[#8678F9]',
               'focus:outline-none outline-transparent focus-visible:outline-none ring-0 focus:ring-0 focus-visible:ring-0',
             )}

diff --git a/app/src/styles/fonts.css b/app/src/styles/fonts.css
@@ -1,31 +1,31 @@
 @font-face {
-  font-family: 'Inter var';
+  font-family: 'geist-sans';
   font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  src: url('/fonts/inter/InterVariable.woff2') format('woff2');
+  src: url('/fonts/geist/GeistVF.woff2') format('woff2');
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: 'geist-sans';
   font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  src: url('/fonts/inter/InterVariable-Italic.woff2') format('woff2');
+  src: url('/fonts/geist/GeistVF.woff2') format('woff2');
 }
 
 @font-face {
-  font-family: 'JetBrains Mono';
+  font-family: 'geist-mono';
   font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  src: url('/fonts/jetbrains-mono/JetBrainsMono.woff2') format('woff2');
+  src: url('/fonts/geist-mono/GeistMonoVF.woff2') format('woff2');
 }
 
 @font-face {
-  font-family: 'JetBrains Mono';
+  font-family: 'geist-mono';
   font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  src: url('/fonts/jetbrains-mono/JetBrainsMono-Italic.woff2') format('woff2');
+  src: url('/fonts/geist-mono/GeistMonoVF.woff2') format('woff2');
 }
diff --git a/app/static/fonts/geist-mono/GeistMonoVF.woff2 b/app/static/fonts/geist-mono/GeistMonoVF.woff2
diff --git a/app/static/fonts/geist/GeistVF.woff2 b/app/static/fonts/geist/GeistVF.woff2
diff --git a/app/static/fonts/inter/InterVariable-Italic.woff2 b/app/static/fonts/inter/InterVariable-Italic.woff2
diff --git a/app/static/fonts/inter/InterVariable.woff2 b/app/static/fonts/inter/InterVariable.woff2
diff --git a/app/static/fonts/jetbrains-mono/JetBrainsMono-Italic.woff2 b/app/static/fonts/jetbrains-mono/JetBrainsMono-Italic.woff2
diff --git a/app/static/fonts/jetbrains-mono/JetBrainsMono.woff2 b/app/static/fonts/jetbrains-mono/JetBrainsMono.woff2
diff --git a/app/tailwind.config.ts b/app/tailwind.config.ts
@@ -130,16 +130,8 @@ export default (<Config>{
         "9xl": "96rem"
       }),
       fontFamily: _ => ({
-        sans: ["Inter var", ...defaultTheme.fontFamily.sans],
-        display: [
-          "Inter var",
-          {
-            fontFeatureSettings: '"ss01", "cv09", "ss08" "zero"',
-            fontVariationSettings: '"opsz" 32'
-          }
-        ],
-        mono: ["JetBrains Mono", ...defaultTheme.fontFamily.mono],
-        jetbrains: ["JetBrains Mono", ...defaultTheme.fontFamily.mono]
+        sans: ["geist-sans", ...defaultTheme.fontFamily.sans],
+        mono: ["geist-mono", ...defaultTheme.fontFamily.mono]
       }),
       animation: _ => ({
         wiggle: "wiggle 1s ease-in-out infinite",

diff --git a/typescript-sdk/bun.lockb b/typescript-sdk/bun.lockb
diff --git a/typescript-sdk/package.json b/typescript-sdk/package.json
@@ -20,7 +20,7 @@
     "@cosmjs/encoding": "^0.32.3",
     "@cosmjs/stargate": "0.32.3",
     "@cosmjs/tendermint-rpc": "0.32.3",
-    "viem": "^2.12.5"
+    "viem": "^2.13.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.3",