Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sockets-Bita-Rosalyn #17

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
a94c2f7
Added components for Movies search library and customer list
ranuseh Jun 24, 2019
329fc58
set up done
Bitaman Jun 24, 2019
75a70f0
Merge branch 'master' of https://github.com/ranuseh/video-store-consumer
Bitaman Jun 24, 2019
70c11a3
made the Movie search component with a search form inside
Bitaman Jun 24, 2019
ddc03ee
Added movies selection feature
ranuseh Jun 24, 2019
5fdcc16
merged app conflicts
ranuseh Jun 24, 2019
8fb8228
Conditional component display feature working
ranuseh Jun 25, 2019
bb373fb
added ability to select movie and display in rental cart
ranuseh Jun 25, 2019
3d2669f
added customer list component and conditional display on main page
ranuseh Jun 25, 2019
e771163
Small formatting changes
ranuseh Jun 25, 2019
9af4565
Addec customer component and ability to select customer and movie and…
ranuseh Jun 25, 2019
fcc45d0
Rental can now be checked out
ranuseh Jun 25, 2019
ca0694a
Small changes to formatting
ranuseh Jun 25, 2019
ed15c36
small changes
ranuseh Jun 25, 2019
926987d
made the axios call inside the form
Bitaman Jun 25, 2019
a32f3e4
fixed merge
Bitaman Jun 25, 2019
a8a8333
search results rendering
ranuseh Jun 25, 2019
23a8d06
the search result is now renders in the MovieSearch
Bitaman Jun 26, 2019
b8b201e
Small changes
ranuseh Jun 26, 2019
695b64b
Merge fixed
ranuseh Jun 26, 2019
1d018c9
Search results rendering effectively
ranuseh Jun 26, 2019
b8fc24d
Search results cleared after each search
ranuseh Jun 26, 2019
3416fee
Added ability to add movies to library
ranuseh Jun 26, 2019
46783de
added add to library confirmation
ranuseh Jun 26, 2019
436078a
Made some small formatting changes
ranuseh Jun 26, 2019
a38d784
Created a seperate card component
ranuseh Jun 26, 2019
eeb32c3
Added visual display of movies
ranuseh Jun 26, 2019
b1de68a
Added details for movie library page
ranuseh Jun 26, 2019
184c764
axios call to get the customers
Bitaman Jun 26, 2019
d023080
Added more details to customer list
ranuseh Jun 26, 2019
89e6e5a
Added some formatting and styles to the main page
ranuseh Jun 26, 2019
fbc76a8
Small changes
ranuseh Jun 26, 2019
89847ca
axios call to display the library
Bitaman Jun 26, 2019
8fdbfdf
Merge branch 'master' of https://github.com/ranuseh/video-store-consumer
Bitaman Jun 26, 2019
4f33967
Styling of header
ranuseh Jun 26, 2019
09af2db
Changes to movies component to reuse it across the app
ranuseh Jun 26, 2019
108fa64
Starting to add routes
ranuseh Jun 26, 2019
f4d9814
Routing implemented
ranuseh Jun 27, 2019
a27ff53
Routing fixed. Now working
ranuseh Jun 27, 2019
dc7293d
Styling and formatting changes
ranuseh Jun 27, 2019
bd6978b
Added formatting to customers
ranuseh Jun 27, 2019
fe93f3d
check out movie is adding to movies checked out to the customer
Bitaman Jun 27, 2019
4e90edf
Merged checkout changes and fixed message upon checkout
ranuseh Jun 27, 2019
4fc6ffd
small changes in rental
Bitaman Jun 27, 2019
e6c47fa
merge conflict resolved
Bitaman Jun 27, 2019
36c1605
added axios call to add a movie to the library
Bitaman Jun 27, 2019
f6e7401
made some changes to addmovie to the library callback function
Bitaman Jun 27, 2019
746141e
Styling changes to customer
ranuseh Jun 27, 2019
317bac2
Merges fixed
ranuseh Jun 27, 2019
890d238
Formatted customers
ranuseh Jun 27, 2019
b86f060
an existing movie can't get added to the library again
Bitaman Jun 27, 2019
d2b6e69
added the ability to rerender customers after checkout to show new re…
ranuseh Jun 28, 2019
02960c4
Fixed issue of images not rendering when added from search to library
ranuseh Jun 28, 2019
f7bf454
Added message when checked out.
ranuseh Jun 28, 2019
fc1bbf6
resolved merge conflicts
Bitaman Jun 28, 2019
2bda26d
merge conflict resolved
Bitaman Jun 28, 2019
4064c4c
fixed another conflict
Bitaman Jun 28, 2019
73603d4
Small changes to formatting
ranuseh Jun 28, 2019
4d895e4
minor changes
Bitaman Jun 28, 2019
a19b475
merge conflict
Bitaman Jun 28, 2019
d267828
Small fixes
ranuseh Jun 28, 2019
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
Prev Previous commit
Next Next commit
Search results rendering effectively
  • Loading branch information
ranuseh committed Jun 26, 2019
commit 1d018c97b2d1aed7969bd00cbc3d1f4945270a59
6 changes: 3 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ class App extends Component {

let searchResults = "";
if (this.state.searchComplete === true) {
return(
<MovieSearch movies={this.state.movies} />
)

searchResults = <MovieSearch movies={this.state.movies} />

}

return (
Expand Down