From 1654704a1bd89fe373f5d78f8b8171a865bb973a Mon Sep 17 00:00:00 2001 From: Jonathan Gucciardi Date: Mon, 17 Apr 2017 20:55:16 -0500 Subject: [PATCH 1/4] test --- src/App.js | 4 ++ yarn.lock | 116 +++++++++++------------------------------------------ 2 files changed, 28 insertions(+), 92 deletions(-) diff --git a/src/App.js b/src/App.js index 0042c777..b9fc9311 100644 --- a/src/App.js +++ b/src/App.js @@ -2,12 +2,16 @@ import React from "react"; import logo from "./logo.svg"; import "./App.css"; +// add seven additional things to this ract app + + function App() { return (
logo

Welcome to React

+

Test Change

To get started, edit src/App.js and save to reload. diff --git a/yarn.lock b/yarn.lock index 137072ec..1066eff8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -239,7 +239,7 @@ asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" -autoprefixer@6.5.1: +autoprefixer@6.5.1, autoprefixer@^6.3.1: version "6.5.1" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.1.tgz#ae759a5221e709f3da17c2d656230e67c43cbb75" dependencies: @@ -250,17 +250,6 @@ autoprefixer@6.5.1: postcss "^5.2.4" postcss-value-parser "^3.2.3" -autoprefixer@^6.3.1: - version "6.7.2" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.2.tgz#172ab07b998ae9b957530928a59a40be54a45023" - dependencies: - browserslist "^1.7.1" - caniuse-db "^1.0.30000618" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^5.2.11" - postcss-value-parser "^3.2.3" - aws-sign2@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" @@ -277,7 +266,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@6.17.0: +babel-core@6.17.0, babel-core@^6.0.0: version "6.17.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.17.0.tgz#6c4576447df479e241e58c807e4bc7da4db7f425" dependencies: @@ -303,30 +292,6 @@ babel-core@6.17.0: slash "^1.0.0" source-map "^0.5.0" -babel-core@^6.0.0: - version "6.22.1" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648" - dependencies: - babel-code-frame "^6.22.0" - babel-generator "^6.22.0" - babel-helpers "^6.22.0" - babel-messages "^6.22.0" - babel-register "^6.22.0" - babel-runtime "^6.22.0" - babel-template "^6.22.0" - babel-traverse "^6.22.1" - babel-types "^6.22.0" - babylon "^6.11.0" - convert-source-map "^1.1.0" - debug "^2.1.1" - json5 "^0.5.0" - lodash "^4.2.0" - minimatch "^3.0.2" - path-is-absolute "^1.0.0" - private "^0.1.6" - slash "^1.0.0" - source-map "^0.5.0" - babel-core@^6.11.4, babel-core@^6.24.0: version "6.24.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02" @@ -369,7 +334,7 @@ babel-eslint@^7.1.1: babel-types "^6.23.0" babylon "^6.16.1" -babel-generator@^6.17.0, babel-generator@^6.18.0, babel-generator@^6.22.0, babel-generator@^6.24.0: +babel-generator@^6.17.0, babel-generator@^6.18.0, babel-generator@^6.24.0: version "6.24.0" resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56" dependencies: @@ -483,14 +448,7 @@ babel-helper-get-function-arity@^6.24.1: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-helper-hoist-variables@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz#3eacbf731d80705845dd2e9718f600cfb9b4ba72" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.22.0" - -babel-helper-hoist-variables@^6.24.1: +babel-helper-hoist-variables@^6.22.0, babel-helper-hoist-variables@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" dependencies: @@ -569,7 +527,7 @@ babel-helper-replace-supers@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-helpers@^6.16.0, babel-helpers@^6.22.0, babel-helpers@^6.23.0: +babel-helpers@^6.16.0, babel-helpers@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992" dependencies: @@ -592,7 +550,7 @@ babel-loader@6.2.5: mkdirp "^0.5.1" object-assign "^4.0.1" -babel-messages@^6.22.0, babel-messages@^6.23.0, babel-messages@^6.8.0: +babel-messages@^6.23.0, babel-messages@^6.8.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" dependencies: @@ -1180,7 +1138,7 @@ babel-preset-react@6.16.0: babel-plugin-transform-react-jsx-self "^6.11.0" babel-plugin-transform-react-jsx-source "^6.3.13" -babel-register@^6.16.0, babel-register@^6.22.0, babel-register@^6.24.0: +babel-register@^6.16.0, babel-register@^6.24.0: version "6.24.0" resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd" dependencies: @@ -1226,7 +1184,7 @@ babel-template@^6.24.1: babylon "^6.11.0" lodash "^4.2.0" -babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.22.1, babel-traverse@^6.23.0, babel-traverse@^6.23.1: +babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1: version "6.23.1" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48" dependencies: @@ -1240,7 +1198,7 @@ babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-tr invariant "^2.2.0" lodash "^4.2.0" -babel-traverse@^6.24.1: +babel-traverse@^6.22.0, babel-traverse@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695" dependencies: @@ -1254,7 +1212,7 @@ babel-traverse@^6.24.1: invariant "^2.2.0" lodash "^4.2.0" -babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.22.0, babel-types@^6.23.0: +babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf" dependencies: @@ -1263,7 +1221,7 @@ babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.22 lodash "^4.2.0" to-fast-properties "^1.0.1" -babel-types@^6.19.0, babel-types@^6.24.1: +babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975" dependencies: @@ -1382,14 +1340,14 @@ browserify-zlib@~0.1.4: dependencies: pako "~0.2.0" -browserslist@^1.0.1, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.1: +browserslist@^1.0.1, browserslist@^1.5.2: version "1.7.7" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" dependencies: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@~1.4.0: +browserslist@^1.4.0, browserslist@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.4.0.tgz#9cfdcf5384d9158f5b70da2aa00b30e8ff019049" dependencies: @@ -1467,7 +1425,7 @@ caniuse-api@^1.5.2: lodash.memoize "^4.1.0" lodash.uniq "^4.3.0" -caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000554, caniuse-db@^1.0.30000618, caniuse-db@^1.0.30000639: +caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000554, caniuse-db@^1.0.30000639: version "1.0.30000646" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000646.tgz#c724b90d61df24286e015fc528d062073c00def4" @@ -2482,7 +2440,7 @@ events@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" -eventsource@0.1.6, eventsource@^0.1.3: +eventsource@^0.1.3: version "0.1.6" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" dependencies: @@ -2579,12 +2537,6 @@ faye-websocket@^0.10.0: dependencies: websocket-driver ">=0.5.1" -faye-websocket@~0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38" - dependencies: - websocket-driver ">=0.5.1" - faye-websocket@~0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.7.3.tgz#cc4074c7f4a4dfd03af54dd65c354b135132ce11" @@ -3043,7 +2995,7 @@ http-errors@~1.6.1: setprototypeof "1.0.3" statuses ">= 1.3.1 < 2" -http-proxy-middleware@0.17.2: +http-proxy-middleware@0.17.2, http-proxy-middleware@~0.17.1: version "0.17.2" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.2.tgz#572d517a6d2fb1063a469de294eed96066352007" dependencies: @@ -3052,16 +3004,7 @@ http-proxy-middleware@0.17.2: lodash "^4.16.2" micromatch "^2.3.11" -http-proxy-middleware@~0.17.1: - version "0.17.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d" - dependencies: - http-proxy "^1.16.2" - is-glob "^3.1.0" - lodash "^4.17.2" - micromatch "^2.3.11" - -http-proxy@^1.15.1, http-proxy@^1.16.2: +http-proxy@^1.15.1: version "1.16.2" resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742" dependencies: @@ -3260,7 +3203,7 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" -is-glob@^3.0.0, is-glob@^3.1.0: +is-glob@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" dependencies: @@ -3998,7 +3941,7 @@ lodash.words@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash@4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.2, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.3.0: +lodash@4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.2, lodash@^4.16.4, lodash@^4.2.0, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -4866,7 +4809,7 @@ postcss-zindex@^2.0.1: postcss "^5.0.4" uniqs "^2.0.0" -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.4: +postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.4: version "5.2.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.16.tgz#732b3100000f9ff8379a48a53839ed097376ad57" dependencies: @@ -5364,13 +5307,13 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.1: +rimraf@2, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" -rimraf@2.5.4: +rimraf@2.5.4, rimraf@^2.2.8: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -5541,7 +5484,7 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -sockjs-client@1.0.3: +sockjs-client@1.0.3, sockjs-client@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.0.3.tgz#b0d8280998460eb2564c5d79d7e3d7cfd8a353ad" dependencies: @@ -5552,17 +5495,6 @@ sockjs-client@1.0.3: json3 "^3.3.2" url-parse "^1.0.1" -sockjs-client@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5" - dependencies: - debug "^2.2.0" - eventsource "0.1.6" - faye-websocket "~0.11.0" - inherits "^2.0.1" - json3 "^3.3.2" - url-parse "^1.1.1" - sockjs@^0.3.15: version "0.3.18" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207" @@ -5965,7 +5897,7 @@ url-parse@1.0.x: querystringify "0.0.x" requires-port "1.0.x" -url-parse@^1.0.1, url-parse@^1.1.1: +url-parse@^1.0.1: version "1.1.8" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" dependencies: From c7e2017a62265f9b9c8d0b533adde50034c864c2 Mon Sep 17 00:00:00 2001 From: Jonathan Gucciardi Date: Thu, 20 Apr 2017 12:35:26 -0500 Subject: [PATCH 2/4] Seven componants added --- src/App.js | 21 +++++++++++++++------ src/componants/Another-comp.js | 12 ++++++++++++ src/componants/CompSix.js | 14 ++++++++++++++ src/componants/Header.js | 14 ++++++++++++++ src/componants/appIntro.js | 13 +++++++++++++ src/componants/pTag.js | 14 ++++++++++++++ src/componants/picture.js | 16 ++++++++++++++++ src/componants/seven.js | 12 ++++++++++++ src/index.js | 2 +- src/users.js | 3 --- 10 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 src/componants/Another-comp.js create mode 100644 src/componants/CompSix.js create mode 100644 src/componants/Header.js create mode 100644 src/componants/appIntro.js create mode 100644 src/componants/pTag.js create mode 100644 src/componants/picture.js create mode 100644 src/componants/seven.js diff --git a/src/App.js b/src/App.js index b9fc9311..473e4542 100644 --- a/src/App.js +++ b/src/App.js @@ -1,7 +1,13 @@ import React from "react"; import logo from "./logo.svg"; import "./App.css"; - +import Header from "./componants/Header"; +import Ptag from "./componants/pTag"; +import Appintro from "./componants/appIntro"; +import AnotherComp from "./componants/Another-comp"; +import Pic from "./componants/picture"; +import CompSix from "./componants/CompSix"; +import Seven from "./componants/seven"; // add seven additional things to this ract app @@ -10,12 +16,15 @@ function App() {

