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

Nav bar fix #511

Closed
wants to merge 189 commits into from
Closed

Nav bar fix #511

wants to merge 189 commits into from

Commits on Jun 12, 2023

  1. Updated Readme

    @Loo-Ashworth
    Loo-Ashworth committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    ad1dd33 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from Loo-Ashworth/ReadmeInitial 

    Updated Readme
    @adrianHards
    adrianHards committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    71cfbe6 View commit details
    Browse the repository at this point in the history

  3. basic links to navigate site

    @adrianHards
    adrianHards committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    3424dce View commit details
    Browse the repository at this point in the history

  4. add basic seed file and structure

    @adrianHards
    adrianHards committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    faa41bc View commit details
    Browse the repository at this point in the history

  5. es6 refactor

    @adrianHards
    adrianHards committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    f7a6855 View commit details
    Browse the repository at this point in the history

  6. Cypress version updated

    @Joecunliffe98
    Joecunliffe98 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    039134e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from Loo-Ashworth/seed 

    basic seed file
    @emmadavids
    emmadavids committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7bb1db2 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. added message to inform user of login

    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    a647b68 View commit details
    Browse the repository at this point in the history

  2. merge with main

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    c3811b9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from Loo-Ashworth/cypress_V2 

    Cypress version updated
    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    b6ae009 View commit details
    Browse the repository at this point in the history

  4. updating config stuff

    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    d3e1f17 View commit details
    Browse the repository at this point in the history

  5. add additional post unit tests

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    637292e View commit details
    Browse the repository at this point in the history

  6. refactored post unit tests

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    095324b View commit details
    Browse the repository at this point in the history

  7. remove posts reverse test from unit test

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    c83287e View commit details
    Browse the repository at this point in the history

  8. use class not text to select new post link

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    436277c View commit details
    Browse the repository at this point in the history

  9. posts show in reverse order

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    c36ed9d View commit details
    Browse the repository at this point in the history

  10. remove commented out test

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    7af047a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #5 from Loo-Ashworth/posts 

    Posts
    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    36b1188 View commit details
    Browse the repository at this point in the history

  12. added user logic

    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    b6dadfa View commit details
    Browse the repository at this point in the history

  13. merge with main

    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    c065748 View commit details
    Browse the repository at this point in the history

  14. fixed config typo

    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e12a696 View commit details
    Browse the repository at this point in the history

  15. fixed test typo

    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    8be0875 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #6 from Loo-Ashworth/emmad 

    Emmad
    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    1b082ce View commit details
    Browse the repository at this point in the history

  17. fix post model and unit tests

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    b33ce83 View commit details
    Browse the repository at this point in the history

  18. update seed file

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    d13a4ee View commit details
    Browse the repository at this point in the history

  19. remove unnecessary imports

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    28171ce View commit details
    Browse the repository at this point in the history

  20. unique post and user id for a like

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    586bb07 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #7 from Loo-Ashworth/add-user-to-post 

    Add user to post
    @lisaoausb
    lisaoausb committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    2489a4e View commit details
    Browse the repository at this point in the history

  22. danger do not use this code

    @emmadavids
    emmadavids committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    014b475 View commit details
    Browse the repository at this point in the history

  23. likes are unique and can be toggled by user for a specific post

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e2f73f6 View commit details
    Browse the repository at this point in the history

  24. modify eslint rules

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    461c98c View commit details
    Browse the repository at this point in the history

  25. refactor

    @adrianHards
    adrianHards committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    0529c5b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. update seed file to drop Likes; add username to User

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    d315867 View commit details
    Browse the repository at this point in the history

  2. update seed file to include username

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6b974dc View commit details
    Browse the repository at this point in the history

  3. comment out username

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    02eeec3 View commit details
    Browse the repository at this point in the history

  4. remove username

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    a640ca5 View commit details
    Browse the repository at this point in the history

  5. show liked by users on hover

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    c6d50e4 View commit details
    Browse the repository at this point in the history

  6. fixed controller issue.

    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1fb1f67 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #8 from Loo-Ashworth/likes 

    Likes
    @lisaoausb
    lisaoausb committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    5c1a8ea View commit details
    Browse the repository at this point in the history

  8. fix post unit tests for multiple posts

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1338f71 View commit details
    Browse the repository at this point in the history

  9. add unit tests for likes

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4831034 View commit details
    Browse the repository at this point in the history

  10. add unit tests for likes

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    406b4f9 View commit details
    Browse the repository at this point in the history

  11. added error handling for duplicate email

    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    11795a0 View commit details
    Browse the repository at this point in the history

  12. commenting out failing test

    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    d6f69f4 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #9 from Loo-Ashworth/likes-unit-tests 

    Likes unit tests
    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    aa21c24 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' of https://github.com/Loo-Ashworth/acebook-poke i… 

    …nto emmad
    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    e8ea256 View commit details
    Browse the repository at this point in the history

  15. fixed session controller pw logic

    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    9eb3ba5 View commit details
    Browse the repository at this point in the history

  16. Update users.js 

    add username to seed data file
    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    fa59ae8 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'main' of https://github.com/Loo-Ashworth/acebook-poke i… 

    …nto emmad
    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1e64167 View commit details
    Browse the repository at this point in the history

  18. cloudinary setup

    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    44b8684 View commit details
    Browse the repository at this point in the history

  19. wahh

    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6da1bed View commit details
    Browse the repository at this point in the history

  20. Merge pull request #11 from Loo-Ashworth/emmad 

    added user validation stuff
    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    b4ab720 View commit details
    Browse the repository at this point in the history

  21. setup friends page, friends model, routes and controller

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    08f319a View commit details
    Browse the repository at this point in the history

  22. testing in progress

    @emmadavids
    emmadavids committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    72715e1 View commit details
    Browse the repository at this point in the history

  23. add ability to add a friend

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    381a678 View commit details
    Browse the repository at this point in the history

  24. Refactored E2E Specs into Site Object

    @Loo-Ashworth
    Loo-Ashworth committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    45fa498 View commit details
    Browse the repository at this point in the history

  25. pending friendships can be accepted or rejected

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ce672d8 View commit details
    Browse the repository at this point in the history

  26. Adjusted to Include Username Entry

    @Loo-Ashworth
    Loo-Ashworth committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    7b2ef39 View commit details
    Browse the repository at this point in the history

  27. list pending friendships

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    00401d0 View commit details
    Browse the repository at this point in the history

  28. add link to friends; show sent friend requests

    @adrianHards
    adrianHards committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    3f1adb9 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. send a friend request

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    5185f26 View commit details
    Browse the repository at this point in the history

  2. show username of poster

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    3196e48 View commit details
    Browse the repository at this point in the history

  3. prevent users from befriending themselves

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    4f7b9bc View commit details
    Browse the repository at this point in the history

  4. refactor stylesheets

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0f363bf View commit details
    Browse the repository at this point in the history

  5. wrote some more tests for user

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    9c4995e View commit details
    Browse the repository at this point in the history

  6. added tests for user

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    200d7e8 View commit details
    Browse the repository at this point in the history

  7. small change to email whitespace test

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    65a82d3 View commit details
    Browse the repository at this point in the history

  8. resolved conflict

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    1f0d766 View commit details
    Browse the repository at this point in the history

  9. Moved File Locations to Improve Cypress Run

    @Loo-Ashworth
    Loo-Ashworth committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    8b7653a View commit details
    Browse the repository at this point in the history

  10. Merge pull request #12 from Loo-Ashworth/befriend 

    Befriend
    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    b42b21c View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into e2e_refactor

    @Loo-Ashworth
    Loo-Ashworth committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0d81155 View commit details
    Browse the repository at this point in the history

  12. Refresh Directories

    @Loo-Ashworth
    Loo-Ashworth committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    1ce65f8 View commit details
    Browse the repository at this point in the history

  13. Deleted pageClassTestSpec.js

    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    bdf6a3b View commit details
    Browse the repository at this point in the history

  14. user stays logged in even after encountering bug

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    4083acb View commit details
    Browse the repository at this point in the history

  15. Added Can See Likes Count On Post Test - Fixed formatting issue with … 

    …posts/index.hbs
    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    59b93fa View commit details
    Browse the repository at this point in the history

  16. Moved likes test file to redundant

    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    bf5ad09 View commit details
    Browse the repository at this point in the history

  17. Added test for likes when multiple posts are made

    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0c62c8c View commit details
    Browse the repository at this point in the history

  18. add a drop db script

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    c33d202 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #14 from Loo-Ashworth/session-persistance-bug 

    Session persistance bug
    @Loo-Ashworth
    Loo-Ashworth committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    74d73cc View commit details
    Browse the repository at this point in the history

  20. render new message when validation error

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    cbb99c2 View commit details
    Browse the repository at this point in the history

  21. shift enter no longer opens a new window

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    7fc12a2 View commit details
    Browse the repository at this point in the history

  22. Test added for seeing posts in reverse order & multiple posts like count

    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    d19e198 View commit details
    Browse the repository at this point in the history

  23. add timestamps to posts

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    98a37f2 View commit details
    Browse the repository at this point in the history

  24. format timestamps

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    3d1ec38 View commit details
    Browse the repository at this point in the history

  25. added functionality to write comments under a post, also displays aut… 

    …hor of post, added some CSS in a separate file for comment section. comments required to edit posts.js, index.hbs of posts views, app.js, created a new routes file and new model and controller files
    @lisaoausb
    lisaoausb committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    7c2690d View commit details
    Browse the repository at this point in the history

  26. refactor posts page

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    8781b97 View commit details
    Browse the repository at this point in the history

  27. Users can see posts in reverse order moved to redundant folder

    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    00aa506 View commit details
    Browse the repository at this point in the history

  28. Added logout feature to site object model & Added user can like anoth… 

    …er users post and likes add up test
    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    62a2a7a View commit details
    Browse the repository at this point in the history

  29. add message when successfully signed in

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    247490e View commit details
    Browse the repository at this point in the history

  30. add message when successfully signed out

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    a41e049 View commit details
    Browse the repository at this point in the history

  31. refactor drop

    @adrianHards
    adrianHards committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    93cfa3a View commit details
    Browse the repository at this point in the history

  32. added tests for comments

    @lisaoausb
    lisaoausb committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    4a4a36e View commit details
    Browse the repository at this point in the history

  33. Added shouldContain method, changed likePost method so a post ID can … 

    …be used instead of just liking the first post
    @Joecunliffe98
    Joecunliffe98 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    1eb29ec View commit details
    Browse the repository at this point in the history

  34. trying to resolve error when posting spaces as a comment

    @lisaoausb
    lisaoausb committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    f2eded4 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #15 from Loo-Ashworth/render-new-on-error 

    improve post information and handling of post errors
    @lisaoausb
    lisaoausb committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    de74aa5 View commit details
    Browse the repository at this point in the history

  36. resolved merge conflicts

    @lisaoausb
    lisaoausb committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    1db95d1 View commit details
    Browse the repository at this point in the history

  37. rewrote tests - some need review still broken

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    849a3c6 View commit details
    Browse the repository at this point in the history

  38. reset files to how they were to find why route is not going back to p… 

    …osts
    @lisaoausb
    lisaoausb committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    a1a904a View commit details
    Browse the repository at this point in the history

  39. playing with cloudinary configg

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    7f9ec3a View commit details
    Browse the repository at this point in the history

  40. playing with cloudinary config part 2

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    ef38e80 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'main' of into testing-user

    @emmadavids
    emmadavids committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    32f1ad9 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. enforce unique username and email

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    2f34dfe View commit details
    Browse the repository at this point in the history

  2. refactor notes

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d5b4243 View commit details
    Browse the repository at this point in the history

  3. cloudinary in progress

    @emmadavids
    emmadavids committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    358ac57 View commit details
    Browse the repository at this point in the history

  4. let a user sign out

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ec15707 View commit details
    Browse the repository at this point in the history

  5. fix sign up bug

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    56a151c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #16 from Loo-Ashworth/testing-user-adrian 

    Modified User model to include middleware checks for uniqueness
    @emmadavids
    emmadavids committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    296185d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #13 from Loo-Ashworth/testing-user 

    Testing user
    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    f87ba58 View commit details
    Browse the repository at this point in the history

  8. error message displays when people enter spaces only

    @lisaoausb
    lisaoausb committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    5b9dcee View commit details
    Browse the repository at this point in the history

  9. comment functionality

    @lisaoausb
    lisaoausb committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    fc3ee34 View commit details
    Browse the repository at this point in the history

  10. cloudinary still in progress..

    @emmadavids
    emmadavids committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    97a7684 View commit details
    Browse the repository at this point in the history

  11. cloudinary still in progress

    @emmadavids
    emmadavids committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a31404a View commit details
    Browse the repository at this point in the history

  12. Redundant folder removed

    @Joecunliffe98
    Joecunliffe98 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    12d8838 View commit details
    Browse the repository at this point in the history

  13. Create main.yml 

    Add CI
    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    7211510 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #17 from Loo-Ashworth/comments 

    Comments
    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ea3dfe4 View commit details
    Browse the repository at this point in the history

  15. merge with main

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    8f45838 View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin' into e2e_refactor

    @Joecunliffe98
    Joecunliffe98 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    6564ff9 View commit details
    Browse the repository at this point in the history

  17. Site object model changed to reflect new posts page

    @Joecunliffe98
    Joecunliffe98 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    f7a2b73 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #20 from Loo-Ashworth/e2e_refactor 

    E2e refactor
    @Loo-Ashworth
    Loo-Ashworth committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    bce2d87 View commit details
    Browse the repository at this point in the history

  19. merge with main

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d6ed7b2 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #19 from Loo-Ashworth/github-action 

    Create main.yml
    @Loo-Ashworth
    Loo-Ashworth committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    8a0fcb7 View commit details
    Browse the repository at this point in the history

  21. cloudinary tinkering

    @emmadavids
    emmadavids committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    0524d8d View commit details
    Browse the repository at this point in the history

  22. tinkering

    @emmadavids
    emmadavids committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    0e5f9ae View commit details
    Browse the repository at this point in the history

  23. remove images

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    c5814c2 View commit details
    Browse the repository at this point in the history

  24. resolve merge conflict

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ade1eb0 View commit details
    Browse the repository at this point in the history

  25. update package lock

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ac432d4 View commit details
    Browse the repository at this point in the history

  26. hide api keys

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    956cde8 View commit details
    Browse the repository at this point in the history

  27. Added Performance Testing

    @Loo-Ashworth
    Loo-Ashworth committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    da1483d View commit details
    Browse the repository at this point in the history

  28. multer woes

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1a5d302 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #21 from Loo-Ashworth/performance 

    Added Performance Testing
    @Lmason14
    Lmason14 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    4576d7b View commit details
    Browse the repository at this point in the history

  30. finally upload to cloudinary

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    b698686 View commit details
    Browse the repository at this point in the history

  31. hide api keys

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    699b9e6 View commit details
    Browse the repository at this point in the history

  32. merge with main

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ac17911 View commit details
    Browse the repository at this point in the history

  33. image is null

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a9f6740 View commit details
    Browse the repository at this point in the history

  34. remove flash

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1f84bc0 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #22 from Loo-Ashworth/cloudinary-adrian 

    Cloudinary adrian
    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    00ba44b View commit details
    Browse the repository at this point in the history

  36. add photos to posts

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    3331d43 View commit details
    Browse the repository at this point in the history

  37. change to input

    @adrianHards
    adrianHards committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    5ae9453 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #23 from Loo-Ashworth/add-photo-to-post 

    add photos to posts
    @Loo-Ashworth
    Loo-Ashworth committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a7ce750 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2023

  1. break index into partials

    @adrianHards
    adrianHards committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    add8919 View commit details
    Browse the repository at this point in the history

  2. ajax for posts

    @adrianHards
    adrianHards committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    d52a910 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. abstract away code from the posts controller

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    78ce04f View commit details
    Browse the repository at this point in the history

  2. abstract away code from other controllers

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    a688b85 View commit details
    Browse the repository at this point in the history

  3. refactor posts to ajax comment

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    6a855e6 View commit details
    Browse the repository at this point in the history

  4. refactor partials

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    b8e6fcc View commit details
    Browse the repository at this point in the history

  5. move ajax js in to public folder

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    b316f86 View commit details
    Browse the repository at this point in the history

  6. ajax working for comments

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    f59b761 View commit details
    Browse the repository at this point in the history

  7. add id to new post to enable comments on that post

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    52ed202 View commit details
    Browse the repository at this point in the history

  8. ajax comments

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    29aec5e View commit details
    Browse the repository at this point in the history

  9. remove unncessary files

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    c9ce8eb View commit details
    Browse the repository at this point in the history

  10. new posts aren't pokeable

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    7149e84 View commit details
    Browse the repository at this point in the history

  11. ajax of likes works on existing posts

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    41cfbf4 View commit details
    Browse the repository at this point in the history

  12. ajax of likes for a new post

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    8cb72bd View commit details
    Browse the repository at this point in the history

  13. pass unit tests

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    a5a7ca9 View commit details
    Browse the repository at this point in the history

  14. added edit/delete functionality to post

    @emmadavids
    emmadavids committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    9a98c3c View commit details
    Browse the repository at this point in the history

  15. create new post

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    0e512bf View commit details
    Browse the repository at this point in the history

  16. refactor code

    @adrianHards
    adrianHards committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    800005d View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. refactor ajax js code into diff files

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    d684d12 View commit details
    Browse the repository at this point in the history

  2. prettier

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    6e991fd View commit details
    Browse the repository at this point in the history

  3. redirect to sign in if not before visiting posts

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    333bb03 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #27 from Loo-Ashworth/editdeletepost 

    added edit/delete functionality to post
    @emmadavids
    emmadavids committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    e01c5a7 View commit details
    Browse the repository at this point in the history

  5. added confirm msg

    @emmadavids
    emmadavids committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    b1340a8 View commit details
    Browse the repository at this point in the history

  6. reset form on submit

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    125d768 View commit details
    Browse the repository at this point in the history

  7. remove lines from e2e

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    74d097f View commit details
    Browse the repository at this point in the history

  8. add user who liked post even if new post

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    bdcb3b3 View commit details
    Browse the repository at this point in the history

  9. failing e2e edits

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    fd824fe View commit details
    Browse the repository at this point in the history

  10. fix handler and refactor target

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    0925666 View commit details
    Browse the repository at this point in the history

  11. remove spacing around 0

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    8cbe5ed View commit details
    Browse the repository at this point in the history

  12. passing 4 and 7

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    191e831 View commit details
    Browse the repository at this point in the history

  13. passing all tests

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f1022d6 View commit details
    Browse the repository at this point in the history

  14. merge edit and delete

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    bf80e02 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #28 from Loo-Ashworth/editdeletepost 

    added confirm msg to delete post
    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7aac94d View commit details
    Browse the repository at this point in the history

  16. merge with main

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    c5a7356 View commit details
    Browse the repository at this point in the history

  17. add delete

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f7c98c5 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #25 from Loo-Ashworth/partials 

    AJAX
    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f846ab3 View commit details
    Browse the repository at this point in the history

  19. add photos to posts and user

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    4c3746b View commit details
    Browse the repository at this point in the history

  20. Merge pull request #30 from Loo-Ashworth/avatar 

    add photos to posts and user
    @lisaoausb
    lisaoausb committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9fc1ced View commit details
    Browse the repository at this point in the history

  21. show modal on edit

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f80f821 View commit details
    Browse the repository at this point in the history

  22. add id to comment

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    e0e8ef3 View commit details
    Browse the repository at this point in the history

  23. added delete button to comments

    @emmadavids
    emmadavids committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    a0b02ee View commit details
    Browse the repository at this point in the history

  24. unable to pass updated message

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    d520a1b View commit details
    Browse the repository at this point in the history

  25. ajax edit a post

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    c0cdb35 View commit details
    Browse the repository at this point in the history

  26. refactor js code

    @adrianHards
    adrianHards committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    d94440d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge pull request #31 from Loo-Ashworth/delete-fix 

    AJAX edit
    @Loo-Ashworth
    Loo-Ashworth committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    2677c05 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into edit-delete-comment

    @emmadavids
    emmadavids committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    85dc2fb View commit details
    Browse the repository at this point in the history

  3. deleted commented out code

    @emmadavids
    emmadavids committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    3f4adf1 View commit details
    Browse the repository at this point in the history

  4. add delete button to comment

    @emmadavids
    emmadavids committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    4043d28 View commit details
    Browse the repository at this point in the history

  5. testing tests

    @emmadavids
    emmadavids committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    cf461a9 View commit details
    Browse the repository at this point in the history

  6. added burger menu

    @emmadavids
    emmadavids committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    fb92904 View commit details
    Browse the repository at this point in the history