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.

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

Stephanie welcomepage #2

Merged
merged 2 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all 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
Binary file removed images/CodeMonkeyMast.gif
Binary file not shown.
4,275 changes: 1,515 additions & 2,760 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"react-dom": "^16.13.0",
"react-redux": "^7.2.0",
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.0",
"react-scripts": "^3.4.3",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0"
},
Expand Down
14 changes: 5 additions & 9 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,16 @@ import Loading from "./components/Loading";
import MessageBox from "./components/MessageBox";
import SignUp from "./pages/SignUp";
import Login from "./pages/Login";
import Welcome from "./pages/Welcome";

import { useDispatch, useSelector } from "react-redux";
import { selectAppLoading } from "./store/appState/selectors";
import { getUserWithStoredToken } from "./store/user/actions";
import { Jumbotron } from "react-bootstrap";

const Home = () => (
const Exercise = () => (
<Jumbotron>
<h1>Home</h1>
</Jumbotron>
);
const Other = () => (
<Jumbotron>
<h1>Other</h1>
<h1>Here comes exercises</h1>
</Jumbotron>
);

Expand All @@ -38,10 +34,10 @@ function App() {
<MessageBox />
{isLoading ? <Loading /> : null}
<Switch>
<Route exact path="/" component={Home} />
<Route path="/other" component={Other} />
<Route exact path="/" component={Welcome} />
<Route path="/signup" component={SignUp} />
<Route path="/login" component={Login} />
<Route path="/exercise/:id" component={Exercise} />
</Switch>
</div>
);
Expand Down
5 changes: 4 additions & 1 deletion src/components/Navigation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ export default function Navigation() {
return (
<Navbar bg="light" expand="lg">
<Navbar.Brand as={NavLink} to="/">
YOUR PROJECT NAME
CodeMonkeyMaster
<span role="img" aria-label="monkey">
🐵
</span>
</Navbar.Brand>
<Navbar.Toggle aria-controls="basic-navbar-nav" />
<Navbar.Collapse id="basic-navbar-nav">
Expand Down
Binary file added src/images/CodeMonkeyMaster.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/pages/Welcome/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React from "react";
import { Link } from "react-router-dom";
import gif from "../../images/CodeMonkeyMaster.gif";
import "./welcome.css";

export default function Welcome() {
return (
<>
<div className="welcomeHeader">
<img className="welcomeGif" src={gif} alt="Logo" />
</div>
<div className="welcomeText">
<h4>Welcome to CodeMonkeyMaster!</h4>
<p>
Here you will learn everything you need to know about{" "}
<i>array methods</i>. <br />
You will start as a code monkey but if you complete all the exercises
you can become the ultimate code master!
<p>
<br />
<b>
<Link to="/signup">
<button className="welcomeButton">Register</button>
</Link>{" "}
for free and start your code challenge now!
</b>
</p>
</p>
</div>
</>
);
}
Loading