Skip to content

Commit

Permalink
카테고리정렬, 페이지네이션, Linting
Browse files Browse the repository at this point in the history
  • Loading branch information
dokdo2013 committed May 14, 2022
1 parent 7b62573 commit 3888aa6
Show file tree
Hide file tree
Showing 19 changed files with 2,274 additions and 1,089 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1",
"react-scroll-to-top": "1.0.8",
"react-sortablejs": "^6.1.1",
"sortablejs": "^1.15.0",
"web-vitals": "2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"lint": "eslint \"*/*.js\" --fix"
},
"eslintConfig": {
"extends": [
Expand Down
47 changes: 29 additions & 18 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,41 @@
import { ChakraProvider } from "@chakra-ui/react"
import { Routes, Route } from 'react-router-dom';
import Main from './Main'
import Login from './Login'
import { ChakraProvider } from "@chakra-ui/react";
import { Routes, Route } from "react-router-dom";
import Main from "./Main";
import Login from "./Login";

function App() {
const setVh = () => {
document.documentElement.style.setProperty('--vh', `${window.innerHeight}px`)
document.documentElement.style.setProperty(
"--vh",
`${window.innerHeight}px`
);
};
window.addEventListener('resize', setVh);
window.addEventListener("resize", setVh);
setVh();

return (
<>
<Routes>
<Route path="/" exact={true} element={
<ChakraProvider>
<Main />
</ChakraProvider>
} />
<Routes>
<Route
path="/"
exact={true}
element={
<ChakraProvider>
<Main />
</ChakraProvider>
}
/>

<Route path="/login" exact={true} element={
<ChakraProvider>
<Login />
</ChakraProvider>
} />
</Routes>
<Route
path="/login"
exact={true}
element={
<ChakraProvider>
<Login />
</ChakraProvider>
}
/>
</Routes>
</>
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/App.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { render, screen } from '@testing-library/react';
import App from './App';
import { render, screen } from "@testing-library/react";
import App from "./App";

test('renders learn react link', () => {
test("renders learn react link", () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
Expand Down
Loading

0 comments on commit 3888aa6

Please sign in to comment.