Merge 1fab7a4 into de8d796

garageScript · Apr 23, 2023 · d946b8b · d946b8b
2 parents de8d796 + 1fab7a4
commit d946b8b
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 6 deletions.
diff --git a/components/Footer.tsx → components/Footer/Footer.tsx b/components/Footer.tsx → components/Footer/Footer.tsx
diff --git a/components/Footer/index.tsx b/components/Footer/index.tsx
@@ -0,0 +1 @@
+export { default } from './Footer'
diff --git a/components/Input.tsx → components/Input/Input.tsx b/components/Input.tsx → components/Input/Input.tsx
diff --git a/components/Input/index.tsx b/components/Input/index.tsx
@@ -0,0 +1 @@
+export { default } from './Input'
diff --git a/components/InputGroup.tsx → components/InputGroup/InputGroup.tsx b/components/InputGroup.tsx → components/InputGroup/InputGroup.tsx
diff --git a/components/InputGroup/index.tsx b/components/InputGroup/index.tsx
@@ -0,0 +1 @@
+export { default } from './InputGroup'
diff --git a/components/Layout.tsx → components/Layout/Layout.tsx b/components/Layout.tsx → components/Layout/Layout.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
-import AppNav from './AppNav'
-import Footer from './Footer'
+import AppNav from '../AppNav'
+import Footer from '../Footer'
 import Head from 'next/head'
-import type { LayoutGetter } from '../@types/page'
-import styles from '../scss/layout.module.scss'
+import type { LayoutGetter } from '../../@types/page'
+import styles from './layout.module.scss'
 
 const Layout: React.FC<{ title?: string }> = ({ children, title }) => (
   <>

diff --git a/components/Layout/index.tsx b/components/Layout/index.tsx
@@ -0,0 +1 @@
+export { getLayout, default } from './Layout'
diff --git a/scss/layout.module.scss → components/Layout/layout.module.scss b/scss/layout.module.scss → components/Layout/layout.module.scss
diff --git a/components/LoadingSpinner.tsx → components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner.tsx → components/LoadingSpinner/LoadingSpinner.tsx
diff --git a/components/LoadingSpinner/index.tsx b/components/LoadingSpinner/index.tsx
@@ -0,0 +1 @@
+export { default } from './LoadingSpinner'
diff --git a/components/admin/AdminLayout.tsx b/components/admin/AdminLayout.tsx
@@ -1,10 +1,11 @@
 import React from 'react'
-import LoadingSpinner from '../../components/LoadingSpinner'
-import Layout from '../../components/Layout'
+import LoadingSpinner from '../LoadingSpinner'
+import Layout from '../Layout'
 import _ from 'lodash'
 import { GetAppProps } from '../../graphql'
 import Error, { StatusCode } from '../../components/Error'
 import { useRouter } from 'next/router'
+
 export const AdminLayout: React.FC<GetAppProps & { title?: string }> = ({
   data,
   children