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.

Sign up for GitHub

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

Jump to bottom

Kate & Leti - Ampers - VideoStoreConsumer #13

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open

Kate & Leti - Ampers - VideoStoreConsumer #13

wants to merge 64 commits into from

Commits on Jun 18, 2018

  1. Setting up react files

    @LetiTran
    LetiTran committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    353a3e2 View commit details
    Browse the repository at this point in the history

  2. starts components folder

    @Oh-KPond
    Oh-KPond committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    63a25d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. gets movie component to render

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    e7ceeae View commit details
    Browse the repository at this point in the history

  2. creates draft Library and Search Results movie collections

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    a81dd82 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature_movie-component

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    47ecfcd View commit details
    Browse the repository at this point in the history

  4. Created a Customer Collection and a Customer Component with a checkbo… 

    …x that has a callback on the CustomerColelction to change the 'selected customer'.
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    4934c01 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from LetiTran/feature_movie-component 

    Feature movie component
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    b153b59 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from LetiTran/feature_customer-component 

    Created a Customer Collection and a Customer Component
    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    21f96c4 View commit details
    Browse the repository at this point in the history

  7. adds axios and gets library movie collection

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    1c4b808 View commit details
    Browse the repository at this point in the history

  8. creates a movie list based on a static query, and fixes showing image

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    1059dcc View commit details
    Browse the repository at this point in the history

  9. Getting all customers from our API with axios to create a table of cu… 

    …stomers components in the customersCollection component.
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    3213153 View commit details
    Browse the repository at this point in the history

  10. Changed checkbox to button and changed conditional statement for the … 

    …displaying of the setState for the selected customer and also it's displaying on the screen.
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    02b6578 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3 from LetiTran/feature_search-results-list-movie… 

    …s-fix

creates a movie list based on a static query, and fixes showing image
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    4a8432e View commit details
    Browse the repository at this point in the history

  12. Merged with master and feature_customerCollection-axios and Fixed cus… 

    …tomerCollection table html
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    0a4a338 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into feature_customerCollection-axios

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    09ae194 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #4 from LetiTran/feature_customerCollection-axios 

    Added Axios to Customer Collection Component and its state logic
    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    e4ea0f2 View commit details
    Browse the repository at this point in the history

  15. adds router and header to app js

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    ca7f4b9 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #5 from LetiTran/feature_header-component 

    adds router and header to app js
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    b3775cc View commit details
    Browse the repository at this point in the history

  17. merging..

    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    8934080 View commit details
    Browse the repository at this point in the history

  18. Merged with routes

    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    ddc340c View commit details
    Browse the repository at this point in the history

  19. Added components SelectionBar and SelectedCustomer - displaying it tr… 

    …ough CustomerCollection for now. Will move it to App.
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    2037238 View commit details
    Browse the repository at this point in the history

  20. Changed costumer selection logic to App.js and its state. Rendering S… 

    …elecitionBar on app.js too now.
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    a87b1e0 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #6 from LetiTran/feature_selectedCustomerComponent 

    Selection Bar Component with Selected Costumer component.
    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    77f1aa2 View commit details
    Browse the repository at this point in the history

  22. creates search form and form functionallity to query api

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    0f98424 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #7 from LetiTran/feature_search-form-component 

    creates search form and form functionality to query api
    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    3d98a6a View commit details
    Browse the repository at this point in the history

  24. code clean up

    @Oh-KPond
    Oh-KPond committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    157c417 View commit details
    Browse the repository at this point in the history

  25. Adds selectedMovie component and selection function on Library.

    @LetiTran
    LetiTran committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    7e19ab1 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. Added movie and customer id elements to Library and Customer componen… 

    …ts and its respective collections in order to send this info on the callBack to add it to App state and then use for the rental functionality.
    @LetiTran
    LetiTran committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    1bc8bb0 View commit details
    Browse the repository at this point in the history

  2. Adding isRequired to Movie prop vlidations

    @LetiTran
    LetiTran committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    376859c View commit details
    Browse the repository at this point in the history

  3. Makes it possible to rent a movie given the movie and slected custome… 

    …r - ads Axios to selectedBar component
    @LetiTran
    LetiTran committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    394f789 View commit details
    Browse the repository at this point in the history

  4. Calculates the due date for a new rental base d on today's date + 7 d… 

    …ays.
    @LetiTran
    LetiTran committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    8bf9d65 View commit details
    Browse the repository at this point in the history

  5. Disbales 'rent' button if customer or movie are not selected.

    @LetiTran
    LetiTran committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    72c5d17 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #8 from LetiTran/feature_checkout-rental 

    Feature checkout rental
    @Oh-KPond
    Oh-KPond committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    a1231da View commit details
    Browse the repository at this point in the history

  7. merges master and finishes add movie to library functionality

    @Oh-KPond
    Oh-KPond committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    4f27ab7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #9 from LetiTran/feature_save-movie-to-library 

    merges master and finishes add movie to library functionality
    @LetiTran
    LetiTran committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    312e702 View commit details
    Browse the repository at this point in the history

  9. Clears state after renting the movie.

    @LetiTran
    LetiTran committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    6491699 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #10 from LetiTran/feature_checkout-rental 

    Clears state after renting the movie.
    @Oh-KPond
    Oh-KPond committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    4129874 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. Adds a modal component and displays it in App.js -- Still needs lots … 

    …of fixing, but it's working.
    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    973064c View commit details
    Browse the repository at this point in the history

  2. Fixes modal for checked-out movie confirmatio. Modal display logic is… 

    … placed inside of App.js so that it can also be used by add-movie-tolibrary Modal.
    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    f7ec71d View commit details
    Browse the repository at this point in the history

  3. Deletes unecessary propTypes - they were used just for displaying res… 

    …ults while developing component.
    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    bb5e171 View commit details
    Browse the repository at this point in the history

  4. attemps to show search results

    @Oh-KPond
    Oh-KPond committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    71f7cc7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11 from LetiTran/feature_modal-rentingConfirmation 

    Feature modal renting confirmation
    @Oh-KPond
    Oh-KPond committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    5be05b0 View commit details
    Browse the repository at this point in the history

  6. conditional component try

    @Oh-KPond
    Oh-KPond committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    298998a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/LetiTran/video-store-cons… 

    …umer
    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    5c3b5a7 View commit details
    Browse the repository at this point in the history

  8. Fixes merge error from before with Checkout Modal

    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    022f946 View commit details
    Browse the repository at this point in the history

  9. Changes prop validation because of Search form error given without id.

    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    b750285 View commit details
    Browse the repository at this point in the history

  10. Adds a toggle function for displaying searchResults route path or not.

    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    08cb25b View commit details
    Browse the repository at this point in the history

  11. Merge pull request #12 from LetiTran/feature_show-search-results-route 

    Conditionally shows search results through Route
    @Oh-KPond
    Oh-KPond committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    657aa01 View commit details
    Browse the repository at this point in the history

  12. Adds modal confirmation for adding a movide from search-results to li… 

    …brary
    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    37da272 View commit details
    Browse the repository at this point in the history

  13. Fixes little Moda bug with file that was beeing imported.

    @LetiTran
    LetiTran committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    96c25a5 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. Merge pull request #13 from LetiTran/feature_modal-adding-to-libraryC… 

    …onfirmation

