Merge pull request #339 from AlphadayHQ/dev

v-almonacid · web-flow · commit 61948f758393 · 2024-03-21T19:16:32.000-03:00
v3.02 — Like endpoint refactor + separate clarity project for mobile
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -84,6 +84,7 @@ jobs:
                   VITE_OAUTH_ID_GOOGLE: ${{ secrets.DEV__REACT_APP_OAUTH_ID_GOOGLE }}
                   VITE_OAUTH_ID_APPLE: ${{ secrets.DEV__FRONTEND__OAUTH_ID_APPLE }}
                   VITE_CLARITY_PROJECT_ID: ${{ secrets.DEV__FRONTEND__CLARITY_PROJECT_ID }}
+                  VITE_CLARITY_MOBILE_PROJECT_ID: ${{ secrets.DEV__FRONTEND__CLARITY_MOBILE_PROJECT_ID }}
 
                   NODE_OPTIONS: "--max_old_space_size=4096"
 
diff --git a/.github/workflows/deploy-epsilon.yml b/.github/workflows/deploy-epsilon.yml
@@ -70,7 +70,8 @@ jobs:
                   VITE_FIRE_MESSAGE_SENDER_ID: ${{ secrets.DEV__REACT_APP_FIRE_MESSAGE_SENDER_ID }}
                   VITE_FIRE_APP_ID: ${{ secrets.DEV__REACT_APP_FIRE_APP_ID }}
                   VITE_SENTRY_DSN: ${{ secrets.PROD__VITE_SENTRY_DSN }}
-                  VITE_CLARITY_PROJECT_ID: ${{ secrets.DEV__REACT_APP_CLARITY_PROJECT_ID }}
+                  VITE_CLARITY_PROJECT_ID: ${{ secrets.DEV__FRONTEND__CLARITY_PROJECT_ID }}
+                  VITE_CLARITY_MOBILE_PROJECT_ID: ${{ secrets.DEV__FRONTEND__CLARITY_MOBILE_PROJECT_ID }}
                   VITE_OAUTH_ID_GOOGLE: ${{ secrets.DEV__REACT_APP_OAUTH_ID_GOOGLE }}
                   VITE_OAUTH_ID_APPLE: ${{ secrets.DEV__FRONTEND__OAUTH_ID_APPLE }}
 
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -88,6 +88,7 @@ jobs:
                   VITE_OAUTH_ID_GOOGLE: ${{ secrets.PROD__REACT_APP_OAUTH_ID_GOOGLE }}
                   VITE_OAUTH_ID_APPLE: ${{ secrets.PROD__FRONTEND__OAUTH_ID_APPLE }}
                   VITE_CLARITY_PROJECT_ID: ${{ secrets.PROD__FRONTEND__CLARITY_PROJECT_ID }}
+                  VITE_CLARITY_MOBILE_PROJECT_ID: ${{ secrets.PROD__FRONTEND__CLARITY_MOBILE_PROJECT_ID }}
 
                   NODE_OPTIONS: "--max_old_space_size=4096"
 
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -82,6 +82,7 @@ jobs:
                   VITE_OAUTH_ID_GOOGLE: ${{ secrets.STAGING__REACT_APP_OAUTH_ID_GOOGLE }}
                   VITE_OAUTH_ID_APPLE: ${{ secrets.STAGING__FRONTEND__OAUTH_ID_APPLE }}
                   VITE_CLARITY_PROJECT_ID: ${{ secrets.STAGING__FRONTEND__CLARITY_PROJECT_ID }}
+                  VITE_CLARITY_MOBILE_PROJECT_ID: ${{ secrets.STAGING__FRONTEND__CLARITY_MOBILE_PROJECT_ID }}
 
                   NODE_OPTIONS: "--max_old_space_size=4096"
 
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@alphaday/frontend",
   "private": true,
