feat: adds the app layout to app

Adds the app layout to the app closes #148
anguspiv · Nov 15, 2022 · 2b844be · 2b844be
1 parent 946b4df
commit 2b844be
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
@@ -1,5 +1,5 @@
 <link rel="preconnect" href="https://fonts.googleapis.com" />
-<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin />
+<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="true" />
 <link
   href="https://fonts.googleapis.com/css2?&family=Fira+Code:wght@300..700&family=Open+Sans:wght@300..700&display=optional"
   rel="stylesheet" />
diff --git a/src/components/atoms/Avatar/Avatar.jsx b/src/components/atoms/Avatar/Avatar.jsx
@@ -12,7 +12,7 @@ export function Avatar({ className, width, height, ...props }) {
 
 Avatar.propTypes = {
   ...Image.propTypes,
-  src: PropTypes.oneOfType([PropTypes.string, PropTypes.shape]).isRequired,
+  src: PropTypes.oneOfType([PropTypes.string, PropTypes.shape({})]).isRequired,
   className: PropTypes.string,
 };
 

diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx
@@ -3,6 +3,8 @@ import createCache from '@emotion/cache';
 import { CacheProvider, Global, ThemeProvider } from '@emotion/react';
 import { global } from '@styles/global';
 import { theme } from '@styles/theme';
+import { AppLayout } from '@components/templates/AppLayout';
+import '@fortawesome/fontawesome-svg-core/styles.css';
 
 const cache = createCache({ key: 'css', prepend: true });
 
@@ -11,7 +13,9 @@ function MyApp({ Component, pageProps }) {
     <CacheProvider value={cache}>
       <ThemeProvider theme={theme}>
         <Global styles={global} />
-        <Component {...pageProps} />
+        <AppLayout>
+          <Component {...pageProps} />
+        </AppLayout>
       </ThemeProvider>
     </CacheProvider>
   );

diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
@@ -5,7 +5,7 @@ export default function Document() {
     <Html>
       <Head>
         <link rel="preconnect" href="https://fonts.googleapis.com" />
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin />
+        <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="true" />
         <link
           href="https://fonts.googleapis.com/css2?&family=Fira+Code:wght@300..700&family=Open+Sans:wght@300..700&display=optional"
           rel="stylesheet"