Skip to content

Commit 4c5db41

Browse files
committed
Merge branch 'feature/frontend/#33' of https://github.com/osamhack2021/Web_Handover_TeamName into feature/frontend/#33
2 parents 0aa8614 + 77e895a commit 4c5db41

6 files changed

Lines changed: 35 additions & 30 deletions

File tree

605 KB
Loading
573 KB
Loading
327 KB
Loading

โ€Žfrontend/assets/index.jsโ€Ž

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
// Images
2-
import "./images/profile-default.jpg";
3-
import "./images/handover-logo.png";
4-
import "./images/demopage.png";
5-
import "./images/share.png";
6-
import "./images/structure.png";
7-
import "./images/meeting.png";
8-
import "./images/wave.png";
9-
import "./svgs/pink_trapezoid.svg";
10-
import "./svgs/logo.svg";
11-
import "./svgs/bookmark.svg";
12-
import "./svgs/bookmark-filled.svg";
13-
import "./svgs/duplicate.svg";
14-
import "./svgs/print.svg";
15-
import "./svgs/show_content.svg";
16-
import "./svgs/comment.svg";
17-
import "./svgs/search_icon.svg";
18-
import "./svgs/clock_icon.svg";
19-
import "./svgs/bell.svg";
20-
import "./svgs/user.svg";
21-
import "./svgs/meeting.svg";
2+
import './images/profile-default.jpg';
3+
import './images/aboutpage-gif.gif';
4+
import './images/share.gif';
5+
import './images/comment.gif';
6+
import './images/handover-logo.png';
7+
import './images/demopage.png';
8+
import './images/share.png';
9+
import './images/structure.png';
10+
import './images/meeting.png';
11+
import './images/wave.png';
12+
import './svgs/pink_trapezoid.svg';
13+
import './svgs/logo.svg';
14+
import './svgs/bookmark.svg';
15+
import './svgs/bookmark-filled.svg';
16+
import './svgs/duplicate.svg';
17+
import './svgs/print.svg';
18+
import './svgs/show_content.svg';
19+
import './svgs/comment.svg';
20+
import './svgs/search_icon.svg';
21+
import './svgs/clock_icon.svg';
22+
import './svgs/bell.svg';
23+
import './svgs/user.svg';
24+
import './svgs/meeting.svg';

โ€Žfrontend/components/pages/AboutPage/AboutPage.jsโ€Ž

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Divider from '@mui/material/Divider';
66
import WelcomeHeader from '_organisms/WelcomeHeader';
77
import Container from '@mui/material/Container';
88
import Stack from '@mui/material/Stack';
9+
import Gif from '_assets/images/aboutpage-gif.gif';
910

1011
export default function AboutPage() {
1112
document.title = 'About - Handover';
@@ -30,12 +31,11 @@ export default function AboutPage() {
3031
spacing={3}
3132
sx={{ marginBottom: '200px' }}
3233
>
33-
<div
34-
style={{
35-
backgroundColor: 'white',
36-
width: '400px',
37-
height: '300px',
38-
}}
34+
<img
35+
alt="gif"
36+
src={Gif}
37+
width="400px"
38+
style={{ border: '3px solid #555' }}
3939
/>
4040
<Typography
4141
sx={{

โ€Žfrontend/components/pages/WelcomePage/WelcomePage.jsโ€Ž

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ import WelcomeHeader from '_organisms/WelcomeHeader';
1212
import WelcomeFooter from '_organisms/WelcomeFooter';
1313
import MeetingPNG from '_assets/images/meeting.png';
1414
import WaveVector from '_assets/images/wave.png';
15+
16+
import Comment from '_assets/images/comment.gif';
17+
import Share from '_assets/images/share.gif';
1518
import DemoPage from '_assets/images/demopage.png';
16-
import Share from '_assets/images/share.png';
17-
import Structure from '_assets/images/structure.png';
19+
1820
import BorderColorIcon from '@mui/icons-material/BorderColor';
1921
import GroupIcon from '@mui/icons-material/Group';
2022
import QuestionAnswerIcon from '@mui/icons-material/QuestionAnswer';
@@ -221,7 +223,7 @@ export default function WelcomePage() {
221223
'์ธ์ˆ˜ ์ธ๊ณ„์„œ ์ž‘์„ฑ',
222224
'ํšจ์œจ์ ์ธ ๋ถ€๋Œ€ ๊ด€๋ฆฌ',
223225
'๋ถ€๋Œ€ ์—…๋ฌด๋ฅผ ํ•œ๊ณณ์— ๋ชจ์•„๋ณด์„ธ์š”. ์‚ฌ์šฉ์ž๊ฐ€ ์†ํ•œ ๊ทธ๋ฃน์˜ ์ธ์ˆ˜์ธ๊ณ„์„œ, ์—…๋ฌด๋“ค์„ ํ•œ๋ฒˆ์— ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.',
224-
Structure,
226+
DemoPage,
225227
'right',
226228
'create',
227229
)}
@@ -237,7 +239,7 @@ export default function WelcomePage() {
237239
'๋Œ“๊ธ€ ๋ถ๋งˆํฌ ๊ธฐ๋Šฅ',
238240
'๋ณด๋‹ค ์‰ฌ์šด ์ธ์ˆ˜์ธ๊ณ„์„œ',
239241
'Handover ์˜ ๋ชจ๋“  ๋ฌธ์„œ๋“ค์€ ์„œ๋ž, ๋ฌธ์„œ, ์นด๋“œ ์˜ ๊ตฌ์กฐ๋ฅผ ๊ฐ€์ง€๊ณ  ์žˆ์Šต๋‹ˆ๋‹ค ๋ชจ๋“  ๋ณด์ง, ๊ทผ๋ฌด์˜ ์ธ์ˆ˜์ธ๊ณ„์„œ๋Š” ๋ˆ„๊ตฌ๋‚˜ ์‰ฝ๊ฒŒ ์ดํ•ดํ•  ์ˆ˜ ์žˆ๋„๋ก ์„œ๋ž, ๋ฌธ์„œ, ์นด๋“œ 3๋‹จ๊ณ„๋กœ ์ฒด๊ณ„ํ™” ๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค. ์–ด๋–ค ์—…๋ฌด๋ฅผ ์ˆ˜ํ–‰ํ•˜๋Š”์ง€, ์–ด๋–ค ์ž‘์—…์ด ์žˆ๋Š”์ง€ ์ฒด๊ณ„์ ์œผ๋กœ ์ •๋ฆฌ๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค. ',
240-
DemoPage,
242+
Comment,
241243
'right',
242244
'comment',
243245
)}

0 commit comments

Comments
ย (0)