diff --git a/packages/pancake-uikit/src/widgets/Menu/Menu.tsx b/packages/pancake-uikit/src/widgets/Menu/Menu.tsx index 1f565e2..2695a61 100644 --- a/packages/pancake-uikit/src/widgets/Menu/Menu.tsx +++ b/packages/pancake-uikit/src/widgets/Menu/Menu.tsx @@ -9,6 +9,7 @@ import Panel from "./components/Panel"; import UserBlock from "./components/UserBlock"; import { NavProps } from "./types"; import Avatar from "./components/Avatar"; +import CakePrice from "./components/CakePrice"; import { MENU_HEIGHT, SIDEBAR_WIDTH_REDUCED, SIDEBAR_WIDTH_FULL } from "./config"; const Wrapper = styled.div` @@ -76,6 +77,7 @@ const Menu: React.FC = ({ children, inviteUrl, socialLink, + documentAddress, }) => { const { isXl } = useMatchBreakpoints(); const isMobile = isXl === false; @@ -124,12 +126,15 @@ const Menu: React.FC = ({ isDark={isDark} href={homeLink?.href ?? "/"} /> - {!!login && !!logout && ( - - - {profile && } - - )} + + + {!!login && !!logout && ( + + + {profile && } + + )} + = ({ pushNav={setIsPushed} links={links} socialLink={socialLink} + documentAddress={documentAddress} /> {children} diff --git a/packages/pancake-uikit/src/widgets/Menu/components/CakePrice.tsx b/packages/pancake-uikit/src/widgets/Menu/components/CakePrice.tsx index 44a784b..e17d9bf 100644 --- a/packages/pancake-uikit/src/widgets/Menu/components/CakePrice.tsx +++ b/packages/pancake-uikit/src/widgets/Menu/components/CakePrice.tsx @@ -10,6 +10,7 @@ interface Props { const PriceLink = styled.a` display: flex; align-items: center; + margin-right: 10px; svg { transition: transform 0.3s; } diff --git a/packages/pancake-uikit/src/widgets/Menu/components/ExternalLink.tsx b/packages/pancake-uikit/src/widgets/Menu/components/ExternalLink.tsx index 5407716..0476b1c 100644 --- a/packages/pancake-uikit/src/widgets/Menu/components/ExternalLink.tsx +++ b/packages/pancake-uikit/src/widgets/Menu/components/ExternalLink.tsx @@ -18,11 +18,15 @@ const Image = styled.img` cursor: pointer; `; +const LinkText = styled(Text)` + word-break: break-all; +`; + const ExternalLink: React.FC = ({ link = "", name = "", icon = "" }) => { return ( <> - {icon ? : {name}} + {icon ? : {name}} ); diff --git a/packages/pancake-uikit/src/widgets/Menu/components/LangSelector.tsx b/packages/pancake-uikit/src/widgets/Menu/components/LangSelector.tsx index 9f443df..40fa1ba 100644 --- a/packages/pancake-uikit/src/widgets/Menu/components/LangSelector.tsx +++ b/packages/pancake-uikit/src/widgets/Menu/components/LangSelector.tsx @@ -1,4 +1,5 @@ import React from "react"; +import styled from "styled-components"; import Text from "../../../components/Text/Text"; import Dropdown from "../../../components/Dropdown/Dropdown"; import Button from "../../../components/Button/Button"; @@ -12,13 +13,17 @@ interface Props { setLang: (lang: Language) => void; } +const ButtonStyle = styled(Button)` + padding-left: 0; +`; + const LangSelector: React.FC = ({ currentLang, langs, setLang }) => ( }> + }> {currentLang?.toUpperCase()} - + } > {langs.map((lang) => ( diff --git a/packages/pancake-uikit/src/widgets/Menu/components/Logo.tsx b/packages/pancake-uikit/src/widgets/Menu/components/Logo.tsx index 5e2a511..125f5b2 100644 --- a/packages/pancake-uikit/src/widgets/Menu/components/Logo.tsx +++ b/packages/pancake-uikit/src/widgets/Menu/components/Logo.tsx @@ -66,7 +66,7 @@ const Logo: React.FC = ({ isPushed, togglePush, isDark, href }) => { {/* */} {/* */} - High City Swap + Hi City Swap ); diff --git a/packages/pancake-uikit/src/widgets/Menu/components/Panel.tsx b/packages/pancake-uikit/src/widgets/Menu/components/Panel.tsx index 5515c02..d606d3d 100644 --- a/packages/pancake-uikit/src/widgets/Menu/components/Panel.tsx +++ b/packages/pancake-uikit/src/widgets/Menu/components/Panel.tsx @@ -8,6 +8,7 @@ import { PanelProps, PushedProps } from "../types"; interface Props extends PanelProps, PushedProps { showMenu: boolean; isMobile: boolean; + documentAddress?: string; } const StyledPanel = styled.div<{ isPushed: boolean; showMenu: boolean }>` diff --git a/packages/pancake-uikit/src/widgets/Menu/components/PanelFooter.tsx b/packages/pancake-uikit/src/widgets/Menu/components/PanelFooter.tsx index 85cc973..2971d0d 100644 --- a/packages/pancake-uikit/src/widgets/Menu/components/PanelFooter.tsx +++ b/packages/pancake-uikit/src/widgets/Menu/components/PanelFooter.tsx @@ -1,16 +1,20 @@ -import React from "react"; +import React, { useContext } from "react"; import styled from "styled-components"; import { CogIcon } from "../../../components/Svg"; import IconButton from "../../../components/Button/IconButton"; +import Link from "../../../components/Link/Link"; import { MENU_ENTRY_HEIGHT } from "../config"; import { PanelProps, PushedProps } from "../types"; -import CakePrice from "./CakePrice"; +// import CakePrice from "./CakePrice"; import ThemeSwitcher from "./ThemeSwitcher"; import LangSelector from "./LangSelector"; import MoreDropDown from "./MoreDropDown"; import DefaultDropDown from "./DefaultDropDown"; +import { ConfigContext } from "../../../components/ConfigProvider/context"; -interface Props extends PanelProps, PushedProps {} +interface Props extends PanelProps, PushedProps { + documentAddress?: string; +} const Container = styled.div` flex: none; @@ -45,9 +49,11 @@ const PanelFooter: React.FC = ({ langs, setLang, socialLink, + documentAddress, }) => { - const defaultList = socialLink?.slice(0, 2); - const moreList = socialLink?.slice(2); + const { t } = useContext(ConfigContext); + const defaultList = socialLink?.slice(0, 3); + const moreList = socialLink?.slice(3); if (!isPushed) { return ( @@ -60,7 +66,7 @@ const PanelFooter: React.FC = ({ return ( - + {/* */} <> {defaultList && } {moreList && moreList.length > 0 && } @@ -69,6 +75,9 @@ const PanelFooter: React.FC = ({ {/* */} + + {t("help center")} + ); diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/Announcement.tsx b/packages/pancake-uikit/src/widgets/Menu/icons/Announcement.tsx new file mode 100644 index 0000000..638c84d --- /dev/null +++ b/packages/pancake-uikit/src/widgets/Menu/icons/Announcement.tsx @@ -0,0 +1,18 @@ +import React from "react"; +import Svg from "../../../components/Svg/Svg"; +import { SvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + ); +}; + +export default Icon; diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/Bazaar.tsx b/packages/pancake-uikit/src/widgets/Menu/icons/Bazaar.tsx new file mode 100644 index 0000000..43bf89c --- /dev/null +++ b/packages/pancake-uikit/src/widgets/Menu/icons/Bazaar.tsx @@ -0,0 +1,18 @@ +import React from "react"; +import Svg from "../../../components/Svg/Svg"; +import { SvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + ); +}; + +export default Icon; diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/BlindBox.tsx b/packages/pancake-uikit/src/widgets/Menu/icons/BlindBox.tsx new file mode 100644 index 0000000..1fe3090 --- /dev/null +++ b/packages/pancake-uikit/src/widgets/Menu/icons/BlindBox.tsx @@ -0,0 +1,18 @@ +import React from "react"; +import Svg from "../../../components/Svg/Svg"; +import { SvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + ); +}; + +export default Icon; diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/Board.tsx b/packages/pancake-uikit/src/widgets/Menu/icons/Board.tsx new file mode 100644 index 0000000..9b9ef18 --- /dev/null +++ b/packages/pancake-uikit/src/widgets/Menu/icons/Board.tsx @@ -0,0 +1,18 @@ +import React from "react"; +import Svg from "../../../components/Svg/Svg"; +import { SvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + ); +}; + +export default Icon; diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/Ido.tsx b/packages/pancake-uikit/src/widgets/Menu/icons/Ido.tsx new file mode 100644 index 0000000..9ef2f00 --- /dev/null +++ b/packages/pancake-uikit/src/widgets/Menu/icons/Ido.tsx @@ -0,0 +1,28 @@ +import React from "react"; +import Svg from "../../../components/Svg/Svg"; +import { SvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + + + + ); +}; + +export default Icon; diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/NFTBox.tsx b/packages/pancake-uikit/src/widgets/Menu/icons/NFTBox.tsx new file mode 100644 index 0000000..dd937fc --- /dev/null +++ b/packages/pancake-uikit/src/widgets/Menu/icons/NFTBox.tsx @@ -0,0 +1,28 @@ +import React from "react"; +import Svg from "../../../components/Svg/Svg"; +import { SvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + + + + ); +}; + +export default Icon; diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/Recommend.tsx b/packages/pancake-uikit/src/widgets/Menu/icons/Recommend.tsx new file mode 100644 index 0000000..751aa67 --- /dev/null +++ b/packages/pancake-uikit/src/widgets/Menu/icons/Recommend.tsx @@ -0,0 +1,18 @@ +import React from "react"; +import Svg from "../../../components/Svg/Svg"; +import { SvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + ); +}; + +export default Icon; diff --git a/packages/pancake-uikit/src/widgets/Menu/icons/index.ts b/packages/pancake-uikit/src/widgets/Menu/icons/index.ts index 6735a8f..98d8e6f 100644 --- a/packages/pancake-uikit/src/widgets/Menu/icons/index.ts +++ b/packages/pancake-uikit/src/widgets/Menu/icons/index.ts @@ -17,3 +17,10 @@ export { default as TelegramIcon } from "./Telegram"; export { default as TicketIcon } from "./Ticket"; export { default as TradeIcon } from "./Trade"; export { default as TwitterIcon } from "./Twitter"; +export { default as BlindBox } from "./BlindBox"; +export { default as Announcement } from "./Announcement"; +export { default as Bazaar } from "./Bazaar"; +export { default as Board } from "./Board"; +export { default as NFTBox } from "./NFTBox"; +export { default as Recommend } from "./Recommend"; +export { default as Ido } from "./Ido"; diff --git a/packages/pancake-uikit/src/widgets/Menu/types.ts b/packages/pancake-uikit/src/widgets/Menu/types.ts index d71a39a..637749f 100644 --- a/packages/pancake-uikit/src/widgets/Menu/types.ts +++ b/packages/pancake-uikit/src/widgets/Menu/types.ts @@ -64,6 +64,7 @@ export interface NavProps extends PanelProps { profile?: Profile; logout?: () => void; socialLink?: SocialLink[]; + documentAddress?: string; } export interface SocialLink {