Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove bottler #40

Merged
merged 68 commits into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
900a6c6
chore: asyc prop in script tags
0xArdy Mar 3, 2023
54a76f4
chore: reduce readme image size
0xArdy Mar 6, 2023
bcd5a12
chore: update member descriptions
0xArdy Mar 6, 2023
3bf51e7
chore: format
0xArdy Mar 6, 2023
df5d713
chore: lazy loading
0xArdy Mar 6, 2023
127463e
chore: update wonder name
0xArdy Mar 7, 2023
a6a3c1b
feat: update members position
0xArdy Mar 20, 2023
82bb600
chore: update turtle twitter
0xArdy Mar 27, 2023
cc4aa23
chore: change landing title
0xArdy Mar 27, 2023
a29f489
fix: dynamic width
0xArdy Mar 27, 2023
97e2985
chore: merge with dev
0xArdy Jun 28, 2023
f7097eb
fix: set max-width
0xArdy Jun 28, 2023
9b3b44e
feat: new videos
0xArdy Jun 28, 2023
72b9b69
feat: text changes
0xGorilla Jun 28, 2023
4abcdf1
feat: titles
0xArdy Jun 28, 2023
b691a21
Merge branch 'feat/remove-bottler' of github-defi:defi-wonderland/won…
0xArdy Jun 28, 2023
873ac54
chore: remove title on team page
0xArdy Jun 28, 2023
50ff517
fix: optimism
0xGorilla Jun 28, 2023
db2f9b3
Merge branch 'feat/remove-bottler' of github.com:defi-wonderland/web-…
0xGorilla Jun 28, 2023
2d3eea3
chore: remove bottler
0xArdy Jun 28, 2023
f73c293
Merge branch 'feat/remove-bottler' of github-defi:defi-wonderland/won…
0xArdy Jun 28, 2023
d203cb6
style: fix some mobile styls
0xArdy Jun 28, 2023
ab42a87
style: right card changes
0xArdy Jun 29, 2023
af300ed
style: navbar and lore spacing
0xArdy Jun 29, 2023
9952757
fix: section styles
0xArdy Jun 29, 2023
68ec44e
fix: section styles and stars animation
0xArdy Jun 29, 2023
66c3dfe
chore: add blog videos
0xArdy Jun 29, 2023
af7a87c
chore: send portfolio projects as params
0xArdy Jun 29, 2023
1fe736b
fix: font size
0xArdy Jun 29, 2023
785bdde
fix: landing
0xArdy Jun 29, 2023
46bd906
chore: add more videos
0xArdy Jun 29, 2023
cf0ea24
feat: change footer styles
0xArdy Jun 29, 2023
64f9f51
feat: change button styles
0xArdy Jun 29, 2023
76ae9a5
style: update member grid
0xArdy Jun 29, 2023
22c2d76
feat: blog page style
0xArdy Jun 29, 2023
6620aa2
fix: footer styles
0xArdy Jun 29, 2023
1dacfd4
chore: update portfolio video
0xArdy Jun 29, 2023
75e4808
feat: blogs and portfolio
0xArdy Jun 29, 2023
a6a8ac1
feat: new changes on portfolio
0xArdy Jun 29, 2023
4758f40
feat: remove pointer events on stars
0xArdy Jun 29, 2023
4f7c258
feat: more margin on footer icons
0xArdy Jun 29, 2023
b7a2b03
fix: member description styles
0xArdy Jun 29, 2023
3032a11
fix: some post styles
0xArdy Jun 29, 2023
70da293
fix: blog styles
0xArdy Jun 29, 2023
3171aa2
fix: landing styles
0xArdy Jun 29, 2023
cf3a922
fix: intro animation
0xArdy Jun 29, 2023
c26905a
fix: landing title
0xArdy Jun 29, 2023
f25b941
feat: member styles
0xArdy Jun 29, 2023
a7d22f2
fix: math equations
0xArdy Jun 29, 2023
bc71136
chore: remove carets
0xArdy Jun 30, 2023
b89341d
fix: remove wrapper
0xArdy Jun 30, 2023
56a2fd8
fix: opoo description
0xArdy Jun 30, 2023
a07b987
fix: member names
0xGorilla Jun 30, 2023
72462f7
fix: member grid border
0xArdy Jun 30, 2023
32d3e08
fix: project descriptions
0xArdy Jun 30, 2023
308d5e9
fix: name
0xGorilla Jun 30, 2023
e14c00b
fix: key text
0xGorilla Jun 30, 2023
eb4c290
fix: members flip on safari
0xArdy Jun 30, 2023
2f4e1f3
Merge branch 'feat/remove-bottler' of github-defi:defi-wonderland/won…
0xArdy Jun 30, 2023
b0cd20d
fix: eye icon on mobile
0xArdy Jun 30, 2023
4fc1f45
fix: skele description
0xArdy Jun 30, 2023
b0ed08c
fix: lore spacing
0xArdy Jun 30, 2023
06a15fe
fix: intro text
0xArdy Jun 30, 2023
1afee9f
fix: texts
0xGorilla Jun 30, 2023
4a9e651
Merge branch 'feat/remove-bottler' of github.com:defi-wonderland/web-…
0xGorilla Jun 30, 2023
54ae4d8
fix: increase line height
0xArdy Jun 30, 2023
ba03715
Merge branch 'feat/remove-bottler' of github-defi:defi-wonderland/won…
0xArdy Jun 30, 2023
8fe499c
fix: firefox animation
0xArdy Jun 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
<meta name="theme-color" content="#10152A" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />

