Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/npm_and_yarn/frontend/web/types/n…
…ode-20.12.12
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,13 @@ | ||
| import { Box, Text } from '@/app/(design-system)'; | ||
|
|
||
| const DiscoverPage = () => { | ||
| return ( | ||
| <Box flex={1} alignItems="center" justifyContent="center" padding="m"> | ||
| <Text color="aqua" variant="text-1"> | ||
| DiscoverAA | ||
| </Text> | ||
| </Box> | ||
| ); | ||
| }; | ||
|
|
||
| export default DiscoverPage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import React, { PropsWithChildren } from 'react'; | ||
| import { ViewProps } from 'react-native-svg/lib/typescript/fabric/utils'; | ||
|
|
||
| import { BoxProps, createBox } from '@shopify/restyle'; | ||
|
|
||
| import { Theme } from './theme'; | ||
|
|
||
| type Props = ViewProps & PropsWithChildren & BoxProps<Theme>; | ||
|
|
||
| const BoxDefault = createBox<Theme>(); | ||
|
|
||
| export const Box: React.FC<Props> = ({ style, ...rest }) => { | ||
| return <BoxDefault style={[style]} {...rest} />; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // TODO: We will have to change these | ||
| export const Colors = { | ||
| darkBlue: '#0C3354', | ||
| darkRed: '#C8102E', | ||
| green: '#14AC3F', | ||
| blue: '#2663FF', | ||
| aqua: '#35B8E2', | ||
| purple: '#9226FF', | ||
| red: '#EC2215', | ||
| orange: '#FF7426', | ||
| yellow: '#FFB626' | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| export const Spacing = { | ||
| none: 0, | ||
| xxs: 4, | ||
| xs: 8, | ||
| s: 12, | ||
| m: 16, | ||
| l: 24, | ||
| xl: 32, | ||
| xxl: 40 | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { createText } from '@shopify/restyle'; | ||
|
|
||
| import { Theme } from './theme'; | ||
|
|
||
| export const Text = createText<Theme>(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Add actual text variants here | ||
| const Texts = { | ||
| 'text-1': { | ||
| fontSize: 20, | ||
| fontWeight: 'bold' | ||
| }, | ||
| 'text-2': { | ||
| fontSize: 16, | ||
| fontWeight: 'normal' | ||
| }, | ||
| 'text-3': { | ||
| fontSize: 14, | ||
| fontWeight: 'normal' | ||
| } | ||
| } as const; | ||
|
|
||
| export const TextVariants = { | ||
| defaults: Texts['text-1'], | ||
| ...Texts | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| export * from './Text'; | ||
| export * from './Box'; | ||
| export * from './theme'; | ||
| export * from './Colors'; | ||
| export * from './Spacing'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import { createTheme } from '@shopify/restyle'; | ||
|
|
||
| import { Colors } from './Colors'; | ||
| import { Spacing } from './Spacing'; | ||
| import { TextVariants } from './TextVariants'; | ||
|
|
||
| export const theme = createTheme({ | ||
| colors: Colors, | ||
| spacing: Spacing, | ||
| textVariants: TextVariants | ||
| }); | ||
|
|
||
| export type Theme = typeof theme; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| module.exports = function async(api) { | ||
| api.cache(true); | ||
| return { | ||
| presets: ['babel-preset-expo'] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters