Skip to content
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.

Sign up for GitHub

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

Jump to bottom

added logo to the header #12

Merged
merged 7 commits into from
Jul 31, 2024
Merged

added logo to the header #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25dc3ce
added logo to the header
sun-amy Jul 31, 2024
d88d15d
added alt title for the logo
sun-amy Jul 31, 2024
a279cb6
Merge branch 'main' into mm-401-add-logo-to-header
sun-amy Jul 31, 2024
d6d0849
added logo to the header
sun-amy Jul 31, 2024
28ae96c
added alt title for the logo
sun-amy Jul 31, 2024
daca097
saved logo as a constant
sun-amy Jul 31, 2024
61f9900
saved logo as a constant
sun-amy Jul 31, 2024
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
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>Marsio Kart</title>
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice change :)

</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file removed public/marsiokartlogo.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import App from './App';
import "@testing-library/jest-dom";
import Hamburger from './Hamburgerbutton';
import Hamburger from './Hamburgerbutton/Hamburgerbutton';

// remove this test when real tests are added
test('renders header', () => {
Expand Down
3 changes: 1 addition & 2 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import './App.scss';
import Home from './Home/Home';
import Header from './header';
import Header from './Header/Header';
import { Quiz } from './Quiz/Quiz';
import Footer from './Footer/Footer';

Expand All @@ -12,7 +12,6 @@ function App() {
return (
<div className="App">
<Router>
<h1>MarsioKart</h1>
<Header/>
<Routes>
<Route path='/'
Expand Down
0 src/Hamburgerbutton.scss → src/Hamburgerbutton/Hamburgerbutton.scss
View file
Open in desktop
File renamed without changes.
0 src/Hamburgerbutton.tsx → src/Hamburgerbutton/Hamburgerbutton.tsx
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion src/header.tsx → src/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import Hamburger from './Hamburgerbutton';
import Hamburger from '../Hamburgerbutton/Hamburgerbutton';

const Header: React.FC = () => {
const handleHamburgerClick = () => {
Expand All @@ -9,6 +9,7 @@ const Header: React.FC = () => {
return (
<div className="App">
<Hamburger onClick={handleHamburgerClick} label={""}/>
<img src={require('../ImageAssets/marsiokartlogo.jpg')} />
sun-amy marked this conversation as resolved.
Show resolved Hide resolved
</div>
);
};
Expand Down
Binary file added src/ImageAssets/marsiokartlogo.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added src/QuestionDisplay/QuestionDisplay.scss
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this file was accidentally left in your branch form another ticket - you can delete it from this branch so it doesn't get merged in with this work

Empty file.
22 changes: 22 additions & 0 deletions src/QuestionDisplay/QuestionDisplay.tsx
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

As above, this looks like this file has snuck in from another branch - you can delete it from this branch so it doesn't get merged in with this work

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// questions = [{"Where is Mars in the solar system?" : [{"Fourth planet from the sun" : true}, {"Next to Pluto" : false}, {"Closer to the sun than Earth" : false}]},
// {"What is a rover?": [{"A dog" : false}, {"A robotic space vehicle" : true}, {"A type of car" : false}]},
// {"How many rovers have NASA sent to Mars?": [{"5": true}, {"4": false}, {"20": false}]},
// {"Which of these lists real Mars rover names?": [{"Resilience, Curiosity, Perseverance": false}, {"Sojourner, Oppertunity, Perseverance" : true}, {"Discovery, Searcher, Pioneer" : false}]},
// {"What are the Mars rovers looking for?": [{"Ares God of War": false}, {"Dead rovers": false}, {"Water": true}]}]
// import getQuestions from './somewhere';

export function QuestionDisplay() {
// const questions = getQuestions();
const questions = [{"Where is Mars in the solar system?" : [{"Fourth planet from the sun" : true}, {"Next to Pluto" : false}, {"Closer to the sun than Earth" : false}]},
{"What is a rover?": [{"A dog" : false}, {"A robotic space vehicle" : true}, {"A type of car" : false}]},
{"How many rovers have NASA sent to Mars?": [{"5": true}, {"4": false}, {"20": false}]},
{"Which of these lists real Mars rover names?": [{"Resilience, Curiosity, Perseverance": false}, {"Sojourner, Opportunity, Perseverance" : true}, {"Discovery, Searcher, Pioneer" : false}]},
{"What are the Mars rovers looking for?": [{"Ares God of War": false}, {"Dead rovers": false}, {"Water": true}]}];

const question = questions[Math.floor(Math.random() * questions.length)];

return (
<></>
)

}
Loading