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

[GSW-546] fix: Entire Improve UI #240

Merged
merged 32 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f732e2d
Update README.md
akstar82 Nov 3, 2023
d538093
Merge remote-tracking branch 'origin/develop' into GSW-546-Entire-Imp…
khiemldk Nov 23, 2023
ac09115
[GSW-411] fix: Fix Entire improve ui
khiemldk Nov 23, 2023
31a1987
[GSW-546] fix: Fix Entire Improve UI
khiemldk Nov 24, 2023
ef2d971
[GSW-546] fix: Fix Skeleton Home Page
khiemldk Nov 24, 2023
2f06bbd
[GSW-546] fix: Add broadcast popup
khiemldk Nov 24, 2023
052acb8
[GSW-546] fix: Fix Main Vercel Comment
khiemldk Nov 24, 2023
a676e3a
[GSW-546] fix: Fix sekeleton loading
khiemldk Nov 27, 2023
f461dd2
[GSW-546] fix: Fix flow connect wallet modal
khiemldk Nov 27, 2023
41ea7ea
[GSW-546] fix: Update flow submit transaction
khiemldk Nov 27, 2023
c1f40ad
[GSW-546] fix: Fix Modal ESC, Sekeleton
khiemldk Nov 27, 2023
d6d658e
[GSW-546] fix: Fix Modal, Loading Sekeleton
khiemldk Nov 28, 2023
bbcf186
[GSW-546] fix: Fix swap page
khiemldk Nov 28, 2023
dc76268
[GSW-546] fix: Fix left comment Swap page
khiemldk Nov 28, 2023
276dcaf
[GSW-546] fix: FIx left comment swap page
khiemldk Nov 28, 2023
a341e6b
[GSW-546] fix: Fix swap page comment vercel
Nov 29, 2023
5841ec8
[GSW-546] fix: Update slippage to string, selectoken position
Nov 29, 2023
db8ba2a
[GSW-546] fix: Fix vercel confirm modal
Nov 29, 2023
8656caf
[GSW-546] fix: Fix Slippage Apply All, Update Token Detail
Nov 29, 2023
6e648f9
[GSW-546] fix: Fix token detail left comment
Nov 30, 2023
a57e657
[GSW-536] fix: Update token detail chart
Nov 30, 2023
e2713dc
[GSW-546] fix: Fix Token Detail Left comment
Dec 1, 2023
eb83559
[GSW-546] fix: Fix data from assets json file
Dec 1, 2023
1a1c9a7
[GSW-546] fix: Fix dashboard
Dec 1, 2023
55266bd
[GSW-546] fix: Fix Dashboard chart
Dec 4, 2023
3076be9
Merge remote-tracking branch 'origin' into GSW-546-Entire-Improve-UI
khiemldk Dec 4, 2023
6c14222
[GSW-546] fix: Fix error merge conflic
khiemldk Dec 4, 2023
f99b557
[GSW-546] fix: Fix Volumn chart bar
khiemldk Dec 4, 2023
09be7d9
[GSW-546] fix: Fix Dashboard and Token detail
khiemldk Dec 4, 2023
cbda04c
[GSW-546] fix: Fix localtion hover bar
khiemldk Dec 5, 2023
a40a731
[GSW-546] fix: hover position top bottom chart
khiemldk Dec 5, 2023
ce0ce29
[GSW-546] fix: Fix mobile hover pointer chart
khiemldk Dec 5, 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: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Gnoswap Interface
# Gnoswap Interface
Welcome to the open source interface for Gnoswap, the first decentralized exchange (DEX) powered by Gnoland, designed to simplify concentrated liquidity experience and increase capital efficiency for traders.