-  "version": "3.0.1",
+  "version": "3.0.2",
   "type": "module",
   "scripts": {
     "prepare": "export VITE_COMMIT=$(git rev-parse --short HEAD)",
diff --git a/packages/frontend/src/api/services/blog/blogEndpoints.ts b/packages/frontend/src/api/services/blog/blogEndpoints.ts
@@ -11,8 +11,6 @@ import {
     TOpenBlogItemResponse,
     TBookmarkBlogItemRequest,
     TBookmarkBlogItemResponse,
-    TLikeBlogItemRequest,
-    TLikeBlogItemResponse,
 } from "./types";
 
 const { BLOG } = CONFIG.API.DEFAULT.ROUTES;
@@ -71,21 +69,6 @@ export const blogApi = alphadayApi.injectEndpoints({
                 };
             },
         }),
-        likeBlogItem: builder.mutation<
-            TLikeBlogItemResponse,
-            TLikeBlogItemRequest
-        >({
-            query: (req: TLikeBlogItemRequest) => {
-                const path = `${BLOG.BASE}${BLOG.LIKE(req.id)}`;
-                Logger.debug("likeBlogItem: querying", path);
-                return {
-                    url: path,
-                    method: "POST",
-                    body: {},
-                };
-            },
-            invalidatesTags: ["Superfeed"],
-        }),
         openBlogItem: builder.mutation<
             TOpenBlogItemResponse,
             TOpenBlogItemRequest
@@ -110,5 +93,4 @@ export const {
     useGetBlogListQuery,
     useOpenBlogItemMutation,
     useBookmarkBlogItemMutation,
-    useLikeBlogItemMutation,
 } = blogApi;
diff --git a/packages/frontend/src/api/services/blog/types.ts b/packages/frontend/src/api/services/blog/types.ts
@@ -26,8 +26,3 @@ export type TOpenBlogItemRequest = {
     id: number;
 };
 export type TOpenBlogItemResponse = Omit<TRemoteBlogItem, "id">;
-
-export type TLikeBlogItemRequest = {
-    id: number;
-};
-export type TLikeBlogItemResponse = Omit<TRemoteBlogItem, "id">;
diff --git a/packages/frontend/src/api/services/news/newsEndpoints.ts b/packages/frontend/src/api/services/news/newsEndpoints.ts
@@ -13,8 +13,6 @@ import {
     TBookmarkNewsItemResponse,
     TGetNewsSummaryRawResponse,
     TGetNewsSummaryRequest,
-    TLikeNewsItemRequest,
-    TLikeNewsItemResponse,
 } from "./types";
 
 const { NEWS } = CONFIG.API.DEFAULT.ROUTES;
@@ -87,21 +85,6 @@ const newsApi = alphadayApi.injectEndpoints({
                 };
             },
         }),
-        likeNewsItem: builder.mutation<
-            TLikeNewsItemResponse,
-            TLikeNewsItemRequest
-        >({
-            query: (req: TLikeNewsItemRequest) => {
-                const path = `${NEWS.BASE}${NEWS.LIKE(req.id)}`;
-                Logger.debug("likeNewsItem: querying", path);
-                return {
-                    url: path,
-                    method: "POST",
-                    body: {},
-                };
-            },
-            invalidatesTags: ["Superfeed"],
-        }),
         openNewsItem: builder.mutation<
             TOpenNewsItemResponse,
             TOpenNewsItemRequest
@@ -127,5 +110,4 @@ export const {
     useGetNewsSummaryQuery,
     useOpenNewsItemMutation,
     useBookmarkNewsItemMutation,
-    useLikeNewsItemMutation,
 } = newsApi;
diff --git a/packages/frontend/src/api/services/news/types.ts b/packages/frontend/src/api/services/news/types.ts
@@ -40,8 +40,3 @@ export type TOpenNewsItemRequest = {
     id: number;
 };
 export type TOpenNewsItemResponse = Omit<TRemoteNewsItem, "id">;
-
-export type TLikeNewsItemRequest = {
-    id: number;
-};
-export type TLikeNewsItemResponse = Omit<TRemoteNewsItem, "id">;
diff --git a/packages/frontend/src/api/services/podcast/podcastEndpoints.ts b/packages/frontend/src/api/services/podcast/podcastEndpoints.ts
@@ -12,8 +12,6 @@ import {
     TBookmarkPodcastItemResponse,
     TBookmarkPodcastItemRequest,
     TGetPodcastChannelsResponse,
-    TLikePodcastItemRequest,
-    TLikePodcastItemResponse,
 } from "./types";
 
 const { PODCAST, SOURCES } = CONFIG.API.DEFAULT.ROUTES;
