-
Notifications
You must be signed in to change notification settings - Fork 36
WX - World Clock Assignment #11
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.
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
Open
wenxin-p
wants to merge
4
commits into
rocketacademy:main
Choose a base branch
from
wenxin-p:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,20 +1,76 @@ | ||
| import logo from "/logo.png"; | ||
| import "./App.css"; | ||
| import { useState } from "react"; | ||
| import { useEffect } from "react"; | ||
| import Clock from "./Clock"; | ||
| import Container from "react-bootstrap/Container"; | ||
| import Row from "react-bootstrap/Row"; | ||
| import Col from "react-bootstrap/Col"; | ||
|
|
||
| function App() { | ||
| export default function App() { | ||
| return ( | ||
| <> | ||
| <div> | ||
| <img src={logo} className="logo" alt="Rocket logo" /> | ||
| </div> | ||
| <div> | ||
| <img src={logo} className="logo" alt="Rocket logo" /> | ||
| <h1>World Clock</h1> | ||
| <div className="card"> | ||
| <p> | ||
| Edit <code>src/App.jsx</code> and save to test HMR | ||
| </p> | ||
| {/* This feels violative of the DIY principle, but idk how to make it into a component */} | ||
| <Container> | ||
| <Row className="table-row"> | ||
| <Col className="table-col">City</Col> | ||
| <Col className="table-time">Clock</Col> | ||
| </Row> | ||
| <Row className="table-row"> | ||
| <Col className="table-col"> | ||
| <p>Asia/Seoul</p> | ||
| </Col> | ||
| <Col className="table-time"> | ||
| <p> | ||
| <Clock timeZone="Asia/Seoul" /> | ||
| </p> | ||
| </Col> | ||
| </Row> | ||
| <Row className="table-row"> | ||
| <Col className="table-col"> | ||
| <p>Asia/Singapore</p> | ||
| </Col> | ||
| <Col className="table-time"> | ||
| <p> | ||
| <Clock timeZone="Asia/Singapore" /> | ||
| </p> | ||
| </Col> | ||
| </Row> | ||
| <Row className="table-row"> | ||
| <Col className="table-col"> | ||
| <p>Europe/London</p> | ||
| </Col> | ||
| <Col className="table-time"> | ||
| <p> | ||
| <Clock timeZone="Europe/London" /> | ||
| </p> | ||
| </Col> | ||
| </Row> | ||
| </Container> | ||
| </div> | ||
| </> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default App; | ||
| // This works too but the boxes are not aligned | ||
| // <div className="card"> | ||
| // <Container> | ||
| // <Row> | ||
| // <Col>City</Col> | ||
| // <Col>Clock</Col> | ||
| // </Row> | ||
| // <Clock timeZone="Asia/Seoul" /> | ||
| // </Row> | ||
| // <Row> | ||
| // <Clock timeZone="Asia/Singapore" /> | ||
| // </Row> | ||
| // <Row> | ||
| // <Clock timeZone="Europe/London" /> | ||
| // </Row> | ||
| // </Row> | ||
| // </Container> | ||
| // </div> | ||
| // </div> | ||
This file contains hidden or 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,25 @@ | ||
| import { useState } from "react"; | ||
| import { useEffect } from "react"; | ||
|
|
||
| // Clock function | ||
| export default function Clock(props) { | ||
| // useState allows you to add state to functional components. It essentially allows you to store and update data. | ||
| const [date, setDate] = useState(new Date()); | ||
| // useEffect tells the clock to move by second. useEffect is used to perform side effects in a component. | ||
| useEffect(() => { | ||
| const timeId = setInterval(() => { | ||
| setDate(new Date()); | ||
| }, 1000); | ||
| return () => { | ||
| clearInterval(timeId); | ||
| }; | ||
| }); | ||
|
|
||
| return ( | ||
| // Add time zone label to make it clearer which time zone each clock is rendering. | ||
| <> | ||
| {/* {props.timeZone} */} | ||
| <p>{date.toLocaleString("en-GB", { timeZone: `${props.timeZone}` })}</p> | ||
| </> | ||
| ); | ||
| } |
This file contains hidden or 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,5 +1,6 @@ | ||
| import ReactDOM from "react-dom/client"; | ||
| import App from "./App.jsx"; | ||
| import "./index.css"; | ||
| // import "bootstrap/dist/css/bootstrap.min.css"; | ||
|
|
||
| ReactDOM.createRoot(document.getElementById("root")).render(<App />); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can improve this by using a data structure and map it!
and then