-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Feat: ProjectsPage asdf * Feat: Projects 세부페이지 router * Feat: Footer Wrap 적용 Footer width 안줄어드는거 해결 ProjectsPage 역순 안되는 버그 해결
- Loading branch information
Showing
12 changed files
with
242 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { Title, Header1, Description } from './typo' | ||
| import { Row, Col, Wrap, Blank } from './container' | ||
|
|
||
| export { Title, Header1, Description, Row, Col, Wrap, Blank } | ||
| export { Title, Header1, Description, Row, Col, Wrap, Blank } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,46 @@ | ||
|
|
||
|
|
||
|
|
||
| html,body { | ||
|
|
||
| width:100vw; | ||
| height:100vh; | ||
| margin:0; | ||
| padding:0; | ||
|
|
||
| html, | ||
| body { | ||
| width: 100vw; | ||
| height: 100vh; | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
| * { | ||
| font-family:'SUIT Variable', sans-serif; | ||
| box-sizing: border-box; | ||
| user-select: none; | ||
| font-family: 'Pretendard Variable', sans-serif; | ||
| box-sizing: border-box; | ||
| user-select: none; | ||
| } | ||
| a { | ||
| text-decoration: none; | ||
| cursor: pointer; | ||
| text-decoration: none; | ||
| cursor: pointer; | ||
| } | ||
| :root { | ||
| --gray-white:#FFFFFF; | ||
| --gray-0:#FBFBFB; | ||
| --gray-100:#EBEDEF; | ||
| --gray-200:#DADCDE; | ||
| --gray-300:#CACBCD; | ||
| --gray-400:#ABACAF; | ||
| --gray-500:#8D9093; | ||
| --gray-600:#64676C; | ||
| --gray-700:#56595D; | ||
| --gray-800:#3B3D3F; | ||
| --gray-900:#212325; | ||
| --gray-black:#000000; | ||
|
|
||
| --brand-100:#CCE4FF; | ||
| --brand-200:#99C8FF; | ||
| --brand-300:#66ADFF; | ||
| --brand-400:#3391FF; | ||
| --brand-500:#0076FF; | ||
| --brand-600:#005ECC; | ||
| --brand-700:#004799; | ||
| --brand-800:#002F66; | ||
| --brand-900:#001833; | ||
|
|
||
| --negative-500:#F63A3A; | ||
|
|
||
| --caution-500:#FFD224; | ||
|
|
||
| --positive-500:#27B278; | ||
| } | ||
| --gray-white: #ffffff; | ||
| --gray-0: #fbfbfb; | ||
| --gray-100: #ebedef; | ||
| --gray-200: #dadcde; | ||
| --gray-300: #cacbcd; | ||
| --gray-400: #abacaf; | ||
| --gray-500: #8d9093; | ||
| --gray-600: #64676c; | ||
| --gray-700: #56595d; | ||
| --gray-800: #3b3d3f; | ||
| --gray-900: #212325; | ||
| --gray-black: #000000; | ||
|
|
||
| --brand-100: #cce4ff; | ||
| --brand-200: #99c8ff; | ||
| --brand-300: #66adff; | ||
| --brand-400: #3391ff; | ||
| --brand-500: #0076ff; | ||
| --brand-600: #005ecc; | ||
| --brand-700: #004799; | ||
| --brand-800: #002f66; | ||
| --brand-900: #001833; | ||
|
|
||
| --negative-500: #f63a3a; | ||
|
|
||
| --caution-500: #ffd224; | ||
|
|
||
| --positive-500: #27b278; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| { | ||
| "imageFolderPath": "./src/assets/ProjectThumbnail/", | ||
| "projects": [ | ||
| { | ||
| "id": 1, | ||
| "imageUrl": ["JipGaGoSipDa.jpg"], | ||
| "year": 2020, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 2, | ||
| "imageUrl": ["DAYCUBE.jpg"], | ||
| "year": 2020, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 3, | ||
| "imageUrl": ["MOLA.jpg"], | ||
| "year": 2020, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 4, | ||
| "imageUrl": ["JOIN.jpg"], | ||
| "year": 2020, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 5, | ||
| "imageUrl": ["DINEON.jpg"], | ||
| "year": 2020, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 6, | ||
| "imageUrl": ["ITNun.jpg"], | ||
| "year": 2022, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 7, | ||
| "imageUrl": ["ASD.jpg", "ASD2.jpg"], | ||
| "year": 2022, | ||
| "title": "학습 환경 개선 프로젝트, ASD", | ||
| "detail": [ | ||
| { | ||
| "content": "우리는 공부를 할 때에 수많은 방해에 노출되어 있습니다.\n\n그중 가장 치명적인 것은 모바일 기기라고 할 수 있는데요, ", | ||
| "bold": false | ||
| }, | ||
| { | ||
| "content": "ASD는 모바일 기기로부터의 방해를 받지 않도록 돕습니다. 자체적으로 개발한 인공지능 스피커와 함께 사용", | ||
| "bold": true | ||
| }, | ||
| { | ||
| "content": "하며, 스피커 위에 기기를 올리면 공부시간에 돌입하며 방해금지 모드가 됩니다.\n\n인공지능 스피커에게 말로 명령을 내려 모바일 기기와의 불필요한 접촉을 막을 수 있습니다.", | ||
| "bold": false | ||
| } | ||
| ], | ||
| "achievement": [ | ||
| { "content": "STA+C", "highlight": false }, | ||
| { "content": "대상", "highlight": true }, | ||
| { "content": "수상", "highlight": false } | ||
| ], | ||
| "media": { | ||
| "press": "게임 동아", | ||
| "date": "2022.11.14", | ||
| "title": "[STAC2022] 미래산업 부문 대상 'ASD' \"AI를 통한 더 좋은 공부 방법을 소개해요\"" | ||
| } | ||
| }, | ||
| { | ||
| "id": 8, | ||
| "imageUrl": ["Yummy.jpg"], | ||
| "year": 2023, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 9, | ||
| "imageUrl": ["MK1.jpg"], | ||
| "year": 2023, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| }, | ||
| { | ||
| "id": 10, | ||
| "imageUrl": ["VOAH.jpg"], | ||
| "year": 2023, | ||
| "title": "", | ||
| "detail": "", | ||
| "achievement": null, | ||
| "media": null | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.