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/532-home-page-on-2560-and-1920-resolutions #625

Merged
merged 2 commits into from
Apr 5, 2024
Merged

fix/532-home-page-on-2560-and-1920-resolutions #625

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3ae5e3
fix resolutions
Sworzen1 Apr 4, 2024
0d54491
replace ternary operator with if statement
Sworzen1 Apr 5, 2024
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
28 changes: 20 additions & 8 deletions govtool/frontend/src/components/organisms/Hero.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,19 @@ export const Hero = () => {
flexDirection="row"
overflow="visible"
position="relative"
px={screenWidth < 640 ? 3 : screenWidth < 1512 ? 10 : 14}
px={
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand but when we see the blocks like this there is a place for questions. We won't handle the breakpoints now as we are going to migrate to the components library, but for the stake of a clarity - please lift up this nested ternaries above to not chain so much in the render.

At this moment it might be just the inner function that returns the px value eg.:

const getSize = useCallback(() => {
if (screenWidth < 640) return 3
...
return 49.25}, [screenWidth])

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oki doki, i will

screenWidth < 640
? 3
: screenWidth < 1512
? 9.375
: screenWidth < 1728
? 14
: screenWidth < 1920
? 27.375
: screenWidth < 2560
? 39.375
: 49.25
}
>
<Box alignItems="center" flex={1} height="min-content">
<Typography
Expand Down Expand Up @@ -82,13 +94,13 @@ export const Hero = () => {
flex={1}
position="absolute"
right={
screenWidth >= 1728
? IMAGE_SIZE / 8
: screenWidth >= 1512
? -(IMAGE_SIZE / 12)
: screenWidth >= 860
? -(IMAGE_SIZE / 8)
: -(IMAGE_SIZE / 4)
screenWidth <= 860
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why on the above nested ternaries we are checking 640, 1512, 1728, 1920, 2560 and here we are checking 860, 1440, 1728? Why it can't be unified?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its not necessary to check every resolution

? -(IMAGE_SIZE / 4)
: screenWidth <= 1440
? -(IMAGE_SIZE / 15)
: screenWidth <= 1728
? screenWidth / 20
: screenWidth / 11
}
top={-80}
zIndex={-1}
Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/src/components/organisms/HomeCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const HomeCards = () => {
? "repeat(1, minmax(300px, 866px))"
: "repeat(2, minmax(300px, 866px))"
}
justifyItems="center"
justifyContent="center"
mb={screenWidth < 640 ? 10 : 17}
mt={screenWidth < 640 ? 10 : 14.5}
px={
Expand Down
Loading