diff --git a/reactjs/tic_tac_turning_app/package.json b/reactjs/tic_tac_turning_app/package.json index 6172293..0b32c52 100644 --- a/reactjs/tic_tac_turning_app/package.json +++ b/reactjs/tic_tac_turning_app/package.json @@ -36,7 +36,7 @@ "react": "^16.1.1", "react-dev-utils": "^4.2.1", "react-dom": "^16.1.1", - "react-router": "^4.2.0", + "react-router": "^3.0.8", "react-scripts": "^1.0.17", "react-tap-event-plugin": "^3.0.2", "style-loader": "0.19.0", diff --git a/reactjs/tic_tac_turning_app/src/containers/Home.js b/reactjs/tic_tac_turning_app/src/containers/Home.js old mode 100644 new mode 100755 index 580c909..21365de --- a/reactjs/tic_tac_turning_app/src/containers/Home.js +++ b/reactjs/tic_tac_turning_app/src/containers/Home.js @@ -1,10 +1,11 @@ import React, {Component} from 'react' class Home extends Component { + render() { - return( + return (
-

Home

+

Home!

) } diff --git a/reactjs/tic_tac_turning_app/src/containers/Profile.js b/reactjs/tic_tac_turning_app/src/containers/Profile.js old mode 100644 new mode 100755 index 4922417..12ca66d --- a/reactjs/tic_tac_turning_app/src/containers/Profile.js +++ b/reactjs/tic_tac_turning_app/src/containers/Profile.js @@ -1,10 +1,11 @@ import React, {Component} from 'react' class Profile extends Component { + render() { - return( + return (
-

Profile

+

Profile!

) } diff --git a/reactjs/tic_tac_turning_app/src/containers/Template.js b/reactjs/tic_tac_turning_app/src/containers/Template.js old mode 100644 new mode 100755 index 8c609a7..ed5deed --- a/reactjs/tic_tac_turning_app/src/containers/Template.js +++ b/reactjs/tic_tac_turning_app/src/containers/Template.js @@ -1,19 +1,26 @@ import React, {Component} from 'react' import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider' import injectTapEventPlugin from 'react-tap-event-plugin' +import RaisedButton from 'material-ui/RaisedButton' injectTapEventPlugin() class Template extends Component { + render() { - return( + return (
-

TicTacTurning

+

TicTacTuring

+ {console.log('hello, I work')}} + />
- {this.prop.children} + {this.props.children}
diff --git a/reactjs/tic_tac_turning_app/src/routes/index.js b/reactjs/tic_tac_turning_app/src/routes/index.js old mode 100644 new mode 100755 index 751b46a..f1070fe --- a/reactjs/tic_tac_turning_app/src/routes/index.js +++ b/reactjs/tic_tac_turning_app/src/routes/index.js @@ -10,14 +10,17 @@ const createRoutes = () => { path='/' component={Template} > - + + ) } const Routes = createRoutes() -export default Routes +export default Routes diff --git a/reactjs/tic_tac_turning_app/yarn.lock b/reactjs/tic_tac_turning_app/yarn.lock index ac12d3c..8c0b458 100644 --- a/reactjs/tic_tac_turning_app/yarn.lock +++ b/reactjs/tic_tac_turning_app/yarn.lock @@ -1604,6 +1604,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-react-class@^15.5.1: + version "15.6.2" + resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.3.1" + object-assign "^4.1.1" + cross-spawn@5.1.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -2514,7 +2522,7 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.6: +fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.6, fbjs@^0.8.9: version "0.8.16" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: @@ -2986,14 +2994,13 @@ he@1.1.x: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" -history@^4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" +history@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c" dependencies: invariant "^2.2.1" loose-envify "^1.2.0" - resolve-pathname "^2.2.0" - value-equal "^0.4.0" + query-string "^4.2.2" warning "^3.0.0" hmac-drbg@^1.0.0: @@ -3012,7 +3019,11 @@ hoek@4.x.x: version "4.2.0" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" -hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1: +hoist-non-react-statics@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" + +hoist-non-react-statics@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0" @@ -4677,7 +4688,7 @@ path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" -path-to-regexp@^1.0.1, path-to-regexp@^1.7.0: +path-to-regexp@^1.0.1: version "1.7.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" dependencies: @@ -5099,7 +5110,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.6.0: +prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -5152,7 +5163,7 @@ qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" -query-string@^4.1.0: +query-string@^4.1.0, query-string@^4.2.2: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" dependencies: @@ -5268,16 +5279,16 @@ react-event-listener@^0.5.1: prop-types "^15.6.0" warning "^3.0.0" -react-router@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986" +react-router@3.0.8: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.4.tgz#25ce0a50dc07bc6ebaeabfd902cad5064da10f22" dependencies: - history "^4.7.2" - hoist-non-react-statics "^2.3.0" - invariant "^2.2.2" - loose-envify "^1.3.1" - path-to-regexp "^1.7.0" - prop-types "^15.5.4" + create-react-class "^15.5.1" + history "^3.0.0" + hoist-non-react-statics "^1.2.0" + invariant "^2.2.1" + loose-envify "^1.2.0" + prop-types "^15.5.6" warning "^3.0.0" react-scripts@^1.0.17: @@ -5642,10 +5653,6 @@ resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" -resolve-pathname@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879" - resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" @@ -6457,10 +6464,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" -value-equal@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" - vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"