Merge pull request #97 from next-petree/boilerPlate

Boiler plate
next-petree · Jan 21, 2024 · 296230e · 296230e
2 parents 5f126e9 + 877aef3
commit 296230e
Show file tree

Hide file tree

Showing 47 changed files with 2,680 additions and 181 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "@types/styled-components": "^5.1.29",
     "axios": "^1.6.0",
     "react": "^18.2.0",
+    "react-datepicker": "^4.25.0",
     "react-daum-postcode": "^3.1.3",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.47.0",
@@ -41,6 +42,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@types/base-64": "^1.0.1",
+    "@types/react-datepicker": "^4.19.5",
     "@types/react-table": "^7.7.18",
     "typescript": "^4.9.5"
   },

diff --git a/src/App.tsx b/src/App.tsx
@@ -29,53 +29,92 @@ import Profile from "./pages/MyPage/profile";
 import Breeder from "./pages/AdoptionRequestList/Breeder/Breeder";
 import Adopter from "./pages/AdoptionRequestList/Adopter/Adopter";
 import RemoveAccount from "./pages/RemoveAccount/RemoveAccount";
+import ManageReview from "./pages/ManageReview/ManageReview";
+import ManageOwnDogs from "./pages/ManageOwnDogs/ManageOwnDogs";
+import CreateReview from "./pages/ManageReview/create/CreateReview";
+import EditReview from "./pages/ManageReview/edit/EditReview";
+import EditOwnDogs from "./pages/ManageOwnDogs/edit/EditOwnDogs";
 
 function App() {
-  return (
-    <>
-      <Routes>
-        <Route path="/breeders/:pageId" element={<BreederCollect />} />
-        <Route path="/dogys/:pageId" element={<DogyCollect />} />
-        <Route path="/" element={<IntroPage />} />
-        <Route path="/login" element={<Login />} />
-        <Route path="oauth/kakao/callback" element={<LoginCheckForKakao />} />
-        <Route path="register" element={<Register />} />
-        <Route
-          path="register/breeder-detail"
-          element={<RegisterBreederDetail />}
-        />
-        <Route
-          path="register/adopter-detail"
-          element={<RegisterAdopterDetail />}
-        />
-        <Route path="success-register" element={<SuccessRegister />} />
-        <Route path="/find-email" element={<FindEmail />} />
-        <Route path="/find-password" element={<FindPassword />} />
-        <Route path="/find-email-result" element={<FindEmailResult />} />
-        <Route path="/change-password" element={<ChangePassword />} />
-        <Route
-          path="/change-password-result"
-          element={<ChangePasswordResult />}
-        />
-        <Route path="" element={<PrivateRoute />}>
-          <Route path="/breeding-register" element={<BreedingRegister />} />
-          <Route path="/register-fillout" element={<RegisterFillOut />} />
-          <Route path="/breeding-complete" element={<BreedingComplete />} />
-        </Route>
-        <Route path="/breeder/:id" element={<BreederDetails />} />
-        <Route path="/customer-details" element={<CustomerDetails />} />
-        <Route path="/test-description" element={<TestDesc />}></Route>
-        <Route path="/basic-test" element={<Test />} />
-        <Route path="/result" element={<Result />} />
-        <Route path="/answer" element={<Answer />} />
-        <Route path="/certify" element={<Certify />} />
-        <Route path="/mypage/adoptlist/adopter" element={<Adopter />} />
-        <Route path="/mypage/adoptlist/breeder" element={<Breeder />} />
-        <Route path="/mypage/modifyauth" element={<ModifyAuth />} />
-        <Route path="/mypage/profile" element={<Profile />} />
-        <Route path="/mypage/remove-account" element={<RemoveAccount />} />
-      </Routes>
-    </>
-  );
+    return (
+        <>
+            <Routes>
+                <Route path="/breeders/:pageId" element={<BreederCollect />} />
+                <Route path="/dogys/:pageId" element={<DogyCollect />} />
+                <Route path="/" element={<IntroPage />} />
+                <Route path="/login" element={<Login />} />
+                <Route
+                    path="oauth/kakao/callback"
+                    element={<LoginCheckForKakao />}
+                />
+                <Route path="register" element={<Register />} />
+                <Route
+                    path="register/breeder-detail"
+                    element={<RegisterBreederDetail />}
+                />
+                <Route
+                    path="register/adopter-detail"
+                    element={<RegisterAdopterDetail />}
+                />
+                <Route path="success-register" element={<SuccessRegister />} />
+                <Route path="/find-email" element={<FindEmail />} />
+                <Route path="/find-password" element={<FindPassword />} />
+                <Route
+                    path="/find-email-result"
+                    element={<FindEmailResult />}
+                />
+                <Route path="/change-password" element={<ChangePassword />} />
+                <Route
+                    path="/change-password-result"
+                    element={<ChangePasswordResult />}
+                />
+                <Route path="" element={<PrivateRoute />}>
+                    <Route
+                        path="/breeding-register"
+                        element={<BreedingRegister />}
+                    />
+                    <Route
+                        path="/register-fillout"
+                        element={<RegisterFillOut />}
+                    />
+                    <Route
+                        path="/breeding-complete"
+                        element={<BreedingComplete />}
+                    />
+                    <Route path="/mypage/review/:pageId" element={<ManageReview />} />
+                    <Route
+                        path="/mypage/review/create"
+                        element={<CreateReview />}
+                    ></Route>
+
+                    <Route
+                        path="/mypage/review/edit/:id"
+                        element={<EditReview />}
+                    ></Route>
+
+                    <Route path="/mypage/owndogs/:pageId" element={<ManageOwnDogs />} />
+                    <Route
+                        path="/mypage/owndogs/edit/:id"
+                        element={<EditOwnDogs />}
+                    />
+                </Route>
+                <Route path="/breeder/:id" element={<BreederDetails />} />
+                <Route path="/customer-details" element={<CustomerDetails />} />
+                <Route path="/test-description" element={<TestDesc />}></Route>
+                <Route path="/basic-test" element={<Test />} />
+                <Route path="/result" element={<Result />} />
+                <Route path="/answer" element={<Answer />} />
+                <Route path="/certify" element={<Certify />} />
+                <Route path="/mypage/adoptlist/adopter" element={<Adopter />} />
+                <Route path="/mypage/adoptlist/breeder" element={<Breeder />} />
+                <Route path="/mypage/modifyauth" element={<ModifyAuth />} />
+                <Route path="/mypage/profile" element={<Profile />} />
+                <Route
+                    path="/mypage/remove-account"
+                    element={<RemoveAccount />}
+                />
+            </Routes>
+        </>
+    );
 }
 export default App;
