Skip to content

Commit 8098646

Browse files
wbglaeserwbglaeser
committed
add impressum
1 parent 527c16f commit 8098646

11 files changed

Lines changed: 165 additions & 67 deletions

File tree

‎src/AppRoutes.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import OnboardingWelcomeTopicsContainer from "@/ui/screens/onboarding-pages/topi
1313
import InfoScreenReturningUserContainer from '@/ui/screens/info-pages/returning-user/InfoScreenReturningUserContainer';
1414
import InfoScreenPrivacyContainer from '@/ui/screens/info-pages/privacy/InfoScreenPrivacyContainer';
1515
import QuestionPageRouter from '@/ui/screens/question-pages/QuestionPageRouter';
16+
import ImpressumPage from './ui/screens/legal/ImpressumPage';
1617

1718
const AppRoutes = () => (
1819
<Routes>
@@ -30,6 +31,7 @@ const AppRoutes = () => (
3031
<Route path="/activity-log" element={<ActivityLogScreen/>}/>
3132
<Route path="/default" element={<ResolveUriScreen/>}/>
3233
<Route path="/questions" element={<QuestionPageRouter/>}/>
34+
<Route path="/impressum" element={<ImpressumPage/>}/>
3335
</Routes>
3436
);
3537

‎src/ui/language/translations.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,17 @@ const translations = {
8787
disclaimerTitleNGI: "Disclaimer",
8888
disclaimerNGI: "Funded by the European Union. Views and opinions expressed are however those of the author(s) only and do not necessarily reflect those of the European Union or European Commission. Neither the European Union nor the granting authority can be held responsible for them. Funded within the framework of the NGI Search project under grant agreement No 101069364.",
8989
},
90+
legal: {
91+
impressum: {
92+
declaration5TMG: "Information in accordance with § 5 TMG",
93+
representedBy: "Represented by",
94+
registered: "Registration",
95+
responsible: "Responsible for the content in accordance with § 55 Abs. 2 RStV",
96+
court: 'Register court',
97+
number: 'Registration number',
98+
vatID: 'VAT ID',
99+
}
100+
}
90101
},
91102
app: {
92103
loading: {
@@ -342,6 +353,17 @@ const translations = {
342353
textNGI: "Wir sind Teil des laufenden Open Calls des NGI Search Incubators. Wir erhalten Fördermittel und zusätzliche Unterstützung, um FörderFunke weiterzuentwickeln.",
343354
disclaimerTitleNGI: "Hinweis",
344355
disclaimerNGI: "Finanziert durch die Europäische Union. Die geäußerten Ansichten und Meinungen stammen jedoch ausschließlich von den Autor:innen und spiegeln nicht unbedingt die Ansichten der Europäischen Union oder der Europäischen Kommission wider. Weder die Europäische Union noch die Bewilligungsbehörde können dafür verantwortlich gemacht werden. Finanziert im Rahmen des NGI Search Projekts unter der Fördernummer Nr. 101069364."
356+
},
357+
legal: {
358+
impressum: {
359+
declaration5TMG: "Angaben gemäß § 5 TMG",
360+
representedBy: "Vertreten durch",
361+
registered: "Eintragung",
362+
responsible: "Verantwortlich für den Inhalt nach § 55 Abs. 2 RStV",
363+
court: 'Registergericht',
364+
number: 'Registernummer',
365+
vatID: 'Umsatzsteuer-ID',
366+
}
345367
}
346368
},
347369
app: {

‎src/ui/screens/benefit-page/BenefitPageScreen.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ const BenefitPageScreen = ({
7878
)
7979
}
8080
<RecursiveRulesTable graphRoot={matchingGraph?.root} t={t} />
81-
8281
</Box>
8382
</VBox>
8483
</AppScreenWrapperContainer>

‎src/ui/screens/landing-page/components/LandingPageSectionWrapper.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
2-
import {VBox} from "../../../shared-components/LayoutBoxes";
3-
import {useStore} from "../../../shared-components/ViewportUpdater";
2+
import {VBox} from "@/ui/shared-components/LayoutBoxes";
3+
import {useStore} from "@/ui/shared-components/ViewportUpdater";
44

55
const LandingPageSectionWrapper = ({backgroundColor= null, children, fullWidth = false}) => {
66
const isDesktop = useStore((state) => state.isDesktop);

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import React from "react";
22
import { Typography } from "@mui/material";
33
import LandingPageSectionWrapper from "../../components/LandingPageSectionWrapper";
44
import FeedbackBox from "./components/FeedbackBox";
5-
import useTranslation from "../../../../language/useTranslation";
6-
import { VBox } from "../../../../shared-components/LayoutBoxes";
7-
import theme from "../../../../../theme";
5+
import useTranslation from "@/ui/language/useTranslation";
6+
import { VBox } from "@/ui/shared-components/LayoutBoxes";
87

98
const LandingPageFeedback = ({ isDesktop }) => {
109
const { t } = useTranslation();
@@ -14,7 +13,7 @@ const LandingPageFeedback = ({ isDesktop }) => {
1413
<VBox sx={{ alignItems: 'center' }}>
1514
<VBox sx={{
1615
maxWidth: "1118px",
17-
gap: isDesktop ? theme.spacing(10) : theme.spacing(6)
16+
gap: isDesktop ? 10 : 6
1817
}}>
1918
<Typography variant="h1">
2019
Feedback

‎src/ui/screens/landing-page/sections/footer/views/LandingPageFooterDesktop.js‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,41 @@
11
import React from "react";
2-
import {Typography} from "@mui/material";
3-
import {HBox, VBox} from "../../../../../shared-components/LayoutBoxes";
4-
import EmailLink from "../../../../../shared-components/EmailLink";
5-
import LinkedInLink from "../../../../../shared-components/LinkedInLink";
6-
import LogoBar from "../../../../../shared-components/LogoBar";
7-
import GitHubLink from "../../../../../shared-components/GitHubLink";
8-
import theme from "../../../../../../theme";
2+
import { HBox, VBox } from "@/ui/shared-components/LayoutBoxes";
3+
import EmailLink from "@/ui/shared-components/EmailLink";
4+
import LinkedInLink from "@/ui/shared-components/LinkedInLink";
5+
import LogoBar from "@/ui/shared-components/LogoBar";
6+
import GitHubLink from "@/ui/shared-components/GitHubLink";
97
import FeatureToggle from "../components/FeatureToggle";
8+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
109

1110
const LandingPageFooterDesktop = () => {
1211

1312
return (
1413
<VBox sx={{
15-
backgroundColor: theme.palette.pink.main,
14+
backgroundColor: 'pink.main',
1615
paddingTop: '104px',
1716
paddingBottom: '52px',
1817
paddingLeft: '96px',
1918
paddingRight: '96px',
2019
alignItems: 'center',
21-
gap: theme.spacing(10),
20+
gap: 10,
2221
}}>
23-
<HBox sx={{width: '100%', justifyContent: 'space-between', alignItems: 'center'}}>
24-
<LogoBar/>
22+
<HBox sx={{ width: '100%', justifyContent: 'space-between', alignItems: 'center' }}>
23+
<LogoBar />
2524
<HBox>
26-
<EmailLink email={'info@foerderfunke.org'}/>
27-
<LinkedInLink linkedin={'https://www.linkedin.com/company/foerderfunke'}/>
28-
<GitHubLink href={"https://github.com/Citizen-Knowledge-Graph"}/>
29-
<FeatureToggle/>
25+
<EmailLink email={'info@foerderfunke.org'} />
26+
<LinkedInLink linkedin={'https://www.linkedin.com/company/foerderfunke'} />
27+
<GitHubLink href={"https://github.com/Citizen-Knowledge-Graph"} />
28+
<FeatureToggle />
3029
</HBox>
3130
</HBox>
3231
<HBox justifyContent={'center'} alignItems={'center'}>
33-
<HBox sx={{width: '506px'}}>
34-
<Typography variant="body2" sx={{textAlign: 'center'}}>
35-
© 2024 by FörderFunke. All rights reserved.
36-
<br/>
37-
FörderFunke UG (haftungsbeschränkt),
38-
c/o Impact Hub Berlin,
39-
Rollbergstraße 28A,
40-
12053 Berlin,
41-
USt-IdNr.: DE369936723,
42-
Geschäftsführung: Benjamin Degenhart & Ben Gläser,
43-
Handelsregisternummer: HRB 267043 B,
44-
Amtsgericht Charlottenburg
45-
</Typography>
32+
<HBox sx={{ width: '506px', justifyContent: 'center' }}>
33+
<RegularButton link='/impressum' variant='pinkContained' text='Impressum' size='small' />
34+
<RegularButton variant='pinkContained' text='Datenschutz' size='small' />
4635
</HBox>
4736
</HBox>
4837
</VBox>
4938
);
5039
}
5140

52-
export default LandingPageFooterDesktop;
41+
export default LandingPageFooterDesktop;

‎src/ui/screens/landing-page/sections/footer/views/LandingPageFooterMobile.js‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
import React from "react";
2-
import { Typography } from "@mui/material";
3-
import { HBox, VBox } from "../../../../../shared-components/LayoutBoxes";
4-
import EmailLink from "../../../../../shared-components/EmailLink";
5-
import LinkedInLink from "../../../../../shared-components/LinkedInLink";
6-
import LogoBar from "../../../../../shared-components/LogoBar";
7-
import GitHubLink from "../../../../../shared-components/GitHubLink";
8-
import theme from "../../../../../../theme";
2+
import { VBox } from "@/ui/shared-components/LayoutBoxes";
3+
import EmailLink from "@/ui/shared-components/EmailLink";
4+
import LinkedInLink from "@/ui/shared-components/LinkedInLink";
5+
import LogoBar from "@/ui/shared-components/LogoBar";
6+
import GitHubLink from "@/ui/shared-components/GitHubLink";
7+
import theme from "@/theme";
8+
import RegularButton from "@/ui/shared-components/buttons/RegularButton";
99

1010
const LandingPageFooterMobile = () => {
1111

1212
return (
1313
<VBox sx={{
1414
backgroundColor: theme.palette.pink.main,
1515
padding: '64px 24px',
16-
gap: theme.spacing(10),
16+
gap: 10,
1717
}}>
18-
<VBox sx={{
19-
gap: theme.spacing(4),
20-
width: '100%',
21-
alignItems: 'flex-start'
18+
<VBox sx={{
19+
gap: 4,
20+
width: '100%',
21+
alignItems: 'flex-start'
2222
}}>
2323
<LogoBar />
2424
<VBox>
@@ -27,22 +27,10 @@ const LandingPageFooterMobile = () => {
2727
<GitHubLink href={"https://github.com/Citizen-Knowledge-Graph"} />
2828
</VBox>
2929
</VBox>
30-
<HBox justifyContent={'center'} alignItems={'center'}>
31-
<HBox sx={{ width: '506px' }}>
32-
<Typography variant="body2" sx={{ textAlign: 'center' }}>
33-
© 2024 by FörderFunke. All rights reserved.
34-
<br />
35-
FörderFunke UG (haftungsbeschränkt),
36-
c/o Impact Hub Berlin,
37-
Rollbergstraße 28A,
38-
12053 Berlin,
39-
USt-IdNr.: DE369936723,
40-
Geschäftsführung: Benjamin Degenhart & Ben Gläser,
41-
Handelsregisternummer: HRB 267043 B,
42-
Amtsgericht Charlottenburg
43-
</Typography>
44-
</HBox>
45-
</HBox>
30+
<VBox>
31+
<RegularButton link='/impressum' variant='pinkContained' text='Impressum' size='small' />
32+
<RegularButton variant='pinkContained' text='Datenschutz' size='small' />
33+
</VBox>
4634
</VBox>
4735
);
4836
}

‎src/ui/screens/legal/ImpressumPage.js‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
import React from "react";
2+
import Layout from "@/ui/shared-components/Layout";
3+
import LandingPageSectionWrapper from "@/ui/screens/landing-page/components/LandingPageSectionWrapper";
4+
import { Typography } from "@mui/material";
5+
import { VBox } from "@/ui/shared-components/LayoutBoxes";
6+
import useTranslation from "@/ui/language/useTranslation";
7+
import { useStore } from "@/ui/shared-components/ViewportUpdater";
8+
9+
const ImpressumPage = () => {
10+
const isDesktop = useStore((state) => state.isDesktop);
11+
const { t } = useTranslation();
12+
13+
return (
14+
<Layout>
15+
<LandingPageSectionWrapper isDesktop={isDesktop}>
16+
<VBox sx={{
17+
maxWidth: "1118px",
18+
gap: isDesktop ? 6 : 4
19+
}}>
20+
<Typography variant="h1">
21+
Impressum
22+
</Typography>
23+
<VBox sx={{ gap: 1 }}>
24+
<Typography variant="h6">
25+
{t('home.legal.impressum.declaration5TMG')}
26+
</Typography>
27+
<VBox sx={{ gap: 0 }}>
28+
<Typography variant="body1">
29+
FörderFunke UG (haftungsbeschränkt)
30+
</Typography>
31+
<Typography variant="body1">
32+
c/o Impact Hub Berlin, Rollbergstraße 28A
33+
</Typography>
34+
<Typography variant="body1">
35+
12053 Berlin
36+
</Typography>
37+
<Typography variant="body1">
38+
E-Mail: info@foerderfunke.org
39+
</Typography>
40+
</VBox>
41+
</VBox>
42+
<VBox sx={{ gap: 1 }}>
43+
<Typography variant="h6">
44+
{t('home.legal.impressum.representedBy')}
45+
</Typography>
46+
<VBox sx={{ gap: 0 }}>
47+
<Typography variant="body1">
48+
Benjamin Degenhart (Geschäftsführerin)
49+
</Typography>
50+
<Typography variant="body1">
51+
Ben Gläser (Geschäftsführerin)
52+
</Typography>
53+
</VBox>
54+
</VBox>
55+
<VBox sx={{ gap: 1 }}>
56+
<Typography variant="h6">
57+
{t('home.legal.impressum.registered')}
58+
</Typography>
59+
<VBox sx={{ gap: 0 }}>
60+
<Typography variant="body1">
61+
{t('home.legal.impressum.court')}: Amtsgericht Berlin Charlottenburg
62+
</Typography>
63+
<Typography variant="body1">
64+
{t('home.legal.impressum.number')}: HRB 267043 B
65+
</Typography>
66+
<Typography variant="body1">
67+
{t('home.legal.impressum.vatID')}: DE369936723
68+
</Typography>
69+
</VBox>
70+
</VBox>
71+
<VBox sx={{ gap: 1 }}>
72+
<Typography variant="h6">
73+
{t('home.legal.impressum.responsible')}
74+
</Typography>
75+
<VBox sx={{ gap: 0 }}>
76+
<Typography variant="body1">
77+
Benjamin Degenhart
78+
</Typography>
79+
<Typography variant="body1">
80+
Ben Gläser
81+
</Typography>
82+
<Typography variant="body1">
83+
c/o Impact Hub Berlin, Rollbergstraße 28A
84+
</Typography>
85+
<Typography variant="body1">
86+
12053 Berlin
87+
</Typography>
88+
</VBox>
89+
</VBox>
90+
</VBox>
91+
</LandingPageSectionWrapper >
92+
</Layout>
93+
);
94+
}
95+
export default ImpressumPage;
96+
97+
98+
// declation5TMG: "Information in accordance with § 5 TMG",
99+
// representedBy: "Represented by",
100+
// registered: "Registration",
101+
// responsible:

‎src/ui/shared-components/buttons/RegularButton.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const RegularButton = ({
4646
: {})}
4747
onClick={onClick || undefined}
4848
>
49-
{t(text)}
49+
{t(text) || text}
5050
</Button>
5151
);
5252
};

‎src/ui/shared-components/header/views/HeaderBarDesktop.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ const HeaderBarDesktop = ({ isApp }) => {
5151
/> : null}
5252
<LandingPageHollowButtonDesktop isApp={isApp} text={t('home.menu.improve')} to={'/#feedback'} />
5353
<LandingPageHollowButtonDesktop isApp={isApp} text={t('home.menu.aboutUs')} to={"/#about-us"} />
54-
<LandingPageHollowButtonDesktop isApp={isApp} text={t('home.menu.activityLog')} to={'/activity-log'} />
5554
<HBox alignItems="center" gap={1} sx={{ color: isApp ? 'white' : 'black' }}>
5655
<span style={{ color: isApp ? 'white' : 'black' }}>DE</span>
5756
<AntSwitch

0 commit comments

Comments
 (0)