Merge pull request #291 from medyo/develop

New version

Author: medyo

src/assets/App.css

@@ -185,13 +185,13 @@ a {
   color: var(--app-name-text-color);
   flex-grow: 1;
   order: 1;
-}
 
-.logo {
-  position: relative;
-  top: 4px;
-  margin-right: 4px;
-  font-size: 24px;
+  .logo {
+    position: relative;
+    top: 4px;
+    margin-right: 4px;
+    font-size: 24px;
+  }
 }
 
 .logoText {
@@ -574,6 +574,10 @@ a {
   color: #0366d6;
 }
 
+.dark .githubTitle {
+  color: #4493f8;
+}
+
 .rowDescription {
   padding: 0;
   margin: 0;

src/components/Layout/AppLayout.tsx

@@ -3,9 +3,9 @@ import 'react-contexify/dist/ReactContexify.css'
 import { Outlet } from 'react-router-dom'
 import { BeatLoader } from 'react-spinners'
 import 'src/assets/App.css'
+import { AdInitializer, StickyBanner } from 'src/features/adv'
 import { AuthModal, useAuth } from 'src/features/auth'
 import { usePostStreak } from 'src/features/hits'
-import { MarketingBanner } from 'src/features/MarketingBanner'
 import { identifyUserStreak } from 'src/lib/analytics'
 import { AuthProvider } from 'src/providers/AuthProvider'
 import { Header } from './Header'
@@ -25,8 +25,8 @@ export const AppLayout = () => {
 
   return (
     <AuthProvider>
-      <MarketingBanner />
-
+      <StickyBanner />
+      <AdInitializer />
       <div className="App">
         <Header />
         <AuthModal showAuth={isAuthModalOpen} />

src/features/MarketingBanner/api/getMarketingConfig.ts

@@ -1,24 +1,22 @@
 import { useQuery } from '@tanstack/react-query'
 import { axios } from 'src/lib/axios'
 import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query'
-import { Ad } from '../types'
 
-const getAd = async (keywords: string[], feed: boolean = false): Promise<Ad | null> => {
-  let params = { keywords: keywords.join(','), feed: feed ? 'true' : 'false' }
-  return axios.get('/engine/ads/adaptive', { params })
+const getAd = async (keywords: string[]): Promise<Ad[]> => {
+  let params = { keywords: keywords.join(',') }
+  return axios.get('/engine/ads/adaptive_v2', { params })
 }
 
 type QueryFnType = typeof getAd
 
 type UseGetAdOptions = {
   keywords: string[]
-  feed?: boolean
   config?: QueryConfig<QueryFnType>
 }
-export const useGetAd = ({ keywords, feed, config }: UseGetAdOptions) => {
+export const useGetAd = ({ keywords, config }: UseGetAdOptions) => {
   return useQuery<ExtractFnReturnType<QueryFnType>>({
     ...config,
-    queryKey: ['ad', 'v2', keywords.join(',')],
-    queryFn: () => getAd(keywords, feed),
+    queryKey: ['ad', 'v3', keywords.join(',')],
+    queryFn: () => getAd(keywords),
   })
 }