Skip to content
Snippets Groups Projects
Commit 145601b7 authored by Martin Wighus Holtmon's avatar Martin Wighus Holtmon
Browse files

firstpart/Problem3 - Moved the rendering of the header out into the page.jsx...

firstpart/Problem3 - Moved the rendering of the header out into the page.jsx file instead of in each component.
firstpart/Problem4 - Added header to p4.
parent 2b9445ed
Branches
No related tags found
No related merge requests found
......@@ -101,7 +101,6 @@ class Example extends React.Component {
render() {
return (
<div className="container Example">
<Header />
<h1>CS142 Project#4 React.js Example</h1>
<div className="motto-update">
......
......@@ -48,7 +48,6 @@ class States extends React.Component {
render() {
return (
<div>
<Header />
<label htmlFor="inName">Name: </label>
<input type="text" placeholder="country" id="inName" onChange={this.findStates}/>
<table>
......
......@@ -3,8 +3,12 @@ import ReactDOM from 'react-dom';
import './styles/main.css';
import Example from './components/example/Example';
import Header from "./components/header/Header";
ReactDOM.render(
<Example/>,
<div>
<Header />
<Example />
</div>,
document.getElementById('reactapp'),
);
......@@ -2,8 +2,12 @@ import React from 'react';
import ReactDOM from 'react-dom';
import States from './components/states/States';
import Header from "./components/header/Header";
ReactDOM.render(
<States/>,
<div>
<Header />
<States/>
</div>,
document.getElementById('reactapp'),
);
......@@ -2,6 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import States from './components/states/States';
import Example from './components/example/Example';
import Header from "./components/header/Header";
class P4 extends React.Component {
constructor(props) {
......@@ -18,6 +19,7 @@ class P4 extends React.Component {
render() {
return(
<div>
<Header />
<button type="button" onClick={this.handleButtonClick}>Switch to {this.state.nextPage.name}</button>
<this.state.activePage/>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment