Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

06/delete posts rebased #58

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3c5d5b4
input placeholders added, non functional
abodian Feb 8, 2023
77db070
added post button
MartaBia Feb 8, 2023
bef723d
added post text box
MartaBia Feb 8, 2023
e8a68c5
removed comments before pull request
MartaBia Feb 8, 2023
e266e84
token generator tests failing
abodian Feb 8, 2023
0893c2e
first and last name added and tests passing
abodian Feb 8, 2023
047cea6
added defaultValue to allow typing on text box
MartaBia Feb 8, 2023
47e5850
navbar ltd functionality
UserChi Feb 8, 2023
732a0ba
Merge pull request #1 from abodian/03/user-can-post
MartaBia Feb 8, 2023
f525c03
error message shows when login credentials incorrect
abodian Feb 8, 2023
6521097
made the navbar folder clearer
UserChi Feb 8, 2023
6964ada
Merge pull request #3 from abodian/05/login-page
UserChi Feb 9, 2023
f1b6306
merge resolution
sirdavy Feb 9, 2023
fdd46d1
Merge pull request #2 from abodian/01/sign-up-page
sirdavy Feb 9, 2023
18714ea
Merge branch 'main' into 02/navbar-non_functuality
sirdavy Feb 9, 2023
0f232fe
Merge pull request #4 from abodian/02/navbar-non_functuality
sirdavy Feb 9, 2023
520cd80
small conflict on sign up page resolved
sirdavy Feb 9, 2023
470d096
Merge pull request #5 from abodian/navbar2
MartaBia Feb 9, 2023
fcae856
added function to post text box/button and added nav bar
sirdavy Feb 9, 2023
c85e93c
Merge pull request #6 from abodian/4-add-functionality-to-post
sirdavy Feb 9, 2023
e889d71
login page fixed
IAmNotAbbas Feb 9, 2023
9dea689
Testing for posting
sirdavy Feb 9, 2023
1d0a3d1
Merge pull request #7 from abodian/fix_login
sirdavy Feb 9, 2023
1393486
Update making_a_post.cy.js
MartaBia Feb 9, 2023
44aa864
Merge pull request #8 from abodian/testingposting
MartaBia Feb 9, 2023
d5d067d
one extra test line
sirdavy Feb 9, 2023
2e6d054
Merge pull request #9 from abodian/testingposting2
UserChi Feb 9, 2023
2c837d8
cypress making post e2e test passes
abodian Feb 9, 2023
2de535c
non functional like and comment button added, timeline sits in center…
abodian Feb 9, 2023
da1c320
added text wrap to .postContent and improved overall look
abodian Feb 9, 2023
e58a989
Merge pull request #10 from abodian/fix-failing-cypress-post-tests
JamesJPaterson Feb 10, 2023
4979655
Merge pull request #11 from abodian/07/reformat-feed
sirdavy Feb 10, 2023
5b2a25a
username stored in database but only after manual input, shows on post
abodian Feb 10, 2023
7307cf2
user email stored in localStorage
abodian Feb 10, 2023
42651bf
get route added to users route file
abodian Feb 10, 2023
b765c54
user controller find method created and tested
abodian Feb 10, 2023
ef2a6d5
user first and last name now accessible in local storage
abodian Feb 10, 2023
285a5e4
user name is stored in the post document when submitted
abodian Feb 10, 2023
131ce40
username shows on posts
abodian Feb 13, 2023
5825156
ready for review
abodian Feb 13, 2023
5ebfab5
Merge branch 'main' into 06/add-username-jwt-method
abodian Feb 13, 2023
64491b3
Merge pull request #12 from abodian/06/add-username-jwt-method
abodian Feb 13, 2023
44c6fc6
minor changes
abodian Feb 13, 2023
0cc1e32
Added logic and route to delete a post
MartaBia Feb 9, 2023
0b7d7e3
updated route
MartaBia Feb 9, 2023
30b880e
added delete button with functionality
MartaBia Feb 9, 2023
b625b7f
refactored
MartaBia Feb 10, 2023
8afd8ef
Added cypress test
MartaBia Feb 13, 2023
8efdd22
post rebase commit
abodian Feb 13, 2023
d24b37a
merged with previous code
MartaBia Feb 13, 2023
00b4972
articles removed from post model
abodian Feb 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
made the navbar folder clearer
UserChi committed Feb 8, 2023
commit 65210975bd771753f5d1db8c9b2b9efaecfb34b7
23 changes: 0 additions & 23 deletions frontend/src/components/nav-bar/.gitignore

This file was deleted.

70 changes: 0 additions & 70 deletions frontend/src/components/nav-bar/README.md

This file was deleted.

Loading