[#86] fix: fix profile image path

2022-2-Graduation-Project · Mar 18, 2023 · 255d070 · 255d070
1 parent 3e27430
commit 255d070
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 43 deletions.
diff --git a/bowwowcare/src/context/ThemeProvider.js b/bowwowcare/src/context/ThemeProvider.js
@@ -9,7 +9,6 @@ function ThemeProvider({ children }) {
   const [myTheme, setMyTheme] = useState(0);
   const [ThemeMode, setThemeMode] = useState(theme[0]);
 
-
   useEffect(() => {
     if(isLogin()){
       userService.getUserBoard().then((response) => {

diff --git a/bowwowcare/src/theme/theme.js b/bowwowcare/src/theme/theme.js
diff --git a/bowwowcare/src/views/AdditionPage/AdditionPage.js b/bowwowcare/src/views/AdditionPage/AdditionPage.js
@@ -12,6 +12,7 @@ import Button from "../../components/Button";
 import Alert from "../../components/Alert";
 import { ThemeContext } from "../../context/ThemeProvider";
 import { colorVariants } from "../../utils/Dictionary";
+import HAPPY from "../../assets/images/happy.png"
 
 function AdditionPage() {
   let navigate = useNavigate();
@@ -85,7 +86,6 @@ function AdditionPage() {
           }
         });
       } else {
-        // TODO: 수정 API 추가
       }
     } else {
       handleOpen();
@@ -101,27 +101,18 @@ function AdditionPage() {
     <div className="container mx-auto px-8 w-screen h-screen">
       <Header />
       <div className="flex flex-col justify-center m-12">
-        <div className="w-full mb-10 flex justify-center">
+        <div className="w-full mb-6 flex justify-center">
           <div className="flex flex-col ">
-            <div className="rounded-full border w-20 h-20 ml-4">
-              {fileImg && (
-                <img
-                  src={
-                    typeof fileImg === "string"
-                      ? fileImg
-                      : URL.createObjectURL(fileImg)
-                  }
+          <label className="font-bold " htmlFor="profileImg">
+            <div className="rounded-full w-20 h-20 ml-4">
+            <img
+                src={!fileImg ? HAPPY : typeof fileImg === "string" ? fileImg : URL.createObjectURL(fileImg)} 
                   alt="프로필 이미지"
                   className="rounded-full w-20 h-20"
                 ></img>
-              )}
             </div>
-
-            <div className="mt-3">
-              <label className="font-bold " htmlFor="profileImg">
-                프로필 이미지 {pet ? "변경" : "추가"}
-              </label>
-              <input
+            </label>
+            <input
                 type="file"
                 id="profileImg"
                 name="avatar"
@@ -130,7 +121,6 @@ function AdditionPage() {
                 onChange={handleChange}
                 style={{ display: "none" }}
               />
-            </div>
           </div>
         </div>
 
@@ -141,6 +131,7 @@ function AdditionPage() {
               colorVariants["border" + themeMode]
             }`}
             value={petname}
+            placeholder="반려견의 이름을 입력해주세요."
             onChange={(e) => {
               setPetName(e.target.value);
             }}

diff --git a/bowwowcare/src/views/UserPage/UserPage.js b/bowwowcare/src/views/UserPage/UserPage.js
@@ -5,6 +5,7 @@ import ThemeSwitcher from "../../components/ThemeSwitcher";
 import userService from "../../services/user.service";
 import { API_URL } from "../../Config";
 import authHeader from "../../services/auth-header";
+import HAPPY from "../../assets/images/happy.png"
 
 function UserPage() {
   const [rewards, setRewards] = useState(0);
@@ -71,7 +72,7 @@ function UserPage() {
           <div className="rounded-full w-12 h-12 border" >
             <label htmlFor="profileImg">
               <img 
-              src={typeof fileImg === "string" ? fileImg : URL.createObjectURL(fileImg)} 
+              src={!fileImg ? HAPPY : typeof fileImg === "string" ? fileImg : URL.createObjectURL(fileImg)} 
               className="rounded-full w-12 h-12" alt="유저 이미지">
               </img>
             </label>