Merge pull request #224 from medyo/develop

Improve UI and copy

Author: medyo

README.md

@@ -48,6 +48,7 @@ Even more features are going to come in the future!
 - Freecodecamp
 - Medium
 - Indiehackers
+- Custom RSS Feed
 - **or create an issue to ask for a new data source**
 
 ## Support

src/App.tsx

@@ -25,8 +25,14 @@ const intersectionCallback = (entries: IntersectionObserverEntry[]) => {
 
 export const App = () => {
   const [showOnboarding, setShowOnboarding] = useState(true)
-  const { onboardingCompleted, maxVisibleCards, isDNDModeActive, DNDDuration, setDNDDuration } =
-    useUserPreferences()
+  const {
+    onboardingCompleted,
+    maxVisibleCards,
+    setAdvStatus,
+    isDNDModeActive,
+    DNDDuration,
+    setDNDDuration,
+  } = useUserPreferences()
 
   useLayoutEffect(() => {
     document.documentElement.style.setProperty('--max-visible-cards', maxVisibleCards.toString())
@@ -38,6 +44,7 @@ export const App = () => {
     setupIdentification()
     const adVerifier = async () => {
       const status = await verifyAdvStatus()
+      setAdvStatus(status)
       identifyAdvBlocked(status)
     }
     adVerifier()

src/features/MarketingBanner/components/MarketingBanner.tsx

@@ -19,7 +19,7 @@ import { Campaign, MarketingConfig } from '../types'
 export const MarketingBanner = () => {
   const { setCampaignClosed, closedCampaigns } = useMarketingConfigStore()
   const { isConnected } = useAuth()
-  const { userSelectedTags, cards, firstSeenDate } = useUserPreferences()
+  const { userSelectedTags, cards, firstSeenDate, advStatus } = useUserPreferences()
   const [availableCampaigns, setAvailableCampaigns] = useState<Campaign[]>([])
   const { data: marketingConfig } = useGetMarketingConfig({
     config: {
@@ -28,6 +28,7 @@ export const MarketingBanner = () => {
     },
   })
   const isMobile = useMediaQuery({ maxWidth: 767 })
+
   const userAtttributes = useMemo(() => {
     return {
       platform: isWebOrExtensionVersion(),
@@ -38,10 +39,11 @@ export const MarketingBanner = () => {
       userTags: userSelectedTags.map((tag) => tag.label),
       cards: cards.map((card) => card.name),
       firstSeenDate,
+      adv: advStatus,
       isConnected,
       usageInDays: diffBetweenTwoDatesInDays(firstSeenDate, Date.now()),
     }
-  }, [userSelectedTags, firstSeenDate, cards])
+  }, [userSelectedTags, firstSeenDate, cards, advStatus])
 
   useEffect(() => {
     if (marketingConfig && marketingConfig.version === 1) {

src/lib/interceptors/DefaultRequestInterceptor.ts

@@ -10,9 +10,11 @@ export async function DefaultRequestInterceptor(config: InternalAxiosRequestConf
       config.headers.Accept = 'application/json'
     }
 
-    const token = await getUserToken()
-    if (token) {
-      config.headers.Authorization = `Bearer ${token}`
+    if (config.url?.startsWith('/engine/')) {
+      const token = await getUserToken()
+      if (token) {
+        config.headers.Authorization = `Bearer ${token}`
+      }
     }
   }
 

src/providers/AuthProvider.tsx

@@ -87,13 +87,13 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
   useEffect(() => {
     const token = searchParams.get('access_token')
     const provider = searchParams.get('provider')
+    const oppositeProvider = provider === 'google' ? 'Github' : 'Google'
     connectTheUser(token, provider).catch((error) => {
       openAuthModal()
       console.log('error', error)
       if (error && error.code === 'auth/account-exists-with-different-credential') {
         setAuthError({
-          message:
-            'This account is already connected with a different provider. Please sign in with that provider to continue.',
+          message: `You've previously signed up using ${oppositeProvider}. To continue, please sign in with ${oppositeProvider}.`,
         })
       } else {
         setAuthError({

src/stores/preferences.ts

@@ -28,6 +28,7 @@ export type UserPreferencesState = {
   cardsSettings: Record<string, CardSettingsType>
   firstSeenDate: number
   userCustomCards: SupportedCardType[]
+  advStatus: boolean
   DNDDuration: DNDDuration
 }
 
@@ -48,6 +49,7 @@ type UserPreferencesStoreActions = {
   isDNDModeActive: () => boolean
   addSearchEngine: (searchEngine: SearchEngineType) => void
   removeSearchEngine: (searchEngineUrl: string) => void
+  setAdvStatus: (status: boolean) => void
 }
 
 const defaultStorage: StateStorage = {
@@ -174,6 +176,7 @@ export const useUserPreferences = create(
       ],
       userCustomCards: [],
       DNDDuration: 'never',
+      advStatus: false,
       setSearchEngine: (searchEngine: string) => set({ searchEngine: searchEngine }),
       setListingMode: (listingMode: ListingMode) => set({ listingMode: listingMode }),
       setTheme: (theme: Theme) => set({ theme: theme }),
@@ -234,6 +237,7 @@ export const useUserPreferences = create(
             searchEngines: state.searchEngines.filter((se) => se.url !== searchEngineUrl),
           }
         }),
+      setAdvStatus: (status) => set({ advStatus: status }),
     }),
     {
       name: 'preferences_storage',