diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts index 383bead1..ed45b297 100644 --- a/packages/design-system/src/index.ts +++ b/packages/design-system/src/index.ts @@ -2,6 +2,7 @@ export { Avatar, Badge, Box, + FlexProps, Button, ButtonGroup, CSSReset, diff --git a/packages/web/assets/profile-background.jpg b/packages/web/assets/main-background.jpg similarity index 100% rename from packages/web/assets/profile-background.jpg rename to packages/web/assets/main-background.jpg diff --git a/packages/web/components/Container.tsx b/packages/web/components/Container.tsx index 4acf6f3c..31188dd6 100644 --- a/packages/web/components/Container.tsx +++ b/packages/web/components/Container.tsx @@ -1,4 +1,5 @@ import { Flex } from '@metafam/ds'; +import BackgroundImage from 'assets/main-background.jpg'; import React from 'react'; type Props = React.ComponentProps; @@ -12,6 +13,7 @@ export const PageContainer: React.FC = ({ children, ...props }) => ( p={[4, 8, 12]} direction="column" align="center" + backgroundImage={`url(${BackgroundImage})`} {...props} > {children} diff --git a/packages/web/components/Player/Box/PlayerCollab.tsx b/packages/web/components/Player/Box/PlayerCollab.tsx deleted file mode 100644 index e82f46ac..00000000 --- a/packages/web/components/Player/Box/PlayerCollab.tsx +++ /dev/null @@ -1,69 +0,0 @@ -import { Box, Flex, HStack, MetaButton, Text } from '@metafam/ds'; -import { PlayerFragmentFragment } from 'graphql/autogen/types'; -import React from 'react'; -import { FaClock, FaGlobe } from 'react-icons/fa'; - -import { PlayerBox } from './PlayerBoxe'; - -// TODO Fake data, role not found and location instead of timezone -type Props = { player: PlayerFragmentFragment }; -export const PlayerCollab: React.FC = ({ player }) => { - return ( - - - - - role - - - Community Lead - - - - - - timezone - - - - - {player.box_profile?.location || '-'} - - - - - - - Availability - - - - - {player.availability_hours || '0'}h/week - - - - - {}} mr={4}> - collab - - {}} disabled> - trust - - - - - ); -}; diff --git a/packages/web/components/Player/Box/PlayerHero.tsx b/packages/web/components/Player/Box/PlayerHero.tsx deleted file mode 100644 index 2adbad9a..00000000 --- a/packages/web/components/Player/Box/PlayerHero.tsx +++ /dev/null @@ -1,96 +0,0 @@ -import { - Avatar, - Box, - Container, - Flex, - HStack, - Image, - P, - Text, -} from '@metafam/ds'; -import { PlayerFragmentFragment } from 'graphql/autogen/types'; -import React from 'react'; -import { - getPlayerDescription, - getPlayerImage, - getPlayerName, -} from 'utils/playerHelpers'; - -import { PersonalityTypes } from '../../../graphql/types'; -import { FlexContainer } from '../../Container'; -import { PlayerBox } from './PlayerBoxe'; - -type Props = { player: PlayerFragmentFragment }; -export const PlayerHero: React.FC = ({ player }) => { - const [show, setShow] = React.useState( - getPlayerDescription(player).length < 115, - ); - - return ( - - - - - - - {getPlayerName(player)} - - {player.playerType?.title && ( - - {player.playerType.title.toUpperCase()} - - )} - - - <> -

- {`${getPlayerDescription(player).substring( - 0, - show ? getPlayerDescription(player).length : 115, - )}${show ? '' : '...'} `} - {getPlayerDescription(player).length > 115 && ( - setShow(!show)} - > - Read {show ? 'less' : 'more'} - - )} -

- -
- - {player.EnneagramType && ( - - {player.EnneagramType.name} - - - {player.EnneagramType.name} - - - {player.EnneagramType.description} - - - - )} - -
-
-
- ); -}; diff --git a/packages/web/components/Player/Box/PlayerAchievements.tsx b/packages/web/components/Player/Section/PlayerAchievements.tsx similarity index 76% rename from packages/web/components/Player/Box/PlayerAchievements.tsx rename to packages/web/components/Player/Section/PlayerAchievements.tsx index 67a4161f..3cb9cb69 100644 --- a/packages/web/components/Player/Box/PlayerAchievements.tsx +++ b/packages/web/components/Player/Section/PlayerAchievements.tsx @@ -2,11 +2,11 @@ import { HStack, Text } from '@metafam/ds'; import React from 'react'; import { FaMedal } from 'react-icons/fa'; -import { PlayerBox } from './PlayerBoxe'; +import { PlayerSection } from './PlayerSection'; // TODO Fake data -type Props = { setRemoveBox: () => void }; -export const PlayerAchievements: React.FC = ({ setRemoveBox }) => { +type Props = { onRemoveClick: () => void }; +export const PlayerAchievements: React.FC = ({ onRemoveClick }) => { const [show, setShow] = React.useState(false); const fakeData = [ 'Founding Father of MetaGame', @@ -15,7 +15,7 @@ export const PlayerAchievements: React.FC = ({ setRemoveBox }) => { ]; return ( - + {(fakeData || []).slice(0, show ? 999 : 3).map((title) => ( @@ -34,6 +34,6 @@ export const PlayerAchievements: React.FC = ({ setRemoveBox }) => { View {show ? 'less' : 'all'} )} - + ); }; diff --git a/packages/web/components/Player/Box/PlayerAddBox.tsx b/packages/web/components/Player/Section/PlayerAddSection.tsx similarity index 81% rename from packages/web/components/Player/Box/PlayerAddBox.tsx rename to packages/web/components/Player/Section/PlayerAddSection.tsx index 07ea2006..66cac3da 100644 --- a/packages/web/components/Player/Box/PlayerAddBox.tsx +++ b/packages/web/components/Player/Section/PlayerAddSection.tsx @@ -1,24 +1,32 @@ -import { Button, Flex, HStack, Select } from '@metafam/ds'; +import { Button, Flex, FlexProps, HStack, Select } from '@metafam/ds'; import React from 'react'; -type Props = { boxList: string[]; setNewBox: (name: string) => void }; -export const PlayerAddBox: React.FC = ({ boxList, setNewBox }) => { +type Props = FlexProps & { + boxList: string[]; + setNewBox: (name: string) => void; +}; + +export const PlayerAddSection: React.FC = ({ + boxList, + setNewBox, + ...props +}) => { const [show, setShow] = React.useState(false); - const addBox = (e: React.ChangeEvent) => { + const addSection = (e: React.ChangeEvent) => { setShow(false); setNewBox(e.target.value); }; return ( {!show && (