From 5889fa232a3932f79960a3136372ddf058a157f2 Mon Sep 17 00:00:00 2001 From: someyaaltous Date: Thu, 22 Aug 2019 11:45:04 +0300 Subject: [PATCH 1/2] add first page --- src/components/App/index.js | 25 +++++++++++++++++++++++-- src/components/FirstPage/index.js | 9 ++++++--- src/index.js | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/components/App/index.js b/src/components/App/index.js index 4fb2db6..3b47d70 100644 --- a/src/components/App/index.js +++ b/src/components/App/index.js @@ -1,4 +1,25 @@ -import React from 'react'; +import React , {Component}from 'react'; import Game from '../Game' +import FirstPage from '../FirstPage' +class App extends Component { -export const App = () => + state = { + gameStarted : false + }; + + startGame = ( ) => { + + this.setState({gameStarted: true})} + render() { + return ( +
+ + { (!this.state.gameStarted )? () : ()} +
+ + ) + } + +} + +export default App \ No newline at end of file diff --git a/src/components/FirstPage/index.js b/src/components/FirstPage/index.js index f932fa8..bcc15ed 100644 --- a/src/components/FirstPage/index.js +++ b/src/components/FirstPage/index.js @@ -1,10 +1,13 @@ -import React, {component} from 'react' -const FirstPage = ()=>{ +import React from 'react' +const FirstPage = ({startGame})=>{ + return(

English Learning Game

- +
) } + export default FirstPage \ No newline at end of file diff --git a/src/index.js b/src/index.js index e93ef96..ddbac1e 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { App } from './components/App'; +import App from './components/App'; ReactDOM.render(, document.getElementById('root')); From ade82db64f6bd859b4b5314808a1b7e6c5da640d Mon Sep 17 00:00:00 2001 From: someyaaltous Date: Thu, 22 Aug 2019 11:49:44 +0300 Subject: [PATCH 2/2] added first page --- src/components/App/index.js | 1 + src/components/FirstPage/index.js | 2 +- src/index.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/App/index.js b/src/components/App/index.js index 3b47d70..44db043 100644 --- a/src/components/App/index.js +++ b/src/components/App/index.js @@ -5,6 +5,7 @@ class App extends Component { state = { gameStarted : false + }; startGame = ( ) => { diff --git a/src/components/FirstPage/index.js b/src/components/FirstPage/index.js index bcc15ed..83f4c61 100644 --- a/src/components/FirstPage/index.js +++ b/src/components/FirstPage/index.js @@ -5,7 +5,7 @@ const FirstPage = ({startGame})=>{

English Learning Game

+ }>Start
) } diff --git a/src/index.js b/src/index.js index ddbac1e..23fc286 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; + import App from './components/App'; ReactDOM.render(, document.getElementById('root'));