Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6d3a1c5
Update README.md
Dec 17, 2018
1dc70bb
Update README.md
tildeee Dec 17, 2018
b22ae05
React Router/NPM install, import for Routes in app.js
leannerivera Dec 17, 2018
1c8fb3c
set up routers, CustomerList and Customer components
jessiezhang2017 Dec 18, 2018
e5d9432
finished load customer list from API, and add the selected customer t…
jessiezhang2017 Dec 19, 2018
2b3ffcf
Merge pull request #1 from leannerivera/customerList
leannerivera Dec 19, 2018
ebdf230
components created
leannerivera Dec 19, 2018
926bbbc
merge with jessie's changes
leannerivera Dec 19, 2018
7876026
Merge pull request #2 from leannerivera/leanne-feature
jessiezhang2017 Dec 19, 2018
ed32929
fixed the merge confliect
jessiezhang2017 Dec 19, 2018
8daa4aa
fix conflect
jessiezhang2017 Dec 19, 2018
9e0410c
fixed some component errors
leannerivera Dec 19, 2018
b2d3c23
Merge pull request #3 from leannerivera/leanne-feature
leannerivera Dec 19, 2018
1af1ff6
resolve conflict
jessiezhang2017 Dec 19, 2018
d58d73a
fixed the movie library props
jessiezhang2017 Dec 19, 2018
2b74eb6
styling for Customer List
jessiezhang2017 Dec 19, 2018
05af8b8
styling on rental form
jessiezhang2017 Dec 20, 2018
45fafce
more bug fixes
leannerivera Dec 20, 2018
c538dfc
Merge branch 'master' into leanne-feature
jessiezhang2017 Dec 20, 2018
628ee7a
Merge pull request #4 from leannerivera/leanne-feature
jessiezhang2017 Dec 20, 2018
a4ba880
fixed bugs for movieCard.js
jessiezhang2017 Dec 20, 2018
c169b3c
list movie title in library page
jessiezhang2017 Dec 20, 2018
a0d0a87
adjust the css file
jessiezhang2017 Dec 20, 2018
257b85e
add select moive function in app.js
jessiezhang2017 Dec 20, 2018
6e1de3f
made movie item show up in rental box when click
jessiezhang2017 Dec 20, 2018
585771e
finish the rental check out section
jessiezhang2017 Dec 20, 2018
2aef259
clear up unused variables
jessiezhang2017 Dec 20, 2018
2af8bac
format the movie items
jessiezhang2017 Dec 21, 2018
6f65986
fixed the search external database function
jessiezhang2017 Dec 21, 2018
ebfa444
added searchCard component to handle add to library function
jessiezhang2017 Dec 21, 2018
b776e87
fixed the bugs in add to library
jessiezhang2017 Dec 21, 2018
1c1fb86
search changes
jessiezhang2017 Dec 21, 2018
6c999ce
adj
jessiezhang2017 Dec 21, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ In this project, you'll take a lot of the knowledge you have so far and create a

This is a [Phase 3](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) Pair project.

Due: EOD Friday December 21st, 2018

## Learning Goals

- Use React to build a dynamic and attractive user interface
Expand Down Expand Up @@ -36,12 +38,10 @@ Each pair/group will give a short presentation on their project and their learni
- Fork this repository
- Add the pair as a collaborator on the project
- Clone the repository
- Use `create-react-app` to generate React scaffolding
- Commit and push the generated files
- The other partner shall then:
- Clone the repository (without forking)
- Install dependencies using `$npm install`
- Both partners shall then
- Install dependencies using `npm install`
- Start the development server using `npm start`
- Start the test watcher using `npm test`

Expand Down
Loading