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

Feat/homepage add ons #1822

Merged
merged 13 commits into from
Nov 13, 2024
Merged

Feat/homepage add ons #1822

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a8ffb48
feat: Added a Bug Report Component
noahonyejese Nov 8, 2024
a75610b
feat: Added a Newsletter Component
noahonyejese Nov 8, 2024
fa7a526
feat: Added BugReport and Newsletter Comps. to statics
noahonyejese Nov 8, 2024
1a71e8e
fix: Improved translations and design a bit
noahonyejese Nov 8, 2024
ed88e37
feat: Implemented Design for Bug Report & Newsletter
noahonyejese Nov 11, 2024
605629e
fix: Fixed Mobile view based on design
noahonyejese Nov 11, 2024
81c2168
fix: Removed bottom margin
noahonyejese Nov 11, 2024
bb07777
feat: Introduce FeatureRequest & Email prefill
noahonyejese Nov 12, 2024
7e39d70
fix: Adjust Email body formatting
noahonyejese Nov 12, 2024
67a325e
fix: Fixed all adjustments from @bprusinowski & @KerstinFaye
noahonyejese Nov 12, 2024
e51931a
fix: Fixed Remaining issues
noahonyejese Nov 12, 2024
75b0f9d
fix: Fixed translations
noahonyejese Nov 13, 2024
1569f9f
fix: Translation Requests
noahonyejese Nov 13, 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
4 changes: 2 additions & 2 deletions app/docs/homepage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ const HomepageStory = {

<Section
sx={{
color: "gray.800",
color: "grey.800",
}}
>
<BugReport
headline="Found a bug?"
description="Please report the bug, so can fix it as soon as possible"
description="Please report the bug, so can fix it as soon as possible."
buttonLabel="Report a bug"
buttonUrl={createMailtoLink("en", {
recipients: {
Expand Down
4 changes: 2 additions & 2 deletions app/homepage/bug-report.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export const BugReport = ({
>
<Typography
sx={{
fontSize: ["1.5rem", "1.5rem", "2rem"],
lineHeight: ["2.5rem", "2.5rem", "3rem"],
fontSize: ["1.125rem", "1.125rem", "1.5rem"],
lineHeight: ["1.75rem", "1.75rem", "2rem"],
}}
>
{headline}
Expand Down
4 changes: 2 additions & 2 deletions app/homepage/contribute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export const Contribute = ({
>
<Typography
sx={{
fontSize: ["1.5rem", "1.5rem", "2rem"],
lineHeight: ["2.5rem", "2.5rem", "3rem"],
fontSize: ["1.125rem", "1.125rem", "1.5rem"],
lineHeight: ["1.75rem", "1.75rem", "2rem"],
}}
>
{headline}
Expand Down
4 changes: 2 additions & 2 deletions app/homepage/feature-request.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export const FeatureRequest = ({
>
<Typography
sx={{
fontSize: ["1.5rem", "1.5rem", "2rem"],
lineHeight: ["2.5rem", "2.5rem", "3rem"],
fontSize: ["1.125rem", "1.125rem", "1.5rem"],
lineHeight: ["1.75rem", "1.75rem", "2rem"],
}}
>
{headline}
Expand Down
4 changes: 2 additions & 2 deletions app/homepage/newsletter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export const Newsletter = ({
>
<Typography
sx={{
fontSize: ["1.5rem", "1.5rem", "2rem"],
lineHeight: ["2.5rem", "2.5rem", "3rem"],
fontSize: ["1.125rem", "1.125rem", "1.5rem"],
lineHeight: ["1.75rem", "1.75rem", "2rem"],
}}
>
{headline}
Expand Down
28 changes: 16 additions & 12 deletions app/static-pages/de/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { bugReportTemplates } from "@/templates/email/bug-report";
import { featureRequestTemplates } from "@/templates/email/feature-request";

import { Divider } from "@mui/material";
import { createMailtoLink } from "../../../app/templates/email";
import {
BAFU_VISUALIZE_EMAIL,
IXT_SUPPORT_EMAIL,
} from "../../../app/templates/email/config";

export const contentId = "home";

Expand Down Expand Up @@ -30,40 +34,40 @@ export const contentId = "home";
buttonLabel="Mehr erfahren"
buttonUrl="https://lindas.admin.ch/?lang=de"
/>
<div style={{ width: "1px", backgroundColor: "#e5e5e5" }}></div>
<Divider />
<Newsletter
headline="Abonnieren Sie unseren Newsletter"
headline="Newsletter abonnieren"
description="Bleiben Sie auf dem Laufenden und abonnieren Sie unseren Newsletter, indem Sie Ihre E-Mail-Adresse unten hinzufügen."
buttonLabel="Abonnieren"
buttonUrl="mailto:[email protected]"
buttonUrl={BAFU_VISUALIZE_EMAIL}
/>
</Section>
<Section
sx={{
color: "gray.800",
color: "grey.800",
}}
>
<BugReport
headline="Einen Fehler gefunden?"
headline="Fehler melden"
description="Bitte melden Sie uns den Fehler, damit wir ihn so schnell wie möglich beheben können."
buttonLabel="Fehler melden"
buttonUrl={createMailtoLink("de", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: bugReportTemplates,
})}
/>
<div style={{ width: "1px", backgroundColor: "#cccccc" }}></div>
<Divider />
<FeatureRequest
headline="Neue Funktion anfordern"
headline="Neue Funktion wünschen"
description="Senden Sie uns Ihre Funktionsanfragen und helfen Sie, die Zukunft unserer Plattform zu gestalten!"
buttonLabel="Einreichen"
buttonUrl={createMailtoLink("de", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: featureRequestTemplates,
})}
Expand Down
22 changes: 13 additions & 9 deletions app/static-pages/en/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { bugReportTemplates } from "@/templates/email/bug-report";
import { featureRequestTemplates } from "@/templates/email/feature-request";

import { Divider } from "@mui/material";
import { createMailtoLink } from "../../../app/templates/email";
import {
BAFU_VISUALIZE_EMAIL,
IXT_SUPPORT_EMAIL,
} from "../../../app/templates/email/config";

export const contentId = "home";

Expand Down Expand Up @@ -30,17 +34,17 @@ export const contentId = "home";
buttonLabel="Learn how"
buttonUrl="https://lindas.admin.ch/?lang=en"
/>
<div style={{ width: "1px", backgroundColor: "#e5e5e5" }}></div>
<Divider />
<Newsletter
headline="Subscribe to our Newsletter"
description="Stay up to day and subscribe to our newsletter by adding your email address below."
buttonLabel="Subscribe"
buttonUrl="mailto:[email protected]"
buttonUrl={BAFU_VISUALIZE_EMAIL}
/>
</Section>
<Section
sx={{
color: "gray.800",
color: "grey.800",
}}
>
<BugReport
Expand All @@ -49,21 +53,21 @@ export const contentId = "home";
buttonLabel="Report a bug"
buttonUrl={createMailtoLink("en", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: bugReportTemplates,
})}
/>
<div style={{ width: "1px", backgroundColor: "#cccccc" }}></div>
<Divider />
<FeatureRequest
headline="New feature request"
description="Submit your feature requests today and help shape the future of our platform!"
buttonLabel="Submit"
buttonUrl={createMailtoLink("en", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: featureRequestTemplates,
})}
Expand Down
22 changes: 13 additions & 9 deletions app/static-pages/fr/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { bugReportTemplates } from "@/templates/email/bug-report";
import { featureRequestTemplates } from "@/templates/email/feature-request";

import { Divider } from "@mui/material";
import { createMailtoLink } from "../../../app/templates/email";
import {
BAFU_VISUALIZE_EMAIL,
IXT_SUPPORT_EMAIL,
} from "../../../app/templates/email/config";

export const contentId = "home";

Expand Down Expand Up @@ -30,17 +34,17 @@ export const contentId = "home";
buttonLabel="En savoir plus"
buttonUrl="https://lindas.admin.ch/?lang=fr"
/>
<div style={{ width: "1px", backgroundColor: "#e5e5e5" }}></div>
<Divider />
<Newsletter
headline="S'abonner à notre newsletter"
description="Restez informé en vous abonnant à notre newsletter en ajoutant votre adresse e-mail ci-dessous."
buttonLabel="S'abonner"
buttonUrl="mailto:[email protected]"
buttonUrl={BAFU_VISUALIZE_EMAIL}
/>
</Section>
<Section
sx={{
color: "gray.800",
color: "grey.800",
}}
>
<BugReport
Expand All @@ -49,21 +53,21 @@ export const contentId = "home";
buttonLabel="Signaler un bug"
buttonUrl={createMailtoLink("fr", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: bugReportTemplates,
})}
/>
<div style={{ width: "1px", backgroundColor: "#cccccc" }}></div>
<Divider />
<FeatureRequest
headline="Nouvelle demande de fonctionnalité"
description="Envoyez-nous vos demandes de fonctionnalités dès aujourd'hui et aidez à façonner l'avenir de notre plateforme!"
buttonLabel="Soumettre"
buttonUrl={createMailtoLink("fr", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: featureRequestTemplates,
})}
Expand Down
21 changes: 13 additions & 8 deletions app/static-pages/it/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { bugReportTemplates } from "@/templates/email/bug-report";
import { featureRequestTemplates } from "@/templates/email/feature-request";
import { Divider } from "@mui/material";

import { createMailtoLink } from "../../../app/templates/email";
import {
BAFU_VISUALIZE_EMAIL,
IXT_SUPPORT_EMAIL,
} from "../../../app/templates/email/config";

export const contentId = "home";

Expand Down Expand Up @@ -30,17 +35,17 @@ export const contentId = "home";
buttonLabel="Scopri come farlo"
buttonUrl="https://lindas.admin.ch/?lang=it"
/>
<div style={{ width: "1px", backgroundColor: "#e5e5e5" }}></div>
<Divider />
<Newsletter
headline="Iscriviti alla nostra newsletter"
description="Resta aggiornato e iscriviti alla nostra newsletter inserendo il tuo indirizzo email qui sotto."
buttonLabel="Iscriviti"
buttonUrl="mailto:[email protected]"
buttonUrl={BAFU_VISUALIZE_EMAIL}
/>
</Section>
<Section
sx={{
color: "gray.800",
color: "grey.800",
}}
>
<BugReport
Expand All @@ -49,21 +54,21 @@ export const contentId = "home";
buttonLabel="Segnala un bug"
buttonUrl={createMailtoLink("it", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: bugReportTemplates,
})}
/>
<div style={{ width: "1px", backgroundColor: "#cccccc" }}></div>
<Divider />
<FeatureRequest
headline="Richiesta di nuove funzionalità"
description="Invia le tue richieste di funzionalità oggi stesso e aiutaci a plasmare il futuro della nostra piattaforma!"
buttonLabel="Invia"
buttonUrl={createMailtoLink("it", {
recipients: {
to: "[email protected]",
cc: "[email protected]",
to: BAFU_VISUALIZE_EMAIL,
cc: IXT_SUPPORT_EMAIL,
},
template: featureRequestTemplates,
})}
Expand Down
16 changes: 8 additions & 8 deletions app/templates/email/bug-report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const bugReportTemplates = {
en: `
Describe the bug
Describe the bug (https://cube-validator.lindas.admin.ch/select)
noahonyejese marked this conversation as resolved.
Show resolved Hide resolved
A clear and concise description of what the bug is. If it seems connected to some data problem (missing values, wrong parsing), please first check the cube in Cube Validator to see if everything is fine there.
noahonyejese marked this conversation as resolved.
Show resolved Hide resolved
Please describe...

Expand All @@ -24,7 +24,7 @@ If applicable, add screenshots or a short video to help put your problem into a
----------------------------------------------
Environment
Please complete the following information.
- Visualize environment and version: [e.g., INT v3.12.0]
- Visualize environment and version: [e.g., INT v4.9.4]
- Browser and version [e.g., Chrome 107]

----------------------------------------------
Expand All @@ -34,7 +34,7 @@ Please describe...
`,

de: `
Fehlermeldung
Fehlermeldung (https://cube-validator.lindas.admin.ch/select)

----------------------------------------------
Beschreiben Sie den Fehler
Expand All @@ -61,7 +61,7 @@ Falls zutreffend, fügen Sie Screenshots oder ein kurzes Video hinzu, um Ihr Pro
----------------------------------------------
Umgebung
Bitte vervollständigen Sie die folgenden Informationen.
- Visualize-Umgebung und Version: [z.B., INT v3.12.0]
- Visualize-Umgebung und Version: [z.B., INT v4.9.4]
- Browser und Version [z.B., Chrome 107]

----------------------------------------------
Expand All @@ -71,7 +71,7 @@ Bitte beschreiben Sie...
`,

fr: `
Description du bug
Description du bug (https://cube-validator.lindas.admin.ch/select)
Une description claire et concise du bug. S'il semble lié à un problème de données (valeurs manquantes, analyse incorrecte), veuillez d'abord vérifier le cube dans le Cube Validator pour vous assurer que tout y est correct.
Veuillez décrire...

Expand All @@ -95,7 +95,7 @@ Le cas échéant, ajoutez des captures d'écran ou une courte vidéo pour mettre
----------------------------------------------
Environnement
Veuillez compléter les informations suivantes.
- Environnement et version Visualize : [ex. INT v3.12.0]
- Environnement et version Visualize : [ex. INT v4.9.4]
- Navigateur et version [ex. Chrome 107]

----------------------------------------------
Expand All @@ -105,7 +105,7 @@ Veuillez décrire...
`,

it: `
Descrizione del bug
Descrizione del bug (https://cube-validator.lindas.admin.ch/select)
Una descrizione chiara e concisa del bug. Se sembra collegato a un problema di dati (valori mancanti, analisi errata), controllare prima il cubo nel Cube Validator per assicurarsi che tutto sia a posto.
Si prega di descrivere...

Expand All @@ -129,7 +129,7 @@ Se applicabile, aggiungere screenshot o un breve video per contestualizzare il p
----------------------------------------------
Ambiente
Si prega di completare le seguenti informazioni.
- Ambiente e versione Visualize: [es. INT v3.12.0]
- Ambiente e versione Visualize: [es. INT v4.9.4]
- Browser e versione [es. Chrome 107]

----------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions app/templates/email/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const BAFU_VISUALIZE_EMAIL = "[email protected]"
export const IXT_SUPPORT_EMAIL = "[email protected]"
noahonyejese marked this conversation as resolved.
Show resolved Hide resolved
Loading