Skip to content

Commit ce2850b

Browse files
authored
Merge pull request #13 from minzero31/jimini
Main 화면#8
2 parents a65c95a + a88ed1b commit ce2850b

18 files changed

+321
-76
lines changed

package-lock.json

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"@testing-library/jest-dom": "^5.17.0",
77
"@testing-library/react": "^13.4.0",
88
"@testing-library/user-event": "^13.5.0",
9+
"lottie-react": "^2.4.0",
910
"react": "^18.3.1",
1011
"react-dom": "^18.3.1",
1112
"react-router-dom": "^6.24.1",

src/App.css

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/App.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { BrowserRouter, Route, Routes } from "react-router-dom";
2-
import "./App.css";
32
import Loading from "./page/Loading";
43
import Login from "./page/Login";
4+
import Main from "./page/Main";
55

66
function App() {
77
return (
88
<BrowserRouter>
99
<Routes>
1010
<Route path="/" element={<Loading />} />
1111
<Route path="/login" element={<Login />} />
12+
<Route path="/main" element={<Main />} />
1213
</Routes>
1314
</BrowserRouter>
1415
);

src/App.test.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/AppProvider.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React, { createContext, useState } from "react";
2+
3+
export const Context = createContext();
4+
5+
const AppProvider = ({ children }) => {
6+
const [state, setState] = useState({
7+
username: "",
8+
});
9+
10+
return (
11+
<Context.Provider value={{ state, setState }}>{children}</Context.Provider>
12+
);
13+
};
14+
15+
export default AppProvider;

src/img/caution.png

10.1 KB
Loading

src/img/doodle.png

13.2 KB
Loading

src/index.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
body {
22
margin: 0;
3-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
4-
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
3+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
4+
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
55
sans-serif;
66
-webkit-font-smoothing: antialiased;
77
-moz-osx-font-smoothing: grayscale;
88
}
99

1010
code {
11-
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
11+
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
1212
monospace;
1313
}

src/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ import React from "react";
22
import ReactDOM from "react-dom/client";
33
import "./index.css";
44
import App from "./App";
5+
import AppProvider from "./AppProvider";
56

67
const root = ReactDOM.createRoot(document.getElementById("root"));
7-
root.render(<App />);
8+
root.render(
9+
<AppProvider>
10+
<App />
11+
</AppProvider>
12+
);

0 commit comments

Comments
 (0)