Little fixes

Vizzuality · Aug 23, 2023 · 6e20763 · 6e20763
1 parent df3df53
commit 6e20763
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 110 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/public/images/categories/energy.svg b/client/public/images/categories/energy.svg
diff --git a/client/src/app/[storyId]/[step]/page.tsx b/client/src/app/[storyId]/[step]/page.tsx
@@ -1,7 +1,3 @@
-import Hydrate from '@/lib/react-query/hydrate';
-
-import { prefetchQueries } from '@/app/prefetch';
-
 import Story from '@/containers/story';
 
 export default async function StoryPage({
@@ -12,11 +8,5 @@ export default async function StoryPage({
     step: string;
   };
 }) {
-  const dehydratedState = await prefetchQueries();
-
-  return (
-    <Hydrate state={dehydratedState}>
-      <Story storyId={params.storyId} step={params.step} />
-    </Hydrate>
-  );
+  return <Story storyId={params.storyId} step={params.step} />;
 }
diff --git a/client/src/app/layout-providers.tsx b/client/src/app/layout-providers.tsx
@@ -13,6 +13,8 @@ import RecoilDevTools from '@/lib/recoil/devtools';
 
 import { TooltipProvider } from '@/components/ui/tooltip';
 
+import { notesESA, sans } from '@/styles/fonts';
+
 export default function Providers({ children }: PropsWithChildren) {
   const [queryClient] = useState(() => new QueryClient());
   const serialize: Serialize = useCallback((x) => {
@@ -24,21 +26,30 @@ export default function Providers({ children }: PropsWithChildren) {
     return JSON.parse(x);
   }, []);
   return (
-    <QueryClientProvider client={queryClient}>
-      <RecoilRoot>
-        <MapProvider>
-          <TooltipProvider>
-            <RecoilURLSyncNext
-              location={{ part: 'queryParams' }}
-              serialize={serialize}
-              deserialize={deserialize}
-            >
-              <RecoilDevTools />
-              {children}
-            </RecoilURLSyncNext>
-          </TooltipProvider>
-        </MapProvider>
-      </RecoilRoot>
-    </QueryClientProvider>
+    <>
+      <style jsx global>{`
+        :root {
+          --font-inter: ${sans.style.fontFamily};
+          --font-esa-notes: ${notesESA.style.fontFamily};
+        }
+      `}</style>
+
+      <QueryClientProvider client={queryClient}>
+        <RecoilRoot>
+          <MapProvider>
+            <TooltipProvider>
+              <RecoilURLSyncNext
+                location={{ part: 'queryParams' }}
+                serialize={serialize}
+                deserialize={deserialize}
+              >
+                <RecoilDevTools />
+                {children}
+              </RecoilURLSyncNext>
+            </TooltipProvider>
+          </MapProvider>
+        </RecoilRoot>
+      </QueryClientProvider>
+    </>
   );
 }
diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx
@@ -5,8 +5,6 @@ import Providers from '@/app/layout-providers';
 
 import Map from '@/containers/home/map';
 
-import Fonts from '@/components/ui/fonts';
-
 export const metadata = {
   title: 'Create Next App',
   description: 'Generated by create next app',
@@ -16,13 +14,10 @@ export default function RootLayout({ children }: { children: React.ReactNode })
   return (
     <Providers>
       <html lang="en">
-        <Fonts />
         <body className="font-notes h-screen w-screen">
-          <main className="flex flex-col">
-            <div>
-              <Map />
-              {children}
-            </div>
+          <main>
+            <Map />
+            {children}
           </main>
         </body>
       </html>

diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
@@ -1,15 +1,5 @@
-import Hydrate from '@/lib/react-query/hydrate';
-
 import Home from '@/containers/home';
 
-import { prefetchQueries } from './prefetch';
-
 export default async function HomePage() {
-  const dehydratedState = await prefetchQueries();
-
-  return (
-    <Hydrate state={dehydratedState}>
-      <Home />
-    </Hydrate>
-  );
+  return <Home />;
 }
diff --git a/client/src/components/ui/fonts.tsx b/client/src/components/ui/fonts.tsx
diff --git a/client/public/fonts/NotesEsaBol.otf → client/src/styles/NotesEsaBol.otf b/client/public/fonts/NotesEsaBol.otf → client/src/styles/NotesEsaBol.otf
diff --git a/client/public/fonts/NotesEsaBolIta.otf → client/src/styles/NotesEsaBolIta.otf b/client/public/fonts/NotesEsaBolIta.otf → client/src/styles/NotesEsaBolIta.otf
diff --git a/client/public/fonts/NotesEsaReg.otf → client/src/styles/NotesEsaReg.otf b/client/public/fonts/NotesEsaReg.otf → client/src/styles/NotesEsaReg.otf
diff --git a/client/public/fonts/NotesEsaRegIta.otf → client/src/styles/NotesEsaRegIta.otf b/client/public/fonts/NotesEsaRegIta.otf → client/src/styles/NotesEsaRegIta.otf
diff --git a/client/src/styles/fonts.ts b/client/src/styles/fonts.ts
@@ -0,0 +1,37 @@
+import { Inter as SansFont } from 'next/font/google';
+import localFont from 'next/font/local';
+
+export const sans = SansFont({
+  subsets: ['latin'],
+  variable: '--font-inter',
+  fallback: ['system-ui', 'Helvetica Neue', 'Helvetica', 'Arial'],
+  weight: ['400'],
+  display: 'block',
+});
+
+export const notesESA = localFont({
+  src: [
+    {
+      path: './NotesEsaBol.otf',
+      weight: 'bold',
+      style: 'normal',
+    },
+    {
+      path: './NotesEsaBolIta.otf',
+      weight: 'bold',
+      style: 'italic',
+    },
+    {
+      path: './NotesEsaReg.otf',
+      weight: 'normal',
+      style: 'normal',
+    },
+    {
+      path: './NotesEsaRegIta.otf',
+      weight: 'normal',
+      style: 'italic',
+    },
+  ],
+  display: 'block',
+  variable: '--font-esa-notes',
+});