Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP(12): Component folder structure #2919

Merged
merged 11 commits into from
Apr 23, 2023
File renamed without changes.
1 change: 1 addition & 0 deletions components/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './Footer'
File renamed without changes.
1 change: 1 addition & 0 deletions components/Input/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './Input'
File renamed without changes.
1 change: 1 addition & 0 deletions components/InputGroup/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './InputGroup'
8 changes: 4 additions & 4 deletions components/Layout.tsx → components/Layout/Layout.tsx
Original file line number Diff line number Diff line change
@@ -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 }) => (
<>
Expand Down
1 change: 1 addition & 0 deletions components/Layout/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { getLayout, default } from './Layout'
File renamed without changes.
1 change: 1 addition & 0 deletions components/LoadingSpinner/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './LoadingSpinner'
5 changes: 3 additions & 2 deletions components/admin/AdminLayout.tsx
Original file line number Diff line number Diff line change
@@ -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
Expand Down