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.

Sign up for GitHub

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

[Deploy] 자잘 수정 사항들 배포 #340

Merged
merged 3 commits into from
Aug 2, 2024
Merged

[Deploy] 자잘 수정 사항들 배포 #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7610a97
fix: pdf, pptx -> pdf (#334)
lydiacho Aug 1, 2024
2791042
[Chore] GNB 이름 마스킹 처리 (#337)
eonseok-jeon Aug 2, 2024
02c0240
[Fix] 파일 관련 필수 에러만 제거 (#339)
eonseok-jeon Aug 2, 2024
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
5 changes: 3 additions & 2 deletions src/common/components/Layout/components/Header/MenuItem/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ interface MenuItemProps {
path?: string;
target?: '_blank' | '_self';
amplitudeId?: string;
className?: string;
onClick?: () => void;
}

const MenuItem = ({ text, path, target, amplitudeId, onClick }: MenuItemProps) => {
const MenuItem = ({ text, path, target, amplitudeId, className, onClick }: MenuItemProps) => {
return (
<li className={menuItem}>
<li className={`${className} ${menuItem}`}>
{path ? (
<NavLink
to={path}
Expand Down
2 changes: 1 addition & 1 deletion src/common/components/Layout/components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const Header = () => {
<MenuItem key={text} text={text} path={path} target={target} amplitudeId={amplitudeId} />
))}
<MenuItem key="로그아웃" text="로그아웃" onClick={handleLogout} />
<MenuItem key="로그인완료" text={`${name}님`} />
<MenuItem key="로그인완료" text={`${name}님`} className="amp-block" />
</>
)}
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/views/ApplyPage/components/FileInput/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface FileInputProps {
}

const LIMIT_SIZE = 1024 ** 2 * 50; // 50MB
const ACCEPTED_FORMATS = '.pdf, .pptx';
const ACCEPTED_FORMATS = '.pdf';

const FileInput = ({ section, id, isReview, disabled, defaultFile }: FileInputProps) => {
const [isError, setIsError] = useState(false);
Expand Down Expand Up @@ -135,7 +135,7 @@ const FileInput = ({ section, id, isReview, disabled, defaultFile }: FileInputPr
{(uploadPercent !== -1 || !defaultFileName) && (
<span className={fileNameVar[fileName === '' ? 'default' : 'selected']}>
{uploadPercent < 0 && fileName === ''
? '50mb 이하 | pdf, pptx'
? '50mb 이하 | pdf'
: uploadPercent < 100
? `업로드 중... ${uploadPercent}/100% 완료`
: uploadPercent === 100 && fileName === ''
Expand Down
2 changes: 0 additions & 2 deletions src/views/ApplyPage/components/FileInput/style.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { theme } from 'styles/theme.css';
export const container = style({
position: 'relative',
width: 720,
height: 53,
maxHeight: 53,
});

export const fileInput = style({
Expand Down
4 changes: 2 additions & 2 deletions src/views/ApplyPage/components/Info/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const Info = ({ value }: { value: string }) => {
return (
<article>
<ol className={container}>
{value?.split('\n').map((text) => (
<li className={info} key={text}>
{value?.split('\n').map((text, idx) => (
<li className={info} key={`${idx},${text}`}>
{text}
</li>
))}
Expand Down