diff --git a/src/assets/images/Group28.png b/src/assets/images/Group28.png
diff --git a/src/assets/images/index.ts b/src/assets/images/index.ts
@@ -4,5 +4,6 @@ import IMG2 from "./Group21.png";
 import IMG3 from "./Rectangle6.png";
 import IMG4 from "./pome1.png";
 import IMG5 from "./golden.png";
+import IMG6 from "./Group28.png";
 
-export { IMG1, IMG2, IMG3, IMG4, IMG5 };
+export { IMG1, IMG2, IMG3, IMG4, IMG5, IMG6 };
diff --git a/src/component/Common/Button/Button.tsx b/src/component/Common/Button/Button.tsx
@@ -0,0 +1,45 @@
+import styled from "styled-components";
+
+const CustomButton = styled.button<{
+  weight: number;
+  size: number;
+  customwidth: number;
+  customheight: number;
+}>`
+  width: ${(props) => props.customwidth}px;
+  height: ${(props) => props.customheight}px;
+  border-radius: 16px;
+  border: none;
+  background: #4ec1bf;
+  gap: 10px;
+  color: #ffffff;
+  font-family: Noto Sans KR;
+  font-size: ${(props) => props.size}px;
+  font-weight: ${(props) => props.weight};
+  line-height: 23px;
+  letter-spacing: -0.03em;
+  cursor: pointer;
+`;
+
+interface IButtonProps {
+  children: React.ReactNode;
+  weight: number;
+  size: number;
+  width: number;
+  height: number;
+}
+
+const Button = ({ children, weight, size, width, height }: IButtonProps) => {
+  return (
+    <CustomButton
+      weight={weight}
+      size={size}
+      customwidth={width}
+      customheight={height}
+    >
+      {children}
+    </CustomButton>
+  );
+};
+
+export default Button;