Skip to content

Commit 90b8f00

Browse files
authored
Merge pull request #163 from oasisprotocol/ml/wrap/integrate
wrap: Integrate
2 parents 5f0fbda + 26d0734 commit 90b8f00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2803
-2
lines changed

home/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"@oasisprotocol/rose-app-discover": "workspace:*",
2222
"@oasisprotocol/rose-app-move": "workspace:*",
2323
"@oasisprotocol/rose-app-stake": "workspace:*",
24+
"@oasisprotocol/rose-app-wrap": "workspace:*",
2425
"@oasisprotocol/rose-app-ui": "workspace:*",
2526
"@rainbow-me/rainbowkit": "^2.1.2",
2627
"@tanstack/react-query": "5.0.5",

home/public/wrap/background.webp

97.3 KB
Loading

home/public/wrap/icon.svg

Lines changed: 5 additions & 0 deletions
Loading

home/src/main.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ReactDOM from 'react-dom/client'
22
import { MoveApp } from '@oasisprotocol/rose-app-move'
33
import { stakeRouteObject } from '@oasisprotocol/rose-app-stake'
4+
import { wrapRouteObject } from '@oasisprotocol/rose-app-wrap'
45
import { DiscoverApp } from '@oasisprotocol/rose-app-discover'
56
import { createHashRouter, RouterProvider } from 'react-router-dom'
67

@@ -18,6 +19,10 @@ const router = createHashRouter([
1819
path: '/',
1920
element: <App />,
2021
},
22+
{
23+
...wrapRouteObject,
24+
path: 'wrap',
25+
},
2126
{
2227
...stakeRouteObject,
2328
path: 'stake',

pnpm-lock.yaml

Lines changed: 46 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ packages:
77
- 'oasisscan'
88
- 'ui'
99
- 'discover'
10+
- 'wrap'

ui/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
},
5858
"./discover": {
5959
"import": "./src/discover/index.ts"
60+
},
61+
"./wrap": {
62+
"import": "./src/wrap/index.ts"
6063
}
6164
}
6265
}

ui/src/core/components/Sidebar/index.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ export function SidebarCmp({ navItem }: Props) {
5555
<NavLink to="/move" className={({ isActive }) => (isActive ? classes.activeLink : '')}>
5656
Move
5757
</NavLink>
58+
{/*<NavLink to="/wrap" className={({ isActive }) => (isActive ? classes.activeLink : '')}>
59+
Wrap
60+
</NavLink>*/}
5861
</div>
5962
</div>
6063

ui/src/core/index.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
--blue-dark-border: #1b0f33;
1818
--brand-blue: #0500e1;
1919
--brand-dark-blue: #1e1e73;
20+
--brand-dark: #3333c4;
2021
--brand-extra-dark-21: #00006236;
2122
--brand-extra-dark-50: #00006280;
2223
--brand-extra-dark-75: #000062bf;
2324
--brand-extra-dark: #000062;
25+
--brand-medium: #0092f6;
26+
--danger: #d44c4c;
2427
--dark: #1b0f33;
2528
--gray-blue-border: #2c3bd533;
2629
--gray-dark-box-shadow: #222f3f3d;
@@ -30,6 +33,9 @@
3033
--gray-light-bg: #f4f2f7;
3134
--gray-light: #fafafa;
3235
--gray-medium-dark: #585266;
36+
--gray-medium-light: #e3e8ed;
37+
--gray-wrap-extra-dark: #06152b;
38+
--gray-wrap-medium-dark: #565b61;
3339
--gray: #b0aabd;
3440
--green-25: #4cd4a940;
3541
--green: #4cd4a9;
@@ -39,6 +45,7 @@
3945
--red-dark: #620000;
4046
--red: #ff0e0e;
4147
--teal-300: #5eead4;
48+
--warn: #664d03;
4249
--white: #fff;
4350
--zinc-300: #d4d4d8;
4451
--zinc-500: #71717a;

ui/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
export * from './stake'
22
export * from './move'
33
export * from './core'
4+
export * from './wrap'

0 commit comments

Comments
 (0)