From 7c57ef0edb908dc158c5758bb034a1c6032f11c3 Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Mon, 12 Aug 2024 12:27:40 -0500 Subject: [PATCH 1/8] build: remove OpenGraph service environment variable (#3915) --- .env | 1 - 1 file changed, 1 deletion(-) diff --git a/.env b/.env index 00937662e..0102e354f 100644 --- a/.env +++ b/.env @@ -6,7 +6,6 @@ NEXT_PUBLIC_POSTHOG_ID=phc_Y0xz6nK55MEwWjobJsI2P8rsiomZJ6eZLoXehmMy9tt NEXT_PUBLIC_CLOUD_NAME=dgxgziswe NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=test NEXT_PUBLIC_STRIPE_SUB_CANCEL_URL=https://billing.stripe.com/p/login/test_bIY8xy3iy6fpeHu3cc -NEXT_PUBLIC_OPENGRAPH_URL=https://beta.opengraph.opensauced.pizza/v1 SENTRY_DSN=https://3f5bb9023ff0407299dd22a6454558f9@o4504872488927232.ingest.sentry.io/4505082236960768 NEXT_PUBLIC_SENTRY_DSN=https://3f5bb9023ff0407299dd22a6454558f9@o4504872488927232.ingest.sentry.io/4505082236960768 From 9cdf87d808bde1bc43576abeac5ea151528a65cc Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Mon, 12 Aug 2024 17:40:54 +0000 Subject: [PATCH 2/8] chore(patch): release 2.54.0-beta.2 on beta channel [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.54.0-beta.2](https://github.com/open-sauced/app/compare/v2.54.0-beta.1...v2.54.0-beta.2) (2024-08-12) ### πŸ€– Build System * remove OpenGraph service environment variable ([#3915](https://github.com/open-sauced/app/issues/3915)) ([7c57ef0](https://github.com/open-sauced/app/commit/7c57ef0edb908dc158c5758bb034a1c6032f11c3)) --- CHANGELOG.md | 7 +++++++ npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5748c802..d061db9a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ > All notable changes to this project will be documented in this file +## [2.54.0-beta.2](https://github.com/open-sauced/app/compare/v2.54.0-beta.1...v2.54.0-beta.2) (2024-08-12) + + +### πŸ€– Build System + +* remove OpenGraph service environment variable ([#3915](https://github.com/open-sauced/app/issues/3915)) ([7c57ef0](https://github.com/open-sauced/app/commit/7c57ef0edb908dc158c5758bb034a1c6032f11c3)) + ## [2.54.0-beta.1](https://github.com/open-sauced/app/compare/v2.53.1-beta.2...v2.54.0-beta.1) (2024-08-12) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d4ea729b9..ff54158d8 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@open-sauced/app", - "version": "2.54.0-beta.1", + "version": "2.54.0-beta.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@open-sauced/app", - "version": "2.54.0-beta.1", + "version": "2.54.0-beta.2", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": { diff --git a/package.json b/package.json index 1cb027bb0..8ab235293 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@open-sauced/app", "description": "πŸ•The dashboard for open source discovery.", "keywords": [], - "version": "2.54.0-beta.1", + "version": "2.54.0-beta.2", "author": "Brian Douglas ", "private": true, "license": "Apache 2.0", From 91119222991a11874b08f1c1428054e43e1f9ad6 Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Mon, 12 Aug 2024 18:58:28 +0000 Subject: [PATCH 3/8] chore(patch): release 2.54.1-beta.1 on beta channel [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.54.1-beta.1](https://github.com/open-sauced/app/compare/v2.54.0...v2.54.1-beta.1) (2024-08-12) ### πŸ€– Build System * remove OpenGraph service environment variable ([#3915](https://github.com/open-sauced/app/issues/3915)) ([7c57ef0](https://github.com/open-sauced/app/commit/7c57ef0edb908dc158c5758bb034a1c6032f11c3)) --- CHANGELOG.md | 7 +++++++ npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eed601ed9..152b235c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ > All notable changes to this project will be documented in this file +## [2.54.1-beta.1](https://github.com/open-sauced/app/compare/v2.54.0...v2.54.1-beta.1) (2024-08-12) + + +### πŸ€– Build System + +* remove OpenGraph service environment variable ([#3915](https://github.com/open-sauced/app/issues/3915)) ([7c57ef0](https://github.com/open-sauced/app/commit/7c57ef0edb908dc158c5758bb034a1c6032f11c3)) + ## [2.54.0](https://github.com/open-sauced/app/compare/v2.53.0...v2.54.0) (2024-08-12) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 522d34b15..a68a3c51d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@open-sauced/app", - "version": "2.54.0", + "version": "2.54.1-beta.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@open-sauced/app", - "version": "2.54.0", + "version": "2.54.1-beta.1", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": { diff --git a/package.json b/package.json index 6c053cc65..e137f844e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@open-sauced/app", "description": "πŸ•The dashboard for open source discovery.", "keywords": [], - "version": "2.54.0", + "version": "2.54.1-beta.1", "author": "Brian Douglas ", "private": true, "license": "Apache 2.0", From 71e8b4ac419168d17e069fb17b5be790c66d87a3 Mon Sep 17 00:00:00 2001 From: Nick Taylor Date: Mon, 12 Aug 2024 16:19:40 -0400 Subject: [PATCH 4/8] feat: added a link to OSCR tooltips pointing to the OSCR docs (#3921) --- components/Contributors/Oscr.tsx | 24 +++++++++++++++++++ components/Tables/ContributorsTable.tsx | 4 ++-- components/atoms/Tooltip/tooltip.tsx | 2 +- .../contributor-profile-tab.tsx | 5 ++-- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/components/Contributors/Oscr.tsx b/components/Contributors/Oscr.tsx index 3c5852531..b83c7bf1c 100644 --- a/components/Contributors/Oscr.tsx +++ b/components/Contributors/Oscr.tsx @@ -1,6 +1,7 @@ import { LockIcon } from "@primer/octicons-react"; import { usePostHog } from "posthog-js/react"; import { useRouter } from "next/router"; +import { HiOutlineInformationCircle } from "react-icons/hi"; import Pill from "components/atoms/Pill/pill"; import Tooltip from "components/atoms/Tooltip/tooltip"; import Button from "components/shared/Button/button"; @@ -83,3 +84,26 @@ export const OscrButton = ({ rating, hideRating, signIn = DEFAULT_SIGN_IN, calcu ); }; + +export const OscrInfoTooltip = () => { + return ( + +

OSCR evaluates the engagement and impact of contributors across the entire open source ecosystem.

+ + + Learn more... + about OSCR rating + + + } + className="w-fit max-w-xs !text-sm shadow-lg text-slate-100 !px-4 !py-3 !rounded-xl" + > + + + ); +}; diff --git a/components/Tables/ContributorsTable.tsx b/components/Tables/ContributorsTable.tsx index 2e583ce92..16c1db0fc 100644 --- a/components/Tables/ContributorsTable.tsx +++ b/components/Tables/ContributorsTable.tsx @@ -22,7 +22,7 @@ import Avatar from "components/atoms/Avatar/avatar"; import { getAvatarByUsername } from "lib/utils/github"; import HoverCardWrapper from "components/molecules/HoverCardWrapper/hover-card-wrapper"; import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "components/shared/Table"; -import { OscrPill } from "components/Contributors/Oscr"; +import { OscrInfoTooltip, OscrPill } from "components/Contributors/Oscr"; import { useMediaQuery } from "lib/hooks/useMediaQuery"; import { setQueryParams } from "lib/utils/query-params"; import Pagination from "components/molecules/Pagination/pagination"; @@ -212,7 +212,7 @@ const mobileColumns = ({ isLoggedIn }: { isLoggedIn: boolean }) => [ header: () => (

OSCR

- +
), enableSorting: true, diff --git a/components/atoms/Tooltip/tooltip.tsx b/components/atoms/Tooltip/tooltip.tsx index f468bd7de..417c8a3db 100644 --- a/components/atoms/Tooltip/tooltip.tsx +++ b/components/atoms/Tooltip/tooltip.tsx @@ -4,7 +4,7 @@ import clsx from "clsx"; interface TooltipProps { children: React.ReactNode; - content: string; + content: React.ReactNode; direction?: "top" | "right" | "left" | "bottom"; delay?: number; className?: string; diff --git a/components/organisms/ContributorProfileTab/contributor-profile-tab.tsx b/components/organisms/ContributorProfileTab/contributor-profile-tab.tsx index ba77cb771..b608c167c 100644 --- a/components/organisms/ContributorProfileTab/contributor-profile-tab.tsx +++ b/components/organisms/ContributorProfileTab/contributor-profile-tab.tsx @@ -37,8 +37,7 @@ import { DayRangePicker } from "components/shared/DayRangePicker"; import IssueCommentsTable from "components/Profiles/IssueCommentsTable/issue-comments-table"; import { contributionsOptions, useContributionsFilter } from "components/Profiles/contributors-sub-tab-list"; import { SubTabsList } from "components/TabList/tab-list"; -import { OscrButton } from "components/Contributors/Oscr"; -import InfoTooltip from "components/shared/InfoTooltip"; +import { OscrButton, OscrInfoTooltip } from "components/Contributors/Oscr"; import { INITIAL_DEV_STATS_TIMESTAMP } from "lib/utils/devStats"; import UserRepositoryRecommendations from "../UserRepositoryRecommendations/user-repository-recommendations"; @@ -375,7 +374,7 @@ const ContributorProfileTab = ({ OSCR Rating - +
From 33fc634d44d8e3139e5e75abcf4e72d66a83f540 Mon Sep 17 00:00:00 2001 From: Nick Taylor Date: Mon, 12 Aug 2024 20:32:21 +0000 Subject: [PATCH 5/8] chore(minor): release 2.55.0-beta.1 on beta channel [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.55.0-beta.1](https://github.com/open-sauced/app/compare/v2.54.1-beta.1...v2.55.0-beta.1) (2024-08-12) ### πŸ• Features * added a link to OSCR tooltips pointing to the OSCR docs ([#3921](https://github.com/open-sauced/app/issues/3921)) ([71e8b4a](https://github.com/open-sauced/app/commit/71e8b4ac419168d17e069fb17b5be790c66d87a3)) --- CHANGELOG.md | 7 +++++++ npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 152b235c9..d6638022c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ > All notable changes to this project will be documented in this file +## [2.55.0-beta.1](https://github.com/open-sauced/app/compare/v2.54.1-beta.1...v2.55.0-beta.1) (2024-08-12) + + +### πŸ• Features + +* added a link to OSCR tooltips pointing to the OSCR docs ([#3921](https://github.com/open-sauced/app/issues/3921)) ([71e8b4a](https://github.com/open-sauced/app/commit/71e8b4ac419168d17e069fb17b5be790c66d87a3)) + ## [2.54.1-beta.1](https://github.com/open-sauced/app/compare/v2.54.0...v2.54.1-beta.1) (2024-08-12) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a68a3c51d..93f3f0591 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@open-sauced/app", - "version": "2.54.1-beta.1", + "version": "2.55.0-beta.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@open-sauced/app", - "version": "2.54.1-beta.1", + "version": "2.55.0-beta.1", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": { diff --git a/package.json b/package.json index e137f844e..9d1682ebb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@open-sauced/app", "description": "πŸ•The dashboard for open source discovery.", "keywords": [], - "version": "2.54.1-beta.1", + "version": "2.55.0-beta.1", "author": "Brian Douglas ", "private": true, "license": "Apache 2.0", From 4337ec3cf4f04638ecd1a127803b4d0f258d77ac Mon Sep 17 00:00:00 2001 From: Nick Taylor Date: Mon, 12 Aug 2024 16:29:49 -0400 Subject: [PATCH 6/8] fix: toggling hide bots for yolo coders no longer causes page jumps (#3911) --- pages/s/[org]/[repo]/index.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pages/s/[org]/[repo]/index.tsx b/pages/s/[org]/[repo]/index.tsx index c43e2cec4..713654c82 100644 --- a/pages/s/[org]/[repo]/index.tsx +++ b/pages/s/[org]/[repo]/index.tsx @@ -4,7 +4,7 @@ import { HiOutlineExternalLink } from "react-icons/hi"; import { FaBalanceScale } from "react-icons/fa"; import { FaRegClock } from "react-icons/fa6"; -import { useEffect, useMemo, useState } from "react"; +import { useMemo, useState } from "react"; import dynamic from "next/dynamic"; import { useRouter } from "next/router"; import { usePostHog } from "posthog-js/react"; @@ -43,6 +43,7 @@ import RossChart from "components/Repositories/RossChart"; import YoloChart from "components/Repositories/YoloChart"; import LanguagePill, { getLanguageTopic } from "components/shared/LanguagePill/LanguagePill"; import OssfChart from "components/Repositories/OssfChart"; +import { setQueryParams } from "lib/utils/query-params"; const AddToWorkspaceModal = dynamic(() => import("components/Repositories/AddToWorkspaceModal"), { ssr: false, @@ -96,9 +97,7 @@ export default function RepoPage({ repoData, ogImageUrl }: RepoPageProps) { const isMobile = useMediaQuery("(max-width: 576px)"); const avatarUrl = getAvatarByUsername(repoData.full_name.split("/")[0], 96); const [lotteryState, setLotteryState] = useState<"lottery" | "yolo">("lottery"); - const [yoloHideBots, setYoloHideBots] = useState( - router.query.hideBots ? (router.query.hideBots === "true" ? true : false) : false - ); + const yoloHideBots = router.query.hideBots === "true"; const [isAddToWorkspaceModalOpen, setIsAddToWorkspaceModalOpen] = useState(false); const range = (router.query.range ? Number(router.query.range) : 30) as Range; const tabList = [ @@ -106,9 +105,9 @@ export default function RepoPage({ repoData, ogImageUrl }: RepoPageProps) { { name: "Contributors", path: "contributors" }, ]; - useEffect(() => { - router.push({ query: { ...router.query, hideBots: yoloHideBots } }); - }, [yoloHideBots]); + function setYoloHideBots(value: boolean) { + setQueryParams({ hideBots: `${value}` }); + } const { data: starsData, From 42e266808a1d3e859ca0d7070fa586d4bb344afd Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Mon, 12 Aug 2024 15:38:54 -0500 Subject: [PATCH 7/8] fix: re-enable newsletter form on Netlify (#3919) --- .../newsletter-form.stories.tsx | 6 +-- .../NewsletterForm/newsletter-form.tsx | 39 ++----------------- pages/feed/index.tsx | 6 +-- public/__newsletter.html | 9 +++++ 4 files changed, 18 insertions(+), 42 deletions(-) create mode 100644 public/__newsletter.html diff --git a/components/molecules/NewsletterForm/newsletter-form.stories.tsx b/components/molecules/NewsletterForm/newsletter-form.stories.tsx index a811e83bc..cab6a3069 100644 --- a/components/molecules/NewsletterForm/newsletter-form.stories.tsx +++ b/components/molecules/NewsletterForm/newsletter-form.stories.tsx @@ -1,12 +1,12 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; -import NewsletterLink from "components/molecules/NewsletterForm/newsletter-form"; +import NewsletterForm from "components/molecules/NewsletterForm/newsletter-form"; const storyConfig = { title: "Design System/Molecules/NewsletterForm", -} as ComponentMeta; +} as ComponentMeta; export default storyConfig; -const NewsletterFormTemplate: ComponentStory = (args) => ; +const NewsletterFormTemplate: ComponentStory = (args) => ; export const Default = NewsletterFormTemplate.bind({}); diff --git a/components/molecules/NewsletterForm/newsletter-form.tsx b/components/molecules/NewsletterForm/newsletter-form.tsx index adb122758..6a04aba7d 100644 --- a/components/molecules/NewsletterForm/newsletter-form.tsx +++ b/components/molecules/NewsletterForm/newsletter-form.tsx @@ -38,7 +38,7 @@ const NewsletterForm = () => { setLoading(true); try { - const res = await fetch("/", { + const res = await fetch("/__newsletter.html", { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded" }, body: new URLSearchParams(formData).toString(), @@ -87,14 +87,7 @@ const NewsletterForm = () => { Stay up to date with the latest OpenSauced news and trends!

-
+ diff --git a/public/__newsletter.html b/public/__newsletter.html new file mode 100644 index 000000000..18b82dc4c --- /dev/null +++ b/public/__newsletter.html @@ -0,0 +1,9 @@ + + + + + + +
+ + From 19ac0e66a90fc536356d016b1ccfe26202d56393 Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Mon, 12 Aug 2024 20:51:49 +0000 Subject: [PATCH 8/8] chore(patch): release 2.55.0-beta.2 on beta channel [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.55.0-beta.2](https://github.com/open-sauced/app/compare/v2.55.0-beta.1...v2.55.0-beta.2) (2024-08-12) ### πŸ› Bug Fixes * re-enable newsletter form on Netlify ([#3919](https://github.com/open-sauced/app/issues/3919)) ([42e2668](https://github.com/open-sauced/app/commit/42e266808a1d3e859ca0d7070fa586d4bb344afd)) * toggling hide bots for yolo coders no longer causes page jumps ([#3911](https://github.com/open-sauced/app/issues/3911)) ([4337ec3](https://github.com/open-sauced/app/commit/4337ec3cf4f04638ecd1a127803b4d0f258d77ac)) --- CHANGELOG.md | 8 ++++++++ npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6638022c..887589fd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ > All notable changes to this project will be documented in this file +## [2.55.0-beta.2](https://github.com/open-sauced/app/compare/v2.55.0-beta.1...v2.55.0-beta.2) (2024-08-12) + + +### πŸ› Bug Fixes + +* re-enable newsletter form on Netlify ([#3919](https://github.com/open-sauced/app/issues/3919)) ([42e2668](https://github.com/open-sauced/app/commit/42e266808a1d3e859ca0d7070fa586d4bb344afd)) +* toggling hide bots for yolo coders no longer causes page jumps ([#3911](https://github.com/open-sauced/app/issues/3911)) ([4337ec3](https://github.com/open-sauced/app/commit/4337ec3cf4f04638ecd1a127803b4d0f258d77ac)) + ## [2.55.0-beta.1](https://github.com/open-sauced/app/compare/v2.54.1-beta.1...v2.55.0-beta.1) (2024-08-12) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 93f3f0591..4922ff319 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@open-sauced/app", - "version": "2.55.0-beta.1", + "version": "2.55.0-beta.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@open-sauced/app", - "version": "2.55.0-beta.1", + "version": "2.55.0-beta.2", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": { diff --git a/package.json b/package.json index 9d1682ebb..a62ba4c20 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@open-sauced/app", "description": "πŸ•The dashboard for open source discovery.", "keywords": [], - "version": "2.55.0-beta.1", + "version": "2.55.0-beta.2", "author": "Brian Douglas ", "private": true, "license": "Apache 2.0",