Skip to content

Commit 864cead

Browse files
wbglaeserwbglaeser
committed
standardise buttons
1 parent ca9e8cf commit 864cead

24 files changed

Lines changed: 317 additions & 269 deletions

File tree

‎src/theme.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const theme = createTheme({
1717
},
1818
yellow: {
1919
main: '#FFEEA6 ',
20-
light: '#9E872C ',
20+
dark: '#9E872C ',
2121
},
2222
blue: {
2323
main: '#84AAD7',

‎src/ui/language/translations.js‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,12 @@ const translations = {
119119
deleteBtn: "Delete your profile",
120120
},
121121
discoverChoice: {
122-
header: "You have the choice:",
123-
text: "You have two options to discover benefits for yourself: You can answer a few questions for a quick check, or you can browse the entire catalog.",
124-
quickCheck: "Quick eligibility check",
125-
quickCheckComment: "Based on up to 10 benefits",
126-
browseAll: "Browse all benefits",
122+
header: "The quick check:",
123+
text: "The quick check is easy: Answer a few questions about yourself and your situation and we will show you which social benefits you might be eligible for.",
124+
quickCheck: "Start quick check",
125+
quickCheckComment: "Answer a few questions to find your potential benefits",
126+
browseHeader: "The catalog",
127+
browseAll: "Browse the catalog",
127128
browseInfo: "Here you can view the catalog to get an overview of the available programs.",
128129
},
129130
topicSelection: {
@@ -372,13 +373,14 @@ const translations = {
372373
deleteBtn: "Profil löschen",
373374
},
374375
discoverChoice: {
375-
header: "Du hast die Wahl:",
376-
text: "Du hast zwei Möglichkeiten, um Leistungen für dich zu entdecken. Du kannst ein paar Fragen beantworten und so einen Schnellcheck machen oder dir den gesamten Katalog ansehen.",
377-
quickCheck: "Schneller Anspruchscheck",
378-
quickCheckComment: "Basierend auf bis zu 10 Leistungen",
376+
header: "Der Quick-Check:",
377+
text: "Der Quick-Check ist einfach: Beantworte ein paar Fragen zu dir und deiner Lebenslage und wir zeigen dir, auf welche Sozialleistungen du Anspruch haben könntest.",
378+
quickCheck: "Starte den Quick-Check",
379+
quickCheckComment: "Beantworte ein paar Fragen, um deine Leistungen zu finden",
379380
quickCheckInfo: "Der Schnellcheck ist eine schnelle Methode, um deinen Anspruchsstatus zu überprüfen. Es dauert nur wenige Minuten.",
380-
browseAll: "Alle Leistungen durchsuchen",
381-
browseInfo: "Hier kannst du den Katalog ansehen, um einen Überblick über die verfügbaren Programme zu erhalten.",
381+
browseHeader: "Der Katalog",
382+
browseAll: "Zum Katalog",
383+
browseInfo: "Wenn du möchtest, kannst du auch alle Leistungen in unserem Katalog durchsuchen, um einen Überblick über die verfügbaren Programme zu erhalten.",
382384
},
383385
topicSelection: {
384386
header: "Schneller Anspruchscheck",

‎src/ui/screens/info-pages/privacy/InfoScreenPrivacy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Layout from "@/ui/shared-components/Layout";
66
import { VBox, HBox } from "@/ui/shared-components/LayoutBoxes";
77
import AppScreenWrapperContainer from "@/ui/shared-components/app-screen-wrapper/AppScreenWrapperContainer";
88
import theme from "@/theme";
9-
import RegularButton from "@/ui/shared-components/RegularButton";
9+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
1010

1111
const InfoScreenPrivacy = ({t, isDesktop, privacyBox}) => {
1212
return (

‎src/ui/screens/info-pages/returning-user/InfoScreenReturningUser.js‎

Lines changed: 27 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,47 @@
11
import React from "react";
2-
import { Link } from "react-router-dom";
3-
import { Button, Typography } from "@mui/material";
4-
import FileDownloadIcon from '@mui/icons-material/FileDownload';
5-
import DeleteIcon from '@mui/icons-material/Delete';
2+
import { Typography } from "@mui/material";
63
import Layout from "@/ui/shared-components/Layout";
74
import AppScreenWrapperContainer from "@/ui/shared-components/app-screen-wrapper/AppScreenWrapperContainer";
85
import { VBox, HBox } from "@/ui/shared-components/LayoutBoxes";
6+
import TileButton from "@/ui/shared-components/buttons/TileButton";
7+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
98

109

1110
const InfoScreenReturningUser = ({ t, isLoading, exportProfile, deleteExistingProfile }) => {
12-
return (
11+
return (
1312
<Layout isApp={true} logo={false}>
1413
<AppScreenWrapperContainer isLoading={isLoading} home={true} backTarget={-1}>
1514
<VBox sx={{ gap: 8 }}>
1615
<Typography variant="h1">{t('app.welcomeBack.header')}</Typography>
1716
<Typography variant="body1">{t("app.welcomeBack.text")}</Typography>
1817
<HBox sx={{ flexWrap: 'wrap' }}>
19-
<HBox>
20-
<Button
21-
variant="text"
22-
sx={{
23-
padding: "32px 32px",
24-
boxShadow: '0px 1px 2px rgba(0, 0, 0, 0.25)',
25-
'&:hover': { backgroundColor: 'yellow.main' },
26-
}}
27-
component={Link}
28-
to={'/onboarding-choice'}
29-
>
30-
<HBox sx={{ alignItems: 'center' }}>
31-
<VBox sx={{ alignItems: 'flex-start' }}>
32-
<Typography variant="h6">{t("app.welcomeBack.yesBtnTitle")}</Typography>
33-
<Typography variant="body1" sx={{ textAlign: 'left' }}>{t("app.welcomeBack.yesBtnText")}</Typography>
34-
</VBox>
35-
</HBox>
36-
</Button>
37-
</HBox>
38-
<HBox>
39-
<Button
40-
sx={{
41-
padding: "32px 32px",
42-
boxShadow: '0px 1px 2px rgba(0, 0, 0, 0.25)',
43-
'&:hover': { backgroundColor: 'yellow.main' },
44-
}}
45-
onClick={deleteExistingProfile}
46-
component={Link}
47-
to={'/user-routing'}
48-
>
49-
<HBox sx={{ alignItems: 'center' }}>
50-
<VBox sx={{ alignItems: 'flex-start' }}>
51-
<Typography variant="h6">{t("app.welcomeBack.noBtnTitle")}</Typography>
52-
<Typography variant="body1" sx={{ textAlign: 'left' }}>{t("app.welcomeBack.noBtnText")}</Typography>
53-
</VBox>
54-
</HBox>
55-
</Button>
56-
</HBox>
18+
<TileButton
19+
variant={'whiteNoBorderYellow'}
20+
title={"app.welcomeBack.yesBtnTitle"}
21+
subtitle="app.welcomeBack.yesBtnText"
22+
link={'/onboarding-choice'}
23+
/>
24+
<TileButton
25+
variant={'whiteNoBorderYellow'}
26+
title={"app.welcomeBack.noBtnTitle"}
27+
subtitle="app.welcomeBack.noBtnText"
28+
onClick={deleteExistingProfile}
29+
link={'/user-routing'}
30+
/>
5731
</HBox>
5832
<HBox sx={{ flexWrap: 'wrap' }}>
59-
<Button
60-
variant="text"
61-
sx={{
62-
backgroundColor: 'greyTransparent.main',
63-
'&:hover': { backgroundColor: 'custom.lightGrey' },
64-
}}
65-
startIcon={<FileDownloadIcon sx={{ color: 'custom.darkGrey' }} />}
33+
<RegularButton
34+
variant={'blackOutlined'}
35+
text={"app.welcomeBack.exportBtn"}
6636
onClick={exportProfile}
67-
>
68-
<Typography variant="body2" sx={{ color: 'custom.darkGrey' }}>
69-
{t("app.welcomeBack.exportBtn")}
70-
</Typography>
71-
</Button>
72-
<Button
73-
variant="text"
74-
sx={{
75-
backgroundColor: 'greyTransparent.main',
76-
'&:hover': { backgroundColor: 'custom.lightGrey' },
77-
}}
78-
startIcon={<DeleteIcon sx={{ color: 'custom.darkGrey' }} />}
37+
size='small'
38+
/>
39+
<RegularButton
40+
variant={'blackOutlined'}
41+
text={"app.welcomeBack.deleteBtn"}
7942
onClick={deleteExistingProfile}
80-
>
81-
<Typography variant="body2" sx={{ color: 'custom.darkGrey' }}>
82-
{t("app.welcomeBack.deleteBtn")}
83-
</Typography>
84-
</Button>
43+
size='small'
44+
/>
8545
</HBox>
8646
</VBox>
8747
</AppScreenWrapperContainer>

‎src/ui/screens/landing-page/sections/fact/LandingPageFact.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Typography } from "@mui/material";
33
import LandingPageSectionWrapper from "../../components/LandingPageSectionWrapper";
44
import useTranslation from "@/ui/language/useTranslation";
55
import { HBox, VBox } from "@/ui/shared-components/LayoutBoxes";
6-
import RegularButton from "@/ui/shared-components/RegularButton";
6+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
77

88
const LandingPageFact = () => {
99
const { t } = useTranslation();

‎src/ui/screens/landing-page/sections/feedback/components/FeedbackBox.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import useFeedbackHandler from "../hooks/useFeedbackHandler";
55
import useTranslation from "@/ui/language/useTranslation";
66
import EmailIcon from "@mui/icons-material/Email";
77
import theme from "@/theme";
8-
import RegularButton from "@/ui/shared-components/RegularButton";
8+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
99

1010
const FeedbackBox = ({ isDesktop }) => {
1111
const { t } = useTranslation();

‎src/ui/screens/landing-page/sections/funding/LandingPageFunding.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Typography } from "@mui/material";
55
import theme from "@/theme";
66
import { SupporterCardNGI, SupporterCardPF } from "./components/LandingPageSupporters";
77
import useTranslation from "@/ui/language/useTranslation";
8-
import RegularButton from "@/ui/shared-components/RegularButton";
8+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
99

1010
const LandingPageFunding = ({ isDesktop }) => {
1111
const { t } = useTranslation();

‎src/ui/screens/landing-page/sections/how-it-works/LandingPageHowItWorks.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import LandingPageSectionWrapper from "../../components/LandingPageSectionWrappe
1010
import LandingPageInfoCard from "./components/LandingPageInfoCard";
1111
import { VBox, HBox } from "@/ui/shared-components/LayoutBoxes";
1212
import { useStore } from "@/ui/shared-components/ViewportUpdater";
13-
import RegularButton from "@/ui/shared-components/RegularButton";
13+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
1414

1515
const LandingPageHowItWorks = () => {
1616
const { t } = useTranslation();

‎src/ui/screens/landing-page/sections/mission/views/LandingPageMissionDesktop.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Typography } from "@mui/material";
33
import useTranslation from "@/ui/language/useTranslation";
44
import { HBox, VBox } from "@/ui/shared-components/LayoutBoxes";
55
import theme from "@/theme";
6-
import RegularButton from "@/ui/shared-components/RegularButton";
6+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
77

88
const LandingPageMissionDesktop = ({ isDesktop }) => {
99
const { t } = useTranslation();

‎src/ui/screens/landing-page/sections/mission/views/LandingPageMissionMobile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Typography } from "@mui/material";
33
import useTranslation from "@/ui/language/useTranslation";
44
import { HBox, VBox } from "@/ui/shared-components/LayoutBoxes";
55
import theme from "@/theme";
6-
import RegularButton from "@/ui/shared-components/RegularButton";
6+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
77

88
const LandingPageMissionMobile = () => {
99
const { t } = useTranslation();

0 commit comments

Comments
 (0)