Merge remote-tracking branch 'upstream/main'

Palette-Labs-Inc · Jan 30, 2025 · 57544ad · 57544ad
2 parents 195cbf2 + aae158a
commit 57544ad
Show file tree

Hide file tree

Showing 29 changed files with 516 additions and 173 deletions.
diff --git a/app/index.html b/app/index.html
@@ -2,7 +2,8 @@
 <html lang="en" class="scheme-light-dark">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="/icon.png" />
+    <link rel="icon" href="icon-light.png" type="image/png" />
+    <link rel="icon" href="icon-dark.png" type="image/png" media="(prefers-color-scheme: dark)" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Porto</title>
   </head>

diff --git a/app/public/icon-dark.png b/app/public/icon-dark.png
diff --git a/app/public/icon-light.png b/app/public/icon-light.png
diff --git a/app/public/icon.png b/app/public/icon.png
diff --git a/app/src/App.tsx b/app/src/App.tsx
@@ -1,24 +1,19 @@
 import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client'
 import { RouterProvider } from '@tanstack/react-router'
-import { Hooks } from 'porto/remote'
 import { WagmiProvider } from 'wagmi'
 
-import { useAppStore } from './lib/app.ts'
-import { porto } from './lib/porto.ts'
 import { persister, queryClient } from './lib/query.ts'
 import { router } from './lib/router.ts'
 import { config } from './lib/wagmi.ts'
 
 export function App() {
-  const appState = useAppStore()
-  const portoState = Hooks.usePortoStore(porto)
   return (
     <WagmiProvider config={config}>
       <PersistQueryClientProvider
         client={queryClient}
         persistOptions={{ persister }}
       >
-        <RouterProvider router={router} context={{ appState, portoState }} />
+        <RouterProvider router={router} />
       </PersistQueryClientProvider>
     </WagmiProvider>
   )

diff --git a/app/src/components/PortoLogo.tsx b/app/src/components/PortoLogo.tsx
@@ -0,0 +1,57 @@
+export function PortoLogo() {
+  return (
+    <svg viewBox="0 0 489 113" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <title>Porto</title>
+      <path
+        d="M189 22.3486H198.744V28.6801H199.566C201.835 25.6316 204.105 23.5602 206.375 22.4659C208.723 21.3715 211.931 20.8244 216.001 20.8244C222.419 20.8244 227.35 21.8014 230.793 23.7556C234.315 25.6316 236.82 28.8364 238.307 33.37C239.794 37.9037 240.537 44.3914 240.537 52.8334C240.537 61.1972 239.794 67.6459 238.307 72.1795C236.898 76.7131 234.472 79.957 231.028 81.9112C227.584 83.7872 222.654 84.7251 216.236 84.7251C211.697 84.7251 208.253 84.178 205.905 83.0837C203.635 81.9893 201.561 79.9179 199.683 76.8695H198.744V108.761H189V22.3486ZM213.888 75.9315C218.271 75.9315 221.636 75.267 223.984 73.9382C226.332 72.5312 228.015 70.1863 229.032 66.9033C230.05 63.5421 230.558 58.8522 230.558 52.8334C230.558 46.7364 230.05 42.0465 229.032 38.7635C228.015 35.4805 226.332 33.1355 223.984 31.7285C221.636 30.3215 218.271 29.6181 213.888 29.6181C209.818 29.6181 206.688 30.3215 204.496 31.7285C202.383 33.0574 200.857 35.4023 199.918 38.7635C198.979 42.0465 198.509 46.7364 198.509 52.8334C198.509 58.9303 198.979 63.6203 199.918 66.9033C200.857 70.1863 202.383 72.5312 204.496 73.9382C206.688 75.267 209.818 75.9315 213.888 75.9315Z"
+        fill="currentColor"
+      />
+      <path
+        d="M280.876 84.7251C273.989 84.7251 268.667 83.7872 264.91 81.9112C261.231 79.957 258.61 76.7131 257.044 72.1795C255.479 67.6459 254.696 61.1972 254.696 52.8334C254.696 44.3914 255.479 37.9037 257.044 33.37C258.61 28.8364 261.231 25.6316 264.91 23.7556C268.667 21.8014 273.989 20.8244 280.876 20.8244C287.763 20.8244 293.085 21.8014 296.842 23.7556C300.598 25.6316 303.259 28.8755 304.825 33.4873C306.39 38.0209 307.173 44.4696 307.173 52.8334C307.173 61.1972 306.39 67.6459 304.825 72.1795C303.259 76.7131 300.598 79.957 296.842 81.9112C293.085 83.7872 287.763 84.7251 280.876 84.7251ZM280.876 75.9315C285.18 75.9315 288.507 75.267 290.854 73.9382C293.202 72.5312 294.846 70.1863 295.785 66.9033C296.803 63.6203 297.311 58.9303 297.311 52.8334C297.311 46.6583 296.803 41.9292 295.785 38.6462C294.846 35.3633 293.202 33.0183 290.854 31.6113C288.507 30.2043 285.18 29.5008 280.876 29.5008C276.571 29.5008 273.245 30.2043 270.897 31.6113C268.627 33.0183 266.984 35.3633 265.966 38.6462C265.027 41.9292 264.558 46.6583 264.558 52.8334C264.558 58.9303 265.027 63.6203 265.966 66.9033C266.984 70.1863 268.627 72.5312 270.897 73.9382C273.245 75.267 276.571 75.9315 280.876 75.9315Z"
+        fill="currentColor"
+      />
+      <path
+        d="M323.054 22.3486H332.445L332.093 36.7702H333.032C335.145 31.7676 336.867 28.3283 338.198 26.4523C339.528 24.4982 340.898 23.2866 342.307 22.8176C343.794 22.3486 346.298 22.075 349.82 21.9969H350.055C354.986 21.8405 358.86 21.8796 361.677 22.1141V31.3768C354.868 31.1423 350.172 31.2205 347.59 31.6113C345.32 32.0021 343.011 33.2528 340.663 35.3633C338.315 37.3956 336.359 39.9751 334.793 43.1017C333.306 46.1502 332.563 49.3159 332.563 52.5989V83.5527H323.054V22.3486Z"
+        fill="currentColor"
+      />
+      <path
+        d="M407.533 84.8424C402.524 84.8424 398.768 84.178 396.263 82.8492C393.759 81.5203 392.076 79.488 391.215 76.7522C390.354 74.0164 389.924 70.1472 389.924 65.1445V31.025H374.075L376.423 22.3486H390.393V8.63045L399.55 4.76123V22.3486H421.034V31.025H399.55V64.6755C399.55 67.4114 399.824 69.5609 400.372 71.1242C400.998 72.6876 402.133 73.8991 403.777 74.759C405.499 75.5406 408.042 75.9315 411.407 75.9315C414.382 75.9315 418.451 75.5797 423.617 74.8762V83.5527C416.729 84.4125 411.368 84.8424 407.533 84.8424Z"
+        fill="currentColor"
+      />
+      <path
+        d="M462.703 84.7251C455.816 84.7251 450.494 83.7872 446.737 81.9112C443.059 79.957 440.437 76.7131 438.872 72.1795C437.306 67.6459 436.524 61.1972 436.524 52.8334C436.524 44.3914 437.306 37.9037 438.872 33.37C440.437 28.8364 443.059 25.6316 446.737 23.7556C450.494 21.8014 455.816 20.8244 462.703 20.8244C469.59 20.8244 474.912 21.8014 478.669 23.7556C482.426 25.6316 485.087 28.8755 486.652 33.4873C488.217 38.0209 489 44.4696 489 52.8334C489 61.1972 488.217 67.6459 486.652 72.1795C485.087 76.7131 482.426 79.957 478.669 81.9112C474.912 83.7872 469.59 84.7251 462.703 84.7251ZM462.703 75.9315C467.008 75.9315 470.334 75.267 472.682 73.9382C475.03 72.5312 476.673 70.1863 477.613 66.9033C478.63 63.6203 479.139 58.9303 479.139 52.8334C479.139 46.6583 478.63 41.9292 477.613 38.6462C476.673 35.3633 475.03 33.0183 472.682 31.6113C470.334 30.2043 467.008 29.5008 462.703 29.5008C458.399 29.5008 455.072 30.2043 452.724 31.6113C450.455 33.0183 448.811 35.3633 447.794 38.6462C446.855 41.9292 446.385 46.6583 446.385 52.8334C446.385 58.9303 446.855 63.6203 447.794 66.9033C448.811 70.1863 450.455 72.5312 452.724 73.9382C455.072 75.267 458.399 75.9315 462.703 75.9315Z"
+        fill="currentColor"
+      />
+      <path
+        d="M0 96.7483C0 93.8444 2.35412 91.4902 5.25806 91.4902H131.452C134.356 91.4902 136.71 93.8444 136.71 96.7483V107.264C136.71 110.168 134.356 112.522 131.452 112.522H5.25807C2.35412 112.522 0 110.168 0 107.264V96.7483Z"
+        fill="currentColor"
+        fill-opacity="0.5"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M5.25806 69.4065C2.35412 69.4065 0 71.7606 0 74.6646V88.8777C1.50391 87.871 3.31243 87.2839 5.25806 87.2839H131.452C133.397 87.2839 135.206 87.871 136.71 88.8777V74.6646C136.71 71.7606 134.356 69.4065 131.452 69.4065H5.25806ZM136.71 96.7484C136.71 93.8445 134.356 91.4904 131.452 91.4904H5.25806C2.35412 91.4904 0 93.8445 0 96.7484V107.265C0 110.169 2.35412 112.523 5.25807 112.523H131.452C134.356 112.523 136.71 110.169 136.71 107.265V96.7484Z"
+        fill="currentColor"
+        fill-opacity="0.5"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M5.25806 47.3225C2.35412 47.3225 0 49.6766 0 52.5806V66.7937C1.50391 65.787 3.31243 65.1999 5.25806 65.1999H131.452C133.397 65.1999 135.206 65.787 136.71 66.7937V52.5806C136.71 49.6766 134.356 47.3225 131.452 47.3225H5.25806ZM136.71 74.6644C136.71 71.7605 134.356 69.4064 131.452 69.4064H5.25806C2.35412 69.4064 0 71.7605 0 74.6644V88.8776C0.115032 88.8006 0.231847 88.726 0.350369 88.654C1.49829 87.9565 2.80635 87.4963 4.20645 87.3416C4.55173 87.3034 4.90261 87.2838 5.25806 87.2838H131.452C131.807 87.2838 132.158 87.3034 132.503 87.3416C134.048 87.5123 135.481 88.0549 136.71 88.8776V74.6644ZM136.71 96.7483C136.71 93.9123 134.464 91.6006 131.654 91.494C131.587 91.4915 131.52 91.4902 131.452 91.4902H5.25806C2.35412 91.4902 0 93.8444 0 96.7483V107.264C0 110.168 2.35412 112.523 5.25807 112.523H131.452C134.356 112.523 136.71 110.168 136.71 107.264V96.7483Z"
+        fill="currentColor"
+        fill-opacity="0.5"
+      />
+      <path
+        opacity="0.3"
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M9 0C4.02944 0 0 4.02944 0 9.00001V44.7098C1.50391 43.7032 3.31243 43.1161 5.25806 43.1161H131.452C133.397 43.1161 135.206 43.7032 136.71 44.7098V9C136.71 4.02944 132.68 0 127.71 0H9ZM136.71 52.5806C136.71 49.6766 134.356 47.3225 131.452 47.3225H5.25806C2.35412 47.3225 0 49.6766 0 52.5806V66.7937C0.115032 66.7167 0.231847 66.6422 0.350369 66.5702C1.49829 65.8727 2.80635 65.4125 4.20645 65.2577C4.55173 65.2195 4.90261 65.1999 5.25806 65.1999H131.452C131.807 65.1999 132.158 65.2195 132.503 65.2577C134.048 65.4285 135.481 65.971 136.71 66.7937V52.5806ZM136.71 74.6645C136.71 71.8284 134.464 69.5167 131.654 69.4102C131.587 69.4077 131.52 69.4064 131.452 69.4064H5.25806C2.35412 69.4064 0 71.7605 0 74.6645V88.8776L0.0373965 88.8527C0.140328 88.7845 0.244669 88.7182 0.350369 88.654C0.48046 88.575 0.612608 88.499 0.746713 88.4261C1.79595 87.8561 2.96502 87.4788 4.20645 87.3416C4.23439 87.3385 4.26236 87.3355 4.29037 87.3327C4.60854 87.3004 4.93137 87.2838 5.25806 87.2838H131.452C131.572 87.2838 131.692 87.2861 131.812 87.2905C132.044 87.2992 132.275 87.3163 132.503 87.3416C134.048 87.5123 135.481 88.0549 136.71 88.8776V74.6645ZM136.71 96.7483C136.71 93.9123 134.464 91.6006 131.654 91.494L131.639 91.4935C131.577 91.4913 131.514 91.4903 131.452 91.4903H5.25806C2.35412 91.4903 0 93.8444 0 96.7483V107.264C0 110.168 2.35412 112.523 5.25807 112.523H131.452C134.356 112.523 136.71 110.168 136.71 107.264V96.7483Z"
+        fill="currentColor"
+      />
+      <path
+        d="M99.9033 14.7227C99.9033 11.8187 102.257 9.4646 105.161 9.4646H121.987C124.891 9.4646 127.245 11.8187 127.245 14.7227V30.4969C127.245 33.4008 124.891 35.7549 121.987 35.7549H105.161C102.257 35.7549 99.9033 33.4008 99.9033 30.4969V14.7227Z"
+        fill="currentColor"
+      />
+    </svg>
+  )
+}
diff --git a/app/src/main.tsx b/app/src/main.tsx
@@ -22,7 +22,7 @@ const offInitialized = Events.onInitialized(porto, (payload) => {
 const offRequests = Events.onRequests(porto, (requests) => {
   const request = requests[0]?.request
   router.navigate({
-    to: request?.method ? `/${request.method}` : '/',
+    to: '/dialog/' + (request?.method ?? ''),
     search: request?.params as never,
   })
 })