_Note: Gnoswap is in active development and not yet in production, and we welcome your contributions! Please check our [contribution guidelines](https://github.com/gnoswap-labs/gnoswap-interface#contributing--support) and the [latest release](https://github.com/gnoswap-labs/gnoswap-interface/releases) to see the current development status._
Expand Down
26 changes: 13 additions & 13 deletions packages/web/public/gnos.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/web/src/common/utils/test-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const generateToken0 = () => {
export const generateToken1 = () => {
return {
token_id: `${generateAddress()}`,
name: "GNOS",
name: "GNS",
symbol: "GNOSWAP",
amount: {
value: generateNumberPlus(),
Expand Down Expand Up @@ -106,7 +106,7 @@ export const generateTokenMetas = () => {
"https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xB98d4C97425d9908E66E53A6fDf673ACcA0BE986/logo.png";
return {
images: [image0, image1],
names: ["GNOT", "GNOS"],
names: ["GNOT", "GNS"],
};
};

Expand Down
52 changes: 20 additions & 32 deletions packages/web/src/components/common/bar-graph/BarGraph.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export const BarGraphWrapper = styled.div<BarGraphWrapperProps>`
width: 100%;
height: auto;
overflow: visible;
pointer-events: none;
& > svg {
transform: translateY(24px);
display: flex;
flex-direction: column;
width: 100%;
Expand All @@ -28,8 +28,13 @@ export const BarGraphWrapper = styled.div<BarGraphWrapperProps>`
pointer-events: auto;
&:hover {
fill: ${(props) =>
props.svgColor === "default" ? ({ theme }) => theme.color.point : ""};
props.svgColor === "default" ? ({ hoverColor }) => hoverColor : ""};
opacity: ${(props) => (props.svgColor === "incentivized" ? 0.4 : 1)};
+ path {
fill: ${(props) =>
props.svgColor === "default" ? ({ hoverColor }) => hoverColor : ""};
opacity: ${(props) => (props.svgColor === "incentivized" ? 0.4 : 1)};
}
}
}
}
Expand All @@ -43,26 +48,15 @@ export const BarLineWrapper = styled.line`
}
`;

interface BarGraphTooltipWrapperProps {
x: number;
y: number;
}

export const BarGraphTooltipWrapper = styled.div<BarGraphTooltipWrapperProps>`
position: absolute;
top: ${(props) => `${props.y - 51}px`};
left: ${(props) => `${props.x}px`};
export const BarGraphTooltipWrapper = styled.div`
display: flex;
flex-direction: column;
min-width: 220px;
min-width: 126px;
height: auto;
padding: 6px 8px;
background: ${({ theme }) => theme.color.background02};
border-radius: 4px;
box-shadow: 2px 2px 12px 0px rgba(0, 0, 0, 0.15);
overflow: visible;
gap: 5px;
transform: translateX(-48%);
gap: 8px;

${fonts.p4};

& .tooltip-header {
Expand All @@ -71,33 +65,27 @@ export const BarGraphTooltipWrapper = styled.div<BarGraphTooltipWrapperProps>`
width: 100%;
height: auto;
justify-content: space-between;
font-size: 16px;
font-weight: 700;
line-height: 19px;
color: ${({ theme }) => theme.color.point};
${fonts.body9}
color: ${({ theme }) => theme.color.text02};
}

& .tooltip-body {
${fonts.p4};
${fonts.body12};
color: ${({ theme }) => theme.color.text04};
.date {
margin-right: 3px;
.time {
margin-left: 40px;
${media.tablet} {
display: none;
}
}
}
`;

export const IncentivizeGraphTooltipWrapper = styled.div<BarGraphTooltipWrapperProps>`
export const IncentivizeGraphTooltipWrapper = styled.div`
${mixins.flexbox("column", "flex-start", "flex-start")};
position: absolute;
top: ${(props) => `${props.y - 140}px`};
left: ${(props) => `${props.x}px`};
padding: 16px;
background: ${({ theme }) => theme.color.background02};
border-radius: 8px;
box-shadow: 8px 8px 20px 0px rgba(0, 0, 0, 0.2);
gap: 8px;
z-index: ${Z_INDEX.modalTooltip};
transform: translateX(-50%);
.row {
${mixins.flexbox("row", "flex-start", "flex-start")};
.token,
Expand Down
Loading