Skip to content

Commit

Permalink
Merge pull request #4 from Likelion-at-SMWU-10th/feat/#1-icon
Browse files Browse the repository at this point in the history
상단 아이콘 추가
  • Loading branch information
HeesuSoh authored Nov 17, 2022
2 parents adf69e0 + 4403ddb commit 7bbcd35
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 7 deletions.
47 changes: 47 additions & 0 deletions trobber_fe/src/pages/Countries.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import Carousel from 'react-bootstrap/Carousel';

function UncontrolledExample() {
return (
<Carousel>
<Carousel.Item>
<img
className="d-block w-100"
src="holder.js/800x400?text=First slide&bg=373940"
alt="First slide"
/>
<Carousel.Caption>
<h3>First slide label</h3>
<p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<img
className="d-block w-100"
src="holder.js/800x400?text=Second slide&bg=282c34"
alt="Second slide"
/>

<Carousel.Caption>
<h3>Second slide label</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<img
className="d-block w-100"
src="holder.js/800x400?text=Third slide&bg=20232a"
alt="Third slide"
/>

<Carousel.Caption>
<h3>Third slide label</h3>
<p>
Praesent commodo cursus magna, vel scelerisque nisl consectetur.
</p>
</Carousel.Caption>
</Carousel.Item>
</Carousel>
);
}

export default UncontrolledExample;
7 changes: 7 additions & 0 deletions trobber_fe/src/pages/TimerSetting.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
img {
padding : 20px
}

.graph{
float: right
}
16 changes: 9 additions & 7 deletions trobber_fe/src/pages/TimerSetting.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React from 'react';
import "./TimerSetting.css";

const TimerSetting = () => {
return (
<div>
<>
<h1>타이머 세팅페이지 입니다! (희수 작업)</h1>
</>
</div>
);
return (
<div>
<div className="icons">
<img className="menubar" src={require("./pageimg/menubar.png")} />
<img className="graph" src={require("./pageimg/graph.png")} />
</div>
</div>
);
};

export default TimerSetting;
Binary file added trobber_fe/src/pages/pageimg/graph.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 trobber_fe/src/pages/pageimg/japan.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 trobber_fe/src/pages/pageimg/menubar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7bbcd35

Please sign in to comment.