Skip to content

Commit

Permalink
Merge branch 'develop' into sero/clean-up-mega-menu
Browse files Browse the repository at this point in the history
  • Loading branch information
Seroxdesign committed Jun 23, 2023
2 parents 0c9d509 + 0ae1cea commit 1f685ee
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 671 deletions.
104 changes: 53 additions & 51 deletions packages/design-system/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,53 +1,3 @@
export { BoxedNextImage } from './BoxedNextImage.js';
export { ConfirmModal } from './ConfirmModal.js';
export * from './Field.js';
export * from './icons/index.js';
export { LoadingState } from './LoadingState.js';
export { MetaBox } from './MetaBox.js';
export { MetaButton } from './MetaButton.js';
export {
FilterTag,
MetaFilterSelectSearch,
MetaSelect,
} from './MetaFilterSelect.js';
export { MetaHeading } from './MetaHeading.js';
export { MetaSecondaryButton } from './MetaSecondaryButton.js';
export { MetaTag } from './MetaTag.js';
export {
MetaTile,
MetaTileBody,
MetaTileHeader,
MetaTileLinkWrapper,
MetaTilePlaybook,
} from './MetaTile.js';
export { MultiSelect } from './MultiSelect.js';
export { ResponsiveText } from './ResponsiveText.js';
export { metaFilterSelectStyles, SelectSearch } from './SelectSearch.js';
export type {
ITimezoneOption,
LabeledOptions,
LabeledValue,
TimeZoneType,
} from './SelectTimeZone.js';
export {
getCityZonesFor,
getTimeZoneFor,
SelectTimeZone,
TimeZoneOptions,
timeZonesFilter,
} from './SelectTimeZone.js';
export * from './StatusedSubmitButton.js';
export * from './SVG.js';
export {
chakraesqueStyles,
dropdownStyles,
theme as MetaTheme,
multiSelectStyles,
searchSelectStyles,
selectStyles,
} from './theme';
export * from './typography.js';
export * from './ViewAllButton.js';
export {
AddIcon,
ArrowBackIcon,
Expand Down Expand Up @@ -91,6 +41,7 @@ export type {
WrapProps,
} from '@chakra-ui/react';
export {
AbsoluteCenter,
Accordion,
AccordionButton,
AccordionIcon,
Expand All @@ -112,6 +63,7 @@ export {
chakra,
ChakraProvider,
Checkbox,
Circle,
CloseButton,
Code,
Collapse,
Expand Down Expand Up @@ -214,7 +166,57 @@ export {
Wrap,
WrapItem,
} from '@chakra-ui/react';
// export { default as styled } from '@emotion/styled';
export { Prose, withProse } from '@nikolovlazar/chakra-ui-prose';
export type { HTMLMotionProps, PanInfo } from 'framer-motion';
export { motion, useAnimation, useMotionValue } from 'framer-motion';
// export { default as styled } from '@emotion/styled';
export { BoxedNextImage } from './BoxedNextImage.js';
export { ConfirmModal } from './ConfirmModal.js';
export * from './Field.js';
export * from './icons/index.js';
export { LoadingState } from './LoadingState.js';
export { MetaBox } from './MetaBox.js';
export { MetaButton } from './MetaButton.js';
export {
FilterTag,
MetaFilterSelectSearch,
MetaSelect,
} from './MetaFilterSelect.js';
export { MetaHeading } from './MetaHeading.js';
export { MetaSecondaryButton } from './MetaSecondaryButton.js';
export { MetaTag } from './MetaTag.js';
export {
MetaTile,
MetaTileBody,
MetaTileHeader,
MetaTileLinkWrapper,
MetaTilePlaybook,
} from './MetaTile.js';
export { MultiSelect } from './MultiSelect.js';
export { ResponsiveText } from './ResponsiveText.js';
export { metaFilterSelectStyles, SelectSearch } from './SelectSearch.js';
export type {
ITimezoneOption,
LabeledOptions,
LabeledValue,
TimeZoneType,
} from './SelectTimeZone.js';
export {
getCityZonesFor,
getTimeZoneFor,
SelectTimeZone,
TimeZoneOptions,
timeZonesFilter,
} from './SelectTimeZone.js';
export * from './StatusedSubmitButton.js';
export * from './SVG.js';
export {
chakraesqueStyles,
dropdownStyles,
theme as MetaTheme,
multiSelectStyles,
searchSelectStyles,
selectStyles,
} from './theme';
export * from './typography.js';
export * from './ViewAllButton.js';
151 changes: 94 additions & 57 deletions packages/web/components/Landing/JoinUs.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import {
AbsoluteCenter,
Box,
Button,
Circle,
Container,
Divider,
HStack,
Text,
useBreakpointValue,
VStack,
} from '@metafam/ds';
import BackgroundImage from 'assets/landing/sections/section-7.webp';
Expand All @@ -13,6 +14,7 @@ import { StartButton } from 'components/Landing/StartButton';
import { MetaLink } from 'components/Link';
import { useMotionDetector } from 'lib/hooks/useMotionDetector';
import { useOnScreen } from 'lib/hooks/useOnScreen';
import Script from 'next/script';
import React, { useRef } from 'react';
import { FaDiscord, FaGithub, FaTwitter } from 'react-icons/fa';

Expand All @@ -26,7 +28,6 @@ export const JoinUs: React.FC<LandingPageSectionProps> = ({ section }) => {
const root = typeof window !== 'undefined' ? document.body : null;
const noMotion = useMotionDetector(root);
const displayElement = noMotion ? true : !!onScreen;
const buttonSize = useBreakpointValue({ base: 'sm', xl: 'lg' });

return (
<FullPageContainer
Expand Down Expand Up @@ -75,64 +76,99 @@ export const JoinUs: React.FC<LandingPageSectionProps> = ({ section }) => {
},
}}
>
<VStack flex={1}>
<Text
fontSize={{ base: 'xl', md: '3xl', '2xl': '4xl' }}
lineHeight={{ base: 'xl', md: '3xl', '2xl': '4xl' }}
fontWeight="700"
mb={{ base: 3, lg: 8 }}
>
The revolution will be televized, <br />
but{' '}
<VStack flex={1} pb={2} mb={20} gap={5}>
<Box>
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 0.9s ease-in'}
fontSize={{ base: 'sm', md: '2xl' }}
lineHeight={{ base: 'xl', md: '3xl', '2xl': '4xl' }}
fontWeight="700"
mb={{ base: 1, lg: 3 }}
>
don’t{' '}
</Text>
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 1.2s ease-in'}
>
just{' '}
</Text>
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 1.5s ease-in'}
>
watch
The revolution will be televized, <br />
but{' '}
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 0.9s ease-in'}
>
don’t{' '}
</Text>
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 1.2s ease-in'}
>
just{' '}
</Text>
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 1.5s ease-in'}
>
watch
</Text>
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 1.8s ease-in'}
>
.
</Text>
</Text>
<StartButton text="Join" />
</Box>
<Box position="relative" padding={{ base: 2, md: 10 }}>
<Divider
borderColor="#FFFFFF50"
width={{ base: '200px', md: '502px' }}
/>
<AbsoluteCenter bg="#270E62">
<Circle
size={{ base: 10, md: 50 }}
border="2px solid #FFFFFF16"
>
<Text color="#77649C">OR</Text>
</Circle>
</AbsoluteCenter>
</Box>
<Box
w="100%"
display="flex"
flexDir="column"
alignItems="center"
justifyItems="center"
>
<Text
as="span"
opacity={displayElement ? 1 : 0}
transition={noMotion ? 'none' : 'opacity 0.5s 1.8s ease-in'}
fontSize={{ base: 'md', md: '2xl' }}
lineHeight={{ base: 'xl', md: '3xl', '2xl': '4xl' }}
fontWeight="700"
mb={{ base: 3, lg: 8 }}
>
.
Stay in the loop
</Text>
</Text>
<HStack
opacity={displayElement ? 1 : 0}
transition={
noMotion
? 'none'
: 'transform 0.3s 1.8s ease-in-out, opacity 0.5s 2s ease-in'
}
>
<MetaLink _hover={{}} href="/dashboard">
<Button
className="screen-esque--alt"
colorScheme="white"
size={buttonSize}
minW="7rem"
>
Watch
</Button>
</MetaLink>
<StartButton text="Join" />
</HStack>
<div id="custom-substack-embed" />
{/* Load substack form */}
<Script id="rendered-component">
{`window.CustomSubstackWidget = {
substackUrl: "metagame.substack.com",
placeholder: "[email protected]",
buttonText: "Subscribe",
theme: "custom",
colors: {
primary: "#FF03FF",
input: "#2E0A67",
email: "#FF03FF",
text: "#000000",
}
};
`}
</Script>
<Script
src="https://substackapi.com/widget.js"
async
id="render-component"
/>
</Box>
</VStack>
</Box>
<Box
Expand All @@ -148,21 +184,22 @@ export const JoinUs: React.FC<LandingPageSectionProps> = ({ section }) => {
height="75px"
maxH="75px"
width="100%"
maxW={{ base: '90%', md: 'lg', lg: 'md', '2xl': '2xl', '4xl': '4xl' }}
maxW={{ base: '90%', md: 'lg', lg: 'xl' }}
transform={`translate3d(0, ${displayElement ? '0' : '50px'}, 0)`}
opacity={displayElement ? 1 : 0}
transition={
'transform 0.3s 2.1s ease-in-out, opacity 0.5s 2.3s ease-in'
}
zIndex={100}
sx={{
pt: '1em',
svg: {
color: 'landing500',
filter: 'drop-shadow(0 0 5px var(--chakra-colors-landing500))',
},
}}
>
<Text>&copy; 2022 MetaGame</Text>
<Text>&copy; {new Date().getFullYear()} MetaGame</Text>
<HStack fontSize={{ base: 'lg', lg: '2xl' }} spacing={5}>
<MetaLink href="https://github.com/metafam" isExternal>
<FaGithub />
Expand Down
5 changes: 4 additions & 1 deletion packages/web/components/Landing/StartButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ export const StartButton: React.FC<{ text: string }> = ({
const buttonSize = useBreakpointValue({ base: 'sm', xl: 'lg' });
return (
<Button
className="screen-esque"
sx={{
backgroundColor: '#FF03FF',
color: '#261561',
}}
background="landing150"
colorScheme="white"
rounded="md"
Expand Down
5 changes: 2 additions & 3 deletions packages/web/components/Player/Section/PlayerMeToken.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { JsonRpcProvider, Web3Provider } from '@ethersproject/providers';
import { JsonRpcProvider } from '@ethersproject/providers';
import {
Box,
Button,
Expand Down Expand Up @@ -706,12 +706,11 @@ export const PlayerMeTokens: React.FC<Props> = ({
symbol={meTokenData.symbol}
collateralAddress={meTokenData.collateralAddress}
owner={player.ethereumAddress}
provider={(provider as JsonRpcProvider)}
provider={provider as JsonRpcProvider}
/>
</>
)}
</Wrap>
</ProfileSection>
);
};

Loading

0 comments on commit 1f685ee

Please sign in to comment.