From 39018853908ac7b1c958ba2397a03ab68dcaa3fd Mon Sep 17 00:00:00 2001 From: SEOKKAMONI Date: Wed, 23 Aug 2023 08:13:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?FIX=20::=20=EB=B0=94=EB=80=90=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/user/public/svg/school_logo.svg | 34 +++++++++++++++++++ .../src/components/common/Footer/Footer.tsx | 16 +++++---- .../src/components/common/Header/Header.tsx | 6 ++-- .../src/components/main/Schedule/Schedule.tsx | 2 +- packages/maru-ui/src/Button/Button.style.ts | 2 +- 5 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 apps/user/public/svg/school_logo.svg diff --git a/apps/user/public/svg/school_logo.svg b/apps/user/public/svg/school_logo.svg new file mode 100644 index 000000000..ced62d00c --- /dev/null +++ b/apps/user/public/svg/school_logo.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/user/src/components/common/Footer/Footer.tsx b/apps/user/src/components/common/Footer/Footer.tsx index 92d73a89c..a1c75b9e2 100644 --- a/apps/user/src/components/common/Footer/Footer.tsx +++ b/apps/user/src/components/common/Footer/Footer.tsx @@ -15,9 +15,15 @@ const Footer = () => { logo_gray -

주소: 부산광역시 강서구 가락대로 1393 봉림동 15 (46708)

-

교무실(입학처): 051-971-2153, Fax: 051-971-2061

-

행정실:051-971-2152, Fax: 051-971-6325

+ + 주소: 부산광역시 강서구 가락대로 1393 봉림동 15 (46708) + + + 교무실(입학처): 051-971-2153, Fax: 051-971-2061 + + + 행정실:051-971-2152, Fax: 051-971-6325 + Copyright © 밤돌이로 all rights reserved. @@ -69,8 +75,6 @@ const StyledFooter = styled.div` `; const InfoBox = styled.div` - ${font.p3} - color: ${color.gray600}; ${flex({ flexDirection: 'column' })} gap: 40px; width: 489px; @@ -84,9 +88,9 @@ const ContentBox = styled.div` `; const NavigationBox = styled.div` + // @TODO Link 리팩토링하면서 ${font.p3} color: ${color.gray600}; display: flex; - // @TODO 확인 gap: 132px; `; diff --git a/apps/user/src/components/common/Header/Header.tsx b/apps/user/src/components/common/Header/Header.tsx index 0a6e13035..d6814d204 100644 --- a/apps/user/src/components/common/Header/Header.tsx +++ b/apps/user/src/components/common/Header/Header.tsx @@ -35,10 +35,10 @@ const Header = () => { router.push(ROUTES.MAIN)} alt="logo" /> diff --git a/apps/user/src/components/main/Schedule/Schedule.tsx b/apps/user/src/components/main/Schedule/Schedule.tsx index 1e97b61df..788cfb968 100644 --- a/apps/user/src/components/main/Schedule/Schedule.tsx +++ b/apps/user/src/components/main/Schedule/Schedule.tsx @@ -31,7 +31,7 @@ const Schedule = () => { return ( - 입학일정 + 2024학년도 부산소마고 입학 일정 {SCHEDULE_DATA.map((item) => ( diff --git a/packages/maru-ui/src/Button/Button.style.ts b/packages/maru-ui/src/Button/Button.style.ts index 9b21ea941..77d83d81d 100644 --- a/packages/maru-ui/src/Button/Button.style.ts +++ b/packages/maru-ui/src/Button/Button.style.ts @@ -43,7 +43,7 @@ export const getButtonStyle = { `, DISABLED: css` background-color: ${color.gray700}; - color: ${color.white}; + color: ${color.gray400}; cursor: auto; `, }; From 297ce94481bc5c7a1eb53fb05d0297903e4368c9 Mon Sep 17 00:00:00 2001 From: SEOKKAMONI Date: Wed, 23 Aug 2023 08:22:37 +0900 Subject: [PATCH 2/3] FIX :: useBoolean -> useBooleanState --- apps/user/src/app/signup/signup.hooks.ts | 8 ++++---- .../user/src/components/common/Header/Profile/Profile.tsx | 6 +++--- packages/maru-hooks/index.ts | 4 ++-- packages/maru-hooks/src/useBoolean.ts | 4 ++-- packages/maru-ui/src/Dropdown/Dropdown.tsx | 4 ++-- packages/maru-ui/src/Input/PreviewInput.tsx | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/user/src/app/signup/signup.hooks.ts b/apps/user/src/app/signup/signup.hooks.ts index 797fb7dfc..588cf77be 100644 --- a/apps/user/src/app/signup/signup.hooks.ts +++ b/apps/user/src/app/signup/signup.hooks.ts @@ -1,7 +1,7 @@ -import { PostJoinAuthReq } from '@/types/auth/remote'; import { useJoinUserMutation, useRequestEmailMutation } from '@/services/auth/mutations'; +import { PostJoinAuthReq } from '@/types/auth/remote'; +import { useBooleanState } from '@maru/hooks'; import { ChangeEventHandler, useState } from 'react'; -import { useBoolean } from '@maru/hooks'; export const useJoinAction = (joinUserData: PostJoinAuthReq, termsAgree: boolean) => { const { joinUserMutate } = useJoinUserMutation(joinUserData); @@ -28,9 +28,9 @@ export const useJoinAction = (joinUserData: PostJoinAuthReq, termsAgree: boolean export const useRequestEmailAction = (email: string) => { // 이메일 요청을 보냈는가? - const { value: isRequestEmail, setValue: setIsRequestEmail } = useBoolean(false); + const { value: isRequestEmail, setValue: setIsRequestEmail } = useBooleanState(false); // 이메일 전송 활성화 비활성화 - const { value: isButtonDisabled, setValue: setIsButtonDisabled } = useBoolean(false); + const { value: isButtonDisabled, setValue: setIsButtonDisabled } = useBooleanState(false); const { requestEmailMutate } = useRequestEmailMutation(email); const handleRequestEmailButtonClick = () => { diff --git a/apps/user/src/components/common/Header/Profile/Profile.tsx b/apps/user/src/components/common/Header/Profile/Profile.tsx index 496facd3e..b86c7a2da 100644 --- a/apps/user/src/components/common/Header/Profile/Profile.tsx +++ b/apps/user/src/components/common/Header/Profile/Profile.tsx @@ -1,18 +1,18 @@ import { ROUTES } from '@/constants/common/constant'; +import { useUser } from '@/hooks'; import { useLogoutUserMutation } from '@/services/auth/mutations'; -import { useBoolean, useOutsideClick } from '@maru/hooks'; +import { useBooleanState, useOutsideClick } from '@maru/hooks'; import { IconArrowDropdown } from '@maru/icon'; import { color, font } from '@maru/theme'; import { Text } from '@maru/ui'; import { flex } from '@maru/utils'; import { useRouter } from 'next/navigation'; -import { useUser } from '@/hooks'; import styled from 'styled-components'; const Profile = () => { const router = useRouter(); const { userData } = useUser(); - const { value: isMenuOpen, toggle: toggleMenuOpen, setFalse: closeMenu } = useBoolean(); + const { value: isMenuOpen, toggle: toggleMenuOpen, setFalse: closeMenu } = useBooleanState(); const { logoutUserMutate } = useLogoutUserMutation(); const menuListBoxRef = useOutsideClick(closeMenu); diff --git a/packages/maru-hooks/index.ts b/packages/maru-hooks/index.ts index ffccb9021..af2162596 100644 --- a/packages/maru-hooks/index.ts +++ b/packages/maru-hooks/index.ts @@ -1,4 +1,4 @@ -export { default as useInterval } from './src/useInterval'; +export { default as useBooleanState } from './src/useBooleanState'; export { default as useDebounceInput } from './src/useDebounceInput'; +export { default as useInterval } from './src/useInterval'; export { default as useOutsideClick } from './src/useOutsideClick'; -export { default as useBoolean } from './src/useBoolean'; diff --git a/packages/maru-hooks/src/useBoolean.ts b/packages/maru-hooks/src/useBoolean.ts index 1e23ce445..d84836052 100644 --- a/packages/maru-hooks/src/useBoolean.ts +++ b/packages/maru-hooks/src/useBoolean.ts @@ -1,6 +1,6 @@ import { useCallback, useState } from 'react'; -const useBoolean = (initialValue?: boolean) => { +const useBooleanState = (initialValue?: boolean) => { const [value, setValue] = useState(!!initialValue); const setTrue = useCallback(() => setValue(true), []); @@ -10,4 +10,4 @@ const useBoolean = (initialValue?: boolean) => { return { value, setValue, setTrue, setFalse, toggle }; }; -export default useBoolean; +export default useBooleanState; diff --git a/packages/maru-ui/src/Dropdown/Dropdown.tsx b/packages/maru-ui/src/Dropdown/Dropdown.tsx index 8a8b60b5b..b552cc869 100644 --- a/packages/maru-ui/src/Dropdown/Dropdown.tsx +++ b/packages/maru-ui/src/Dropdown/Dropdown.tsx @@ -1,4 +1,4 @@ -import { useBoolean, useOutsideClick } from '@maru/hooks'; +import { useBooleanState, useOutsideClick } from '@maru/hooks'; import { IconArrowBottom, IconArrowTop } from '@maru/icon'; import { color, font } from '@maru/theme'; import { flex } from '@maru/utils'; @@ -33,7 +33,7 @@ const Dropdown = ({ value: isOpen, setFalse: closeDropdown, toggle: handleToggleButtonClick, - } = useBoolean(); + } = useBooleanState(); const dropdownRef = useOutsideClick(closeDropdown); const handleDropdownItemButtonClick = (data: string) => { diff --git a/packages/maru-ui/src/Input/PreviewInput.tsx b/packages/maru-ui/src/Input/PreviewInput.tsx index cc9d8f9cf..c6bd63b37 100644 --- a/packages/maru-ui/src/Input/PreviewInput.tsx +++ b/packages/maru-ui/src/Input/PreviewInput.tsx @@ -1,4 +1,4 @@ -import { useBoolean } from '@maru/hooks'; +import { useBooleanState } from '@maru/hooks'; import { IconInvisibleEye, IconVisibleEye } from '@maru/icon'; import { color, font } from '@maru/theme'; import { flex } from '@maru/utils'; @@ -17,7 +17,7 @@ const PreviewInput = ({ isError = false, onChange, }: InputProps) => { - const { value: isPreview, toggle: toggleIsPreview } = useBoolean(); + const { value: isPreview, toggle: toggleIsPreview } = useBooleanState(); return (
From 56f649b558ea0fb31d64d4c4f1864817431ca2eb Mon Sep 17 00:00:00 2001 From: SEOKKAMONI Date: Wed, 23 Aug 2023 08:28:21 +0900 Subject: [PATCH 3/3] FIX :: file name --- packages/maru-hooks/src/{useBoolean.ts => useBooleanState.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/maru-hooks/src/{useBoolean.ts => useBooleanState.ts} (100%) diff --git a/packages/maru-hooks/src/useBoolean.ts b/packages/maru-hooks/src/useBooleanState.ts similarity index 100% rename from packages/maru-hooks/src/useBoolean.ts rename to packages/maru-hooks/src/useBooleanState.ts