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

Whales - Migration Mess - Dana, Sorida, Daria, Camila #19

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open

Whales - Migration Mess - Dana, Sorida, Daria, Camila #19

wants to merge 90 commits into from

Commits on Jun 28, 2022

  1. create components

    @soridalac
    soridalac committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    80ed5db View commit details
    Browse the repository at this point in the history

  2. change 's'

    @soridalac
    soridalac committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    b71376a View commit details
    Browse the repository at this point in the history

  3. app files

    @soridalac
    soridalac committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    7faf2e6 View commit details
    Browse the repository at this point in the history

  4. make some change, create a newboardform, app and board

    @soridalac
    soridalac committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    cc548d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. I edit and make some changes with post submit to the board

    @soridalac
    soridalac committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    459da54 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. Created CardList and Card components

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    2fd97a1 View commit details
    Browse the repository at this point in the history

  2. CardList - Passing cardData to cardComponents

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    b9826f6 View commit details
    Browse the repository at this point in the history

  3. Added cardData to App, passing data down to CardList and Card

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    4718d66 View commit details
    Browse the repository at this point in the history

  4. Like button functionality for cards

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    eee3cf3 View commit details
    Browse the repository at this point in the history

  5. Renamed Submit button under NewCardForm

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    28422dd View commit details
    Browse the repository at this point in the history

  6. remove the axios

    @soridalac
    soridalac committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    4ef6c3b View commit details
    Browse the repository at this point in the history

  7. edit the app js adding the curly bracket and edit the commet

    @soridalac
    soridalac committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    276d665 View commit details
    Browse the repository at this point in the history

  8. Added board_id to card data

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    2f3dd1f View commit details
    Browse the repository at this point in the history

  9. Resolving conflict

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    7efb0e0 View commit details
    Browse the repository at this point in the history

  10. Commented like button, accepted both changes to NewCardForm

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    540dcac View commit details
    Browse the repository at this point in the history

  11. resolving commit changes

    @soridalac
    soridalac committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    cdb1876 View commit details
    Browse the repository at this point in the history

  12. trying to resolve the conflict

    @soridalac
    soridalac committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    555ba01 View commit details
    Browse the repository at this point in the history

  13. adding code function inside the cardlists

    @soridalac
    soridalac committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    4a0d98c View commit details
    Browse the repository at this point in the history

  14. Working on Like button

    @dana-rocha
    dana-rocha committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    2282c63 View commit details
    Browse the repository at this point in the history

  15. it works now with the refresh page

    @soridalac
    soridalac committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    69c72fb View commit details
    Browse the repository at this point in the history

  16. making the cards for <name board> edit on app.js, card.js and cardlist

    @soridalac
    soridalac committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    875f5a9 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Co-working 6/30

    @dana-rocha
    dana-rocha committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    ee13c72 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board

Resolving merge conflict
    @dana-rocha
    dana-rocha committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    f8c2708 View commit details
    Browse the repository at this point in the history

  3. update the app and cardlist function

    @soridalac
    soridalac committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    4c2db73 View commit details
    Browse the repository at this point in the history

  4. getting result back from card

    @soridalac
    soridalac committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    6ca06b6 View commit details
    Browse the repository at this point in the history

  5. Fix merge conflict

    @dana-rocha
    dana-rocha committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    88ca5b0 View commit details
    Browse the repository at this point in the history

  6. add the border to css

    @soridalac
    soridalac committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    99f69cc View commit details
    Browse the repository at this point in the history

  7. Displaying Card messages for selected board

    @dana-rocha
    dana-rocha committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    f5fbe38 View commit details
    Browse the repository at this point in the history

  8. Displaying Card messages and like count for selected board

    @dana-rocha
    dana-rocha committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    0fb1564 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board

Accepting updates
    @dana-rocha
    dana-rocha committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    e94d537 View commit details
    Browse the repository at this point in the history

  10. trying to fixed the error and did css for page

    @soridalac
    soridalac committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    5fa873c View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2022

  1. Added Delete button for cards, no functionality yet

    @dana-rocha
    dana-rocha committed Jul 2, 2022
    Configuration menu
    Copy the full SHA
    535b231 View commit details
    Browse the repository at this point in the history

  2. Added Delete Card button functionality

    @dana-rocha
    dana-rocha committed Jul 2, 2022
    Configuration menu
    Copy the full SHA
    6eb4eea View commit details
    Browse the repository at this point in the history

  3. Added comments

    @dana-rocha
    dana-rocha committed Jul 2, 2022
    Configuration menu
    Copy the full SHA
    1b270e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2022

  1. fixing the merge conflict

    @soridalac
    soridalac committed Jul 3, 2022
    Configuration menu
    Copy the full SHA
    1129d33 View commit details
    Browse the repository at this point in the history

  2. adding the className for css and put background images

    @soridalac
    soridalac committed Jul 3, 2022
    Configuration menu
    Copy the full SHA
    c02d953 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

  1. Increase likes, need to work on state

    @dana-rocha
    dana-rocha committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    87b1aba View commit details
    Browse the repository at this point in the history

  2. Increase likes working except for render

    @dana-rocha
    dana-rocha committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    119e6c2 View commit details
    Browse the repository at this point in the history

  3. delete boardlist, add the if check the length of message and board

    @soridalac
    soridalac committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    5e99122 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Like button functionality is working

    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    8f3e932 View commit details
    Browse the repository at this point in the history

  2. Added comments, removed unnecessary comments and console logs

    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    b182b2e View commit details
    Browse the repository at this point in the history

  3. Added more comments to CardList

    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    ef0246c View commit details
    Browse the repository at this point in the history

  4. Fixed Like Count, Like button is now working after refresh

    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    445a7ec View commit details
    Browse the repository at this point in the history

  5. update the form

    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    faf6f96 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board
    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    cb43949 View commit details
    Browse the repository at this point in the history

  7. added sorting component

    @diakymenko
    diakymenko committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    07875cf View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board
    @diakymenko
    diakymenko committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    d16c279 View commit details
    Browse the repository at this point in the history

  9. added sorting option to Cardslist

    @diakymenko
    diakymenko committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    66c5b0f View commit details
    Browse the repository at this point in the history

  10. adding the alerts for max 40 characters

    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    f9cdc08 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board
    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    2fe8b3a View commit details
    Browse the repository at this point in the history

  12. Styling buttons to be round

    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    584ee0c View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board