<script async src="/libs/blotter.min.js"></script>

<title>Wonderland</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"react-markdown": "8.0.5",
"react-responsive-carousel": "3.2.23",
"react-router-dom": "6.8.0",
"react-text-fun": "1.0.0",
"react-transition-group": "4.4.5",
"rehype-katex": "6.0.2",
"rehype-raw": "6.1.1",
"remark-math": "5.1.1",
"styled-components": "5.3.5"
},
Expand Down
170 changes: 170 additions & 0 deletions public/blog-posts/a-mev-racing-story.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Oracle Manipulation 101 (Math edition)

Dec 26 2022

This article is divided into two.

In the first part, we will present a quick refresher on how Uniswap works specifically tailored to the needs of computing manipulation costs. It'll explore how to move the spot price in an AMM to the desired target for Uniswap v2 and v3.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Oracle Manipulation 101

Dec 26 2022

In our [last post](https://mirror.xyz/price-oracle.eth/wf_eF-PLnaoXeHRbiZ3VJiTn0Y8hwUrvmKwCK0M4M_I), we talked about the risks of using systems with centralized incentives and the issues that structure poses. Today, we would like to discuss the dangers of using liquidity pools (Uniswap v3 in particular) as a price oracle for any DeFi system.

Price manipulation is the primary concern with liquidity pool-based oracles such as Uniswap v3. With enough liquidity, anyone can manipulate any price in any market. But why would someone manipulate a market? How and when does that happen? If incentives are in place, manipulations WILL eventually occur. Despite the regulatory landscape, we even see this [behaviour](https://www.investopedia.com/terms/l/libor-scandal.asp) in Traditional Finance (TradFi).
Expand Down
4 changes: 0 additions & 4 deletions public/archives/1.md → public/blog-posts/rip-oracles.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# RIP, Oracles

Dec 26 2022

Oracles are a single point of failure and can make or break a DeFi protocol. They are reliable until a black swan event happens…

Unfortunately, crypto is a flock of black swans, so you better be prepared.
Expand Down
6 changes: 6 additions & 0 deletions public/img/footer/book.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/img/footer/sphere.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 0 additions & 30 deletions public/libs/blotter.min.js

This file was deleted.

Binary file added src/assets/videos/blog.mp4
Binary file not shown.
Binary file added src/assets/videos/blog.webm
Binary file not shown.
Binary file added src/assets/videos/landing.mp4
Binary file not shown.
Binary file added src/assets/videos/landing.webm
Binary file not shown.
Binary file added src/assets/videos/lore.mp4
Binary file not shown.
Binary file added src/assets/videos/lore.webm
Binary file not shown.
Binary file added src/assets/videos/portfolio.mp4
Binary file not shown.
Binary file added src/assets/videos/portfolio.webm
Binary file not shown.
91 changes: 83 additions & 8 deletions src/components/common/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { FC } from 'react';
import styled from 'styled-components';

import { FONT_MEDIUM_L, SPACING_12, SPACING_16, SPACING_24, SPACING_40, SPACING_48 } from './Variables';
import { FONT_MEDIUM_L, SPACING_12, SPACING_16, SPACING_24, SPACING_40 } from './Variables';

const StyledButton = styled.button`
position: relative;
display: flex;
align-items: center;
justify-content: center;
border-radius: ${SPACING_48};
padding: ${SPACING_16} ${SPACING_40};
height: ${SPACING_24};
text-transform: uppercase;
Expand All @@ -18,22 +18,97 @@ const StyledButton = styled.button`
letter-spacing: 0.2rem;
cursor: pointer;

border: 1px solid var(--text-light);
color: var(--text-light);
background: var(--background-surface-primary);
background-color: transparent;

transition: all 500ms ease-in-out;
&:before,
&:after,
.line-container .line,
a {
transition: all 200ms ease-in-out;
}

&:hover {
background: white;
color: black;
.line-container .line,
&:before,
&:after {
border-color: rgba(255, 255, 255, 0.6);
}
}

&:hover a,
&:hover span {
opacity: 0.8;
}

& .line-container {
margin: unset;
width: 5rem;
height: 2rem;
position: absolute;
display: flex;
align-items: center;
background: transparent;

&:first-of-type {
left: 0;
transform: translateX(-50%);
}

&:last-of-type {
right: 0;
transform: translateX(50%);
}

& .line {
width: 100%;
display: block;
height: 1px;
background-color: white;
border-bottom: 1px solid white;
margin: 0 auto;
}
}

&:before,
&:after {
content: '';
width: 100%;
position: absolute;
border-radius: 4.8rem;
height: 50%;
margin: 0;
}

&:before {
top: 0;
border-top: 1px solid var(--text-light);
}

&:after {
bottom: 0;
border-bottom: 1px solid var(--text-light);
}
`;

export interface ButtonProps {
children?: any;
}

export const SideLine = () => {
return (
<span className='line-container'>
<span className='line'></span>
</span>
);
};

export const Button: FC<ButtonProps> = ({ children, ...props }) => {
return <StyledButton {...props}>{children}</StyledButton>;
return (
<StyledButton {...props}>
<SideLine />
{children}
<SideLine />
</StyledButton>
);
};
49 changes: 0 additions & 49 deletions src/components/common/DistortionText.tsx

This file was deleted.

50 changes: 0 additions & 50 deletions src/components/common/LiquidDistortion.tsx

This file was deleted.

4 changes: 4 additions & 0 deletions src/components/common/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ const StyledSection = styled.section<{
background-size: cover;
background-position: center;
`}

@media screen and (max-width: 665px) {
min-height: 80vh;
}
`;

export interface SectionProps {
Expand Down
2 changes: 2 additions & 0 deletions src/components/common/SectionArticle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const TextContainer = styled.p`
letter-spacing: inherit;
display: inline;
position: relative;
text-transform: uppercase;
`;

export const ArticleTitle = styled(DisplayText)``;
Expand Down Expand Up @@ -300,6 +301,7 @@ const Star = styled.img.attrs({ src: STAR })`
position: absolute;
width: 3.5rem;
top: 8.3rem;
pointer-events: none;
`;

export const SectionArticle: FC<SectionArticleProps> = ({ title, center, children, ...props }) => {
Expand Down
2 changes: 0 additions & 2 deletions src/components/common/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
export * from './AnimationIn';
export * from './Ball';
export * from './Button';
export * from './DistortionText';
export * from './DisplayText';
export * from './GradientTitle';
export * from './Link';
export * from './LiquidDistortion';
export * from './Ring';
export * from './Section';
export * from './SectionArticle';
Expand Down
21 changes: 15 additions & 6 deletions src/constants/posts.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
export const POSTS = [
{
id: '3',
id: 'a-mev-racing-story',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not be in constant, but be an xml or json file in an S3, and be manually retrieved on runtime (if we want to update the posts later), so we don't need another build for it. @0xGorilla @0xArdy

name: 'A (MEV) racing story',
description: 'What do we know about the dark forest 2.0?',
date: new Date('05/04/23').toDateString().slice(4),
tags: ['MEV', 'Flashbots'],
image:
'https://images.unsplash.com/photo-1536909526839-8f10e29ba80c?ixlib=rb-4.0.3&q=85&fm=jpg&crop=entropy&cs=srgb&w=7200',
},
{
id: 'oracle-manipulation-101',
name: 'Oracle Manipulation 101',
description: 'What does an Uniswap v3 oracle manipulation look like?',
date: new Date('12/26/22').toDateString().slice(4),
tags: ['oracles', 'Uniswap V3'],
tags: ['Price', 'Oracles', 'Uniswap V3'],
image:
'https://price-oracle.notion.site/image/https%3A%2F%2Fs3-us-west-2.amazonaws.com%2Fsecure.notion-static.com%2F9297e650-550e-4395-97f6-84ea64d688fd%2Fimage.jpeg?table=block&id=cbcea67b-7796-4969-9543-7907d3b1b4ba&spaceId=de552277-5ae2-4d88-932f-dd538421d024&width=2000&userId=&cache=v2',
},
{
id: '2',
id: 'oracle-manipulation-101-math-edition',
name: 'Oracle Manipulation 101 (Math edition)',
description: 'What does an Uniswap v3 oracle manipulation look like?',
date: new Date('12/26/22').toDateString().slice(4),
tags: ['oracles', 'Uniswap V3', 'math'],
tags: ['Price', 'Oracles', 'Uniswap V3', 'Math'],
image:
'https://price-oracle.notion.site/image/https%3A%2F%2Fs3-us-west-2.amazonaws.com%2Fsecure.notion-static.com%2F645a9912-e67f-4cca-a108-4d9ea0dbc64c%2Fimage.png?table=block&id=e9ceba01-98dc-4cc3-84bb-7de919806a9c&spaceId=de552277-5ae2-4d88-932f-dd538421d024&width=1360&userId=&cache=v2',
},
{
id: '1',
id: 'rip-oracles',
name: 'RIP, Oracles',
description: 'Status quo: Current dangers and how to solve it.',
date: new Date('12/26/22').toDateString().slice(4),
tags: ['oracles'],
tags: ['Price', 'Oracles'],
image:
'https://mirror-media.imgix.net/publication-images/Go3xqXtpWA1ze8b-ULayp.png?height=1440&width=2880&h=1440&w=2880&auto=compress',
},
Expand Down
Loading