@@ -89,21 +87,6 @@ export const podcastApi = alphadayApi.injectEndpoints({
                 };
             },
         }),
-        likePodcastItem: builder.mutation<
-            TLikePodcastItemResponse,
-            TLikePodcastItemRequest
-        >({
-            query: (req: TLikePodcastItemRequest) => {
-                const path = `${PODCAST.BASE}${PODCAST.LIKE(req.id)}`;
-                Logger.debug("likePodcastItem: querying", path);
-                return {
-                    url: path,
-                    method: "POST",
-                    body: {},
-                };
-            },
-            invalidatesTags: ["Superfeed"],
-        }),
         openPodcastItem: builder.mutation<
             TOpenPodcastItemResponse,
             TOpenPodcastItemRequest
@@ -127,5 +110,4 @@ export const {
     useOpenPodcastItemMutation,
     useBookmarkPodcastItemMutation,
     useGetPodcastChannelsListQuery,
-    useLikePodcastItemMutation,
 } = podcastApi;
diff --git a/packages/frontend/src/api/services/superfeed/superfeedEndpoints.ts b/packages/frontend/src/api/services/superfeed/superfeedEndpoints.ts
@@ -12,6 +12,9 @@ import {
     TGetSuperfeedFilterKeywordsResponse,
     TGetSuperfeedFilterKeywordsRequest,
     TGetSuperfeedFilterKeywordsRawResponse,
+    TLikeSuperfeedItemResponse,
+    TLikeSuperfeedItemRequest,
+    TLikeSuperfeedItemRawResponse,
 } from "./types";
 
 const { SUPERFEED } = CONFIG.API.DEFAULT.ROUTES;
