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.

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

fix: Removes NewsletterForm usage in favor of sole link to newsletter #3897

Merged
merged 2 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import NewsletterForm from "components/molecules/NewsletterForm/newsletter-form";
import NewsletterLink from "components/molecules/NewsletterForm/newsletter-form";

const storyConfig = {
title: "Design System/Molecules/NewsletterForm",
} as ComponentMeta<typeof NewsletterForm>;
} as ComponentMeta<typeof NewsletterLink>;

export default storyConfig;

const NewsletterFormTemplate: ComponentStory<typeof NewsletterForm> = (args) => <NewsletterForm />;
const NewsletterFormTemplate: ComponentStory<typeof NewsletterLink> = (args) => <NewsletterLink />;

export const Default = NewsletterFormTemplate.bind({});
38 changes: 37 additions & 1 deletion components/molecules/NewsletterForm/newsletter-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ import TextInput from "components/atoms/TextInput/text-input";
import SaucedLogo from "img/fallbackImageColor.svg";
import { validateEmail } from "lib/utils/validate-email";

/*
* cursed: this form needs a refactor as it won't actually subscribe the user to
* the newsletter while still returning success. This is related to breaking changes
* with how Next works with Netlify forms: https://docs.netlify.com/frameworks/next-js/overview/#breaking-changes
*
* For now, use NewsletterLink which is a simple link off to the ghost.io blog directly.
*
* related to: https://github.com/open-sauced/app/issues/3796
*/

const NewsletterForm = () => {
const [loading, setLoading] = useState(false);
const [email, setEmail] = useState("");
Expand Down Expand Up @@ -127,4 +137,30 @@ const NewsletterForm = () => {
);
};

export default NewsletterForm;
const NewsletterLink = () => {
return (
<aside
aria-labelledby="subscribe-to-newsletter"
className="newsletter-wrap flex flex-col w-full gap-3 p-6 pt-5 border rounded-lg bg-light-slate-1"
>
<div className="w-64 space-y-1">
<h2 className="text-lg" id="subscribe-to-newsletter">
Subscribe to our newsletter
</h2>
<p className="text-sm font-normal text-light-slate-11">
Stay up to date with the latest OpenSauced news and trends!
</p>
</div>
<a
href="https://news.opensauced.pizza/#/portal/signup"
target="_blank"
className="flex flex-none justify-center py-1 border-light-orange-7 text-light-orange-10 px-2"
type="button"
>
Subscribe
</a>
</aside>
);
};

export default NewsletterLink;
6 changes: 3 additions & 3 deletions pages/feed/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import Pagination from "components/molecules/Pagination/pagination";
import PaginationResults from "components/molecules/PaginationResults/pagination-result";
import FollowingHighlightWrapper from "components/organisms/FollowersHighlightWrapper/following-highlight-wrapper";
import HomeHighlightsWrapper from "components/organisms/HomeHighlightsWrapper/home-highlights-wrapper";
import NewsletterForm from "components/molecules/NewsletterForm/newsletter-form";
import NewsletterLink from "components/molecules/NewsletterForm/newsletter-form";
import UserCard, { MetaObj } from "components/atoms/UserCard/user-card";
import FeaturedHighlightsPanel from "components/molecules/FeaturedHighlightsPanel/featured-highlights-panel";
import AnnouncementCard from "components/molecules/AnnouncementCard/announcement-card";
Expand Down Expand Up @@ -165,7 +165,7 @@ export default function Feeds(props: HighlightSSRProps) {
twitterCard="summary_large_image"
/>
<div className="hidden">
<NewsletterForm />
<NewsletterLink />
</div>
</>
);
Expand Down Expand Up @@ -361,7 +361,7 @@ export default function Feeds(props: HighlightSSRProps) {
{featuredHighlights && featuredHighlights.length > 0 && (
<FeaturedHighlightsPanel highlights={featuredHighlights} />
)}
<NewsletterForm />
<NewsletterLink />
</div>
</div>
</WorkspaceLayout>
Expand Down
Loading