Merge pull request #103 from medyo/develop

medyo · web-flow · commit 8fd5c75bcfcf · 2022-12-02T22:28:49.000+01:00
v 1.15.0
diff --git a/package.json b/package.json
@@ -5,8 +5,6 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^1.5.5",
     "@craco/craco": "^6.4.5",
-    "@sentry/react": "^7.17.4",
-    "@sentry/tracing": "^7.17.4",
     "@tanstack/react-query": "^4.13.0",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
diff --git a/src/config/index.tsx b/src/config/index.tsx
@@ -27,7 +27,6 @@ import { CardPropsType } from 'src/types'
 // Keys
 export const ANALYTICS_ENDPOINT = process.env.REACT_APP_AMPLITUDE_URL as string
 export const ANALYTICS_SDK_KEY = process.env.REACT_APP_AMPLITUDE_KEY as string
-export const SENTRY_DSN = process.env.REACT_APP_SENTRY_DSN as string
 export const LS_ANALYTICS_ID_KEY = 'hackerTabAnalyticsId'
 // Meta
 export const name = 'Hackertab.dev'
@@ -180,6 +179,7 @@ export const GLOBAL_TAG = {
   devtoValues: ['programming'],
   hashnodeValues: ['programming'],
   mediumValues: ['programming'],
+  redditValues: ['programming'],
   freecodecampValues: ['programming'],
 }
 export const MY_LANGUAGES_TAG = {
@@ -189,6 +189,7 @@ export const MY_LANGUAGES_TAG = {
   devtoValues: ['myLangs'],
   hashnodeValues: ['myLangs'],
   mediumValues: ['myLangs'],
+  redditValues: ['myLangs'],
   freecodecampValues: ['myLangs'],
 }
 export const MAX_ITEMS_PER_CARD = 50
diff --git a/src/features/cards/api/getMediumArticles.ts b/src/features/cards/api/getMediumArticles.ts
@@ -4,7 +4,7 @@ import { Article } from 'src/types'
 import { axios } from 'src/lib/axios'
 
 const getArticles = async (tag: string): Promise<Article[]> => {
-  return axios.get(`/data/v2/devto/${tag}.json`)
+  return axios.get(`/data/v2/medium/${tag}.json`)
 }
 
 type QueryFnType = typeof getArticles
diff --git a/src/features/cards/components/devtoCard/DevtoCard.tsx b/src/features/cards/components/devtoCard/DevtoCard.tsx
@@ -44,7 +44,7 @@ export function DevtoCard({ withAds, meta }: CardPropsType) {
         if (!curr.data) return acc
         return [...acc, ...curr.data]
       }, [])
-      .sort((a, b) => b.reactions - a.reactions)
+      .sort((a, b) => b.published_at - a.published_at)
   }
 
   const renderItem = (item: Article, index: number) => (
diff --git a/src/features/cards/components/freecodecampCard/FreecodecampCard.tsx b/src/features/cards/components/freecodecampCard/FreecodecampCard.tsx
@@ -44,7 +44,7 @@ export function FreecodecampCard({ meta, withAds }: CardPropsType) {
         if (!curr.data) return acc
         return [...acc, ...curr.data]
       }, [])
-      .sort((a, b) => b.reactions - a.reactions)
+      .sort((a, b) => b.published_at - a.published_at)
   }
 
   const renderItem = (item: Article, index: number) => (
diff --git a/src/features/cards/components/hashnodeCard/HashnodeCard.tsx b/src/features/cards/components/hashnodeCard/HashnodeCard.tsx
@@ -44,7 +44,7 @@ export function HashnodeCard({ withAds, meta }: CardPropsType) {
         if (!curr.data) return acc
         return [...acc, ...curr.data]
       }, [])
-      .sort((a, b) => b.reactions - a.reactions)
+      .sort((a, b) => b.published_at - a.published_at)
   }
 
   const renderItem = (item: Article, index: number) => (
diff --git a/src/features/cards/components/mediumCard/MediumCard.tsx b/src/features/cards/components/mediumCard/MediumCard.tsx
@@ -44,7 +44,7 @@ export function MediumCard({ meta, withAds }: CardPropsType) {
         if (!curr.data) return acc
         return [...acc, ...curr.data]
       }, [])