@@ -47,9 +50,9 @@ export const superfeedApi = alphadayApi.injectEndpoints({
                     fileUrl: i.file_url,
                     startsAt: i.starts_at,
                     endsAt: i.ends_at,
-                    sourceIcon: i.source.icon,
-                    sourceSlug: i.source.slug,
-                    sourceName: i.source.name,
+                    sourceIcon: i.source?.icon,
+                    sourceSlug: i.source?.slug,
+                    sourceName: i.source?.name,
                     tags: i.tags || [],
                     likes: i.likes,
                     isLiked: i.is_liked,
@@ -62,6 +65,42 @@ export const superfeedApi = alphadayApi.injectEndpoints({
             // TODO(v-almonacid): Re-assess this value post-MVP release
             // keepUnusedDataFor: 60,
         }),
+        likeSuperfeedItem: builder.mutation<
+            TLikeSuperfeedItemResponse,
+            TLikeSuperfeedItemRequest
+        >({
+            query: (req) => ({
+                url: `${SUPERFEED.BASE}${SUPERFEED.LIKE(req.id)}`,
+                method: "POST",
+                body: undefined,
+            }),
+            transformResponse: (
+                i: TLikeSuperfeedItemRawResponse
+            ): TLikeSuperfeedItemResponse => ({
+                id: i.id,
+                type: i.content_type,
+                title: i.title,
+                date: i.item_date,
+                itemId: i.item_id,
+                trendiness: i.trendiness,
+                url: i.url,
+                image: i.image,
+                shortDescription: i.short_description,
+                duration: i.duration,
+                fileUrl: i.file_url,
+                startsAt: i.starts_at,
+                endsAt: i.ends_at,
+                sourceIcon: i.source?.icon,
+                sourceSlug: i.source?.slug,
+                sourceName: i.source?.name,
+                tags: i.tags || [],
+                likes: i.likes,
+                isLiked: i.is_liked,
+                comments: i.comments,
+                data: i.data,
+            }),
+            invalidatesTags: ["Superfeed"],
+        }),
         getFilterData: builder.query<
             TGetSuperfeedFilterDataResponse,
             TGetSuperfeedFilterDataRequest
@@ -121,4 +160,5 @@ export const {
     useGetSuperfeedListQuery,
     useGetFilterDataQuery,
     useGetFilterKeywordsQuery,
+    useLikeSuperfeedItemMutation,
 } = superfeedApi;
diff --git a/packages/frontend/src/api/services/superfeed/types.ts b/packages/frontend/src/api/services/superfeed/types.ts
@@ -101,3 +101,9 @@ export type TGetSuperfeedFilterKeywordsResponse = {
     coins: TRemoteFilterKeyword[];
     chains: TRemoteFilterKeyword[];
 };
+
+export type TLikeSuperfeedItemRequest = {
+    id: number;
+};
+export type TLikeSuperfeedItemRawResponse = TRemoteSuperfeedItem;
+export type TLikeSuperfeedItemResponse = TSuperfeedItem;
diff --git a/packages/frontend/src/api/services/video/types.ts b/packages/frontend/src/api/services/video/types.ts
@@ -42,8 +42,3 @@ export type TBookmarkVideoItemRequest = {
 export type TBookmarkVideoItemResponse = Omit<TRemoteVideoItem, "id">;
 
 export type TGetVideoChannelsResponse = TVideoChannel[];
-
-export type TLikeVideoItemRequest = {
-    id: number;
-};
-export type TLikeVideoItemResponse = Omit<TRemoteVideoItem, "id">;
diff --git a/packages/frontend/src/api/services/video/videoEndpoints.ts b/packages/frontend/src/api/services/video/videoEndpoints.ts
@@ -15,8 +15,6 @@ import {
     TGetLatestVideoResponse,
     TGetLatestVideoRequest,
     TGetLatestVideoRawResponse,
-    TLikeVideoItemRequest,
-    TLikeVideoItemResponse,
 } from "./types";
 
 const { VIDEO, SOURCES } = CONFIG.API.DEFAULT.ROUTES;
@@ -113,21 +111,6 @@ export const videoApi = alphadayApi.injectEndpoints({
                 };
             },
         }),
-        likeVideoItem: builder.mutation<
-            TLikeVideoItemResponse,
-            TLikeVideoItemRequest
-        >({
-            query: (req: TLikeVideoItemRequest) => {
-                const path = `${VIDEO.BASE}${VIDEO.LIKE(req.id)}`;
-                Logger.debug("likeVideoItem: querying", path);
-                return {
-                    url: path,
-                    method: "POST",
-                    body: {},
-                };
-            },
-            invalidatesTags: ["Superfeed"],
-        }),
         openVideoItem: builder.mutation<
             TOpenVideoItemResponse,
             TOpenVideoItemRequest
@@ -152,5 +135,4 @@ export const {
     useOpenVideoItemMutation,
     useBookmarkVideoItemMutation,
     useGetVideoChannelsListQuery,
-    useLikeVideoItemMutation,
 } = videoApi;
diff --git a/packages/frontend/src/api/types/superfeed.ts b/packages/frontend/src/api/types/superfeed.ts
@@ -68,6 +68,8 @@ export type TFeedItemData = {
 };
 
 export type TSuperfeedItem = Omit<TBaseItem, "bookmarked"> & {
+    itemId: number;
+    trendiness: number;
     type: EFeedItemType;
     date: string;
     startsAt: string | null;
diff --git a/packages/frontend/src/config/backend.ts b/packages/frontend/src/config/backend.ts
@@ -26,7 +26,6 @@ const API_V0 = {
             BOOKMARKS: "/bookmarks/",
             CLICKED: (id: number): string => `/${id}/clicked/`,
             BOOKMARK: (id: number): string => `/${id}/toggle_bookmark/`,
-            LIKE: (id: number): string => `/${id}/toggle_like/`,
         },
         BLOG: {
             BASE: "items/blogs",
@@ -35,7 +34,6 @@ const API_V0 = {
             BOOKMARKS: "/bookmarks/",
             CLICKED: (id: number): string => `/${id}/clicked/`,
             BOOKMARK: (id: number): string => `/${id}/toggle_bookmark/`,
-            LIKE: (id: number): string => `/${id}/toggle_like/`,
         },
         COINS: {
             BASE: "coins",
@@ -127,6 +125,7 @@ const API_V0 = {
             DEFAULT: "/",
             FILTER_DATA: "/filter_data/",
             FILTER_KEYWORDS: "/filter_keywords/",
+            LIKE: (id: number): string => `/${id}/toggle_like/`,
         },
         TVL: {
             BASE: "tvl",
@@ -161,7 +160,6 @@ const API_V0 = {
             DETAILS: (id: number): string => `/${id}/`,
             CLICKED: (id: number): string => `/${id}/clicked/`,
             BOOKMARK: (id: number): string => `/${id}/toggle_bookmark/`,
-            LIKE: (id: number): string => `/${id}/toggle_like/`,
         },
         VIDEO: {
             BASE: "items/videos",
@@ -172,7 +170,6 @@ const API_V0 = {
             DETAILS: (id: number): string => `/${id}/`,
             CLICKED: (id: number): string => `/${id}/clicked/`,
             BOOKMARK: (id: number): string => `/${id}/toggle_bookmark/`,
-            LIKE: (id: number): string => `/${id}/toggle_like/`,
         },
         SOURCES: {
             BASE: "/sources/",
diff --git a/packages/frontend/src/config/config.ts b/packages/frontend/src/config/config.ts
@@ -53,6 +53,7 @@ const SENTRY = {
 const CLARITY = {
     ENABLE: true,
     PROJECT_ID: import.meta.env.VITE_CLARITY_PROJECT_ID,
+    MOBILE_PROJECT_ID: import.meta.env.VITE_CLARITY_MOBILE_PROJECT_ID,
 };
 
 const HOTJAR = {
diff --git a/packages/frontend/src/main.tsx b/packages/frontend/src/main.tsx
@@ -15,7 +15,7 @@ import { wagmiConfig } from "./api/store/providers/wallet-connect-provider";
 // TODO (xavier-charles): add themes support import ThemeProvider from "./api/store/providers/theme-provider";
 import { store } from "./api/store/store";
 import { ECookieChoice } from "./api/types";
-import { lazyRetry } from "./api/utils/helpers";
+import { lazyRetry, isMobile } from "./api/utils/helpers";
 import { Logger } from "./api/utils/logging";
 import CONFIG from "./config";
 import SeoContainer from "./containers/seo/SeoContainer";
@@ -73,19 +73,26 @@ try {
     );
 }
 
-if (CONFIG.CLARITY.ENABLE && CONFIG.CLARITY.PROJECT_ID) {
-    Logger.debug("initializing clarity...");
-    clarity.init(CONFIG.CLARITY.PROJECT_ID);
-    clarity.consent();
-    Logger.debug("clarity initialized");
+if (CONFIG.CLARITY.ENABLE) {
+    if (isMobile() && CONFIG.CLARITY.MOBILE_PROJECT_ID) {
+        Logger.debug("initializing clarity for mobile...");
+        clarity.init(CONFIG.CLARITY.MOBILE_PROJECT_ID);
+        clarity.consent();
+        Logger.debug("clarity initialized");
+    } else if (CONFIG.CLARITY.PROJECT_ID) {
+        Logger.debug("initializing clarity for desktop...");
+        clarity.init(CONFIG.CLARITY.PROJECT_ID);
+        clarity.consent();
+        Logger.debug("clarity initialized");
+    }
 }
 
 const AppSwitcher = () => {
-    const isMobile = useIsMobile();
+    const isMobileApp = useIsMobile();
     if (isMobile === undefined) return <PreloaderPage />;
     return (
         <Suspense fallback={<PreloaderPage />}>
-            {isMobile ? <MobileApp /> : <App />}
+            {isMobileApp ? <MobileApp /> : <App />}
         </Suspense>
     );
 };
diff --git a/packages/frontend/src/mobile-components/feed/MarketCard.tsx b/packages/frontend/src/mobile-components/feed/MarketCard.tsx
diff --git a/packages/frontend/src/mobile-containers/SuperfeedContainer.tsx b/packages/frontend/src/mobile-containers/SuperfeedContainer.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@alphaday/frontend",`
`3`	`3`	`"private": true,`
`4`		`- "version": "3.0.1",`
	`4`	`+ "version": "3.0.2",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"prepare": "export VITE_COMMIT=$(git rev-parse --short HEAD)",`