logo -

Welcome to React

-

Test Change

+
+
-

- To get started, edit src/App.js and save to reload. -

+ + + + + +
); } diff --git a/src/componants/Another-comp.js b/src/componants/Another-comp.js new file mode 100644 index 00000000..35329b33 --- /dev/null +++ b/src/componants/Another-comp.js @@ -0,0 +1,12 @@ +import React from "react"; + +function AnotherComp() { + return ( +
+

AnotherComponant

+
+ + ); +} + +export default AnotherComp; diff --git a/src/componants/CompSix.js b/src/componants/CompSix.js new file mode 100644 index 00000000..f22bf26c --- /dev/null +++ b/src/componants/CompSix.js @@ -0,0 +1,14 @@ +import React from "react"; + +function Compsix(props) { + return ( +
+ +

{props.message}

+ +
+ + ); +} + +export default Compsix; diff --git a/src/componants/Header.js b/src/componants/Header.js new file mode 100644 index 00000000..71c463c7 --- /dev/null +++ b/src/componants/Header.js @@ -0,0 +1,14 @@ +import React from "react"; + +function Header(props) { + return ( +
+ +

{props.message}

+ +
+ + ); +} + +export default Header; diff --git a/src/componants/appIntro.js b/src/componants/appIntro.js new file mode 100644 index 00000000..37e6f7dc --- /dev/null +++ b/src/componants/appIntro.js @@ -0,0 +1,13 @@ +import React from "react"; + +function Appintro() { + + return ( +
+

App-Intro

+
+ ); + +} + +export default Appintro; diff --git a/src/componants/pTag.js b/src/componants/pTag.js new file mode 100644 index 00000000..f4fc9d18 --- /dev/null +++ b/src/componants/pTag.js @@ -0,0 +1,14 @@ +import React from "react"; + +function Ptag(props) { + return ( +
+ +

{props.message}

+ +
+ + ); +} + +export default Ptag; diff --git a/src/componants/picture.js b/src/componants/picture.js new file mode 100644 index 00000000..0b9b3d14 --- /dev/null +++ b/src/componants/picture.js @@ -0,0 +1,16 @@ +import React from "react"; +import logo from "../logo.svg"; + +function Pic() { + return ( +
+ logo +
+ ); + + + +} + + +export default Pic; diff --git a/src/componants/seven.js b/src/componants/seven.js new file mode 100644 index 00000000..5cf372cf --- /dev/null +++ b/src/componants/seven.js @@ -0,0 +1,12 @@ +import React from "react"; + +function Seven() { + return ( +
+ Seven#@!@# +
+ + ); +} + +export default Seven; diff --git a/src/index.js b/src/index.js index 8e6bfe35..19517bd7 100644 --- a/src/index.js +++ b/src/index.js @@ -7,7 +7,7 @@ import users from "./users"; function render() { ReactDOM.render( - , + , document.getElementById("root") ); } diff --git a/src/users.js b/src/users.js index b700dc61..78359cb6 100644 --- a/src/users.js +++ b/src/users.js @@ -55,6 +55,3 @@ export default [ } ]; - - - From d65ef6c8ec568c8a3a6f5e6160c964b9e7874089 Mon Sep 17 00:00:00 2001 From: Jonathan Gucciardi Date: Mon, 24 Apr 2017 14:50:58 -0500 Subject: [PATCH 3/4] Addres book w/ secen components & names listed --- src/App.js | 32 ----------------------------- src/componants/Another-comp.js | 4 ++-- src/{ => componants}/App.css | 0 src/componants/App.js | 35 ++++++++++++++++++++++++++++++++ src/{ => componants}/App.test.js | 0 src/componants/DetailOutput.js | 13 ++++++++++++ src/componants/ListOfUsers.js | 20 ++++++++++++++++++ src/componants/ListOutput.js | 13 ++++++++++++ src/componants/Main.js | 17 ++++++++++++++++ src/componants/UserDetail.js | 16 +++++++++++++++ src/{ => componants}/logo.svg | 0 src/componants/picture.js | 7 +------ src/index.js | 4 ++-- 13 files changed, 119 insertions(+), 42 deletions(-) delete mode 100644 src/App.js rename src/{ => componants}/App.css (100%) create mode 100644 src/componants/App.js rename src/{ => componants}/App.test.js (100%) create mode 100644 src/componants/DetailOutput.js create mode 100644 src/componants/ListOfUsers.js create mode 100644 src/componants/ListOutput.js create mode 100644 src/componants/Main.js create mode 100644 src/componants/UserDetail.js rename src/{ => componants}/logo.svg (100%) diff --git a/src/App.js b/src/App.js deleted file mode 100644 index 473e4542..00000000 --- a/src/App.js +++ /dev/null @@ -1,32 +0,0 @@ -import React from "react"; -import logo from "./logo.svg"; -import "./App.css"; -import Header from "./componants/Header"; -import Ptag from "./componants/pTag"; -import Appintro from "./componants/appIntro"; -import AnotherComp from "./componants/Another-comp"; -import Pic from "./componants/picture"; -import CompSix from "./componants/CompSix"; -import Seven from "./componants/seven"; -// add seven additional things to this ract app - - -function App() { - return ( -
-
- logo -
- -
- - - - - - -
- ); -} - -export default App; diff --git a/src/componants/Another-comp.js b/src/componants/Another-comp.js index 35329b33..b94011f0 100644 --- a/src/componants/Another-comp.js +++ b/src/componants/Another-comp.js @@ -3,9 +3,9 @@ import React from "react"; function AnotherComp() { return (
-

AnotherComponant

+

AnotherComponant Test

- + ); } diff --git a/src/App.css b/src/componants/App.css similarity index 100% rename from src/App.css rename to src/componants/App.css diff --git a/src/componants/App.js b/src/componants/App.js new file mode 100644 index 00000000..0d268ccb --- /dev/null +++ b/src/componants/App.js @@ -0,0 +1,35 @@ +import React from "react"; +import logo from "./logo.svg"; +import "./App.css"; +import Header from "./Header"; +import Ptag from "./pTag"; +import Appintro from "./appIntro"; +import AnotherComp from "./Another-comp"; +import Pic from "./picture"; +import CompSix from "./CompSix"; +import Seven from "./seven"; +import Main from "./Main"; + +// add seven additional things to this ract app + +function App(props) { + const UserInfo = props.users[0]; + return ( +
+
+ logo +
+ +
+ + +
+ + + + +
+ ); +} + +export default App; diff --git a/src/App.test.js b/src/componants/App.test.js similarity index 100% rename from src/App.test.js rename to src/componants/App.test.js diff --git a/src/componants/DetailOutput.js b/src/componants/DetailOutput.js new file mode 100644 index 00000000..3343a710 --- /dev/null +++ b/src/componants/DetailOutput.js @@ -0,0 +1,13 @@ +import React from "react"; +import UserDetail from "./UserDetail"; + +function DetailOutput(props) { + const first = props.user; + return ( +
+ +
+ ); +} + +export default DetailOutput; diff --git a/src/componants/ListOfUsers.js b/src/componants/ListOfUsers.js new file mode 100644 index 00000000..e4238999 --- /dev/null +++ b/src/componants/ListOfUsers.js @@ -0,0 +1,20 @@ +/* Gathers list of users*/ +import React from "react"; + +function ListOfUsers(props) { + const UserList = props.users.map(function(user, index) { + return ( +
  • + {user.first_name} +
  • + + ); + }); + return ( +
    + {UserList} +
    + ); +} + +export default ListOfUsers; diff --git a/src/componants/ListOutput.js b/src/componants/ListOutput.js new file mode 100644 index 00000000..3e39bce8 --- /dev/null +++ b/src/componants/ListOutput.js @@ -0,0 +1,13 @@ +/*Outputs the list of users*/ +import React from "react"; +import ListOfUsers from "./ListOfUsers"; + +function ListOutput(props) { + return ( +
    + +
    + ); +} + +export default ListOutput; diff --git a/src/componants/Main.js b/src/componants/Main.js new file mode 100644 index 00000000..6ad827f4 --- /dev/null +++ b/src/componants/Main.js @@ -0,0 +1,17 @@ +import React from "react"; +import ListOutput from "./ListOutput"; +import DetailOutput from "./DetailOutput"; + + +function Main(props) { + const first = props.user; + return ( +
    + + + +
    + ); +} + +export default Main; diff --git a/src/componants/UserDetail.js b/src/componants/UserDetail.js new file mode 100644 index 00000000..6c5c4282 --- /dev/null +++ b/src/componants/UserDetail.js @@ -0,0 +1,16 @@ +import React from "react"; + +function UserDetail(props) { + const firstName = (props.user.first_name); + const lastName = (props.user.last_name); + return ( +
      +
    • + {firstName} + {lastName} +
    • +
    + ); +} + +export default UserDetail; diff --git a/src/logo.svg b/src/componants/logo.svg similarity index 100% rename from src/logo.svg rename to src/componants/logo.svg diff --git a/src/componants/picture.js b/src/componants/picture.js index 0b9b3d14..c310c623 100644 --- a/src/componants/picture.js +++ b/src/componants/picture.js @@ -1,5 +1,5 @@ import React from "react"; -import logo from "../logo.svg"; +import logo from "./logo.svg"; function Pic() { return ( @@ -7,10 +7,5 @@ function Pic() { logo
    ); - - - } - - export default Pic; diff --git a/src/index.js b/src/index.js index 19517bd7..d205958e 100644 --- a/src/index.js +++ b/src/index.js @@ -1,13 +1,13 @@ import React from "react"; import ReactDOM from "react-dom"; -import App from "./App"; +import App from "./componants/App"; import "./index.css"; import users from "./users"; function render() { ReactDOM.render( - , + , document.getElementById("root") ); } From b07aa0850ca05d3c21981934caff54e6b00639e9 Mon Sep 17 00:00:00 2001 From: Jonathan Gucciardi Date: Mon, 24 Apr 2017 19:46:47 -0500 Subject: [PATCH 4/4] Solved props validation error and corrected linting errors --- package.json | 7 +++++-- src/componants/App.js | 8 ++++++-- src/componants/CompSix.js | 5 +++++ src/componants/DetailOutput.js | 6 ++++++ src/componants/Header.js | 8 +++++--- src/componants/ListOfUsers.js | 7 +++++-- src/componants/ListOutput.js | 6 +++++- src/componants/Main.js | 9 ++++++--- src/componants/UserDetail.js | 4 ++++ src/componants/pTag.js | 8 +++++--- src/componants/seven.js | 1 - yarn.lock | 16 +++++++++++++++- 12 files changed, 67 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index a449367b..59a21e5d 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,11 @@ "dependencies": { "foreman": "^2.0.0", "json-server": "^0.9.4", + "prop": "^0.1.1", + "prop-types": "^15.5.8", "react": "^15.3.2", - "react-dom": "^15.3.2" + "react-dom": "^15.3.2", + "types": "^0.1.1" }, "scripts": { "start": "nf start", @@ -24,5 +27,5 @@ "test": "npm run lint && react-scripts test --env=jsdom", "eject": "react-scripts eject" }, - "proxy" : "http://localhost:3001" + "proxy": "http://localhost:3001" } diff --git a/src/componants/App.js b/src/componants/App.js index 0d268ccb..905538b9 100644 --- a/src/componants/App.js +++ b/src/componants/App.js @@ -9,7 +9,7 @@ import Pic from "./picture"; import CompSix from "./CompSix"; import Seven from "./seven"; import Main from "./Main"; - +import propTypes from "prop-types"; // add seven additional things to this ract app function App(props) { @@ -19,7 +19,6 @@ function App(props) {
    logo
    -
    @@ -32,4 +31,9 @@ function App(props) { ); } +App.propTypes = { + users: propTypes.string.isRequired +}; + + export default App; diff --git a/src/componants/CompSix.js b/src/componants/CompSix.js index f22bf26c..98af59c3 100644 --- a/src/componants/CompSix.js +++ b/src/componants/CompSix.js @@ -1,4 +1,5 @@ import React from "react"; +import propTypes from "prop-types"; function Compsix(props) { return ( @@ -10,5 +11,9 @@ function Compsix(props) { ); } +Compsix.propTypes = { + message: propTypes.string.isRequired +}; + export default Compsix; diff --git a/src/componants/DetailOutput.js b/src/componants/DetailOutput.js index 3343a710..99456054 100644 --- a/src/componants/DetailOutput.js +++ b/src/componants/DetailOutput.js @@ -1,5 +1,6 @@ import React from "react"; import UserDetail from "./UserDetail"; +import propTypes from "prop-types"; function DetailOutput(props) { const first = props.user; @@ -9,5 +10,10 @@ function DetailOutput(props) { ); } +DetailOutput.propTypes = { + user: propTypes.string.isRequired +}; + + export default DetailOutput; diff --git a/src/componants/Header.js b/src/componants/Header.js index 71c463c7..dccc5500 100644 --- a/src/componants/Header.js +++ b/src/componants/Header.js @@ -1,14 +1,16 @@ import React from "react"; +import propTypes from "prop-types"; function Header(props) { return (
    -

    {props.message}

    -
    - ); } +Header.propTypes = { + message: propTypes.string.isRequired +}; + export default Header; diff --git a/src/componants/ListOfUsers.js b/src/componants/ListOfUsers.js index e4238999..ec732e82 100644 --- a/src/componants/ListOfUsers.js +++ b/src/componants/ListOfUsers.js @@ -1,13 +1,13 @@ /* Gathers list of users*/ import React from "react"; +import propTypes from "prop-types"; function ListOfUsers(props) { - const UserList = props.users.map(function(user, index) { + const UserList = props.users.map(function (user, index) { return (
  • {user.first_name}
  • - ); }); return ( @@ -17,4 +17,7 @@ function ListOfUsers(props) { ); } +ListOfUsers.propTypes = { + users: propTypes.string.isRequired +}; export default ListOfUsers; diff --git a/src/componants/ListOutput.js b/src/componants/ListOutput.js index 3e39bce8..f0f3a207 100644 --- a/src/componants/ListOutput.js +++ b/src/componants/ListOutput.js @@ -1,6 +1,6 @@ -/*Outputs the list of users*/ import React from "react"; import ListOfUsers from "./ListOfUsers"; +import propTypes from "prop-types"; function ListOutput(props) { return ( @@ -10,4 +10,8 @@ function ListOutput(props) { ); } +ListOutput.propTypes = { + users: propTypes.string.isRequired +}; + export default ListOutput; diff --git a/src/componants/Main.js b/src/componants/Main.js index 6ad827f4..bd89d086 100644 --- a/src/componants/Main.js +++ b/src/componants/Main.js @@ -1,17 +1,20 @@ import React from "react"; import ListOutput from "./ListOutput"; import DetailOutput from "./DetailOutput"; - +import propTypes from "prop-types"; function Main(props) { const first = props.user; return (
    - + -
    ); } +Main.propTypes = { + user: propTypes.string.isRequired +}; + export default Main; diff --git a/src/componants/UserDetail.js b/src/componants/UserDetail.js index 6c5c4282..e95874ad 100644 --- a/src/componants/UserDetail.js +++ b/src/componants/UserDetail.js @@ -1,4 +1,5 @@ import React from "react"; +import propTypes from "prop-types"; function UserDetail(props) { const firstName = (props.user.first_name); @@ -12,5 +13,8 @@ function UserDetail(props) { ); } +UserDetail.propTypes = { + user: propTypes.string.isRequired +}; export default UserDetail; diff --git a/src/componants/pTag.js b/src/componants/pTag.js index f4fc9d18..70d44517 100644 --- a/src/componants/pTag.js +++ b/src/componants/pTag.js @@ -1,14 +1,16 @@ import React from "react"; +import propTypes from "prop-types"; function Ptag(props) { return (
    -

    {props.message}

    -
    - ); } +Ptag.propTypes = { + message: propTypes.string.isRequired +}; + export default Ptag; diff --git a/src/componants/seven.js b/src/componants/seven.js index 5cf372cf..4c8ee470 100644 --- a/src/componants/seven.js +++ b/src/componants/seven.js @@ -5,7 +5,6 @@ function Seven() {
    Seven#@!@#
    - ); } diff --git a/yarn.lock b/yarn.lock index 1066eff8..05776d1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2052,6 +2052,10 @@ dotenv@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-2.0.0.tgz#bd759c357aaa70365e01c96b7b0bec08a6e0d949" +dotty@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/dotty/-/dotty-0.0.1.tgz#cbe6d45c52abd92c4224c079206e2581d14d038a" + duplexer2@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -4863,12 +4867,18 @@ promise@7.1.1, promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.5.7, prop-types@~15.5.7: +prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7: version "15.5.8" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394" dependencies: fbjs "^0.8.9" +prop@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/prop/-/prop-0.1.1.tgz#e464c772f6cec96e4c3db87b6b7ebb8257676441" + dependencies: + dotty "0.0.1" + proxy-addr@~1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3" @@ -5808,6 +5818,10 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" +types@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/types/-/types-0.1.1.tgz#860c6859d11366293f835d8c95aebcf95029838e" + ua-parser-js@^0.7.9: version "0.7.12" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"