Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Home Screen Responsivesness #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Home Screen Responsivesness #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion audire/audire-mobile-app/src/modules/common/FooterView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ const FooterView = () => {
return (
<Box
borderRadius="$2xl"
position="absolute"
position="$fixed"
w="$full"
$lg-maxWidth="$1/3"
bottom="$0"
display="flex"
flexDirection="row"
justifyContent="space-between"
alignSelf="center"
bg="#D6A8D4"
px="$10"
py="$5"
Expand Down
88 changes: 50 additions & 38 deletions audire/audire-mobile-app/src/modules/home/HomeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const CARD_COLORS = ['#D6A8D4', '#94B6BB', '#FBB6B1', '#FF33D1', '#33D1FF'];
const HomeView = () => {
const {
user: { firstName, optedCourse },
} = useActiveUser()
} = useActiveUser();
const router = useRouter();

useEffect(() => {
Expand All @@ -36,43 +36,55 @@ const HomeView = () => {

return (
<Box flex={1} width="$full">
<Text fontSize="$xl" color="black" fontWeight="$bold" ml="$5" py="$5">
Hello {firstName}!
</Text>
<Box bg="white" p="$1.5">
<Image
borderRadius={10}
style={{
resizeMode: 'contain',
width: imageWidth,
height: imageHeight,
}}
alt="homepageBanner"
source={HomePageBanner}
/>
</Box>
<Text fontSize="$xl" color="black" fontWeight="$medium" ml="$5" py="$5">
Choose your stage
</Text>
<Box
display="flex"
flexDirection="row"
justifyContent="space-evenly"
alignItems="center"
borderRadius="$2xl"
>
{optedCourse.stages.map((stage, index) => (
<View
borderRadius="$lg"
key={stage.id}
style={{ backgroundColor: CARD_COLORS[index % CARD_COLORS.length] }}
>
<StageCard
stage={stage.title}
href={`/course-stages/${stage.id}`}
/>
</View>
))}
<Box $lg-pb="$96">
<Text fontSize="$xl" color="black" fontWeight="$bold" ml="$5" py="$5">
Hello {firstName}!
</Text>
<Box bg="white" p="$1.5" maxHeight={dimensions.height / 1.5}>
<Image
borderRadius={10}
maxHeight="$full"
resizeMode="cover"
$md-resizeMode="cover"
style={{
width: imageWidth,
height: imageHeight,
}}
alt="homepageBanner"
source={HomePageBanner}
/>
</Box>
<Text fontSize="$xl" color="black" fontWeight="$medium" ml="$5" py="$5">
Choose your stage
</Text>
<Box
display="flex"
gap="$2"
flexDirection="row"
justifyContent="space-evenly"
alignItems="center"
borderRadius="$2xl"
>
{optedCourse.stages.map((stage, index) => (
<View
borderRadius="$lg"
minHeight={dimensions.height - dimensions.height * 0.85}
width="$1/3"
key={stage.id}
display="flex"
justifyContent="center"
alignItems="center"
style={{
backgroundColor: CARD_COLORS[index % CARD_COLORS.length],
}}
>
<StageCard
stage={stage.title}
href={`/course-stages/${stage.id}`}
/>
</View>
))}
</Box>
</Box>
<FooterView />
</Box>
Expand Down
25 changes: 19 additions & 6 deletions audire/audire-mobile-app/src/modules/home/stage-card/StageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,34 @@ type StageCardProps = {

const StageCard: FC<StageCardProps> = ({ stage, href }) => {
return (
<Box width={120} height={120} alignItems="center">
<Box>
<Link href={href} asChild>
<TouchableOpacity>
<Box alignItems="center" pt="$3">
<Box
$md-display="flex"
$md-flexDirection="row"
justifyContent="center"
alignItems="center"
>
<Text
color="black"
fontSize="$lg"
sx={{
'@base': {
size: 'xl',
},
'@md': {
size: '2xl',
},
'@xl': {
size: '6xl',
},
}}
fontWeight="$medium"
justifyContent="center"
alignItems="center"
>
{stage}
</Text>

<Box pt="$10" ml="$10">
<Box>
<Icon as={ArrowRightIcon} color="#B051AE" m="$2" w="$6" h="$6" />
</Box>
</Box>
Expand Down
Loading