From 1715d332aa2434acabdc96f55e7fa52dedcb15af Mon Sep 17 00:00:00 2001 From: Abhas Bhattacharya Date: Fri, 30 Mar 2018 12:19:56 +0530 Subject: [PATCH] Rename weather-app to WeatherApp Also modify App render to data loading conditional rendering parts --- src/Components/{Weather-App => WeatherApp}/App.css | 0 .../{Weather-App => WeatherApp}/App.test.tsx | 0 src/Components/{Weather-App => WeatherApp}/App.tsx | 10 +++++++++- src/Components/{Weather-App => WeatherApp}/index.tsx | 0 src/Components/{Weather-App => WeatherApp}/logo.svg | 0 src/index.tsx | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) rename src/Components/{Weather-App => WeatherApp}/App.css (100%) rename src/Components/{Weather-App => WeatherApp}/App.test.tsx (100%) rename src/Components/{Weather-App => WeatherApp}/App.tsx (86%) rename src/Components/{Weather-App => WeatherApp}/index.tsx (100%) rename src/Components/{Weather-App => WeatherApp}/logo.svg (100%) diff --git a/src/Components/Weather-App/App.css b/src/Components/WeatherApp/App.css similarity index 100% rename from src/Components/Weather-App/App.css rename to src/Components/WeatherApp/App.css diff --git a/src/Components/Weather-App/App.test.tsx b/src/Components/WeatherApp/App.test.tsx similarity index 100% rename from src/Components/Weather-App/App.test.tsx rename to src/Components/WeatherApp/App.test.tsx diff --git a/src/Components/Weather-App/App.tsx b/src/Components/WeatherApp/App.tsx similarity index 86% rename from src/Components/Weather-App/App.tsx rename to src/Components/WeatherApp/App.tsx index a4a03fb..b9d780e 100644 --- a/src/Components/Weather-App/App.tsx +++ b/src/Components/WeatherApp/App.tsx @@ -62,6 +62,14 @@ export class WeatherApp extends React.Component<{}, WeatherDataState> { }); } + renderLoading(): JSX.Element | string { + return 'Still Loading'; + } + + renderDates(): JSX.Element | string { + return 'Loading complete'; + } + render() { return (
@@ -70,7 +78,7 @@ export class WeatherApp extends React.Component<{}, WeatherDataState> {

Welcome to React

- {this.state.data !== undefined ? JSON.stringify(this.state.data) : 'Data Loading...'} + {this.state.data !== undefined ? this.renderDates() : this.renderLoading()}
); } diff --git a/src/Components/Weather-App/index.tsx b/src/Components/WeatherApp/index.tsx similarity index 100% rename from src/Components/Weather-App/index.tsx rename to src/Components/WeatherApp/index.tsx diff --git a/src/Components/Weather-App/logo.svg b/src/Components/WeatherApp/logo.svg similarity index 100% rename from src/Components/Weather-App/logo.svg rename to src/Components/WeatherApp/logo.svg diff --git a/src/index.tsx b/src/index.tsx index 0e2088f..66ceb9b 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; -import { WeatherApp } from './Components/Weather-App'; +import { WeatherApp } from './Components/WeatherApp'; import registerServiceWorker from './registerServiceWorker'; import './index.css';