Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
# testing
/coverage

# api key
.env

# production
/build

Expand Down
279 changes: 20 additions & 259 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@types/jest": "^27.5.2",
"@types/node": "^16.18.126",
"@types/react-dom": "^19.1.5",
"dotenv": "^16.5.0",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-responsive-carousel": "^3.2.23",
Expand Down
9 changes: 0 additions & 9 deletions src/App.test.tsx

This file was deleted.

11 changes: 2 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
import React from "react";
import "./App.scss";
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
import PhotoOfTheDay from "./Components/photoOfTheDay/photoOfTheDay";
import RoverDetails from "./Components/RoverDetails/RoverDetails";

function App() {
return (
<Router>
<Routes>
<Route path="/" element={<PhotoOfTheDay />} />
</Routes>
</Router>
);
return <RoverDetails />;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you handle the merge here you can do this,
<Route path="/" element={ <> <PhotoOfTheDay /> <RoverDetails /> </> } />

}

export default App;
Binary file added src/Assets/Images/Opportunity_button.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/curiosity_button.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/spirit_button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading