diff --git a/packages/web/assets/colors/Ambition.svg b/packages/web/assets/colors/Ambition.svg index 9d2e4820..bba3cc6c 100644 --- a/packages/web/assets/colors/Ambition.svg +++ b/packages/web/assets/colors/Ambition.svg @@ -1,15 +1,14 @@ - - + + - - - - + + + + + - - - - - diff --git a/packages/web/assets/colors/Balance.svg b/packages/web/assets/colors/Balance.svg index 4e59e78f..147655f3 100644 --- a/packages/web/assets/colors/Balance.svg +++ b/packages/web/assets/colors/Balance.svg @@ -1,15 +1,9 @@ - - + + - - - - + + + - - - - - diff --git a/packages/web/assets/colors/Wisdom.svg b/packages/web/assets/colors/Wisdom.svg index 2492feba..92777432 100644 --- a/packages/web/assets/colors/Wisdom.svg +++ b/packages/web/assets/colors/Wisdom.svg @@ -1,25 +1,15 @@ - - + + - - - - - + + + + + + - - - - image/svg+xml - - - - - - - - - - diff --git a/packages/web/components/Player/ColorBar.tsx b/packages/web/components/Player/ColorBar.tsx index 79e4bc80..dfcef28a 100644 --- a/packages/web/components/Player/ColorBar.tsx +++ b/packages/web/components/Player/ColorBar.tsx @@ -1,4 +1,4 @@ -import { Box, ChakraProps, Flex, SVG } from '@metafam/ds'; +import { Box, ChakraProps, Flex } from '@metafam/ds'; import { FlexContainer } from 'components/Container'; import { colors, getPersonalityInfo, images } from 'graphql/getPersonalityInfo'; import { PersonalityOption } from 'graphql/types'; @@ -39,15 +39,23 @@ export const ColorBar = ({ }, []); return ( - - + + {parts.map((part) => { const set = (mask & part.mask) !== 0; return !set ? null : ( // if the bit isn't set // return null for map to work - + - + {parts.map((part) => (mask & part.mask) === 0 ? null : ( - - - - - - - - - - - - + ), )} - - {types?.[mask]?.name} + + {types?.[mask]?.name} ); diff --git a/packages/web/graphql/getPersonalityInfo.ts b/packages/web/graphql/getPersonalityInfo.ts index c439074b..a9f1a6e5 100644 --- a/packages/web/graphql/getPersonalityInfo.ts +++ b/packages/web/graphql/getPersonalityInfo.ts @@ -20,6 +20,11 @@ const AspectsQuery = gql` } `; +export type ColorStops = { + start: string; + end: string; +}; + export const images: { [x: number]: string; } = { @@ -31,13 +36,13 @@ export const images: { }; export const colors: { - [x: number]: string; + [x: number]: ColorStops; } = { - 0b10000: '#c4aab4', - 0b01000: '#0273b2', - 0b00100: '#141a36', - 0b00010: '#b72d5b', - 0b00001: '#36ae60', + 0b10000: { start: '#DCA8A9', end: '#ffffff' }, + 0b01000: { start: '#04468B', end: '#09B9F2' }, + 0b00100: { start: '#020121', end: '#2F3E57' }, + 0b00010: { start: '#94136E', end: '#F15236' }, + 0b00001: { start: '#0E9651', end: '#9FD638' }, }; export const getPersonalityInfo = async (): Promise<{