diff --git a/README.md b/README.md index ce4ea2e..58ceb2f 100755 --- a/README.md +++ b/README.md @@ -90,3 +90,7 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo This repository is the starter code for _all_ Udacity students. Therefore, we most likely will not accept pull requests. For details, check out [CONTRIBUTING.md](CONTRIBUTING.md). + +1. Download or clone this project from [git] +2. To install app: Ffrom the command line, type: npm install. +3. When complete, to run app, type: npm start diff --git a/package-lock.json b/package-lock.json index 8028e8d..a70194d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4249,12 +4249,29 @@ "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", "dev": true }, + "history": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz", + "integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==", + "requires": { + "invariant": "2.2.4", + "loose-envify": "1.3.1", + "resolve-pathname": "2.2.0", + "value-equal": "0.4.0", + "warning": "3.0.0" + } + }, "hoek": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "dev": true }, + "hoist-non-react-statics": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz", + "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w==" + }, "home-or-tmp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", @@ -4533,7 +4550,6 @@ "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, "requires": { "loose-envify": "1.3.1" } @@ -7052,6 +7068,48 @@ "prop-types": "15.6.1" } }, + "react-router": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.2.0.tgz", + "integrity": "sha512-DY6pjwRhdARE4TDw7XjxjZsbx9lKmIcyZoZ+SDO7SBJ1KUeWNxT22Kara2AC7u6/c2SYEHlEDLnzBCcNhLE8Vg==", + "requires": { + "history": "4.7.2", + "hoist-non-react-statics": "2.5.0", + "invariant": "2.2.4", + "loose-envify": "1.3.1", + "path-to-regexp": "1.7.0", + "prop-types": "15.6.1", + "warning": "3.0.0" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "requires": { + "isarray": "0.0.1" + } + } + } + }, + "react-router-dom": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.2.2.tgz", + "integrity": "sha512-cHMFC1ZoLDfEaMFoKTjN7fry/oczMgRt5BKfMAkTu5zEuJvUiPp1J8d0eXSVTnBh6pxlbdqDhozunOOLtmKfPA==", + "requires": { + "history": "4.7.2", + "invariant": "2.2.4", + "loose-envify": "1.3.1", + "prop-types": "15.6.1", + "react-router": "4.2.0", + "warning": "3.0.0" + } + }, "react-scripts": { "version": "0.9.5", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-0.9.5.tgz", @@ -7456,6 +7514,11 @@ "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", "dev": true }, + "resolve-pathname": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz", + "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==" + }, "restore-cursor": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", @@ -8281,6 +8344,11 @@ "spdx-expression-parse": "3.0.0" } }, + "value-equal": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz", + "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==" + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -8322,6 +8390,14 @@ "makeerror": "1.0.11" } }, + "warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", + "requires": { + "loose-envify": "1.3.1" + } + }, "watch": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz", diff --git a/package.json b/package.json index be5083a..1d98220 100755 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "dependencies": { "prop-types": "^15.5.8", "react": "^15.5.4", - "react-dom": "^15.5.4" + "react-dom": "^15.5.4", + "react-router-dom": "^4.2.2" }, "devDependencies": { "react-scripts": "0.9.5" diff --git a/src/App.js b/src/App.js index 7c80a01..b840a78 100755 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,8 @@ import React from 'react' +import { Route, BrowserRouter } from 'react-router-dom' // import * as BooksAPI from './BooksAPI' +import Bookshelf from './Bookshelf' +import SearchPage from './SearchPage' import './App.css' class BooksApp extends React.Component { @@ -16,188 +19,18 @@ class BooksApp extends React.Component { render() { return (
- {this.state.showSearchPage ? ( -
-
- this.setState({ showSearchPage: false })}>Close -
- {/* - NOTES: The search from BooksAPI is limited to a particular set of search terms. - You can find these search terms here: - https://github.com/udacity/reactnd-project-myreads-starter/blob/master/SEARCH_TERMS.md - However, remember that the BooksAPI.search method DOES search by title or author. So, don't worry if - you don't find a specific author or title. Every search is limited by search terms. - */} - + ( + + )}/> -
-
-
-
    -
    + ( + + )}/> + +
    + this.setState({ showSearchPage: true })}>Add a book
    - ) : ( -
    -
    -

    MyReads

    -
    -
    -
    -
    -

    Currently Reading

    -
    -
      -
    1. -
      -
      -
      -
      - -
      -
      -
      To Kill a Mockingbird
      -
      Harper Lee
      -
      -
      2. -
    2. -
      -
      -
      -
      - -
      -
      -
      Enders Game
      -
      Orson Scott Card
      -
      -
      3. -
    -
    -
    -
    -

    Want to Read

    -
    -
      -
    1. -
      -
      -
      -
      - -
      -
      -
      1776
      -
      David McCullough
      -
      -
      2. -
    2. -
      -
      -
      -
      - -
      -
      -
      Harry Potter and the Sorcerers Stone
      -
      J.K. Rowling
      -
      -
      3. -
    -
    -
    -
    -

    Read

    -
    -
      -
    1. -
      -
      -
      -
      - -
      -
      -
      The Hobbit
      -
      J.R.R. Tolkien
      -
      -
      2. -
    2. -
      -
      -
      -
      - -
      -
      -
      Oh, the Places Youll Go!
      -
      Seuss
      -
      -
      3. -
    3. -
      -
      -
      -
      - -
      -
      -
      The Adventures of Tom Sawyer
      -
      Mark Twain
      -
      -
      4. -
    -
    -
    -
    -
    - -
    - )}
    ) } diff --git a/src/Bookshelf.js b/src/Bookshelf.js new file mode 100644 index 0000000..3c7bc1b --- /dev/null +++ b/src/Bookshelf.js @@ -0,0 +1,169 @@ +import React, { Component } from 'react'; + +class Bookshelf extends Component { + render() { + return ( +
    Bookshelf
    +/* +
    +
    +

    MyReads

    +
    +
    +
    +
    +

    Currently Reading

    +
    +
      +
    1. +
      +
      +
      +
      + +
      +
      +
      To Kill a Mockingbird
      +
      Harper Lee
      +
      +
      2. +
    2. +
      +
      +
      +
      + +
      +
      +
      Enders Game
      +
      Orson Scott Card
      +
      +
      3. +
    +
    +
    +
    +

    Want to Read

    +
    +
      +
    1. +
      +
      +
      +
      + +
      +
      +
      1776
      +
      David McCullough
      +
      +
      2. +
    2. +
      +
      +
      +
      + +
      +
      +
      Harry Potter and the Sorcerers Stone
      +
      J.K. Rowling
      +
      +
      3. +
    +
    +
    +
    +

    Read

    +
    +
      +
    1. +
      +
      +
      +
      + +
      +
      +
      The Hobbit
      +
      J.R.R. Tolkien
      +
      +
      2. +
    2. +
      +
      +
      +
      + +
      +
      +
      Oh, the Places Youll Go!
      +
      Seuss
      +
      +
      3. +
    3. +
      +
      +
      +
      + +
      +
      +
      The Adventures of Tom Sawyer
      +
      Mark Twain
      +
      +
      4. +
    +
    +
    +
    +
    +
    + */ + ) + } +} + +export default Bookshelf diff --git a/src/SearchPage.js b/src/SearchPage.js new file mode 100644 index 0000000..d0cfea5 --- /dev/null +++ b/src/SearchPage.js @@ -0,0 +1,33 @@ +import React, { Component } from 'react'; + +class SearchPage extends Component { + render() { + return ( +
    SearchPage
    + /* +
    +
    + this.setState({ showSearchPage: false })}>Close +
    + { + NOTES: The search from BooksAPI is limited to a particular set of search terms. + You can find these search terms here: + https://github.com/udacity/reactnd-project-myreads-starter/blob/master/SEARCH_TERMS.md + + However, remember that the BooksAPI.search method DOES search by title or author. So, don't worry if + you don't find a specific author or title. Every search is limited by search terms. + } + + +
    +
    +
    +
      +
      +
      + */ + ) + } +} + +export default SearchPage