merging new changes for alert message
    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    e633b1b View commit details
    Browse the repository at this point in the history

  14. hover to the buttons

    @mctagle
    mctagle committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    1b2ae9c View commit details
    Browse the repository at this point in the history

  15. hover on the boards list

    @mctagle
    mctagle committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    288d3ac View commit details
    Browse the repository at this point in the history

  16. pointer to the cursor

    @mctagle
    mctagle committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    15b84d1 View commit details
    Browse the repository at this point in the history

  17. adding the sort and dropdown list in css

    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    3f570ae View commit details
    Browse the repository at this point in the history

  18. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board
    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    23a5c42 View commit details
    Browse the repository at this point in the history

  19. Selected board box in progress to be fixed

    @mctagle
    mctagle committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    5b794e1 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board

fixing merge conflict
    @mctagle
    mctagle committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    263aabe View commit details
    Browse the repository at this point in the history

  21. nothing new

    @mctagle
    mctagle committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    a56ff3d View commit details
    Browse the repository at this point in the history

  22. add space between sort by

    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    4027c73 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board
    @soridalac
    soridalac committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    09f93a6 View commit details
    Browse the repository at this point in the history

  24. Adding Procfile

    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    e3a0953 View commit details
    Browse the repository at this point in the history

  25. Deleted Procfile

    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    c59f2fe View commit details
    Browse the repository at this point in the history

  26. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board

fixing merge conflict
    @dana-rocha
    dana-rocha committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    6a7904e View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. added css for boards, selected board

    @diakymenko
    diakymenko committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    1009ac5 View commit details
    Browse the repository at this point in the history

  2. change the fr in the card__container css and make adjust to create me… 

    …ssage
    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    3f07439 View commit details
    Browse the repository at this point in the history

  3. added background

    @diakymenko
    diakymenko committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    b4fe311 View commit details
    Browse the repository at this point in the history

  4. make the card slimmer

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    3b5bc89 View commit details
    Browse the repository at this point in the history

  5. added css to buttons

    @diakymenko
    diakymenko committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    7aa484e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board
    @diakymenko
    diakymenko committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4db276c View commit details
    Browse the repository at this point in the history

  7. css for cards display

    @diakymenko
    diakymenko committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    52db85b View commit details
    Browse the repository at this point in the history

  8. adding footer to app.js and css

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    d0ea815 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/mctagle/front-end-inspirati… 

    …on-board
    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    ffc0a7d View commit details
    Browse the repository at this point in the history

  10. edit inspiration board logo

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4b8701e View commit details
    Browse the repository at this point in the history

  11. fix the h2 and change colors

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    0fbc3fe View commit details
    Browse the repository at this point in the history

  12. edit some more css with background of boards

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    53ea8ae View commit details
    Browse the repository at this point in the history

  13. edit the footer

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    56bcbcf View commit details
    Browse the repository at this point in the history

  14. fixed the empty box

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    bd89cd1 View commit details
    Browse the repository at this point in the history

  15. fix the empty message checking

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    24f6574 View commit details
    Browse the repository at this point in the history

  16. checking the length

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    d7bbf8c View commit details
    Browse the repository at this point in the history

  17. take out the red over the input

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    81e2589 View commit details
    Browse the repository at this point in the history

  18. fix the board list

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    e43923f View commit details
    Browse the repository at this point in the history

  19. add the alert for length empty

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    1fb5447 View commit details
    Browse the repository at this point in the history

  20. clean up the code and delete a picture

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    1509f42 View commit details
    Browse the repository at this point in the history

  21. clean up more codes

    @soridalac
    soridalac committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    1bac894 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. Update README.md

    @dana-rocha
    dana-rocha authored Oct 6, 2022
    Configuration menu
    Copy the full SHA
    fd09e61 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @dana-rocha
    dana-rocha authored Oct 6, 2022
    Configuration menu
    Copy the full SHA
    471ce40 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @dana-rocha
    dana-rocha authored Oct 6, 2022
    Configuration menu
    Copy the full SHA
    7ffe407 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @dana-rocha
    dana-rocha authored Oct 6, 2022
    Configuration menu
    Copy the full SHA
    5d5f0d9 View commit details
    Browse the repository at this point in the history