stiftelsen-effekt · fellmirr · Jan 31, 2025 · Jan 31, 2025
diff --git a/components/main/blocks/BlockContentRenderer.tsx b/components/main/blocks/BlockContentRenderer.tsx
@@ -314,6 +314,7 @@ export const SectionBlockContentRenderer: React.FC<{ blocks: any }> = ({ blocks
               <InterventionWidget
                 key={block._key || block._id}
                 title={block.title}
+                description={block.description}
                 donationLabel={block.donation_label}
                 default_sum={block.default_sum}
                 outputConfiguration={block.output_configuration}

diff --git a/components/main/blocks/InterventionWidget/InterventionWidget.module.scss b/components/main/blocks/InterventionWidget/InterventionWidget.module.scss
@@ -2,17 +2,21 @@
   border-radius: 5px;
   width: 100%;
   margin-bottom: 30px;
+  max-width: 740px;
 }
 
 .wrapper h3 {
   margin-top: 50px;
   margin-bottom: 55px;
   text-align: left;
-  max-width: 740px;
   margin-left: auto;
   margin-right: auto;
 }
 
+.header {
+  margin-bottom: 4rem;
+}
+
 .grid {
   display: grid;
   grid-template-rows: max-content max-content;

diff --git a/components/main/blocks/InterventionWidget/InterventionWidget.tsx b/components/main/blocks/InterventionWidget/InterventionWidget.tsx
@@ -3,14 +3,14 @@ import styles from "./InterventionWidget.module.scss";
 import {
   InterventionWidgetOutput,
   InterventionWidgetOutputConfiguration,
-  SanityIntervention,
 } from "./InterventionWidgetOutput";
-import { LinkType } from "../Links/Links";
-import { NavLink } from "../../../shared/components/Navbar/Navbar";
+import { PortableText } from "next-sanity";
+import { customComponentRenderers } from "../Paragraph/Citation";
 
 export interface InterventionWidgetProps {
   default_sum: number;
   title: string;
+  description: any[];
   donationLabel?: string;
   outputConfiguration?: InterventionWidgetOutputConfiguration;
   /* From site settings */
@@ -21,6 +21,7 @@ export interface InterventionWidgetProps {
 export const InterventionWidget: React.FC<InterventionWidgetProps> = ({
   default_sum,
   title,
+  description,
   donationLabel,
   outputConfiguration,
   currency,
@@ -36,6 +37,9 @@ export const InterventionWidget: React.FC<InterventionWidgetProps> = ({
     <div className={styles.wrapper}>
       <div className={styles.header}>
         <h3>{title}</h3>
+        {description && (
+          <PortableText value={description} components={customComponentRenderers}></PortableText>
+        )}
       </div>
       <div className={styles.grid}>
         <div className={styles.input}>

diff --git a/components/main/blocks/Links/Links.tsx b/components/main/blocks/Links/Links.tsx
@@ -49,7 +49,6 @@ export const LinkComponent: React.FC<{
   return (
     <Link
       href={getHref(link, articlesPagePath)}
-      passHref
       target={link._type === "link" && link.newtab ? "_blank" : ""}
       onClick={(e) => {
         e.currentTarget.blur();

diff --git a/components/main/blocks/WealthCalculatorTeaser/WealthCalculatorTeaser.tsx b/components/main/blocks/WealthCalculatorTeaser/WealthCalculatorTeaser.tsx
@@ -86,7 +86,6 @@ export const WealthCalculatorTeaser: React.FC<{
                   ? `/${[...articlesPagePath, link.slug].join("/")}`
                   : `/${link.slug}`
               }
-              passHref
             >
               <EffektButton onClick={() => {}}>{link.title}</EffektButton>
             </Link>
@@ -126,7 +125,6 @@ export const WealthCalculatorTeaser: React.FC<{
               ? `/${[...articlesPagePath, link.slug].join("/")}`
               : `/${link.slug}`
           }
-          passHref
         >
           <EffektButton onClick={() => {}} fullWidth>
             {link.title}

diff --git a/components/main/layout/PreviewBlock/PreviewBlock.tsx b/components/main/layout/PreviewBlock/PreviewBlock.tsx
@@ -9,7 +9,7 @@ export const PreviewBlock: React.FC = () => {
       <Eye size={"0.8rem"} />
       <span>In preview</span>
       <span className={styles.divider}>|</span>
-      <Link href="/api/exit-preview" passHref className={styles.exitLink}>
+      <Link href="/api/exit-preview" className={styles.exitLink}>
         <span>Exit preview</span>
         <LogOut size={"0.8rem"} />
       </Link>

diff --git a/components/main/layout/RelatedArticles/ArticlePreview.tsx b/components/main/layout/RelatedArticles/ArticlePreview.tsx
@@ -12,12 +12,7 @@ export const ArticlePreview: React.FC<{
   const { articlesPagePath } = useRouterContext();
 
   return (
-    <Link
-      key={slug}
-      href={`/${[...articlesPagePath, slug].join("/")}`}
-      passHref
-      style={{ border: "none" }}
-    >
+    <Link key={slug} href={`/${[...articlesPagePath, slug].join("/")}`} style={{ border: "none" }}>
       <li className={styles.article}>
         {header.published && (
           <div className={styles.article__meta}>

diff --git a/components/main/layout/RelatedArticles/RelatedArticles.tsx b/components/main/layout/RelatedArticles/RelatedArticles.tsx
@@ -26,7 +26,7 @@ export const RelatedArticles: React.FC<{
       <div className={styles.header}>
         <h4>{relatedArticlesLabel}</h4>
         <div className={styles.viewall}>
-          <Link href={`/${articlesPagePath.join("/")}`} passHref>
+          <Link href={`/${articlesPagePath.join("/")}`}>
             <span>{seeAllArticlesLabel}</span>
             <div>→</div>
           </Link>

diff --git a/components/profile/details/DataInfo/DataInfo.tsx b/components/profile/details/DataInfo/DataInfo.tsx
@@ -1,7 +1,6 @@
 import Link from "next/link";
 import style from "./DataInfo.module.scss";
 import { PortableText } from "@portabletext/react";
-import { ProfilePageInfoConfiguration } from "../ProfileInfo/ProfileInfo";
 import { ProfilePage } from "../../../../pages/dashboard/ProfilePage";
 
 export const DataInfo: React.FC<{ page: ProfilePage }> = ({ page }) => {
@@ -13,15 +12,15 @@ export const DataInfo: React.FC<{ page: ProfilePage }> = ({ page }) => {
           <strong>{page.tax_subtitle}</strong>
           <PortableText value={page.tax} />
 
-          <Link href={page.tax_link ?? "/"} passHref target={"_blank"}>
+          <Link href={page.tax_link ?? "/"} target={"_blank"}>
             {page.read_more_label}→
           </Link>
         </section>
         <section className={style.privacy}>
           <strong>{page.data_subtitle}</strong>
           <PortableText value={page.data} />
 
-          <Link href={page.data_link ?? "/"} passHref target={"_blank"}>
+          <Link href={page.data_link ?? "/"} target={"_blank"}>
             {page.read_more_label}→
           </Link>
         </section>

diff --git a/components/profile/donations/YearMenu/YearMenu.tsx b/components/profile/donations/YearMenu/YearMenu.tsx
@@ -28,7 +28,6 @@ const DonationYearMenu: React.FC<{
           <CustomLink
             href={dashboardPath.join("/")}
             scroll={false}
-            passHref
             onClick={(e) => e.currentTarget.blur()}
           >
             <span>{totalTitle}</span>
@@ -47,7 +46,6 @@ const DonationYearMenu: React.FC<{
                 pathname: [...donationsPagePath!, year].join("/"),
               }}
               scroll={false}
-              passHref
               onClick={(e) => e.currentTarget.blur()}
             >
               <span>{year}</span>

diff --git a/components/profile/tax/TaxMenu/TaxMenu.tsx b/components/profile/tax/TaxMenu/TaxMenu.tsx
@@ -29,11 +29,7 @@ const TaxMenu: React.FC<{
 
             return (
               <li className={isSelected ? style["menu-selected"] : ""} key={c.slug.current}>
-                <CustomLink
-                  href={`${taxPagePath.join("/")}/${c.slug.current}`}
-                  passHref
-                  scroll={false}
-                >
+                <CustomLink href={`${taxPagePath.join("/")}/${c.slug.current}`} scroll={false}>
                   {c.title}
                 </CustomLink>
               </li>

diff --git a/components/shared/components/EffektButton/LinkButton.tsx b/components/shared/components/EffektButton/LinkButton.tsx
@@ -15,7 +15,6 @@ const LinkButton: React.FC<{
     <Link
       href={url}
       target={target}
-      passHref
       className={`${styles.button} ${
         type == "primary"
           ? styles.buttonprimary

diff --git a/components/shared/components/Navbar/Navbar.tsx b/components/shared/components/Navbar/Navbar.tsx
@@ -191,7 +191,6 @@ export const Navbar = withStaticProps(
             <div className={styles.logoWrapperImage}>
               <CustomLink
                 href="/"
-                passHref
                 onClick={(e) => e.currentTarget.blur()}
                 style={{
                   position: "relative",
@@ -212,7 +211,6 @@ export const Navbar = withStaticProps(
             <div className={styles.logoWrapperImage}>
               <CustomLink
                 href="/"
-                passHref
                 onClick={(e) => e.currentTarget.blur()}
                 style={{
                   position: "relative",
@@ -262,7 +260,6 @@ export const Navbar = withStaticProps(
                             <li key={subel.title} data-cy={`${subel.slug}-link`.replace(/ /g, "-")}>
                               <CustomLink
                                 href={[...(dashboard ? dashboardPath : []), subel.slug].join("/")}
-                                passHref
                                 onClick={(e) => {
                                   e.currentTarget.blur();
                                   setExpanded(false);
@@ -280,7 +277,6 @@ export const Navbar = withStaticProps(
               <li key={el._key} data-cy={`${el.slug}-link`}>
                 <CustomLink
                   href={[...(dashboard ? dashboardPath : []), el.slug].join("/")}
-                  passHref
                   onClick={() => setExpanded(false)}
                 >
                   {el.title}
@@ -300,7 +296,7 @@ export const Navbar = withStaticProps(
                 {labels.logout}
               </EffektButton>
             ) : (
-              <CustomLink href={dashboardPath.join("/")} passHref tabIndex={-1}>
+              <CustomLink href={dashboardPath.join("/")} tabIndex={-1}>
                 <EffektButton
                   variant={EffektButtonVariant.SECONDARY}
                   onClick={() => setExpanded(false)}

diff --git a/components/shared/components/Widget/components/panes/DonorPane/CustomCheckBox.tsx b/components/shared/components/Widget/components/panes/DonorPane/CustomCheckBox.tsx
@@ -45,7 +45,7 @@ export const CustomCheckBox: React.FC<CheckBoxProps> = ({
         <CheckBoxLabel>
           {`${label} `}
           {hyperlink && (
-            <Link href={hyperlink.url} passHref target="_blank">
+            <Link href={hyperlink.url} target="_blank">
               {`${hyperlink.text} ↗`}
             </Link>
           )}

diff --git a/components/shared/components/Widget/components/panes/DonorPane/DonorPane.tsx b/components/shared/components/Widget/components/panes/DonorPane/DonorPane.tsx
@@ -288,7 +288,6 @@ export const DonorPane: React.FC<{
                       {text.privacy_policy_text}{" "}
                       <Link
                         href={`/${text.privacy_policy_link.slug}`}
-                        passHref
                         target={"_blank"}
                         onClick={(e) => {
                           e.currentTarget.blur();

diff --git a/components/shared/layout/Footer/Footer.tsx b/components/shared/layout/Footer/Footer.tsx
@@ -89,7 +89,6 @@ const Footer = withStaticProps(async ({ draftMode = false }: { draftMode: boolea
                             ? `/${footerItem.slug}`
                             : footerItem.url || "/"
                         }
-                        passHref
                         target={footerItem._type === "link" && footerItem.newtab ? "_blank" : ""}
                       >
                         {footerItem.title}

diff --git a/next.config.js b/next.config.js
@@ -8,7 +8,7 @@ const STUDIO_REWRITE = {
   source: "/studio/:path*",
   destination:
     process.env.NODE_ENV === "development"
-      ? "http://localhost:3333/studio/:path*"
+      ? "http://127.0.0.1:3333/studio/:path*"
       : "/studio/index.html",
 };
 

diff --git a/studio/schemas/types/interventionwidget.ts b/studio/schemas/types/interventionwidget.ts
@@ -1,4 +1,5 @@
 import { Zap } from "react-feather";
+import { blocktype } from "./blockcontent";
 
 export default {
   name: "interventionwidget",
@@ -11,6 +12,12 @@ export default {
       type: "string",
       title: "Title",
     },
+    {
+      name: "description",
+      title: "Description",
+      type: "array",
+      of: [blocktype, { type: "latex" }],
+    },
     {
       name: "donation_label",
       type: "string",