Code

Validation#148

Code

Open

carolrs wants to merge 181 commits intomakersacademy:mainmakersacademy/acebook-mern-template:mainfrom ManuelaIacobovici:validationManuelaIacobovici/acebook-mern-water-team:validationCopy head branch name to clipboard

+35,248-347

Commits

Commits on May 9, 2023

• added test to readme

  pablisch

  committed
  b08070a

  Copy full SHA for b08070a

Commits on May 11, 2023

• Added button to signup screen

  pablisch

  committed
  d9cdd4a

  Copy full SHA for d9cdd4a

• Merge pull request #1 from ManuelaIacobovici/pablo

  Show description for e970f48
  ManuelaIacobovici

  authored
  e970f48

  Copy full SHA for e970f48

• TDD AddPost component and test passes

  pablisch

  committed
  27865c8

  Copy full SHA for 27865c8

• Display posts with newest post first

  tomcarmichael

  committed
  3d0f920

  Copy full SHA for 3d0f920

• Merged with main

  tomcarmichael

  committed
  acaf173

  Copy full SHA for acaf173

• new posts creating and all tests passing

  pablisch

  committed
  2be9bbd

  Copy full SHA for 2be9bbd

• .then handling handleSubmit. Test passing

  pablisch

  committed
  0e25a01

  Copy full SHA for 0e25a01

• post being created but posts not refreshing

  pablisch

  committed
  ddc6a66

  Copy full SHA for ddc6a66

• clear commented code

  pablisch

  committed
  c1556ff

  Copy full SHA for c1556ff

• Co-authored-by: Daniel John <[email protected]>

  carolrs

  committed
  b8e90a1

  Copy full SHA for b8e90a1

• removing videos

  carolrs

  committed
  4656570

  Copy full SHA for 4656570

• tidy white space

  pablisch

  committed
  548905c

  Copy full SHA for 548905c

Commits on May 12, 2023

• css for navbar

  carolrs

  committed
  91ec34b

  Copy full SHA for 91ec34b

• edits from PR review 1

  pablisch

  committed
  ef755da

  Copy full SHA for ef755da

• Merge pull request #3 from ManuelaIacobovici/mlpj/new/create-post

  Show description for fab3412
  pablisch

  authored
  fab3412

  Copy full SHA for fab3412

• Added username in signup, and tests pass

  pablisch

  committed
  d035d8e

  Copy full SHA for d035d8e

• completed add username

  Show description for cc69384
  pablisch

  committed
  cc69384

  Copy full SHA for cc69384

• Merge pull request #5 from ManuelaIacobovici/tcpj/new/add-username

  Show description for 5e7a956
  pablisch

  authored
  5e7a956

  Copy full SHA for 5e7a956

• AddPost.js | Enabled page refresh upon clicking 'Post'

  djohn06

  committed
  b28e756

  Copy full SHA for b28e756

Commits on May 13, 2023

• Merge branch 'main' into NavBar

  carolrs

  committed
  f42e9aa

  Copy full SHA for f42e9aa

• changes requested

  carolrs

  committed
  a20da22

  Copy full SHA for a20da22

• changed as requested

  carolrs

  committed
  5eae4dd

  Copy full SHA for 5eae4dd

Commits on May 14, 2023

• test orderByDate passing

  carolrs

  committed
  bd9b000

  Copy full SHA for bd9b000

• Merge pull request #4 from ManuelaIacobovici/NavBar

  Show description for a530dfb
  carolrs

  authored
  a530dfb

  Copy full SHA for a530dfb

Commits on May 15, 2023

• Merge pull request #6 from ManuelaIacobovici/DjMi/new/RerenderPosts

  Show description for e06fcca
  djohn06

  authored
  e06fcca

  Copy full SHA for e06fcca

• validation for email

  carolrs

  committed
  25ad1da

  Copy full SHA for 25ad1da

• Merged with main

  tomcarmichael

  committed
  705a63a

  Copy full SHA for 705a63a

• Merge pull request #2 from ManuelaIacobovici/tcjr/new/posts_by_date_order

  Show description for ff70014
  tomcarmichael

  authored
  ff70014

  Copy full SHA for ff70014

• Publishing branch

  Show description for 0248d7e
  

  djohn06

  and

  pablisch

  committed
  0248d7e

  Copy full SHA for 0248d7e

