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

chore: 초기화면, 회원가입, 기타 페이지 얼루가 컴포넌트 3.3.2 버전 적용 #99

Open
wants to merge 4 commits into
base: update-components
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@eolluga/eolluga-ui": "^3.2.9",
"@eolluga/eolluga-ui": "^3.3.2",
"@hookform/resolvers": "^3.9.0",
"@mui/material": "^6.1.2",
"@mui/x-date-pickers": "^7.18.0",
Expand Down
4 changes: 2 additions & 2 deletions src/app/global-error.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { Flexbox, deleteTokenFromCookie } from '@/shared'
import { ButtonMobile } from '@eolluga/eolluga-ui'
import { ButtonMobile } from '@eolluga/eolluga-ui/Navigation'
import Link from 'next/link'

export default function GlobalError({
Expand All @@ -23,7 +23,7 @@ export default function GlobalError({
<Flexbox direction="col" className="w-full gap-4 px-4">
<ButtonMobile
size="L"
style="primary"
mode="primary"
state="enabled"
type="text"
text1="다시 시도하기"
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/join/ui/LoginButton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { Icon } from '@eolluga/eolluga-ui'
import Icon from '@eolluga/eolluga-ui/icon/Icon'
import Link from 'next/link'
import { sendRNFunction } from '@/shared'
import { useEffect } from 'react'
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/join/ui/RoleSelection.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { ButtonMobile, TopBar } from '@eolluga/eolluga-ui'
import { ButtonMobile, TopBar } from '@eolluga/eolluga-ui/Navigation'
import { Flexbox } from '@/shared'
import BadgeCard from './BadgeCard'
import useJoin from '../hooks/useJoin'
Expand Down Expand Up @@ -33,7 +33,7 @@ export default function RoleSelection({ handlePreviousStep }: RoleSelectionProps
onClick={handleMemberClick}
size="L"
state="enabled"
style="primary"
mode="primary"
text1="네 직원이에요"
type="text"
/>
Expand Down
11 changes: 6 additions & 5 deletions src/widgets/join/ui/SignupName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import { useState } from 'react'
import { useRouter } from 'next/navigation'
import { ButtonMobile, TopBar } from '@eolluga/eolluga-ui/Navigation'
import { TextField } from '@eolluga/eolluga-ui/Input'
import FlexBox from '@/shared/ui/Flexbox'
import { ButtonMobile, TopBar, TextField } from '@eolluga/eolluga-ui'
import { ToastMessage } from '@/shared'
import { useAtom } from 'jotai'
import { uid, memberIdAtom } from '@/widgets/join/atoms/joinAtoms' // 중복 제거
Expand Down Expand Up @@ -137,7 +138,7 @@ export default function SignupName({
<TextField
onChange={handleNameChange}
size="L"
style="outlined"
mode="outlined"
label="이름"
placeholder="이름을 입력해주세요"
value={name}
Expand All @@ -146,7 +147,7 @@ export default function SignupName({
<TextField
onChange={handlePhoneChangeWrap}
size="L"
style="outlined"
mode="outlined"
label="전화번호"
placeholder="전화번호를 입력해주세요"
value={phone}
Expand All @@ -170,8 +171,8 @@ export default function SignupName({
<FlexBox direction="col" className="w-full p-spacing-04 absolute bottom-4">
<ButtonMobile
size="L"
style="primary"
state={getButtonState()}
mode="primary"
state={name && phone ? 'enabled' : 'disabled'}
type="text"
text1={buttonText}
onClick={handleStartClick}
Expand Down
11 changes: 7 additions & 4 deletions src/widgets/join/ui/SignupStore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
'use client'

import FlexBox from '@/shared/ui/Flexbox'
import { ButtonMobile, Dialog, Scrim, TextField, TopBar } from '@eolluga/eolluga-ui'
import { ButtonMobile, TopBar } from '@eolluga/eolluga-ui/Navigation'
import { TextField } from '@eolluga/eolluga-ui/Input'
import { Scrim } from '@eolluga/eolluga-ui/Layout'
import { Dialog } from '@eolluga/eolluga-ui/Feedback'
import { useState } from 'react'
import ToastMessage from '@/shared/ui/ToastMessage'
import { useAtom } from 'jotai'
Expand Down Expand Up @@ -128,7 +131,7 @@ export default function SignupStore({
<TextField
onChange={isOwner ? handleStoreChange : hadleStoreIdChange}
size="L"
style="underlined"
mode="underlined"
label={isOwner ? '가게 이름' : '근무 중인 가게 코드'}
placeholder={isOwner ? '가게 이름을 입력해주세요' : '가게 코드를 입력해주세요'}
value={isOwner ? store : storeId.slice(0, 4)}
Expand All @@ -138,7 +141,7 @@ export default function SignupStore({
<TextField
onChange={handleNameChange}
size="L"
style="underlined"
mode="underlined"
label="이름"
placeholder="이름을 입력해주세요"
state="readOnly"
Expand All @@ -157,7 +160,7 @@ export default function SignupStore({
)}
<ButtonMobile
size="L"
style="primary"
mode="primary"
state={getButtonState()}
type="text"
text1={isOwner ? '가게 코드 받기' : '코드 승인 받기'}
Expand Down
5 changes: 3 additions & 2 deletions src/widgets/join/ui/UserProfile.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import FlexBox from '@/shared/ui/Flexbox'
import { Avatar, ButtonMobile, TopBar } from '@eolluga/eolluga-ui'
import { ButtonMobile, TopBar } from '@eolluga/eolluga-ui/Navigation'
import { Avatar } from '@eolluga/eolluga-ui/Display'
import { useRouter } from 'next/navigation'
import useJoin from '../hooks/useJoin'

Expand Down Expand Up @@ -34,7 +35,7 @@ export default function UserProfile({
<FlexBox direction="col" className="w-full px-spacing-04 py-spacing-03 absolute bottom-4">
<ButtonMobile
size="L"
style="primary"
mode="primary"
state="enabled"
type="text"
text1={isOwner ? '프로필 생성하기' : '출근하기'}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1016,10 +1016,10 @@
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6"
integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==

"@eolluga/eolluga-ui@^3.2.9":
version "3.2.9"
resolved "https://registry.yarnpkg.com/@eolluga/eolluga-ui/-/eolluga-ui-3.2.9.tgz#7cb21d8b3669356818a522abadc5322c94d3ee5b"
integrity sha512-yarFC1cF3IKCavSu/PbU6dcZngK8S6vlyYmScbQp7BdiypxaBlWc7PzzXZEGxK2SF5GYiSval5ftzazUh7+Jpw==
"@eolluga/eolluga-ui@^3.3.2":
version "3.3.2"
resolved "https://registry.yarnpkg.com/@eolluga/eolluga-ui/-/eolluga-ui-3.3.2.tgz#12114aa496b449402bdb2effe2713890cc97dbc0"
integrity sha512-dox/W69HA9Kdz2AJPJl1pAPcGsIia4C95v9IGkmjQGM1FIJxpHoy7ZOS8NtDZ+m3+TMkqGdTPelFuymrhDKpAg==
dependencies:
"@svgr/rollup" "^8.1.0"
dayjs "^1.11.12"
Expand Down