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

Update theme #41

Open
wants to merge 29 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
66eaa11
chore: Update market addresses in marketsConfig
JAYDARANIYA Jul 31, 2024
a75f9c3
chore: Remove unused code and comments
JAYDARANIYA Jul 31, 2024
7b6de8d
feat: Remove swap button
JAYDARANIYA Jul 31, 2024
f4c9443
chore: Update subscription intervals to 30 seconds
JAYDARANIYA Jul 31, 2024
3c3762d
chore: addedd COLLECTOR address in market config
JAYDARANIYA Jul 31, 2024
24b4478
chore: Update faucet URL in marketsConfig
JAYDARANIYA Aug 5, 2024
4801423
chore: Update faucet URL and network configurations
JAYDARANIYA Aug 5, 2024
c82092b
chore: remove unused routes -
shreyaspangal Aug 6, 2024
694da63
ui: responsive fixes
shreyaspangal Aug 6, 2024
4ebe132
Rebrand superlend market
JAYDARANIYA Aug 12, 2024
6dac66a
Merge branch 'feat/mainnet_testing' of https://github.com/Plenty-netw…
JAYDARANIYA Aug 12, 2024
c05a930
rebrand superlend markets change
JAYDARANIYA Aug 12, 2024
ad1da3a
ui: theme changes
shreyaspangal Aug 13, 2024
36cec1c
config: update addresses
shreyaspangal Aug 13, 2024
8afb7fb
fix: deployment error fix
shreyaspangal Aug 13, 2024
7f2965a
fix: deployment error fix 2
shreyaspangal Aug 13, 2024
5651f47
ui: favicon and secondary color update
shreyaspangal Aug 13, 2024
1af92bb
fix: pToken to slToken update
shreyaspangal Aug 13, 2024
0e07568
ui: add font family
shreyaspangal Aug 13, 2024
29ef822
ui: launguage list dark mode bg
shreyaspangal Aug 14, 2024
3b54f54
update: secondary cta button and body text font family
shreyaspangal Aug 22, 2024
6f8ed37
ui: update toggle buton variant
shreyaspangal Aug 23, 2024
77b3ddc
update: superlend e-mode doc url
shreyaspangal Aug 23, 2024
7292e76
fix: T&C UI alignment
shreyaspangal Aug 28, 2024
094ad58
update: superlend doc urls
shreyaspangal Aug 28, 2024
0d475fb
fix: remove unused icon
shreyaspangal Aug 28, 2024
5621ff6
chore: update images and brand text
shreyaspangal Aug 28, 2024
ab22ca0
update: homepage logo size
shreyaspangal Aug 28, 2024
f13a16e
fix: max borrow amount 0.01% slippage
shreyaspangal Aug 29, 2024
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Plend Protocol Interface
# Superlend Protocol Interface

An open source interface for the decentralized liquidity protocol Plend
An open source interface for the decentralized liquidity protocol Superlend

Enabling users to:

- Manage and monitor their positions on the Plend Protocol, and the overall status of it
- Manage and monitor their positions on the Superlend Protocol, and the overall status of it

## How to use

Expand Down
9 changes: 5 additions & 4 deletions pages/_app.page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import '/public/fonts/basier-circle/basier-circle.css';
import '/public/fonts/inter/inter.css';
import '/public/fonts/space-grotesk/space-grotesk.css';
// import '/public/fonts/space-grotesk/space-grotesk.css';
import '/src/styles/variables.css';

import { CacheProvider, EmotionCache } from '@emotion/react';
Expand All @@ -8,7 +9,7 @@ import { providers } from 'ethers';
import { NextPage } from 'next';
import { AppProps } from 'next/app';
import Head from 'next/head';
import PlendMetaImage from 'public/plendMetaLogo.jpg';
// import SuperlendMetaImage from '/public/superlendMetaLogo.jpg';
import * as React from 'react';
// import { AddressBlocked } from 'src/components/AddressBlocked';
import { BlockVPN } from 'src/components/BlockVPN';
Expand Down Expand Up @@ -65,8 +66,8 @@ export default function MyApp(props: MyAppProps) {
</Head>
<Meta
title={'Etherlink-Powered Lending Market'}
description={'Plend'}
imageUrl={PlendMetaImage.src}
description={'Superlend'}
imageUrl="https://asset.cloudinary.com/dbogvpefw/07d39cb3701b76bca4dbeacfb5b9e927"
/>
<LanguageProvider>
<BlockVPN>
Expand Down
4 changes: 2 additions & 2 deletions pages/governance/proposal/[proposalId].governance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
useTheme,
} from '@mui/material';
import dayjs from 'dayjs';
import AaveMetaImage from 'public/plendMetaLogo.jpg';
// import AaveMetaImage from 'public/superlendMetaLogo.jpg';
import { useEffect, useState } from 'react';
import ReactMarkdown from 'react-markdown';
import remarkGfm from 'remark-gfm';
Expand Down Expand Up @@ -165,7 +165,7 @@ export default function ProposalPage({
return (
<>
{ipfs && (
<Meta imageUrl={AaveMetaImage.src} title={ipfs.title} description={ipfs.shortDescription} />
<Meta imageUrl="https://asset.cloudinary.com/dbogvpefw/07d39cb3701b76bca4dbeacfb5b9e927" title={ipfs.title} description={ipfs.shortDescription} />
)}
<ProposalTopPanel />

Expand Down
Binary file modified public/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon.ico
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 16 additions & 0 deletions public/fonts/basier-circle/basier-circle.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* #### Generated By: http://font.download #### */

@font-face {
font-family: 'Basier Circle Regular';
font-style: normal;
font-weight: normal;
src: local('Basier Circle Regular'), url('BasierCircle-Regular.woff') format('woff');
}


@font-face {
font-family: 'Basier Square Regular';
font-style: normal;
font-weight: normal;
src: local('Basier Square Regular'), url('BasierSquare-Regular.woff') format('woff');
}
17 changes: 17 additions & 0 deletions public/fonts/basier-circle/example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css"
href="style.css"/>
</head>

<body>

<h1>Generated from: http://font.download</h1><br/>
<h1 style="font-family:'Basier Circle Regular';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
<h1 style="font-family:'Basier Square Regular';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>


</body>
</html>
5 changes: 5 additions & 0 deletions public/logos/superlend-full-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logos/superlend-full-logo.webp
Binary file not shown.
Binary file added public/logos/superlendlogo.webp
Binary file not shown.
4 changes: 2 additions & 2 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "Plend",
"name": "Plend",
"short_name": "Superlend",
"name": "Superlend",
"description": "Maker-Powered Lending Market",
"icons": [
{
Expand Down
Binary file added public/superlendMetaLogo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/BlockVPN.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { Box, Link, Typography } from '@mui/material';
import { useEffect, useState } from 'react';

import WalletConnectLogoDark from '/public/walletConnectLogoDark.svg';
import WalletConnectLogoDark from '/public/logos/superlend-full-logo.svg';

export function BlockVPN({ children }: { children: React.ReactNode }): React.ReactElement {
if (process.env.NEXT_PUBLIC_VPN_PROTECTION !== '1') {
Expand Down
40 changes: 17 additions & 23 deletions src/components/ConnectWalletPaper.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Trans } from '@lingui/macro';
import { Box, CircularProgress, Paper, PaperProps, Typography, useTheme } from '@mui/material';
import { Box, CircularProgress, Paper, PaperProps, Typography } from '@mui/material';
import { ReactNode } from 'react';

import WalletConnectLogoDark from '/public/walletConnectLogoDark.svg';
import FullLogo from '/public/logos/superlend-full-logo.svg';

import MarkedList from './lists/MarkedList';
import MarkedListItem from './lists/MarkedListItem';
Expand All @@ -20,36 +20,30 @@ export const ConnectWalletPaper = ({
sx,
...rest
}: ConnectWalletPaperProps) => {
const theme = useTheme();
return (
<Paper
{...rest}
sx={{
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
textAlign: 'center',
flex: 1,
...sx,
}}
>
{theme.palette.mode === 'light' ? (
<Box
sx={{
display: 'flex',
justifyContent: 'center',
width: '100%',
backgroundColor: '#27212F',
borderTopLeftRadius: '6px',
borderTopRightRadius: '6px',
}}
>
<WalletConnectLogoDark style={{ marginBottom: '16px', maxWidth: '250px' }} />
</Box>
) : (
<WalletConnectLogoDark style={{ marginBottom: '16px', maxWidth: '250px' }} />
)}
<Box
sx={{
display: 'flex',
justifyContent: 'center',
width: '100%',
backgroundColor: '#FF5B00',
borderTopLeftRadius: '6px',
borderTopRightRadius: '6px',
}}
>
<FullLogo style={{ marginBottom: '16px', maxWidth: '250px' }} />
</Box>
<Box sx={{ p: 4 }}>
{loading ? (
<CircularProgress />
Expand Down Expand Up @@ -115,7 +109,7 @@ export const Disclaimers = () => {
the jurisdiction in which I reside and am located.
</MarkedListItem>
<MarkedListItem>
I understand the risks associated with entering into using the Plend.
I understand the risks associated with entering into using the Superlend.
</MarkedListItem>
</MarkedList>
</Trans>
Expand All @@ -132,8 +126,8 @@ export const InnerLink = ({ children, href }: InnerLinkProps) => {
<Link
href={href}
target="_blank"
sx={(theme) => ({
color: theme.palette.mode === 'light' ? '#3F2566' : '#52F4DC',
sx={() => ({
color: '#FF5B00',
textDecoration: 'underline',
})}
>
Expand Down
6 changes: 3 additions & 3 deletions src/components/FaucetButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { Button, SvgIcon, Typography } from '@mui/material';
import { useProtocolDataContext } from 'src/hooks/useProtocolDataContext';

import { DarkTooltip } from './infoTooltips/DarkTooltip';
import { Link, ROUTES } from './primitives/Link';
import { Link } from './primitives/Link';

export const FaucetButton = () => {
const { currentNetworkConfig } = useProtocolDataContext();

return (
<DarkTooltip title="Get free assets to test Plend Protocol">
<DarkTooltip title="Get free assets to test Superlend Protocol">
<Button
startIcon={
<img
Expand All @@ -25,7 +25,7 @@ export const FaucetButton = () => {
</SvgIcon>
}
component={Link}
href={ROUTES.faucet}
href={"https://faucet.etherlink.com"}
variant="outlined"
size="small"
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/HealthFactorNumber.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const HealthFactorNumber = ({
{onInfoClick && (
<Button
onClick={onInfoClick}
variant="surface"
variant="contained"
size="small"
sx={{ minWidth: 'unset', ml: { xs: 0, xsm: 2 } }}
>
Expand Down
11 changes: 6 additions & 5 deletions src/components/MarketSwitcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type MarketLogoProps = {
export const MarketLogo = ({ size, logo, testChainName }: MarketLogoProps) => {
return (
<Box sx={{ mr: 2, width: size, height: size, position: 'relative' }}>
<img src={logo} alt="" width="100%" height="100%" />
<Box sx={{filter: 'brightness(0.7)'}}><img src={logo} alt="" width="100%" height="100%" /></Box>

{testChainName && (
<Tooltip title={testChainName} arrow>
Expand Down Expand Up @@ -131,7 +131,7 @@ export const MarketSwitcher = () => {
variant={upToLG ? 'display1' : 'h1'}
sx={{
fontSize: downToXSM ? '1.55rem' : undefined,
color: 'common.white',
color: theme.palette.mode === 'dark' ? 'common.white' : '#2A2826',
mr: 1,
}}
>
Expand All @@ -147,7 +147,7 @@ export const MarketSwitcher = () => {
p: 0,
backgroundColor: 'transparent !important',
},
'.MuiSelect-icon': { color: '#F1F1F3' },
'.MuiSelect-icon': { color: theme.palette.mode === 'dark' ? '#F1F1F3' : '#2A2826' },
},
MenuProps: {
anchorOrigin: {
Expand All @@ -157,6 +157,7 @@ export const MarketSwitcher = () => {
PaperProps: {
style: {
minWidth: 240,
background: theme.palette.mode === 'dark' ? '#2A2826' : '#f1f1f1'
},
variant: 'outlined',
elevation: 0,
Expand All @@ -167,7 +168,7 @@ export const MarketSwitcher = () => {
<Box>
<Typography variant="subheader2" color="text.secondary" sx={{ px: 4, py: 2 }}>
<Trans>
{ENABLE_TESTNET || STAGING_ENV ? 'Select Plend Testnet Market' : 'Select Plend Market'}
{ENABLE_TESTNET || STAGING_ENV ? 'Select Superlend Testnet Market' : 'Select Superlend Market'}
</Trans>
</Typography>
</Box>
Expand All @@ -194,7 +195,7 @@ export const MarketSwitcher = () => {
{marketNaming.name} {market.isFork ? 'Fork' : ''}
</ListItemText>
<ListItemText sx={{ textAlign: 'right' }}>
<Typography color="text.muted" variant="description">
<Typography color="text.secondary" variant="description">
{marketNaming.testChainName}
</Typography>
</ListItemText>
Expand Down
8 changes: 4 additions & 4 deletions src/components/Meta.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ type MetaProps = {
export function Meta({ title, description, imageUrl, timestamp }: MetaProps) {
return (
<Head>
<title>Plend - {title}</title>
<title>Superlend - {title}</title>
<meta name="description" content={description} key="description" />
<meta property="og:title" content={`Plend - ${title}`} key="title" />
<meta property="og:title" content={`Superlend - ${title}`} key="title" />
<meta property="og:description" content={description} key="ogdescription" />
{imageUrl && <meta property="og:image" content={imageUrl} key="ogimage" />}
{imageUrl && <meta name="twitter:image" content={imageUrl} key="twitterimage" />}
{imageUrl && <meta name="twitter:image:alt" content={`plend logo`} key="twitteralt" />}
{imageUrl && <meta name="twitter:image:alt" content={`Superlend logo`} key="twitteralt" />}
<meta name="twitter:site" content="@AaveAave" key="twittersite" />
<meta
property="twitter:card"
Expand All @@ -37,7 +37,7 @@ export function Meta({ title, description, imageUrl, timestamp }: MetaProps) {
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#171715" />
<meta name="theme-color" content="#171715" />
<meta name="theme-color" content="#FF5B00" />
</Head>
);
}
2 changes: 1 addition & 1 deletion src/components/ReserveOverviewBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function ReserveOverviewBox({
<Box
sx={(theme) => ({
borderRadius: '6px',
border: `1px solid ${theme.palette.divider}`,
border: `1px solid ${theme.palette.mode === 'dark' ? theme.palette.divider : '#cecece'}`,
flex: fullWidth ? '0 100%' : '0 32%',
marginBottom: '2%',
height: { md: '70px', lg: '60px' },
Expand Down
16 changes: 8 additions & 8 deletions src/components/StyledToggleButton.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { styled, ToggleButton, ToggleButtonProps } from '@mui/material';
import React from 'react';

const CustomToggleButton = styled(ToggleButton)<ToggleButtonProps>(({ theme }) => ({
const CustomToggleButton = styled(ToggleButton)<ToggleButtonProps>(() => ({
border: '0px',
flex: 1,
backgroundColor: '#27212F',
borderRadius: '4px',

'&.Mui-selected, &.Mui-selected:hover': {
backgroundColor: '#3F2566',
backgroundColor: '#FF5B00',
borderRadius: '4px !important',
border: 'none',
},
Expand All @@ -20,14 +20,14 @@ const CustomToggleButton = styled(ToggleButton)<ToggleButtonProps>(({ theme }) =
justifyContent: 'center',

'.MuiTypography-subheader1': {
background: theme.palette.gradients.aaveGradient,
backgroundClip: 'text',
textFillColor: 'transparent',
// background: theme.palette.gradients.aaveGradient,
// backgroundClip: 'text',
textFillColor: '#fff',
},
'.MuiTypography-secondary14': {
background: theme.palette.gradients.aaveGradient,
backgroundClip: 'text',
textFillColor: 'transparent',
// background: theme.palette.gradients.aaveGradient,
// backgroundClip: 'text',
// textFillColor: 'transparent',
},
},
})) as typeof ToggleButton;
Expand Down
2 changes: 1 addition & 1 deletion src/components/TopInfoPanel/PageTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const PageTitle = ({ pageTitle, withMarketSwitcher, withMigrateButton }:
{isMigrateToV3Available && withMigrateButton && (
<Link href={ROUTES.migrationTool} sx={{ mt: { xs: 2, xsm: 0 } }}>
<Button variant="gradient" size="small">
<Trans>Migrate to Plend Protocol</Trans>
<Trans>Migrate to Superlend Protocol</Trans>
</Button>
</Link>
)}
Expand Down
Loading