Adds modal with confirmation of adding a movie to library
    @Oh-KPond
    Oh-KPond committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    2ef3352 View commit details
    Browse the repository at this point in the history

  2. makes the customer table look pretty

    @Oh-KPond
    Oh-KPond committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    dea91e1 View commit details
    Browse the repository at this point in the history

  3. Added prop validaiton for new func.

    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    b0a1032 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature_modal-adding-to-libraryConfirmation' because of… 

    … last commit that adds props validation
    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    5cd6f32 View commit details
    Browse the repository at this point in the history

  5. styles movie and movie collections components

    @Oh-KPond
    Oh-KPond committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    0609eff View commit details
    Browse the repository at this point in the history

  6. Merge pull request #14 from LetiTran/feature_movie-customer-styling 

    Feature movie customer styling
    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    f669e24 View commit details
    Browse the repository at this point in the history

  7. adds styling to select bar and some styles to the nav

    @Oh-KPond
    Oh-KPond committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    de2b7ed View commit details
    Browse the repository at this point in the history

  8. Merge pull request #15 from LetiTran/feature_style-select-bar 

    adds styling to select bar and some styles to the nav
    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    259ac3c View commit details
    Browse the repository at this point in the history

  9. Formats release date for movies.

    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    89c77c0 View commit details
    Browse the repository at this point in the history

  10. Fixes typo in SelectionBar that was causing a little bug on button to… 

    … be active with the wrong condition
    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    0774f78 View commit details
    Browse the repository at this point in the history

  11. Adds $ sign to customer credit.

    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    5ce2f55 View commit details
    Browse the repository at this point in the history

  12. styles modals and select customer button

    @Oh-KPond
    Oh-KPond committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    9079f57 View commit details
    Browse the repository at this point in the history

  13. styles header

    @Oh-KPond
    Oh-KPond committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    01a442a View commit details
    Browse the repository at this point in the history

  14. Merge pull request #16 from LetiTran/feature_style-select-bar 

    Feature style select bar
    @LetiTran
    LetiTran committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    a5c88d8 View commit details
    Browse the repository at this point in the history