diff --git a/src/Components/WeatherApp/App.css b/src/Components/WeatherApp/App.css index c5c6e8a..76b6235 100644 --- a/src/Components/WeatherApp/App.css +++ b/src/Components/WeatherApp/App.css @@ -1,28 +1,21 @@ -.App { +.WeatherApp { text-align: center; } -.App-logo { - animation: App-logo-spin infinite 20s linear; - height: 80px; -} - -.App-header { +.WeatherApp-header { background-color: #222; - height: 150px; - padding: 20px; color: white; + + width: 100%; + height: 10vh; } -.App-title { - font-size: 1.5em; +.WeatherApp-title { + padding: 3.5vh 0; + font-size: 3vh; } -.App-intro { - font-size: large; -} - -@keyframes App-logo-spin { - from { transform: rotate(0deg); } - to { transform: rotate(360deg); } -} +.WeatherApp-body { + width: 100%; + height: 90vh; +} \ No newline at end of file diff --git a/src/Components/WeatherApp/App.tsx b/src/Components/WeatherApp/App.tsx index b9d780e..903dc69 100644 --- a/src/Components/WeatherApp/App.tsx +++ b/src/Components/WeatherApp/App.tsx @@ -1,42 +1,43 @@ import * as React from 'react'; +// import * as moment from 'moment'; +import '../../../node_modules/open-weather-icons/dist/css/open-weather-icons.css'; import './App.css'; - -const logo = require('./logo.svg'); +import { MultiDayForecast } from '../MultiDayForecast'; export interface ForecaseAtInstance { - dt: Number; + dt: number; main: { - temp: Number; - temp_min: Number; - temp_max: Number; - pressure: Number; - sea_level: Number; - grnd_level: Number; - humidity: Number; - temp_kf: Number; + temp: number; + temp_min: number; + temp_max: number; + pressure: number; + sea_level: number; + grnd_level: number; + humidity: number; + temp_kf: number; }; weather: [{ - id: Number; + id: number; main: string; // Make enum description: string; icon: string; }]; clouds: { - all: Number; + all: number; }; wind: { - speed: Number; - deg: Number; + speed: number; + deg: number; }; dt_txt: string; } export interface Forecast5Days { - cnt: Number; + cnt: number; list: Array; } @@ -66,19 +67,21 @@ export class WeatherApp extends React.Component<{}, WeatherDataState> { return 'Still Loading'; } - renderDates(): JSX.Element | string { - return 'Loading complete'; + renderDates(forecast5Days: Forecast5Days): JSX.Element | string { + return ; } render() { return ( -
-
- logo -

Welcome to React

+
+
+
+ Weather Forecast +
- - {this.state.data !== undefined ? this.renderDates() : this.renderLoading()} +
+ {this.state.data !== undefined ? this.renderDates(this.state.data) : this.renderLoading()} +
); } diff --git a/src/Components/WeatherApp/index.tsx b/src/Components/WeatherApp/index.tsx index f435512..d7bd095 100644 --- a/src/Components/WeatherApp/index.tsx +++ b/src/Components/WeatherApp/index.tsx @@ -1 +1 @@ -export { WeatherApp } from './App'; \ No newline at end of file +export { WeatherApp, ForecaseAtInstance, Forecast5Days } from './App'; \ No newline at end of file diff --git a/src/Components/WeatherApp/logo.svg b/src/Components/WeatherApp/logo.svg deleted file mode 100644 index 6b60c10..0000000 --- a/src/Components/WeatherApp/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -