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.

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/462/463 #478

Merged
merged 1 commit into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions govtool/frontend/src/components/atoms/Typography.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const Typography = ({
}: TypographyProps) => {
const fontSize = {
headline1: 100,
headline2: 50,
headline2: 57,
headline3: 36,
headline4: 32,
headline5: 28,
Expand All @@ -21,7 +21,7 @@ export const Typography = ({

const fontWeight = {
headline1: 600,
headline2: 600,
headline2: 700,
headline3: 400,
headline4: 600,
headline5: 500,
Expand Down
24 changes: 7 additions & 17 deletions govtool/frontend/src/components/molecules/ActionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
secondButtonLabel,
title,
} = props;
const { isMobile, screenWidth } = useScreenDimension();
const { screenWidth } = useScreenDimension();

const {
palette: { boxShadow2 },
Expand All @@ -52,23 +52,14 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
>
<Box display="flex" flexDirection="column" flex={1}>
{imageURL ? (
<img
src={imageURL}
width={imageWidth}
height={imageHeight}
style={{
alignSelf: screenWidth < 640 ? "center" : "start",
}}
/>
<img height={imageHeight} src={imageURL} width={imageWidth} />
) : null}
{title ? (
<Typography
fontWeight={isMobile ? 600 : 500}
sx={{
mt: screenWidth < 640 ? 4 : 2.5,
textAlign: screenWidth < 640 ? "center" : "left",
mt: 2.5,
}}
variant={isMobile ? "title2" : "headline5"}
variant={"headline5"}
>
{title}
</Typography>
Expand All @@ -79,9 +70,8 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
sx={{
mb: 4.25,
mt: 1.75,
textAlign: screenWidth < 640 ? "center" : "left",
}}
variant={isMobile ? "body2" : "body1"}
variant={"body1"}
>
{description}
</Typography>
Expand All @@ -103,11 +93,11 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
data-testid={dataTestIdSecondButton}
onClick={secondButtonAction}
sx={{
visibility: secondButtonLabel ? "visible" : "hidden",
display: !secondButtonLabel && screenWidth < 768 ? "none" : "block",
ml: screenWidth < 640 ? 0 : 2,
mt: screenWidth < 640 ? 2 : 0,
visibility: secondButtonLabel ? "visible" : "hidden",
width: screenWidth < 640 ? "100%" : "auto",
display: !secondButtonLabel && screenWidth < 768 ? "none" : "block",
}}
variant="outlined"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const ReviewCreatedGovernanceAction = ({
{label}
</Typography>
<Typography
sx={{ mt: 0.5, overflow: "hidden", textOverflow: "ellipsis" }}
sx={{ mt: 0.5, wordBreak: "break-word" }}
variant="body2"
>
{value as string}
Expand Down
28 changes: 14 additions & 14 deletions govtool/frontend/src/components/organisms/DashboardCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const DashboardCards = () => {
const navigate = useNavigate();
const { currentDelegation, isCurrentDelegationLoading } =
useGetAdaHolderCurrentDelegationQuery(stakeKey);
const { isMobile, screenWidth } = useScreenDimension();
const { screenWidth } = useScreenDimension();
const { openModal } = useModal();
const [isRetirementLoading, setIsRetirementLoading] =
useState<boolean>(false);
Expand Down Expand Up @@ -187,13 +187,12 @@ export const DashboardCards = () => {
);

const onClickGovernanceActionCardActionButton = useCallback(() => {
if(govActionTransaction.transactionHash) {
navigate(PATHS.dashboardGovernanceActions)
return
if (govActionTransaction.transactionHash) {
navigate(PATHS.dashboardGovernanceActions);
return;
}
navigate(PATHS.createGovernanceAction)

}, [govActionTransaction.transactionHash, navigate])
navigate(PATHS.createGovernanceAction);
}, [govActionTransaction.transactionHash, navigate]);

const displayedDelegationId = useMemo(() => {
const restrictedNames = [
Expand Down Expand Up @@ -333,11 +332,12 @@ export const DashboardCards = () => {
display: "grid",
gridTemplateColumns:
screenWidth < 1280
? "1fr"
: screenWidth > 1728
? "repeat(3, minmax(300px, 572px))"
: "repeat(2, minmax(300px, 572px))",
px: isMobile ? 2 : 5,
? "repeat(1, minmax(300px, 530px))"
: screenWidth >= 1728
? "repeat(3, minmax(300px, 570px))"
: "repeat(2, minmax(300px, 530px))",
justifyContent: screenWidth < 1024 ? "center" : "flex-start",
px: screenWidth < 640 ? 2 : 5,
py: 3,
rowGap: 3,
}}
Expand Down Expand Up @@ -538,9 +538,9 @@ export const DashboardCards = () => {
firstButtonAction={onClickGovernanceActionCardActionButton}
firstButtonLabel={t(
`dashboard.proposeGovernanceAction.${
govActionTransaction.transactionHash ? "view" : "propose"
govActionTransaction.transactionHash ? "view" : "propose"
}`
)}
)}
inProgress={!!govActionTransaction.transactionHash}
secondButtonLabel={t("learnMore")}
secondButtonAction={() =>
Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/src/components/organisms/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const Hero = () => {
<Typography
variant={screenWidth < 860 ? "headline2" : "headline1"}
sx={{ whiteSpace: "pre-line" }}
{...(screenWidth < 375 && { fontSize: 45 })}
{...(screenWidth < 430 && { fontSize: 50 })}
>
{t("hero.headline")}
</Typography>
Expand Down
10 changes: 7 additions & 3 deletions govtool/frontend/src/components/organisms/HomeCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ export const HomeCards = () => {

return (
<Box
columnGap={5}
columnGap={4.625}
display="grid"
gridTemplateColumns={screenWidth >= 1920 ? "1fr 1fr" : "1fr"}
gridTemplateColumns={
screenWidth < 2560
? "repeat(1, minmax(300px, 866px))"
: "repeat(2, minmax(300px, 866px))"
}
justifyItems="center"
mb={screenWidth < 640 ? 10 : 17}
mt={screenWidth < 640 ? 10 : 14.5}
Expand All @@ -68,7 +72,7 @@ export const HomeCards = () => {
? 10
: 34
}
rowGap={5}
rowGap={4.625}
>
{/* DELEGATE CARD */}
<ActionCard
Expand Down
4 changes: 2 additions & 2 deletions govtool/frontend/src/components/organisms/TopNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import MenuIcon from "@mui/icons-material/Menu";
import { Button, Link } from "@atoms";
import { ICONS, IMAGES, PATHS, NAV_ITEMS } from "@consts";
import { useCardano, useModal } from "@context";
import { useScreenDimension } from "@hooks";
import { useScreenDimension, useTranslation } from "@hooks";
import { openInNewTab } from "@utils";
import { useTranslation } from "@hooks";

import { DrawerMobile } from "./DrawerMobile";

Expand Down Expand Up @@ -55,6 +54,7 @@ export const TopNav = ({ isConnectButton = true }) => {
: "transparent",
borderBottom: isMobile ? 1 : 0,
borderColor: "lightblue",
borderRadius: 0,
boxShadow: 0,
justifyContent: "center",
flex: 1,
Expand Down