diff --git a/bowwowcare/src/context/ThemeProvider.js b/bowwowcare/src/context/ThemeProvider.js index d199ec1..25b0b29 100644 --- 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 deleted file mode 100644 index c44ed4b..0000000 --- a/bowwowcare/src/theme/theme.js +++ /dev/null @@ -1,23 +0,0 @@ -export const primaryTheme = { - primary: '#38A8AC', - secondary: "#E5EEC1", -}; - -// TODO: 색상 변경 -// 일단은 보라 -export const secondaryTheme = { - primary: '#7E57C2', - secondary:'#EDE7F6' -}; - -// 일단은 검정 -export const thirdTheme = { - primary: '#424242', - secondary:'#F5F5F5' -}; - -export const theme = { - primaryTheme, - secondaryTheme, - thirdTheme -} \ No newline at end of file diff --git a/bowwowcare/src/views/AdditionPage/AdditionPage.js b/bowwowcare/src/views/AdditionPage/AdditionPage.js index cd3af7d..870e0b3 100644 --- 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() {
-
+
-
- {fileImg && ( - +
+ 프로필 이미지 - )}
- -
- - + -
@@ -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 index 2b469d0..b08539f 100644 --- 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() {