Skip to content

[release] v1.0.5 #429

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

Merged
oesnuj merged 10 commits into from
May 18, 2025
Merged

[release] v1.0.5 #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3d8cb45
chore: jest-transform-stub 라이브러리 μ„€μΉ˜ (이미지 import ν…ŒμŠ€νŠΈ 였λ₯˜ λŒ€μ‘)
oesnuj May 16, 2025
c01066b
test: Jest 이미지 파일 transform μ„€μ • μΆ”κ°€
oesnuj May 16, 2025
8eb1dfe
Merge pull request #422 from Moadong/fix/#421-jest-svg-import-error
oesnuj May 18, 2025
0552153
fix: κ΄€λ¦¬μžνŽ˜μ΄μ§€ SNS μž…λ ₯ ν•„λ“œ μž„μ‹œ λΉ„ν™œμ„±ν™” 처리
oesnuj May 18, 2025
2789535
feat: SNS μž…λ ₯ μ„Ήμ…˜μ— μ€€λΉ„ 쀑 μ•ˆλ‚΄ 문ꡬ μΆ”κ°€
oesnuj May 18, 2025
82e8266
style: SNS μ•ˆλ‚΄ 문ꡬ ν•˜λ‹¨ 간격 μ‘°μ •
oesnuj May 18, 2025
fb8a60e
refactor: SNS 링크 μž…λ ₯ μ„Ήμ…˜ μž„μ‹œ 주석 처리
oesnuj May 18, 2025
5417675
refactor: InfoBox 높이 μŠ€νƒ€μΌ μž¬μˆ˜μ •
oesnuj May 18, 2025
824f788
refactor: μž„μ‹œλ‘œ SnsLinkIcons μ»΄ν¬λ„ŒνŠΈ 주석 처리
oesnuj May 18, 2025
ca0124e
Merge pull request #428 from Moadong/fix/#427-disable-sns-input-befor…
oesnuj May 18, 2025
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
1 change: 1 addition & 0 deletions frontend/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
testEnvironment: 'jsdom',
transform: {
'^.+\\.tsx?$': ['ts-jest', {}],
'\\.(svg|png|jpg|jpeg|gif)$': 'jest-transform-stub',
},
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
Expand Down
8 changes: 8 additions & 0 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-fetch-mock": "^3.0.3",
"jest-transform-stub": "^2.0.0",
"mini-css-extract-plugin": "^2.9.2",
"path": "^0.12.7",
"prettier": "^3.4.2",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/AdminPage/tabs/ClubInfoEditTab/ClubInfoEditTab.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const InfoTitle = styled.h2`
font-size: 1.5rem;
font-weight: bold;
letter-spacing: 0;
margin-bottom: 46px;
margin-bottom: 30px;
`;

export const InfoGroup = styled.div`
Expand Down
48 changes: 25 additions & 23 deletions frontend/src/pages/AdminPage/tabs/ClubInfoEditTab/ClubInfoEditTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,29 +183,31 @@ const ClubInfoEditTab = () => {
<MakeTags value={clubTags} onChange={setClubTags} />
</Styled.TagEditGroup>

<Styled.InfoTitle>동아리 SNS 링크</Styled.InfoTitle>
<Styled.SNSInputGroup>
{Object.entries(SNS_CONFIG).map(([rawKey, { label, placeholder }]) => {
const key = rawKey as SNSPlatform;

return (
<Styled.SNSRow key={key}>
<Styled.SNSCheckboxLabel>{label}</Styled.SNSCheckboxLabel>
<InputField
placeholder={placeholder}
value={socialLinks[key]}
onChange={(e) => handleSocialLinkChange(key, e.target.value)}
onClear={() => {
setSocialLinks((prev) => ({ ...prev, [key]: '' }));
setSnsErrors((prev) => ({ ...prev, [key]: '' }));
}}
isError={snsErrors[key] !== ''}
helperText={snsErrors[key]}
/>
</Styled.SNSRow>
);
})}
</Styled.SNSInputGroup>
{/*<Styled.InfoTitle>동아리 SNS 링크</Styled.InfoTitle>*/}
{/*<p>ν˜„μž¬ μ€€λΉ„ 쀑인 κΈ°λŠ₯μž…λ‹ˆλ‹€. 쑰금만 κΈ°λ‹€λ € μ£Όμ„Έμš”!</p>*/}
{/*<Styled.SNSInputGroup>*/}
{/* {Object.entries(SNS_CONFIG).map(([rawKey, { label, placeholder }]) => {*/}
{/* const key = rawKey as SNSPlatform;*/}

{/* return (*/}
{/* <Styled.SNSRow key={key}>*/}
{/* <Styled.SNSCheckboxLabel>{label}</Styled.SNSCheckboxLabel>*/}
{/* <InputField*/}
{/* placeholder={placeholder}*/}
{/* value={socialLinks[key]}*/}
{/* onChange={(e) => handleSocialLinkChange(key, e.target.value)}*/}
{/* onClear={() => {*/}
{/* setSocialLinks((prev) => ({ ...prev, [key]: '' }));*/}
{/* setSnsErrors((prev) => ({ ...prev, [key]: '' }));*/}
{/* }}*/}
{/* isError={snsErrors[key] !== ''}*/}
{/* helperText={snsErrors[key]}*/}
{/* disabled={true}*/}
{/* />*/}
{/* </Styled.SNSRow>*/}
{/* );*/}
{/* })}*/}
{/*</Styled.SNSInputGroup>*/}
</>
);
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/ClubDetailPage/components/InfoBox/InfoBox.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const InfoBoxWrapper = styled.div`

export const InfoBox = styled.div`
width: 573px;
height: 197px;
height: 164px; //todo μΆ”ν›„ 197둜 μˆ˜μ • ν•„μš”
border-radius: 18px;
border: 1px solid #dcdcdc;
padding: 30px;
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/pages/ClubDetailPage/components/InfoBox/InfoBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import * as Styled from './InfoBox.styles';
import { ClubDetail } from '@/types/club';
import { INFOTABS_SCROLL_INDEX } from '@/constants/scrollSections';
import SnsLinkIcons from '@/pages/ClubDetailPage/components/SnsLinkIcons/SnsLinkIcons';
//import SnsLinkIcons from '@/pages/ClubDetailPage/components/SnsLinkIcons/SnsLinkIcons';

interface ClubInfoItem {
label: string;
Expand Down Expand Up @@ -39,10 +39,10 @@ const InfoBox = ({ sectionRefs, clubDetail }: InfoBoxProps) => {
descriptions: [
{ label: '회μž₯이름', value: clubDetail.presidentName },
{ label: 'μ „ν™”λ²ˆν˜Έ', value: clubDetail.presidentPhoneNumber },
{
label: 'SNS',
render: <SnsLinkIcons apiSocialLinks={clubDetail.socialLinks} />,
},
// {
// label: 'SNS',
// render: <SnsLinkIcons apiSocialLinks={clubDetail.socialLinks} />,
// },
],
refIndex: INFOTABS_SCROLL_INDEX.CLUB_INFO_TAB,
},
Expand Down