-      .sort((a, b) => b.reactions - a.reactions)
+      .sort((a, b) => b.published_at - a.published_at)
   }
 
   const renderItem = (item: Article, index: number) => (
diff --git a/src/features/cards/components/redditCard/RedditCard.tsx b/src/features/cards/components/redditCard/RedditCard.tsx
@@ -5,13 +5,37 @@ import { Article, CardPropsType } from 'src/types'
 import { useUserPreferences } from 'src/stores/preferences'
 import { getCardTagsValue } from 'src/utils/DataEnhancement'
 import ArticleItem from './ArticleItem'
+import { useState, useEffect } from 'react'
+import { Tag } from 'src/features/remoteConfig'
+import { GLOBAL_TAG, MY_LANGUAGES_TAG } from 'src/config'
+import SelectableCard from 'src/components/SelectableCard'
+import { trackCardLanguageSelect } from 'src/lib/analytics'
+
+const REDDIT_MENU_LANGUAGE_ID = 'REDDIT_MENU_LANGUAGE_ID'
 
 export function RedditCard({ withAds, meta }: CardPropsType) {
-  const { userSelectedTags } = useUserPreferences()
+  const { userSelectedTags, cardsSettings, setCardSettings } = useUserPreferences()
+  const [selectedTag, setSelectedTag] = useState<Tag>()
+
+  useEffect(() => {
+    if (selectedTag) {
+      setCardSettings(meta.value, { language: selectedTag.label })
+    }
+  }, [selectedTag, meta, setCardSettings])
+
+  const getQueryTags = () => {
+    if (!selectedTag) {
+      return []
+    }
 
-  const tags = getCardTagsValue(userSelectedTags, 'redditValues')
+    if (selectedTag.value === MY_LANGUAGES_TAG.redditValues[0]) {
+      return getCardTagsValue(userSelectedTags, 'redditValues') || []
+    }
+    return selectedTag.redditValues || []
+  }
 
-  const results = useGetRedditArticles({ tags })
+  console.log('getQueryTags()', getQueryTags())
+  const results = useGetRedditArticles({ tags: getQueryTags() })
 
   const getIsLoading = () => results.some((result) => result.isLoading)
 
@@ -25,11 +49,38 @@ export function RedditCard({ withAds, meta }: CardPropsType) {
   }
 
   const renderItem = (item: Article, index: number) => (
-    <ArticleItem item={item} key={`re-${index}`} index={index} analyticsTag={meta.analyticsTag} />
+    <ArticleItem
+      item={item}
+      key={`md-${index}`}
+      index={index}
+      selectedTag={selectedTag}
+      analyticsTag={meta.analyticsTag}
+    />
   )
 
+  const HeaderTitle = () => {
+    return (
+      <div style={{ display: 'inline-block', margin: 0, padding: 0 }}>
+        <span> {meta.label} </span>
+        <SelectableCard
+          isLanguage={true}
+          tagId={REDDIT_MENU_LANGUAGE_ID}
+          selectedTag={selectedTag}
+          setSelectedTag={setSelectedTag}
+          fallbackTag={GLOBAL_TAG}
+          cardSettings={cardsSettings?.reddit?.language}
+          trackEvent={(tag: Tag) => trackCardLanguageSelect(meta.analyticsTag, tag.value)}
+          data={userSelectedTags.map((tag) => ({
+            label: tag.label,
+            value: tag.value,
+          }))}
+        />
+      </div>
+    )
+  }
+
   return (
-    <Card card={meta}>
+    <Card card={meta} titleComponent={<HeaderTitle />}>
       <ListComponent
         items={getData()}
         isLoading={getIsLoading()}
diff --git a/src/index.js b/src/index.js
@@ -8,15 +8,6 @@ import {AppErrorBoundary} from 'src/providers/AppErrorBoundary'
 import { ConfigurationWrapper } from 'src/features/remoteConfig/'
 import { QueryClientProvider } from '@tanstack/react-query'
 import { queryClient } from 'src/lib/react-query'
-import * as Sentry from '@sentry/react'
-import { SENTRY_DSN } from './config'
-import { BrowserTracing } from '@sentry/tracing'
-
-Sentry.init({
-  dsn: SENTRY_DSN,
-  integrations: [new BrowserTracing()],
-  tracesSampleRate: 1.0,
-})
 
 ReactDOM.render(
   <React.StrictMode>
diff --git a/yarn.lock b/yarn.lock
@@ -1799,59 +1799,6 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
   integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
-"@sentry/browser@7.17.4":
-  version "7.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.17.4.tgz#2e4ad09180905929b823d01e2a029f10933c0a03"
-  integrity sha512-cNLQ/6ea0KOZyLKXGLTdgfqWYdg43+T/uF9D/hmc6kp/5qXm2dR3FcFRZX6OicaENM3dXvSoBIF6bSWmcszRtQ==
-  dependencies:
-    "@sentry/core" "7.17.4"
-    "@sentry/types" "7.17.4"
-    "@sentry/utils" "7.17.4"
-    tslib "^1.9.3"
-
-"@sentry/core@7.17.4":
-  version "7.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.17.4.tgz#62686e1b2baf4e7ba3d9ca57d91d2dfc643b8250"
-  integrity sha512-U3ABSJBKGK8dJ01nEG2+qNOb6Wv7U3VqoajiZxfV4lpPWNFGCoEhiTytxBlFTOCmdUH8209zSZiWJZaDLy+TSA==
-  dependencies:
-    "@sentry/types" "7.17.4"
-    "@sentry/utils" "7.17.4"
-    tslib "^1.9.3"
-
-"@sentry/react@^7.17.4":
-  version "7.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.17.4.tgz#1d2c752841ace0561043be6a863de9fc7437f64c"
-  integrity sha512-Hw8lgeCgUthgVQ5OG24/iZWGNXnxodVfCmfngeIfqUWeFgQUae1V833GNkYZCiE5j2yjNVh3LL2bXA8PnvMCEg==
-  dependencies:
-    "@sentry/browser" "7.17.4"
-    "@sentry/types" "7.17.4"
-    "@sentry/utils" "7.17.4"
-    hoist-non-react-statics "^3.3.2"
-    tslib "^1.9.3"
-
-"@sentry/tracing@^7.17.4":
-  version "7.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.17.4.tgz#1254f4eb7397e1134248de1dade33d2fec864005"
-  integrity sha512-9Fz6DI16ddnd970mlB5MiCNRSmSXp4SVZ1Yv3L22oS3kQeNxjBTE+htYNwJzSPrQp9aL/LqTYwlnrCy24u9XQA==
-  dependencies:
-    "@sentry/core" "7.17.4"
-    "@sentry/types" "7.17.4"
-    "@sentry/utils" "7.17.4"
-    tslib "^1.9.3"
-
-"@sentry/types@7.17.4":
-  version "7.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.17.4.tgz#476522bc988989101e7aee9eee3c3f8f16fa59ea"
-  integrity sha512-QJj8vO4AtxuzQfJIzDnECSmoxwnS+WJsm1Ta2Cwdy+TUCBJyWpW7aIJJGta76zb9gNPGb3UcAbeEjhMJBJeRMQ==
-
-"@sentry/utils@7.17.4":
-  version "7.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.17.4.tgz#b8f4fb6a329765b97668b34f6d397e8de2169fef"
-  integrity sha512-ioG0ANy8uiWzig82/e7cc+6C9UOxkyBzJDi1luoQVDH6P0/PvM8GzVU+1iUVUipf8+OL1Jh09GrWnd5wLm3XNQ==
-  dependencies:
-    "@sentry/types" "7.17.4"
-    tslib "^1.9.3"
-
 "@sinclair/typebox@^0.24.1":
   version "0.24.46"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.46.tgz#57501b58023776dbbae9e25619146286440be34c"
@@ -6461,7 +6408,7 @@ hoist-non-react-statics@^1.2.0:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha512-r8huvKK+m+VraiRipdZYc+U4XW43j6OFG/oIafe7GfDbRpCduRoX9JI/DRxqgtBSCeL+et6N6ibZoedHS2NyOQ==
 
-hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -12192,7 +12139,7 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.1, tslib@^1.9.3:
+tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { Article } from 'src/types'`
`4`	`4`	`import { axios } from 'src/lib/axios'`
`5`	`5`
`6`	`6`	`const getArticles = async (tag: string): Promise<Article[]> => {`
`7`		- return axios.get(`/data/v2/devto/${tag}.json`)
	`7`	+ return axios.get(`/data/v2/medium/${tag}.json`)
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`type QueryFnType = typeof getArticles`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export function DevtoCard({ withAds, meta }: CardPropsType) {`
`44`	`44`	`if (!curr.data) return acc`
`45`	`45`	`return [...acc, ...curr.data]`
`46`	`46`	`}, [])`
`47`		`- .sort((a, b) => b.reactions - a.reactions)`
	`47`	`+ .sort((a, b) => b.published_at - a.published_at)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`const renderItem = (item: Article, index: number) => (`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export function FreecodecampCard({ meta, withAds }: CardPropsType) {`
`44`	`44`	`if (!curr.data) return acc`
`45`	`45`	`return [...acc, ...curr.data]`
`46`	`46`	`}, [])`
`47`		`- .sort((a, b) => b.reactions - a.reactions)`
	`47`	`+ .sort((a, b) => b.published_at - a.published_at)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`const renderItem = (item: Article, index: number) => (`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export function HashnodeCard({ withAds, meta }: CardPropsType) {`
`44`	`44`	`if (!curr.data) return acc`
`45`	`45`	`return [...acc, ...curr.data]`
`46`	`46`	`}, [])`
`47`		`- .sort((a, b) => b.reactions - a.reactions)`
	`47`	`+ .sort((a, b) => b.published_at - a.published_at)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`const renderItem = (item: Article, index: number) => (`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export function MediumCard({ meta, withAds }: CardPropsType) {`
`44`	`44`	`if (!curr.data) return acc`
`45`	`45`	`return [...acc, ...curr.data]`
`46`	`46`	`}, [])`
`47`		`- .sort((a, b) => b.reactions - a.reactions)`
	`47`	`+ .sort((a, b) => b.published_at - a.published_at)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`const renderItem = (item: Article, index: number) => (`