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

[김제완] sprint8 #551

Open
wants to merge 5 commits into
base: React-김제완
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 39 additions & 47 deletions package-lock.json

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

8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.12",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-responsive": "^10.0.0",
"react-router-dom": "^6.22.3",
"react-scripts": "5.0.1",
"typescript": "^4.5.5",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand All @@ -36,5 +41,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
}
}
19 changes: 10 additions & 9 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import Router from "./Router";
import React from "react";

export default function App() {
return (
<>
<Router />
</>
);
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const Router_1 = __importDefault(require("./Router"));
const react_1 = __importDefault(require("react"));
function App() {
return (react_1.default.createElement(react_1.default.Fragment, null,
react_1.default.createElement(Router_1.default, null)));
}
exports.default = App;
10 changes: 10 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Router from "./Router";
import React from "react";

export default function App() {
return (
<>
<Router />
</>
);
}
40 changes: 25 additions & 15 deletions src/Router.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
import { Route, Routes } from "react-router-dom";
import ItemPage from "./pages/items";
import MarketPage from "./pages/market";
import HomePage from "./pages/home";
import ProductPage from "./pages/product";

export default function Router() {
return (
<Routes>
<Route path="/" element={<HomePage />} />
<Route path="items" element={<MarketPage />} />
<Route path="items/:id" element={<ProductPage />} />
<Route path="additem" element={<ItemPage />} />
</Routes>
);
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const react_router_dom_1 = require("react-router-dom");
const react_1 = __importDefault(require("react"));
const home_1 = __importDefault(require("./pages/home"));
const faq_1 = __importDefault(require("./pages/faq"));
const market_1 = __importDefault(require("./pages/market"));
const product_1 = __importDefault(require("./pages/product"));
const items_1 = __importDefault(require("./pages/items"));
const signin_1 = __importDefault(require("./pages/signin"));
const signup_1 = __importDefault(require("./pages/signup"));
const privacy_1 = __importDefault(require("./pages/privacy"));
function Router() {
return (react_1.default.createElement(react_router_dom_1.Routes, null,
react_1.default.createElement(react_router_dom_1.Route, { path: "/", element: react_1.default.createElement(home_1.default, null) }),
react_1.default.createElement(react_router_dom_1.Route, { path: "items", element: react_1.default.createElement(market_1.default, null) }),
react_1.default.createElement(react_router_dom_1.Route, { path: "items/:id", element: react_1.default.createElement(product_1.default, null) }),
react_1.default.createElement(react_router_dom_1.Route, { path: "additem", element: react_1.default.createElement(items_1.default, null) }),
react_1.default.createElement(react_router_dom_1.Route, { path: "signin", element: react_1.default.createElement(signin_1.default, null) }),
react_1.default.createElement(react_router_dom_1.Route, { path: "signup", element: react_1.default.createElement(signup_1.default, null) }),
react_1.default.createElement(react_router_dom_1.Route, { path: "privacy", element: react_1.default.createElement(privacy_1.default, null) }),
react_1.default.createElement(react_router_dom_1.Route, { path: "faq", element: react_1.default.createElement(faq_1.default, null) })));
}
exports.default = Router;
25 changes: 25 additions & 0 deletions src/Router.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { Route, Routes } from "react-router-dom";
import React from "react";
import HomePage from "./pages/home";
import Faq from "./pages/faq";
import MarketPage from "./pages/market";
import ProductPage from "./pages/product";
import ItemPage from "./pages/items";
import Signin from "./pages/signin";
import Signup from "./pages/signup";
import Privacy from "./pages/privacy";

export default function Router() {
return (
<Routes>
<Route path="/" element={<HomePage />} />
<Route path="items" element={<MarketPage />} />
<Route path="items/:id" element={<ProductPage />} />
<Route path="additem" element={<ItemPage />} />
<Route path="signin" element={<Signin />} />
<Route path="signup" element={<Signup />} />
<Route path="privacy" element={<Privacy />} />
<Route path="faq" element={<Faq />} />
</Routes>
);
}
10 changes: 10 additions & 0 deletions src/assets/icon/eye-invisible.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon/eye-visible.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icon/google-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon/ic_facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon/ic_instagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading