Merge branch 'main' into experiment-onestop-composer

Author: tsahimatsliah

packages/shared/src/features/hackathon/components/HackathonHero.tsx

@@ -28,7 +28,7 @@ export const HackathonHero = (): ReactElement => {
         </Typography>
       </FlexRow>
       <img
-        src={fromCDN('/assets/hackathon-og.png')}
+        src={fromCDN('/assets/hackathon-og.png?v=2')}
         alt="daily.dev Hackathon"
         className="w-full max-w-2xl rounded-16"
       />

packages/shared/src/features/hackathon/components/HackathonHowItWorks.tsx

@@ -45,8 +45,13 @@ export const HackathonHowItWorks = (): ReactElement => {
               daily.dev Plus
             </a>
           </Link>{' '}
-          with all the benefits for best submissions. Winning projects featured
-          on daily.dev and social media.
+          with all the benefits for best submissions.{' '}
+          <Link href="https://www.coderabbit.ai/pricing">
+            <a target="_blank" className="text-[#FF570A] underline">
+              3 free months of CodeRabbit Pro Plus.
+            </a>
+          </Link>{' '}
+          Winning projects featured on daily.dev and social media.
         </Typography>
       </FlexCol>
 

packages/shared/src/features/onboarding/steps/FunnelOrganicSignup.tsx

@@ -78,7 +78,9 @@ export const FunnelOrganicSignup = withIsActiveGuard(
     const [authDisplay, setAuthDisplay] = useState(
       AuthDisplay.OnboardingSignup,
     );
-    const isEmailSignupActive = authDisplay === AuthDisplay.Registration;
+    const isEmailSignupActive =
+      authDisplay === AuthDisplay.Registration ||
+      authDisplay === AuthDisplay.EmailVerification;
     const isSocialSignupActive =
       isAuthReady &&
       isLoggedIn &&

packages/webapp/__tests__/TagPage.tsx

@@ -1,5 +1,6 @@
 import type { FeedData } from '@dailydotdev/shared/src/graphql/posts';
 import { TAG_FEED_QUERY } from '@dailydotdev/shared/src/graphql/feed';
+import { PostType } from '@dailydotdev/shared/src/graphql/posts';
 import nock from 'nock';
 import AuthContext from '@dailydotdev/shared/src/contexts/AuthContext';
 import React from 'react';
@@ -69,6 +70,14 @@ afterEach(() => {
   jest.clearAllMocks();
 });
 
+const tagFeedSupportedTypes = [
+  PostType.Article,
+  PostType.VideoYouTube,
+  PostType.Collection,
+  PostType.Share,
+  PostType.Freeform,
+];
+
 const createFeedMock = (
   page = defaultFeedPage,
   query: string = TAG_FEED_QUERY,
@@ -78,6 +87,7 @@ const createFeedMock = (
     loggedIn: true,
     tag: 'react',
     ranking: 'TIME',
+    supportedTypes: tagFeedSupportedTypes,
   },
 ): MockedGraphQLResponse<FeedData> => ({
   request: {
@@ -264,6 +274,7 @@ it('should show follow and block buttons when logged-out', async () => {
         loggedIn: false,
         tag: 'react',
         ranking: 'TIME',
+        supportedTypes: tagFeedSupportedTypes,
       }),
     ],
     null,
@@ -284,6 +295,7 @@ it('should show login popup when logged-out on follow click', async () => {
         loggedIn: false,
         tag: 'react',
         ranking: 'TIME',
+        supportedTypes: tagFeedSupportedTypes,
       }),
     ],
     null,
@@ -313,6 +325,7 @@ it('should show login popup when logged-out on block click', async () => {
         loggedIn: false,
         tag: 'react',
         ranking: 'TIME',
+        supportedTypes: tagFeedSupportedTypes,
       }),
     ],
     null,

packages/webapp/pages/hackathon/index.tsx

@@ -25,7 +25,7 @@ const HACKATHON_DESCRIPTION =
   '72 hours, the daily.dev Public API, and three open tracks. Build something for developers, from developers.';
 
 // TODO move to cloudinary
-const HACKATHON_OG_IMAGE = fromCDN('/assets/hackathon-og.png');
+const HACKATHON_OG_IMAGE = fromCDN('/assets/hackathon-og.png?v=2');
 
 const seoTitles = getPageSeoTitles(HACKATHON_TITLE);
 const seo: NextSeoProps = {

packages/webapp/pages/tags/[tag].tsx

@@ -296,6 +296,8 @@ const TagPage = ({
         PostType.Article,
         PostType.VideoYouTube,
         PostType.Collection,
+        PostType.Share,
+        PostType.Freeform,
       ],
       period: 365,
     }),
@@ -309,6 +311,8 @@ const TagPage = ({
         PostType.Article,
         PostType.VideoYouTube,
         PostType.Collection,
+        PostType.Share,
+        PostType.Freeform,
       ],
     }),
     [tag],
@@ -317,11 +321,31 @@ const TagPage = ({
     () => ({
       tag,
       period: 365,
+      supportedTypes: [
+        PostType.Article,
+        PostType.VideoYouTube,
+        PostType.Collection,
+        PostType.Share,
+        PostType.Freeform,
+      ],
     }),
     [tag],
   );
   // Must be memoized to prevent refreshing the feed
-  const queryVariables = useMemo(() => ({ tag, ranking: 'TIME' }), [tag]);
+  const queryVariables = useMemo(
+    () => ({
+      tag,
+      ranking: 'TIME',
+      supportedTypes: [
+        PostType.Article,
+        PostType.VideoYouTube,
+        PostType.Collection,
+        PostType.Share,
+        PostType.Freeform,
+      ],
+    }),
+    [tag],
+  );
   const { feedSettings } = useFeedSettings();
   const { FeedPageLayoutComponent } = useFeedLayout();
   const { onFollowTags, onUnfollowTags, onBlockTags, onUnblockTags } =