Skip to content

Commit

Permalink
fix: (#55) npm run dev 실행 시 발생하는 오류 해결, 라우팅 이슈 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
inyeong-kang committed Jul 16, 2023
1 parent f7ce862 commit dba88a2
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 67 deletions.
75 changes: 25 additions & 50 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import { RouterProvider } from 'react-router-dom';

import { QueryClient, QueryClientProvider } from '@tanstack/react-query';

import Home from '@pages/Home';
import { ThemeProvider } from 'styled-components';

import router from '@routes/router';

import { GlobalStyle } from '@styles/globalStyle';
import { theme } from '@styles/theme';

const queryClient = new QueryClient();

const App = () => (
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} >
<Example />
<Home />
</RouterProvider>
</QueryClientProvider>
<ThemeProvider theme={theme}>
<GlobalStyle />
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} />
</QueryClientProvider>
</ThemeProvider>
);

export default App;
6 changes: 2 additions & 4 deletions frontend/src/components/Example/style.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { styled } from 'styled-components';

import { theme } from '@styles/theme';

export const Button = styled.button`
width: 80px;
color: ${theme.color.white};
background: ${theme.color.primary};
color: red;
font-size: 1rem;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default meta;
type Story = StoryObj<typeof OptionUploadImageButton>;

export const Default: Story = {
render: () => <OptionUploadImageButton labelId={123} />,
render: () => <OptionUploadImageButton optionId={123} />,
};
8 changes: 4 additions & 4 deletions frontend/src/routes/router.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { createBrowserRouter } from 'react-router-dom';

import PostDetail from '@pages/Post/PostDetail';
import PostList from '@pages/Post/PostList';
import WritePost from '@pages/Post/WritePost';
import PostDetail from '@pages/post/PostDetail';
import PostList from '@pages/post/PostList';
import WritePost from '@pages/post/WritePost';

const router = createBrowserRouter([
{
path: '/',
element: <PostList />,
children: [
{ path: '', element: <PostList /> },
{
path: 'posts/write',
element: <WritePost />,
Expand Down

0 comments on commit dba88a2

Please sign in to comment.