• Package.json

  djohn06

  committed
  1234d64

  Copy full SHA for 1234d64

• Merge branch 'main' into DjPj/new/AddComment

  djohn06

  committed
  9bd9e45

  Copy full SHA for 9bd9e45

• added comments array into schema for users

  Show description for d7debaa
  

  pablisch

  and

  djohn06

  committed
  d7debaa

  Copy full SHA for d7debaa

• Fixed breaking tests due to username: required being added to Users schema

  tomcarmichael

  committed
  85ecb39

  Copy full SHA for 85ecb39

• Added patch route to routes

  pablisch

  committed
  8cd5b86

  Copy full SHA for 8cd5b86

• Added post controller update

  pablisch

  committed
  ab16663

  Copy full SHA for ab16663

• partial implementation, displays timestamp and user Object ID

  tomcarmichael

  committed
  ec6acb6

  Copy full SHA for ec6acb6

• nav logout button to work, deleted feed logout button

  ManuelaIacobovici

  committed
  0d254bf

  Copy full SHA for 0d254bf

• Co-authored-by: Daniel John <[email protected]>

  Show description for 7acd85f
  ManuelaIacobovici

  committed
  7acd85f

  Copy full SHA for 7acd85f

• Impelement functionality to display post username and timestamp

  tomcarmichael

  committed
  ecc0854

  Copy full SHA for ecc0854

• Add formatting to display of username and timestamp for posts

  tomcarmichael

  committed
  b3a431a

  Copy full SHA for b3a431a

• updated post to patch in AddComment

  Show description for 93d979b
  

  3 peoplecommitted
  93d979b

  Copy full SHA for 93d979b

• update to AddComment controller and comp

  pablisch

  committed
  f32ecc1

  Copy full SHA for f32ecc1

• Update to AddComment component to fix token

  pablisch

  committed
  b8b5c7e

  Copy full SHA for b8b5c7e

• added username to navbar

  ManuelaIacobovici

  committed
  17280a1

  Copy full SHA for 17280a1

• Some CSS to ease the eyes

  pablisch

  committed
  d5e56f5

  Copy full SHA for d5e56f5

• Add AuthorUserID to new post in posts conroller before saving to DB...

  Show description for bfde89f
  tomcarmichael

  committed
  bfde89f

  Copy full SHA for bfde89f

• remove erroneous comment. Comment block in posts controller still to be removed..

  Show description for 4754ab4
  tomcarmichael

  committed
  4754ab4

  Copy full SHA for 4754ab4

Commits on May 16, 2023

• added username to the navbar

  ManuelaIacobovici

  committed
  80ba62e

  Copy full SHA for 80ba62e

• Remove errnoeuous commented out code block in posts.js

  tomcarmichael

  committed
  87ba3f9

  Copy full SHA for 87ba3f9

• tiny css button and input changes

  pablisch

  committed
  8a7d2a5

  Copy full SHA for 8a7d2a5

• Merge pull request #7 from ManuelaIacobovici/mijr/navbar/view

  Show description for 7af127c
  ManuelaIacobovici

  authored
  7af127c

  Copy full SHA for 7af127c

• Merge with main locally

  Show description for 8a8d2c7
  tomcarmichael

  committed
  8a8d2c7

  Copy full SHA for 8a8d2c7

• Merge pull request #8 from ManuelaIacobovici/tcac/display-username

  Show description for 396f729
  tomcarmichael

  authored
  396f729

  Copy full SHA for 396f729

• Merge branch 'main' into DjPj/new/AddComment

  pablisch

  committed
  423df85

  Copy full SHA for 423df85

• Merge pull request #9 from ManuelaIacobovici/DjPj/new/AddComment

  Show description for 4fef3ed
  pablisch

  authored
  4fef3ed

  Copy full SHA for 4fef3ed

• Removed redundant comma line 12 post model

  Show description for 463c8fb
  tomcarmichael

  authored
  463c8fb

  Copy full SHA for 463c8fb

• Merge pull request #11 from ManuelaIacobovici/tomcarmichael-patch-1

  Show description for e48cbdf
  pablisch

  authored
  e48cbdf

  Copy full SHA for e48cbdf

