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

06/delete posts rebased #58

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

06/delete posts rebased #58

wants to merge 51 commits into from

Commits on Feb 8, 2023

  1. input placeholders added, non functional

    @abodian
    abodian committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    3c5d5b4 View commit details
    Browse the repository at this point in the history

  2. added post button

    @MartaBia
    MartaBia committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    77db070 View commit details
    Browse the repository at this point in the history

  3. added post text box

    @MartaBia
    MartaBia committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    bef723d View commit details
    Browse the repository at this point in the history

  4. removed comments before pull request

    @MartaBia
    MartaBia committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    e8a68c5 View commit details
    Browse the repository at this point in the history

  5. token generator tests failing

    @abodian
    abodian committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    e266e84 View commit details
    Browse the repository at this point in the history

  6. first and last name added and tests passing

    @abodian
    abodian committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    0893c2e View commit details
    Browse the repository at this point in the history

  7. added defaultValue to allow typing on text box

    @MartaBia
    MartaBia committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    047cea6 View commit details
    Browse the repository at this point in the history

  8. navbar ltd functionality

    @UserChi
    UserChi committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    47e5850 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1 from abodian/03/user-can-post 

    03/user can post
    @MartaBia
    MartaBia authored Feb 8, 2023
    Configuration menu
    Copy the full SHA
    732a0ba View commit details
    Browse the repository at this point in the history

  10. error message shows when login credentials incorrect

    @abodian
    abodian committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    f525c03 View commit details
    Browse the repository at this point in the history

  11. made the navbar folder clearer

    @UserChi
    UserChi committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    6521097 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. Merge pull request #3 from abodian/05/login-page 

    error message shows when login credentials incorrect
    @UserChi
    UserChi authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    6964ada View commit details
    Browse the repository at this point in the history

  2. merge resolution

    @sirdavy
    sirdavy committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    f1b6306 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from abodian/01/sign-up-page 

    01/sign up page
    @sirdavy
    sirdavy authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    fdd46d1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into 02/navbar-non_functuality

    @sirdavy
    sirdavy authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    18714ea View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from abodian/02/navbar-non_functuality 

    02/navbar non functuality
    @sirdavy
    sirdavy authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    0f232fe View commit details
    Browse the repository at this point in the history

  6. small conflict on sign up page resolved

    @sirdavy
    sirdavy committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    520cd80 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from abodian/navbar2 

    small conflict on sign up page resolved
    @MartaBia
    MartaBia authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    470d096 View commit details
    Browse the repository at this point in the history

  8. added function to post text box/button and added nav bar

    @sirdavy
    sirdavy committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    fcae856 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #6 from abodian/4-add-functionality-to-post 

    added function to post text box/button and added nav bar
    @sirdavy
    sirdavy authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    c85e93c View commit details
    Browse the repository at this point in the history

  10. login page fixed

    @IAmNotAbbas
    IAmNotAbbas committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    e889d71 View commit details
    Browse the repository at this point in the history

  11. Testing for posting

    @sirdavy
    sirdavy committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    9dea689 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #7 from abodian/fix_login 

    login page fixed
    @sirdavy
    sirdavy authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    1d0a3d1 View commit details
    Browse the repository at this point in the history

  13. Update making_a_post.cy.js

    @MartaBia
    MartaBia authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    1393486 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #8 from abodian/testingposting 

    Testing for posting
    @MartaBia
    MartaBia authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    44aa864 View commit details
    Browse the repository at this point in the history

  15. one extra test line

    @sirdavy
    sirdavy committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    d5d067d View commit details
    Browse the repository at this point in the history

  16. Merge pull request #9 from abodian/testingposting2 

    one extra test line
    @UserChi
    UserChi authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    2e6d054 View commit details
    Browse the repository at this point in the history

  17. cypress making post e2e test passes

    @abodian
    abodian committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    2c837d8 View commit details
    Browse the repository at this point in the history

  18. non functional like and comment button added, timeline sits in center… 

    … with bordered posts
    @abodian
    abodian committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    2de535c View commit details
    Browse the repository at this point in the history

  19. added text wrap to .postContent and improved overall look

    @abodian
    abodian committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    da1c320 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. Merge pull request #10 from abodian/fix-failing-cypress-post-tests 

    cypress making post e2e test passes
    @JamesJPaterson
    JamesJPaterson authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    e58a989 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from abodian/07/reformat-feed 

    07/reformat feed
    @sirdavy
    sirdavy authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    4979655 View commit details
    Browse the repository at this point in the history

  3. username stored in database but only after manual input, shows on post

    @abodian
    abodian committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    5b2a25a View commit details
    Browse the repository at this point in the history

  4. user email stored in localStorage

    @abodian
    abodian committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    7307cf2 View commit details
    Browse the repository at this point in the history

  5. get route added to users route file

    @abodian
    abodian committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    42651bf View commit details
    Browse the repository at this point in the history

  6. user controller find method created and tested

    @abodian
    abodian committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    b765c54 View commit details
    Browse the repository at this point in the history

  7. user first and last name now accessible in local storage

    @abodian
    abodian committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    ef2a6d5 View commit details
    Browse the repository at this point in the history

  8. user name is stored in the post document when submitted

    @abodian
    abodian committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    285a5e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. username shows on posts

    @abodian
    abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    131ce40 View commit details
    Browse the repository at this point in the history

  2. ready for review

    @abodian
    abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    5825156 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into 06/add-username-jwt-method

    @abodian
    abodian authored Feb 13, 2023
    Configuration menu
    Copy the full SHA
    5ebfab5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #12 from abodian/06/add-username-jwt-method 

    06/add username jwt method
    @abodian
    abodian authored Feb 13, 2023
    Configuration menu
    Copy the full SHA
    64491b3 View commit details
    Browse the repository at this point in the history

  5. minor changes

    @abodian
    abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    44c6fc6 View commit details
    Browse the repository at this point in the history

  6. Added logic and route to delete a post

    @MartaBia @abodian
    MartaBia authored and abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    0cc1e32 View commit details
    Browse the repository at this point in the history

  7. updated route

    @MartaBia @abodian
    MartaBia authored and abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    0b7d7e3 View commit details
    Browse the repository at this point in the history

  8. added delete button with functionality

    @MartaBia @abodian
    MartaBia authored and abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    30b880e View commit details
    Browse the repository at this point in the history

  9. refactored

    @MartaBia @abodian
    MartaBia authored and abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    b625b7f View commit details
    Browse the repository at this point in the history

  10. Added cypress test

    @MartaBia @abodian
    MartaBia authored and abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    8afd8ef View commit details
    Browse the repository at this point in the history

  11. post rebase commit

    @abodian
    abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    8efdd22 View commit details
    Browse the repository at this point in the history

  12. merged with previous code

    @MartaBia
    MartaBia committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    d24b37a View commit details
    Browse the repository at this point in the history

  13. articles removed from post model

    @abodian
    abodian committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    00b4972 View commit details
    Browse the repository at this point in the history