Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
cb7a777
feat: Union 섹션 기초 틀 잡기
karpitony Feb 11, 2025
6e7a14d
feat: Union 레이아웃 콘텐츠 박스 제외하고 요소 추가
karpitony Feb 11, 2025
b42fcc1
Merge branch 'develop' into feature/8-create-union-section
karpitony Feb 11, 2025
e2494d3
feat: New 뱃지와 유니온 텍스트 정렬
karpitony Feb 11, 2025
ee91eea
feat: 콘텐츠박스 배경 Gradiant 추가 + refactor: 스타일드 따로 분리
karpitony Feb 11, 2025
9533c2c
fix: 오타 수정 + 레이아웃 중앙 정렬되게 수정
karpitony Feb 11, 2025
80defd9
feat: Union 설명 내용 추가
karpitony Feb 11, 2025
46bff2b
Merge branch 'develop' into feature/8-create-union-section
karpitony Feb 11, 2025
88a680b
feat: 한 학기 활동 내용 추가 + 약간의 미디어쿼리
karpitony Feb 11, 2025
89b7bdd
feat: 미디어 쿼리 조정 및 스타일 세부 작업
karpitony Feb 11, 2025
352320e
feat: 미디어쿼리 커스텀훅 추가
karpitony Feb 12, 2025
33ecf3a
refactor: 미디어 쿼리 커스텀훅으로 변경
karpitony Feb 12, 2025
128c37b
Merge pull request #9 from DguFarmSystem/feature/8-create-union-section
dewbeeny Feb 12, 2025
308c6ec
feat: Style 업데이트
dongmin0204 Feb 12, 2025
95ceaae
feat: 기본 세팅 + 표시할 데이터 추가
karpitony Feb 12, 2025
4b1ca1e
feature: 커밋 추가
dongmin0204 Feb 12, 2025
88ac8c5
feat: Achievements 컴포넌트 레이아웃 1차 완성
dewbeeny Feb 12, 2025
cacc6df
feat: intro 폰트 수정
dongmin0204 Feb 12, 2025
c5649b0
feat: 유니온으로 이동 텍스트 추가
karpitony Feb 12, 2025
4eb34b2
feat: 트랙 선택 버튼 + 버튼 모음집 추가
karpitony Feb 12, 2025
c419305
feat: 지원 요건 레이아웃 1차 완성
dewbeeny Feb 12, 2025
baeae47
feat: 교수님들 정보 추가
karpitony Feb 12, 2025
c45d544
feat: InfoBox로 선택된 트랙 내려보내기 + 내부 스타일 추가
karpitony Feb 12, 2025
21138b5
feat: 각 트랙별 제목 및 설명 추가
karpitony Feb 12, 2025
5401017
feat: 트랙 별 커리큘럼 카드 추가
karpitony Feb 12, 2025
e4cccc5
chore: 교수님들 사진 assets에 추가
karpitony Feb 12, 2025
e8daec0
feat: 교수님 관련 정보 추가
karpitony Feb 12, 2025
959b069
feat: 팝업추가, 이미지변경
dongmin0204 Feb 13, 2025
8656438
fix: 패키지 수정!(develop일치)
dongmin0204 Feb 13, 2025
084a375
feat: 그림자 추가, bold체 변경
dongmin0204 Feb 13, 2025
3e8cdef
feat: 임시저장
dongmin0204 Feb 13, 2025
04c9bd7
Merge pull request #16 from DguFarmSystem/Feature/12-create-intro-hea…
dewbeeny Feb 13, 2025
7a6246f
Merge pull request #17 from DguFarmSystem/feature/11-create-track-sec…
dewbeeny Feb 13, 2025
6202137
fix: 사용하지 않는 import 삭제 및 일부 스타일 변경
dewbeeny Feb 13, 2025
8c58f52
Merge pull request #14 from DguFarmSystem/feature/10-achievements-layout
dewbeeny Feb 13, 2025
611c4da
fix: 사용하지 않는 import 삭제
dewbeeny Feb 13, 2025
b2eeb73
fix: usestate import 수정
dewbeeny Feb 13, 2025
9f6022b
fix: react 임포트 삭제
dewbeeny Feb 13, 2025
a7de6ea
fix: 인스타그램 로고 경로 수정
dewbeeny Feb 13, 2025
2803474
Merge pull request #15 from DguFarmSystem/13-BottomInfo-layout
dewbeeny Feb 13, 2025
9ed7ac7
fix: Hedaer, 메인 페이지 네비게이션 분리
dewbeeny Feb 13, 2025
e7499ce
fix: 메인페이지 네비게이션 이동을 위한 각 섹션 아이디 추가
dewbeeny Feb 13, 2025
c6e337e
fix: useNavigate 사용해서 헤더 클릭시 페이지 이동 부드럽게
karpitony Feb 13, 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
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
* text=auto

*.js text eol=lf
*.jsx text eol=lf
*.ts text eol=lf
*.tsx text eol=lf
*.css text eol=lf
*.svg text eol=lf
190 changes: 188 additions & 2 deletions package-lock.json

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

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,22 @@
"preview": "vite preview"
},
"dependencies": {
"@types/styled-components": "^5.1.34",
"axios": "^1.7.9",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-responsive": "^10.0.0",
"react-router": "^7.1.5",
"react-slick": "^0.30.3",
"slick-carousel": "^1.8.1",
"styled-components": "^6.1.15",
"zustand": "^5.0.3"
},
"devDependencies": {
"@eslint/js": "^9.17.0",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/react-slick": "^0.23.13",
"@vitejs/plugin-react": "^4.3.4",
"eslint": "^9.17.0",
"eslint-plugin-react-hooks": "^5.0.0",
Expand Down
Binary file added src/assets/DGULogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/FarmLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/Icons/OrangeArrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Icons/robotarm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Images/Professors/KimDW.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Images/Professors/LimSS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Images/Professors/SeokMK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Images/Professors/SongSH.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Images/Professors/SunSK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/Images/Professors/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export { default as SongSH } from './SongSH.png';
export { default as KimDW } from './KimDW.png';
export { default as LimSS } from './LimSS.png';
export { default as SeokMK } from './SeokMK.png';
export { default as SunSK } from './SunSK.png';
Binary file added src/assets/InstagramLogo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/LinktreeLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/githubLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/githubLogo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/image 8 (1).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/instagramLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading