Merge pull request #97 from medyo/refactor/typescript-cards

Refactor/typescript cards

Author: medyo

package.json

@@ -63,6 +63,9 @@
       "last 1 safari version"
     ]
   },
+  "resolutions": {
+    "react-error-overlay": "6.0.9"
+  },
   "devDependencies": {
     "@types/chrome": "^0.0.198",
     "@types/jest": "^29.1.2",

src/App.js

@@ -1,11 +1,10 @@
 import React, { useState, useEffect } from 'react'
-import './App.css'
-import { Footer } from 'src/components/Layout'
-import Header from 'src/components/Header'
+import 'src/assets/App.css'
+import { Footer, Header } from 'src/components/Layout'
 import { BookmarksSidebar } from 'src/features/bookmarks'
-import { MarketingBanner } from 'src/components/Elements/MarketingBanner'
+import { MarketingBanner } from 'src/components/Elements'
 import ScrollCardsNavigator from './components/ScrollCardsNavigator'
-import AppContentLayout from './components/AppContentLayout'
+import { AppContentLayout } from './components/Layout'
 import 'react-contexify/dist/ReactContexify.css'
 import { setupAnalytics, trackPageView, setupIdentification } from 'src/lib/analytics'
 import { useRemoteConfigStore } from 'src/features/remoteConfig'
@@ -14,9 +13,7 @@ function App() {
   const [showSideBar, setShowSideBar] = useState(false)
   const [showSettings, setShowSettings] = useState(false)
 
-  const {
-    remoteConfig: { marketingBannerConfig },
-  } = useRemoteConfigStore()
+  const { marketingBannerConfig } = useRemoteConfigStore()
 
   useEffect(() => {
     setupAnalytics()

src/App.css src/assets/App.csssrc/App.css renamed to src/assets/App.css

@@ -1,13 +1,13 @@
 @font-face {
   font-family: 'Nunito';
-  src: url("assets/fonts/nunito/nunito-regular.woff2") format('woff2');
+  src: url("fonts/nunito/nunito-regular.woff2") format('woff2');
 }
 
 @font-face {
   font-family: 'Nunito';
   font-weight: 600;
   font-style: normal;
-  src: url("assets/fonts/nunito/nunito-semibold.woff2") format('woff2');
+  src: url("fonts/nunito/nunito-semibold.woff2") format('woff2');
 }
 
 html.dark {