-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(website): styling cleanups for hero sections (#660)
- Loading branch information
Showing
13 changed files
with
169 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,13 +5,24 @@ | |
| "landing-page": { | ||
| "title": [ | ||
| { | ||
| "text": "Etwas bewegen, nicht nur darüber sprechen. " | ||
| "text": "Wir hatten die Möglichkeit, nichts zu tun. " | ||
| }, | ||
| { | ||
| "text": "Dies war der Anfang von Social Income.", | ||
| "text": "Wir haben uns dagegen entschieden.", | ||
| "color": "secondary" | ||
| } | ||
| ] | ||
| ], | ||
| "subtitle": "Die Verbesserung der Lebensbedingungen von Menschen in Armut sehen wir als unsere Verantwortung. Aus dieser Überzeugung heraus wurde Social Income ins Leben gerufen.", | ||
| "contact": "Kontakt", | ||
| "contact-title": "Schreib uns an", | ||
| "contact-email": "[email protected]", | ||
| "registration": "NGO Registrierung", | ||
| "registration-title": "Rechtsstatus", | ||
| "registration-foundation": "Social Income ist eine gemeinnützige Organisation, die 2019 nach schweizerischem Recht gegründet wurde und steuerbefreit ist.", | ||
| "registration-uid": "UID: ", | ||
| "registration-uid-nr": "CHE-289.611.695", | ||
| "registration-duns": "DUNS: ", | ||
| "registration-duns-nr": "48-045-6376" | ||
| }, | ||
| "our-mission": { | ||
| "header": "Unsere Mission", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,13 +5,24 @@ | |
| "landing-page": { | ||
| "title": [ | ||
| { | ||
| "text": "We wanted to act. We found a way to do it. " | ||
| "text": "We had the option to do nothing. " | ||
| }, | ||
| { | ||
| "text": "Social Income was born.", | ||
| "text": "We decided against it.", | ||
| "color": "secondary" | ||
| } | ||
| ] | ||
| ], | ||
| "subtitle": "We believe that improving the lives of people in need is not just a possibility but a responsibility. That's how Social Income was born.", | ||
| "contact": "Contact Us", | ||
| "contact-title": "Get in touch", | ||
| "contact-email": "[email protected]", | ||
| "registration": "NGO Registration", | ||
| "registration-title": "Legal status", | ||
| "registration-foundation": "Social Income is a non-profit organization founded under Swiss law in 2019 with tax exempt status.", | ||
| "registration-uid": "UID: ", | ||
| "registration-uid-nr": "CHE-289.611.695", | ||
| "registration-duns": "DUNS: ", | ||
| "registration-duns-nr": "48-045-6376" | ||
| }, | ||
| "our-mission": { | ||
| "header": "Our Mission", | ||
|
|
@@ -54,7 +65,7 @@ | |
| "header": "Flow of Funds", | ||
| "title": [ | ||
| { | ||
| "text": "From Everywhere to the Global South " | ||
| "text": "From Everywhere to the Global South. " | ||
| }, | ||
| { | ||
| "text": "Safe, Fast, and Direct.", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 0 additions & 76 deletions
76
website/src/app/[lang]/[region]/(website)/about-us/(sections)/contact.tsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| import { WebsiteLanguage } from '@/i18n'; | ||
| import { Translator } from '@socialincome/shared/src/utils/i18n'; | ||
| import { BaseContainer, Typography } from '@socialincome/ui'; | ||
| import { Badge, BaseContainer, Button, Popover, PopoverContent, PopoverTrigger, Typography } from '@socialincome/ui'; | ||
| import { FontColor } from '@socialincome/ui/src/interfaces/color'; | ||
| import Image from 'next/image'; | ||
| import Link from 'next/link'; | ||
| import changeGif from '../(assets)/change.gif'; | ||
|
|
||
| export default async function LandingPage({ lang }: { lang: WebsiteLanguage }) { | ||
|
|
@@ -13,13 +14,88 @@ export default async function LandingPage({ lang }: { lang: WebsiteLanguage }) { | |
|
|
||
| return ( | ||
| <BaseContainer className="min-h-screen-navbar grid grid-cols-1 content-center items-center gap-16 md:grid-cols-5"> | ||
| <p className="mx-auto max-w-lg md:col-span-3"> | ||
| <div className="mx-auto max-w-lg space-y-5 md:col-span-3"> | ||
| {translator.t<{ text: string; color?: FontColor }[]>('landing-page.title').map((title, index) => ( | ||
| <Typography as="span" key={index} size="5xl" weight="bold" color={title.color}> | ||
| <Typography as="span" key={index} size="5xl" weight="bold" lineHeight="tight" color={title.color}> | ||
| {title.text} | ||
| </Typography> | ||
| ))} | ||
| </p> | ||
| <Typography size="2xl" lineHeight="normal"> | ||
| {translator.t('landing-page.subtitle')} | ||
| </Typography> | ||
| <div className="flex space-x-2 pt-5"> | ||
| <div> | ||
| <Popover> | ||
| <PopoverTrigger> | ||
| <Badge variant="muted"> | ||
| <Typography size="md" weight="normal" className="p-1"> | ||
| {translator.t('landing-page.contact')} | ||
| </Typography> | ||
| </Badge> | ||
| </PopoverTrigger> | ||
| <PopoverContent> | ||
| <div className="space-y-2"> | ||
| <Typography size="md" lineHeight="normal" weight="medium"> | ||
| {translator.t('landing-page.contact-title')} | ||
| </Typography> | ||
| <Link href="mailto:[email protected]"> | ||
| <Button variant="link" className="p-0"> | ||
| <Typography size="md" lineHeight="normal" weight="normal"> | ||
| {translator.t('landing-page.contact-email')} | ||
| </Typography> | ||
| </Button> | ||
| </Link> | ||
| </div> | ||
| </PopoverContent> | ||
| </Popover> | ||
| </div> | ||
| <div> | ||
| <Popover> | ||
| <PopoverTrigger> | ||
| <Badge variant="muted"> | ||
| <Typography size="md" weight="normal" className="p-1"> | ||
| {translator.t('landing-page.registration')} | ||
| </Typography> | ||
| </Badge> | ||
| </PopoverTrigger> | ||
| <PopoverContent> | ||
| <div className="space-y-2"> | ||
| <Typography size="md" lineHeight="normal" weight="medium"> | ||
| {translator.t('landing-page.registration-title')} | ||
| </Typography> | ||
| <Typography size="md" lineHeight="normal"> | ||
| {translator.t('landing-page.registration-foundation')} | ||
| </Typography> | ||
| <div className="flex items-center space-x-1"> | ||
| <Typography size="md" lineHeight="normal"> | ||
| {translator.t('landing-page.registration-uid')} | ||
| </Typography> | ||
| <Link href="https://www.uid.admin.ch/Detail.aspx?uid_id=CHE-289.611.695&lang=en" target="_blank"> | ||
| <Button variant="link" className="m-0 p-0"> | ||
| <Typography size="md" lineHeight="normal" weight="normal"> | ||
| {translator.t('landing-page.registration-uid-nr')} | ||
| </Typography> | ||
| </Button> | ||
| </Link> | ||
| </div> | ||
| <div className="flex items-center space-x-1"> | ||
| <Typography size="md" lineHeight="normal"> | ||
| {translator.t('landing-page.registration-duns')} | ||
| </Typography> | ||
| <Link href="https://www.dnb.com/duns/what-is-a-DUNS-number.html" target="_blank"> | ||
| <Button variant="link" className="p-0"> | ||
| <Typography size="md" lineHeight="normal" weight="normal"> | ||
| {translator.t('landing-page.registration-duns-nr')} | ||
| </Typography> | ||
| </Button> | ||
| </Link> | ||
| </div> | ||
| </div> | ||
| </PopoverContent> | ||
| </Popover> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <Image | ||
| className="mx-auto w-full max-w-lg md:order-first md:col-span-2" | ||
| src={changeGif} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.