Commit957b14f

committed

added title

1 parent026bba9 commit957b14fCopy full SHA for 957b14f

File tree

+30

-2

lines changed

+30

-2

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,13 @@ import React, { Component } from 'react';`
`2`	`2`
`3`	`3`	`importSearchBarfrom'../containers/search_bar';`
`4`	`4`	`importWeatherListfrom'../containers/weather_list';`
	`5`	`+importHeaderfrom'./header';`
`5`	`6`
`6`	`7`	`exportdefaultclassAppextendsComponent{`
`7`	`8`	`render(){`
`8`	`9`	`return(`
`9`	`10`	`<div>`
	`11`	`+<Header/>`
`10`	`12`	`<SearchBar/>`
`11`	`13`	`<WeatherList/>`
`12`	`14`	`</div>`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,9 @@`
	`1`	`+importReact,{Component}from'react'`
	`2`	`+`
	`3`	`+exportdefaultclassHeaderextendsComponent{`
	`4`	`+render(){`
	`5`	`+return(`
	`6`	`+<h1>Five Day Forecast</h1>`
	`7`	`+);`
	`8`	`+}`
	`9`	`+}`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`importReact,{Component}from'react';`
`2`	`2`	`import{connect}from'react-redux';`
`3`	`3`	`importChartfrom'../components/chart';`
`4`		`-`
	`4`	`+importGoogleMapfrom'../components/google_map'`
`5`	`5`
`6`	`6`	`classWeatherListextendsComponent{`
`7`	`7`	`renderWeather(cityData){`
`@@ -10,10 +10,12 @@ class WeatherList extends Component {`
`10`	`10`	`consttemps=list.map((weather)=>weather.main.temp);`
`11`	`11`	`constpressure=list.map((weather)=>weather.main.pressure);`
`12`	`12`	`consthumidity=list.map((weather)=>weather.main.humidity);`
`13`		`-console.log(cityData);`
	`13`	`+const{ lon, lat}=cityData.city.coord;`
	`14`	`+`
`14`	`15`	`return(`
`15`	`16`	`<trkey={name}>`
`16`	`17`	`<td>{name}</td>`
	`18`	`+<td><GoogleMaplon={lon}lat={lat}/></td>`
`17`	`19`	`<td><Chartdata={temps}color="blue"units="°F"/></td>`
`18`	`20`	`<td><Chartdata={pressure}color="orange"units="hPa"/></td>`
`19`	`21`	`<td><Chartdata={humidity}color="black"units="%"/></td>`
`@@ -27,6 +29,7 @@ class WeatherList extends Component {`
`27`	`29`	`<thead>`
`28`	`30`	`<tr>`
`29`	`31`	`<th>City</th>`
	`32`	`+<th>Map</th>`
`30`	`33`	`<th>Temp (°F)</th>`
`31`	`34`	`<th>Pressure (hPa)</th>`
`32`	`35`	`<th>Humidity (%)</th>`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,22 @@`
	`1`	`+* {`
	`2`	`+margin:0;`
	`3`	`+}`
	`4`	`+`
	`5`	`+h1 {`
	`6`	`+text-align: center;`
	`7`	`+margin:20px0;`
	`8`	`+}`
	`9`	`+`
`1`	`10`	`td,th {`
`2`	`11`	`vertical-align: middle!important;`
`3`	`12`	`text-align: center!important;`
`4`	`13`	`}`
`5`	`14`
`6`	`15`	`.input-group {`
`7`	`16`	`margin:20px0;`
	`17`	`+}`
	`18`	`+`
	`19`	`+td:nth-of-type(2),td:nth-of-type(2)>div {`
	`20`	`+height:200px;`
	`21`	`+width:250px;`
`8`	`22`	`}`

Comments

(0)