• Co-authored-by: Tom Carmichael-Mhanna <[email protected]>

  Show description for 7b5bbdf
  carolrs

  committed
  7b5bbdf

  Copy full SHA for 7b5bbdf

• Add author to comments object and display both

  Show description for e1b705c
  

  pablisch

  and

  tomcarmichael

  committed
  e1b705c

  Copy full SHA for e1b705c

• Merge branch 'main' into tcpjmi/fix.add-comments

  pablisch

  committed
  c834ceb

  Copy full SHA for c834ceb

• add likes d.b/controller and test for likes

  carolrs

  committed
  3fac572

  Copy full SHA for 3fac572

• Merge pull request #10 from ManuelaIacobovici/NavBar

  Show description for 1af9699
  carolrs

  authored
  1af9699

  Copy full SHA for 1af9699

• remove comments and add setNewComment("")

  pablisch

  committed
  fc794fe

  Copy full SHA for fc794fe

• Merge pull request #12 from ManuelaIacobovici/tcpjmi/fix.add-comments

  Show description for 0d27392
  pablisch

  authored
  0d27392

  Copy full SHA for 0d27392

• Merge branch 'main' into TJA/Likes

  carolrs

  committed
  81e34ab

  Copy full SHA for 81e34ab

• Merge pull request #13 from ManuelaIacobovici/TJA/Likes

  Show description for 6a6dc87
  carolrs

  authored
  6a6dc87

  Copy full SHA for 6a6dc87

• username login and logout to login page

  pablisch

  committed
  f83c12c

  Copy full SHA for f83c12c

• indentation fix on navbar file

  pablisch

  committed
  4398f48

  Copy full SHA for 4398f48

• Update post component unit test so mock post object structure matches the real one

  tomcarmichael

  committed
  ab04b4a

  Copy full SHA for ab04b4a

• adding testing for likes in the models.

  carolrs

  committed
  1ae22bf

  Copy full SHA for 1ae22bf

• Fix broken feed component unit test, mocking complete post object in response body

  tomcarmichael

  committed
  cdac3fc

  Copy full SHA for cdac3fc

• testing for comments

  carolrs

  committed
  57a6099

  Copy full SHA for 57a6099

• Partial fix of all frontend cypress test, AddComment test outstanding

  tomcarmichael

  committed
  c0f2247

  Copy full SHA for c0f2247

• cypress did this not me!

  pablisch

  committed
  cfc0822

  Copy full SHA for cfc0822

Commits on May 17, 2023

• Updated cypresss screenshot for AddComment test

  tomcarmichael

  committed
  ebfd0d7

  Copy full SHA for ebfd0d7

• testing avatar

  carolrs

  committed
  3b1922a

  Copy full SHA for 3b1922a

• Merge pull request #14 from ManuelaIacobovici/pj/fix/username-login

  Show description for c989a65
  pablisch

  authored
  c989a65

  Copy full SHA for c989a65

• Local merge with main

  Show description for c57c4a9
  tomcarmichael

  committed
  c57c4a9

  Copy full SHA for c57c4a9

• Merge pull request #15 from ManuelaIacobovici/tc/testing

  Show description for 1054a2c
  tomcarmichael

  authored
  1054a2c

  Copy full SHA for 1054a2c

• Fix failing tests for addComment and addPost

  tomcarmichael

  committed
  6e9390a

  Copy full SHA for 6e9390a

• add --runInBand flag to npm run test script in backend package.json..

  Show description for 62765c7
  tomcarmichael

  committed
  62765c7

  Copy full SHA for 62765c7

• Fix LoginForm test now that we log in with username not email

  tomcarmichael

  committed
  c85ec49

  Copy full SHA for c85ec49

• Fixed e2e signing in test now that sign-in asks for username instead of email

  tomcarmichael

  committed
  ed054cf

  Copy full SHA for ed054cf

• Uncomment window.location.reload() in AddPost.js

  tomcarmichael

  committed
  095b620

  Copy full SHA for 095b620

• feature setup

  tomcarmichael

  committed
  d2cad3b

  Copy full SHA for d2cad3b

• Merge pull request #17 from ManuelaIacobovici/tcpj/addCommentTest

  Show description for c161eb2
  tomcarmichael

  authored
  c161eb2

  Copy full SHA for c161eb2

• Merge branch 'TJA/Likes' into pj/add/css

  pablisch

  committed
  4ad75d3

  Copy full SHA for 4ad75d3

• Merge branch 'main' into testing

  carolrs

  committed
  8667275

  Copy full SHA for 8667275

• Merge pull request #18 from ManuelaIacobovici/testing

  Show description for d7a3974
  carolrs

  authored
  d7a3974

  Copy full SHA for d7a3974

• correct folder structure error and remove old comments

  tomcarmichael

  committed
  9adbbb2

  Copy full SHA for 9adbbb2

• Merge branch 'main' into pj/add/css

  pablisch

  committed
  7633f11

  Copy full SHA for 7633f11

• added labels to input fields for signup and login

  ManuelaIacobovici

  committed
  17ac584

  Copy full SHA for 17ac584

• trying to merge my branch with main

  ManuelaIacobovici

  committed
  8eb9442

  Copy full SHA for 8eb9442

• ammended AddLikes in posts controller to use req.user_id & return new token

  tomcarmichael

  committed
  01362ce

  Copy full SHA for 01362ce

• some css on the navbar component

  pablisch

  committed
  3b2f8d5

  Copy full SHA for 3b2f8d5

• refactored

  ManuelaIacobovici

  committed
  02ef7ff

  Copy full SHA for 02ef7ff

• Co-authored-by: Jamie Richardson <[email protected]>

  Show description for 64137a4
  carolrs

  committed
  64137a4

  Copy full SHA for 64137a4

• Write intiial code for Likes component

  tomcarmichael

  committed
  0366b8b

  Copy full SHA for 0366b8b

• single navbar return

  ManuelaIacobovici

  committed
  da168b2

  Copy full SHA for da168b2

• Merge pull request #19 from ManuelaIacobovici/manuela

  Show description for 54b659b
  ManuelaIacobovici

  authored
  54b659b

  Copy full SHA for 54b659b

• Merge pull request #20 from ManuelaIacobovici/midj/fix/navbuttons

  Show description for 6bfb621
  ManuelaIacobovici

  authored
  6bfb621

  Copy full SHA for 6bfb621

• navbar css fonts

  pablisch

  committed
  ad7c326

  Copy full SHA for ad7c326

• Merge branch 'main' into pj/add/css

  pablisch

  committed
  aff82d7

  Copy full SHA for aff82d7

• Basic css for most of site

  pablisch

  committed
  7a6e2be

  Copy full SHA for 7a6e2be

• fixed the login signup button context thing

  pablisch

  committed
  05d1ec0

  Copy full SHA for 05d1ec0

Commits on May 18, 2023

• Iterate on likes component

  tomcarmichael

  committed
  0a375fa

  Copy full SHA for 0a375fa

• Adjusted NavBar component cypress test to reflect changes and pass tests

  tomcarmichael

  committed
  6a21b5b

  Copy full SHA for 6a21b5b

• review changes

  pablisch

  committed
  6ca21ef

  Copy full SHA for 6ca21ef

• Merge branch 'pj/add/css' of https://github.com/ManuelaIacobovici/acebook-mern-water-team into pj/add/css

  pablisch

  committed
  ee6f91a

  Copy full SHA for ee6f91a

• Merge pull request #21 from ManuelaIacobovici/pj/add/css

  Show description for a6642fa
  pablisch

  authored
  a6642fa

  Copy full SHA for a6642fa

• warning fix

  pablisch

  committed
  e68b78c

  Copy full SHA for e68b78c

• Merge pull request #22 from ManuelaIacobovici/pj/fix/warning

  Show description for 9953b36
  pablisch

  authored
  9953b36

  Copy full SHA for 9953b36

• Change thumbs up images and correct folder structure

  tomcarmichael

  committed
  6b3fe73

  Copy full SHA for 6b3fe73

• Merge with main and resolve conflicts in post component

  tomcarmichael

  committed
  c0ffcb8

  Copy full SHA for c0ffcb8

• added missing e2e folder in cypress dir

  tomcarmichael

  committed
  31522a2

  Copy full SHA for 31522a2

• fixed two failing tests on the backend - token generator which now takes longer to time out cos of Pablos work and signing in now that we no longer use email

  tomcarmichael

  committed
  be355c1

  Copy full SHA for be355c1

• Merge branch 'main' into testing

  carolrs

  committed
  aa56549

  Copy full SHA for aa56549

• Updated AddLikes function in posts controller to look for 'article_id' instead of 'post_id'

  tomcarmichael

  committed
  c67ffca

  Copy full SHA for c67ffca

• taking out the comments

  carolrs

  committed
  a3db32a

  Copy full SHA for a3db32a

• continue implementation of like

  Show description for f93840e
  tomcarmichael

  committed
  f93840e

  Copy full SHA for f93840e

• adjust posts controller addLikes to take article_id as body param

  tomcarmichael

  committed
  985714f

  Copy full SHA for 985714f

• Likes can be added from the front end, display does not yet update

  tomcarmichael

  committed
  bcd3ed1

  Copy full SHA for bcd3ed1

• Merge pull request #23 from ManuelaIacobovici/testing

  Show description for a9a5e54
  carolrs

  authored
  a9a5e54

  Copy full SHA for a9a5e54

• Correct the logic for displaying right like button if user has liked already

  tomcarmichael

  committed
  97cc185

  Copy full SHA for 97cc185

• Like thumb image is refreshed automatically after user has liked

  tomcarmichael

  committed
  86b66d3

  Copy full SHA for 86b66d3

• Update likes label to be singular with just one like

  tomcarmichael

  committed
  e739d5d

  Copy full SHA for e739d5d

• Working password validation

  Show description for 0153799
  

  djohn06

  and

  pablisch

  committed
  0153799

  Copy full SHA for 0153799

• Update likes component

  tomcarmichael

  committed
  13676ec

  Copy full SHA for 13676ec

• adjust size of liked thumb image

  tomcarmichael

  committed
  450e54a

  Copy full SHA for 450e54a

• Write and pass component test for Likes

  tomcarmichael

  committed
  b1f98b9

  Copy full SHA for b1f98b9

• New posts refresh Feed

  pablisch

  committed
  aa165b6

  Copy full SHA for aa165b6

• feed reloads when new comment is made

  pablisch

  committed
  a7b3e22

  Copy full SHA for a7b3e22

• Fix failing test for AddPost and AddComment

  tomcarmichael

  committed
  ca3081a

  Copy full SHA for ca3081a

• Local merge with main

  Show description for 1bd9a6f
  tomcarmichael

  committed
  1bd9a6f

  Copy full SHA for 1bd9a6f

• validation for existing email

  carolrs

  committed
  f292b74

  Copy full SHA for f292b74

• Fix cypress e2e tests with valid password

  tomcarmichael

  committed
  e485c7a

  Copy full SHA for e485c7a

• Fix broken backend tests

  tomcarmichael

  committed
  231feec

  Copy full SHA for 231feec

• Create passing tests for email validation is spec/controllers/users

  tomcarmichael

  committed
  20d62a0

  Copy full SHA for 20d62a0

• Resolve merge conflict with main

  tomcarmichael

  committed
  e3e5c0a

  Copy full SHA for e3e5c0a

• Merge pull request #24 from ManuelaIacobovici/Dj/new/passwordValidation

  Show description for 5a25d7f
  djohn06

  authored
  5a25d7f

  Copy full SHA for 5a25d7f

• Supplied props to AddPost and AddComment component tests

  tomcarmichael

  committed
  ba21d36

  Copy full SHA for ba21d36

• Correct token generator test in backend

  tomcarmichael

  committed
  1981541

  Copy full SHA for 1981541

• comments collapse and css for changes

  pablisch

  committed
  28534c5

  Copy full SHA for 28534c5

• package.json changes

  pablisch

  committed
  5cd01db

  Copy full SHA for 5cd01db

• remove redundant comment and console log as per review suggestions

  tomcarmichael

  committed
  7deeb1f

  Copy full SHA for 7deeb1f

• Merge pull request #25 from ManuelaIacobovici/tc/displayLikes

  Show description for 5961c0f
  tomcarmichael

  authored
  5961c0f

  Copy full SHA for 5961c0f

• tests pass... no, really!

  pablisch

  committed
  d923d84

  Copy full SHA for d923d84

• Merge branch 'main' into pj/new/collapse-comments

  pablisch

  committed
  d3e85ed

  Copy full SHA for d3e85ed

• Merge branch 'main' into pablo-test

  pablisch

  committed
  21ca2f4

  Copy full SHA for 21ca2f4

• Merge pull request #27 from ManuelaIacobovici/pablo-test

  Show description for ca2f6b5
  pablisch

  authored
  ca2f6b5

  Copy full SHA for ca2f6b5

• Reformat like button and comments slightly

  tomcarmichael

  committed
  b430ff4

  Copy full SHA for b430ff4

• Merge branch 'main' into pj/new/collapse-comments

  pablisch

  committed
  ed3ebc3

  Copy full SHA for ed3ebc3

• duplicate code fix

  pablisch

  committed
  97f75e9

  Copy full SHA for 97f75e9

• Create failing test for e2e making a post

  tomcarmichael

  committed
  4dacd0f

  Copy full SHA for 4dacd0f

• merge with main

  tomcarmichael

  committed
  4b0ffd2

  Copy full SHA for 4b0ffd2

• Merge with main

  carolrs

  committed
  2592d80

  Copy full SHA for 2592d80

• e2e test for making a post passes after merge with re render feature branch

  tomcarmichael

  committed
  bb4859f

  Copy full SHA for bb4859f

• update gitignore

  carolrs

  committed
  66ccbb0

  Copy full SHA for 66ccbb0

• fix merge

  carolrs

  committed
  a1484a6

  Copy full SHA for a1484a6

• Merge branch 'main' into validation

  carolrs

  committed
  0f13583

  Copy full SHA for 0f13583

• fixing tests import

  carolrs

  committed
  cade7c6

  Copy full SHA for cade7c6

• Merge pull request #29 from ManuelaIacobovici/pj/new/collapse-comments

  Show description for e6b6ef6
  pablisch

  authored
  e6b6ef6

  Copy full SHA for e6b6ef6

• testing for validation when email exist

  carolrs

  committed
  461e97a

  Copy full SHA for 461e97a

• deleted unecessary code

  pablisch

  committed
  586f500

  Copy full SHA for 586f500

• some nonsense just because

  pablisch

  committed
  05074b1

  Copy full SHA for 05074b1

Commits on May 19, 2023

• deleted commeted and unwanted logs

  pablisch

  committed
  7dce234

  Copy full SHA for 7dce234

• merge with main

  tomcarmichael

  committed
  9dfe5cf

  Copy full SHA for 9dfe5cf

• Merge pull request #30 from ManuelaIacobovici/tc/testMakingAPost

  Show description for e0fcd12
  tomcarmichael

  authored
  e0fcd12

  Copy full SHA for e0fcd12

• Merge pull request #31 from ManuelaIacobovici/pj/cleanup/rubbish

  Show description for 50b776c
  pablisch

  authored
  50b776c

  Copy full SHA for 50b776c

• Merge pull request #26 from ManuelaIacobovici/validation

  Show description for 65755f7
  carolrs

  authored
  65755f7

  Copy full SHA for 65755f7

• Upload Image

  carolrs

  committed
  06e5c09

  Copy full SHA for 06e5c09

• Merge pull request #32 from ManuelaIacobovici/validation

  Show description for 972415c
  carolrs

  authored
  972415c

  Copy full SHA for 972415c

• Merge branch 'main' into validation

  carolrs

  committed
  e3d81a4

  Copy full SHA for e3d81a4

• css all over

  pablisch

  committed
  232e1db

  Copy full SHA for 232e1db

• Merge branch 'main' into pj/fix/comments-expand

  pablisch

  committed
  d004f64

  Copy full SHA for d004f64

• login route fix

  pablisch

  committed
  c878dc6

  Copy full SHA for c878dc6

• Merge pull request #35 from ManuelaIacobovici/pj/fix/login-route

  Show description for b6ec4cf
  pablisch

  authored
  b6ec4cf

  Copy full SHA for b6ec4cf

• Merge pull request #33 from ManuelaIacobovici/pj/fix/comments-expand

  Show description for 27a442e
  pablisch

  authored
  27a442e

  Copy full SHA for 27a442e

• fix issue

  carolrs

  committed
  a20e74c

  Copy full SHA for a20e74c

• Merge branch 'main' into validation

  carolrs

  committed
  00c530a

  Copy full SHA for 00c530a