Code

Cy testing#170

Code

Open

camybish wants to merge 183 commits intomakersacademy:mainmakersacademy/acebook-mern-template:mainfrom sharmine-s:cy-testingsharmine-s/acebook-airbenders:cy-testingCopy head branch name to clipboard

+2,385-372

Commits

Commits on Jun 6, 2023

• Diagraming first day

  michael-szczepanski

  committed
  c5c4bd4

  Copy full SHA for c5c4bd4

• Merge pull request #1 from sharmine-s/notes

  camybish

  authored
  a3d3ecb

  Copy full SHA for a3d3ecb

Commits on Jun 7, 2023

• Delete .DS_Store

  sharmine-s

  authored
  2f62ced

  Copy full SHA for 2f62ced

• Delete .DS_Store in api folder

  sharmine-s

  authored
  82d58fe

  Copy full SHA for 82d58fe

• Delete videos folder in frontend cypress tests

  sharmine-s

  authored
  abfc726

  Copy full SHA for abfc726

Commits on Jun 8, 2023

• added login heading

  ChristieGriffiths

  committed
  7658ab6

  Copy full SHA for 7658ab6

• increased margin size

  ChristieGriffiths

  committed
  a0e91f5

  Copy full SHA for a0e91f5

• removed redundant role tag in login form

  ChristieGriffiths

  committed
  3e4fdf5

  Copy full SHA for 3e4fdf5

• added /cypress/screenshots to frontend gitignore file

  wimdavies

  committed
  acc433a

  Copy full SHA for acc433a

• console.log message now correctly confirms success/unsuccess of login

  ChristieGriffiths

  committed
  dc07d18

  Copy full SHA for dc07d18

• testdrove adding User name on Model

  wimdavies

  committed
  5cb8a1c

  Copy full SHA for 5cb8a1c

• deleted redundant package-lock.json

  ChristieGriffiths

  committed
  5fe7bcc

  Copy full SHA for 5fe7bcc

• add header and labels to form. Add function to check valid email and password exists and feedback to user

  sarahc-dev

  committed
  d0fe121

  Copy full SHA for d0fe121

• removed h1 tag from within form tag and place into empty tag, and added labels for email and password

  sharmine-s

  committed
  c5d0fdf

  Copy full SHA for c5d0fdf

• Merge pull request #4 from sharmine-s/login-html

  Show description for 6be8998
  sharmine-s

  authored
  6be8998

  Copy full SHA for 6be8998

• Merge pull request #3 from sharmine-s/signup_html

  Show description for afe70cf
  sharmine-s

  authored
  afe70cf

  Copy full SHA for afe70cf

• actually adding the User model change

  wimdavies

  committed
  2cd8237

  Copy full SHA for 2cd8237

• Merge remote-tracking branch 'origin/main' into name-on-signup

  hanguyen21

  committed
  3275954

  Copy full SHA for 3275954

• merging

  wimdavies

  committed
  0e06a33

  Copy full SHA for 0e06a33

• Create a post form created, Post model updated for date input

  michael-szczepanski

  committed
  8e46384

  Copy full SHA for 8e46384

• addname on Signup form

  hanguyen21

  committed
  cafdfc5

  Copy full SHA for cafdfc5

• add vaidation for server error. Amend css to make errors red

  sarahc-dev

  committed
  190acb0

  Copy full SHA for 190acb0

• altered mongoose schema to force email to be unique

  sharmine-s

  committed
  195bac1

  Copy full SHA for 195bac1

• fixing git issue

  wimdavies

  committed
  31e7898

  Copy full SHA for 31e7898

• add novalidate to disable html errors

  sarahc-dev

  committed
  04fd1cc

  Copy full SHA for 04fd1cc

• added default name on Model to enable tests to pass; reordered schema properties so that request body is handled correctly

  wimdavies

  committed
  dcfde07

  Copy full SHA for dcfde07

• Merge pull request #5 from sharmine-s/post_creation

  Show description for b9edbd9
  hanguyen21

  authored
  b9edbd9

  Copy full SHA for b9edbd9

• Merge pull request #6 from sharmine-s/email-uniqueness-2

  Show description for d481709
  hanguyen21

  authored
  d481709

  Copy full SHA for d481709

• add frontend error handling to login page

  sarahc-dev

  committed
  b54f4fc

  Copy full SHA for b54f4fc

• Merge branch 'main' into name-on-signup

  wimdavies

  authored
  7e57e38

  Copy full SHA for 7e57e38

• signing up with an existing email now returns a 409 error

  sharmine-s

  committed
  4fba244

  Copy full SHA for 4fba244

• Merge pull request #7 from sharmine-s/name-on-signup

  Show description for 74f165c
  michael-szczepanski

  authored
  74f165c

  Copy full SHA for 74f165c

• Adding time to posts; rewrote a unit test to include a valid time

  wimdavies

  committed
  6c4f0b4

  Copy full SHA for 6c4f0b4

• added backend test to check that error is thrown when signing up duplicate email

  sharmine-s

  committed
  b253862

  Copy full SHA for b253862

• Merge pull request #9 from sharmine-s/duplicate-email-error-code

  Show description for 1136333
  sarahc-dev

  authored
  1136333

  Copy full SHA for 1136333

• change date to the right format

  hanguyen21

  committed
  74ec0b8

  Copy full SHA for 74ec0b8

• add merges

  sarahc-dev

  committed
  edf38d7

  Copy full SHA for edf38d7

• Merge remote-tracking branch 'origin/main' into user_alerts

  sarahc-dev

  committed
  ce5b36b

  Copy full SHA for ce5b36b

• password now encrypted on sign up

  ChristieGriffiths

  committed
  fd2acba

  Copy full SHA for fd2acba

• added backend validation message from server

  sarahc-dev

  committed
  5726be2

  Copy full SHA for 5726be2

• updated validations on login

  sarahc-dev

  committed
  23c182c

  Copy full SHA for 23c182c

• Working on adding user name to token. Currently name is undefined within the TokenGenerator, fo rsome reason

  wimdavies

  committed
  49b1c5b

  Copy full SHA for 49b1c5b

• log in now decrypts passwords and refactored 1 test, others failing

  ChristieGriffiths

  committed
  b51bca7

  Copy full SHA for b51bca7

• add validation error to create post

  sarahc-dev

  committed
  33e19f2

  Copy full SHA for 33e19f2

• 2 out of 3 paths fixed

  camybish

  committed
  8125c5d

  Copy full SHA for 8125c5d

Commits on Jun 9, 2023

• added post sort by date with newest posts appearing first

  michael-szczepanski

  committed
  7597660

  Copy full SHA for 7597660

• fixed posts.spec test failing because of controller change

  michael-szczepanski

  committed
  4b60b3b

  Copy full SHA for 4b60b3b

• fixed failing test to pass which just needed async and await

  sharmine-s

  committed
  7b3d296

  Copy full SHA for 7b3d296

• Post Page now refreshes after new post received

  camybish

  committed
  3b59990

  Copy full SHA for 3b59990

• Merge pull request #10 from sharmine-s/user_alerts

  Show description for 5aaf8b6
  ChristieGriffiths

  authored
  5aaf8b6

  Copy full SHA for 5aaf8b6

• Worked out how to populate user name and id into newly created Posts

  wimdavies

  committed
  d6a511e

  Copy full SHA for d6a511e

• posts redirects to login if logged out or invalid token

  sarahc-dev

  committed
  249860b

  Copy full SHA for 249860b

• Frontend ready to display post.user.name; requires API post Index to populate in chain

  wimdavies

  committed
  fe687fd

  Copy full SHA for fe687fd

• like button and user_id retrieval complete

  michael-szczepanski

  committed
  7e160cb

  Copy full SHA for 7e160cb

• clean up files and add comment

  sarahc-dev

  committed
  2f4fb79

  Copy full SHA for 2f4fb79

• created new Navbar component with Logout in it, so far the logout button is showing but not doing anything

  sharmine-s

  committed
  1cce5a6

  Copy full SHA for 1cce5a6

• logout button on navbar now worksgit status

  sharmine-s

  committed
  071618f

  Copy full SHA for 071618f

• Added bar loader for invalid access to /posts

  camybish

  committed
  367ab9e

  Copy full SHA for 367ab9e

• Merge branch 'main' into user-flow

  camybish

  authored
  cf0e8ad

  Copy full SHA for cf0e8ad

• trying to add css, currently not working

  sharmine-s

  committed
  dc35c84

  Copy full SHA for dc35c84

• Working implementation.

  wimdavies

  committed
  2e3f2bb

  Copy full SHA for 2e3f2bb

• likes now correctly update the database

  michael-szczepanski

  committed
  d35e9e6

  Copy full SHA for d35e9e6

• Removed comments; removed unnecessary .populate in Create

  wimdavies

  committed
  46bd9c2

  Copy full SHA for 46bd9c2

• created individual css files to add margins for sign up, login and posts

  ChristieGriffiths

  committed
  2d1aef5

  Copy full SHA for 2d1aef5

• styled topnav and logout button

  sharmine-s

  committed
  f04f257

  Copy full SHA for f04f257

• Started SPIKE on default avatar

  camybish

  committed
  ae0683d

  Copy full SHA for ae0683d

• Started SPIKE on default avatar 2

  camybish

  committed
  da7b3ac

  Copy full SHA for da7b3ac

• edited css for topnav

  sharmine-s

  committed
  b9f288b

  Copy full SHA for b9f288b

• fixed mistake where tests were greyed out

  sharmine-s

  committed
  d82d9e1

  Copy full SHA for d82d9e1

• fixed another issue with the tests, all clear now

  sharmine-s

  committed
  3139327

  Copy full SHA for 3139327

• Merge branch 'main' into posts-date-and-name

  wimdavies

  authored
  b7bd942

  Copy full SHA for b7bd942

• Merge pull request #12 from sharmine-s/encrypted-password

  Show description for 5ae42e3
  sarahc-dev

  authored
  5ae42e3

  Copy full SHA for 5ae42e3

• Merge pull request #11 from sharmine-s/post-sort

  Show description for 29405d7
  ChristieGriffiths

  authored
  29405d7

  Copy full SHA for 29405d7

• Merge pull request #15 from sharmine-s/navbar

  Show description for 1edc99a
  ChristieGriffiths

  authored
  1edc99a

  Copy full SHA for 1edc99a

• Merge branch 'main' into posts-date-and-name

  wimdavies

  authored
  5c9efc2

  Copy full SHA for 5c9efc2

• Merge branch 'main' into user-flow

  wimdavies

  authored
  d6f3bff

  Copy full SHA for d6f3bff

• Merge branch 'main' into posts-date-and-name

  wimdavies

  authored
  a356cbe

  Copy full SHA for a356cbe

• Merge pull request #16 from sharmine-s/posts-date-and-name

  Show description for 44e251a
  wimdavies

  authored
  44e251a

  Copy full SHA for 44e251a

• Merge branch 'main' into like-button

  michael-szczepanski

  authored
  dfedb13

  Copy full SHA for dfedb13

• Correcting errors in conflict resolves on tokens.js and posts.js controllers

  wimdavies

  committed
  1482c21

  Copy full SHA for 1482c21

• Merge pull request #17 from sharmine-s/fixing-errors

  Show description for 81e51ed
  wimdavies

  authored
  81e51ed

  Copy full SHA for 81e51ed

Commits on Jun 11, 2023

• fixed some weird ass bullcrap

  michael-szczepanski

  committed
  11c1158

  Copy full SHA for 11c1158

• Merge branch 'main' into like-button

  michael-szczepanski

  authored
  78de7ae

  Copy full SHA for 78de7ae

Commits on Jun 12, 2023

• add loading state to fix bug where no posts in db

  sarahc-dev

  committed
  4682708

  Copy full SHA for 4682708

• Merge pull request #14 from sharmine-s/like-button

  Show description for 803e864
  wimdavies

  authored
  803e864

  Copy full SHA for 803e864

• Merge branch 'main' into user-flow

  michael-szczepanski

  authored
  03f1e93

  Copy full SHA for 03f1e93

• Merge pull request #13 from sharmine-s/user-flow

  Show description for 499461f
  michael-szczepanski

  authored
  499461f

  Copy full SHA for 499461f

• fix issue with if statement

  sarahc-dev

  committed
  140185f

  Copy full SHA for 140185f

• formatting changes

  michael-szczepanski

  committed
  ce3ed03

  Copy full SHA for ce3ed03

• I like git less and less these days. Missing jwt_decoder dependency missing

  michael-szczepanski

  committed
  9f76f81

  Copy full SHA for 9f76f81

• Merge pull request #18 from sharmine-s/fix-feed

  Show description for 8895ff0
  wimdavies

  authored
  8895ff0

  Copy full SHA for 8895ff0

• Merge remote-tracking branch 'origin/main' into default-avatar-spike

  camybish

  committed
  ae46cc4

  Copy full SHA for ae46cc4

• Package.json test script ammended

  michael-szczepanski

  committed
  b8d4fe9

  Copy full SHA for b8d4fe9

• test to check post has correct properties

  ChristieGriffiths

  committed
  e9b1988

  Copy full SHA for e9b1988

• Initial implementation of default avatar complete

  camybish

  committed
  0187977

  Copy full SHA for 0187977

• add update comment to schema and attempt test

  sarahc-dev

  committed
  2e09bc3

  Copy full SHA for 2e09bc3

• Merge pull request #19 from sharmine-s/default-avatar-spike

  Show description for 17819cd
  sarahc-dev

  authored
  17819cd

  Copy full SHA for 17819cd

• merge from main

  sarahc-dev

  committed
  bc4149d

  Copy full SHA for bc4149d

• npm installed cloudinary

  camybish

  committed
  b44689b

  Copy full SHA for b44689b

• Merge remote-tracking branch 'origin/main' into image-api

  camybish

  committed
  8d561fb

  Copy full SHA for 8d561fb

• complete test for post controller update

  ChristieGriffiths

  committed
  52520fe

  Copy full SHA for 52520fe

• merging main

  ChristieGriffiths

  committed
  c84b681

  Copy full SHA for c84b681

• test drive to add comment

  sarahc-dev

  committed
  8748b6d

  Copy full SHA for 8748b6d

• tokens controller.create extra test case

  michael-szczepanski

  committed
  1a460ca

  Copy full SHA for 1a460ca

• backend cloudinary config

  wimdavies

  committed
  3dd48bd

  Copy full SHA for 3dd48bd

• removed redundant console.logs

  michael-szczepanski

  committed
  2b52054

  Copy full SHA for 2b52054

• link between login and signup

  hanguyen21

  committed
  81c8bd2

  Copy full SHA for 81c8bd2

• add method to add comment - not tested

  sarahc-dev

  committed
  29475d3

  Copy full SHA for 29475d3

• removed unnecessary process.env.PUBLIC_URL from avatar display

  wimdavies

  committed
  68a9c7c

  Copy full SHA for 68a9c7c

• Merge pull request #21 from sharmine-s/link-login-signup

  Show description for 0a4de40
  camybish

  authored
  0a4de40

  Copy full SHA for 0a4de40

• Merge pull request #20 from sharmine-s/testing-debt

  Show description for 7d392c3
  wimdavies

  authored
  7d392c3

  Copy full SHA for 7d392c3

• Merging main changes into image-api

  wimdavies

  committed
  ffdaca1

  Copy full SHA for ffdaca1

Commits on Jun 13, 2023

• remove postRefresh in onclick and amend console.log in feed for better visibility on data returned

  sarahc-dev

  committed
  42df2fe

  Copy full SHA for 42df2fe

• Merge pull request #22 from sharmine-s/bugfix-refresh-page

  Show description for 699aa27
  camybish

  authored
  699aa27

  Copy full SHA for 699aa27

• erased cloudinary dependencies on backend

  wimdavies

  committed
  541c8a3

  Copy full SHA for 541c8a3

• merged tests PR

  sharmine-s

  committed
  63420a5

  Copy full SHA for 63420a5

• fixed bug caused by parallel jest testing

  michael-szczepanski

  committed
  b7ce121

  Copy full SHA for b7ce121

• changed patch route to /comments

  sharmine-s

  committed
  14993db

  Copy full SHA for 14993db

• Feed now correctly rerenders after post creation

  michael-szczepanski

  committed
  ffd271b

  Copy full SHA for ffd271b

• removed redundant css code

  michael-szczepanski

  committed
  4ef4042

  Copy full SHA for 4ef4042

• Revert "Merge pull request #22 from sharmine-s/bugfix-refresh-page"

  Show description for d1c2b6a
  ChristieGriffiths

  committed
  d1c2b6a

  Copy full SHA for d1c2b6a

• add logo across the board

  ChristieGriffiths

  committed
  1228015

  Copy full SHA for 1228015

• added comments collection which includes userId, and commentId now shows in its parent Post

  sharmine-s

  committed
  22c7e14

  Copy full SHA for 22c7e14

• Added template for cloudinary upload template, needs implimentation

  camybish

  committed
  aed2d74

  Copy full SHA for aed2d74

• Merge pull request #23 from sharmine-s/bug-fixes

  Show description for d1e64cf
  camybish

  authored
  d1e64cf

  Copy full SHA for d1e64cf

• Merge remote-tracking branch 'origin/main' into image-api

  wimdavies

  committed
  b515ce0

  Copy full SHA for b515ce0

• css shenanigans for post display

  michael-szczepanski

  committed
  470996f

  Copy full SHA for 470996f

• Merge branch 'main' into logo-take2

  michael-szczepanski

  authored
  47df37b

  Copy full SHA for 47df37b

• padding fix

  michael-szczepanski

  committed
  b1fa858

  Copy full SHA for b1fa858

• Merge pull request #24 from sharmine-s/logo-take2

  Show description for fa8edb4
  wimdavies

  authored
  fa8edb4

  Copy full SHA for fa8edb4

• Merge pull request #25 from sharmine-s/bug-fixes

  Show description for ab6eef1
  ChristieGriffiths

  authored
  ab6eef1

  Copy full SHA for ab6eef1

• populate comment in find

  sarahc-dev

  committed
  757de22

  Copy full SHA for 757de22

• refreshPage bugfix and DOM compliance

  michael-szczepanski

  committed
  67d9b61

  Copy full SHA for 67d9b61

• change to to prevent duplicates

  sarahc-dev

  committed
  be09fdd

  Copy full SHA for be09fdd

• clean up files, add comments, populate user field in comment

  sarahc-dev

  committed
  967e562

  Copy full SHA for 967e562

• amend populate to not include password

  sarahc-dev

  committed
  e357bd7

  Copy full SHA for e357bd7

• Merge pull request #26 from sharmine-s/refresh-bug-fix

  Show description for c9a65bb
  sharmine-s

  authored
  c9a65bb

  Copy full SHA for c9a65bb

• Implemented the basic widget component, and used it in SignUpForm

  wimdavies

  committed
  2ecc3f7

  Copy full SHA for 2ecc3f7

• Merge remote-tracking branch 'origin/main' into image-api

  wimdavies

  committed
  048f4a3

  Copy full SHA for 048f4a3

Commits on Jun 14, 2023

• Merge remote-tracking branch 'origin/main' into comments

  sharmine-s

  committed
  6e6f1e8

  Copy full SHA for 6e6f1e8

• started creating comments model spec test, needs to be updated

  sharmine-s

  committed
  2db4732

  Copy full SHA for 2db4732

• created passing tests for comments model

  sharmine-s

  committed
  2526693

  Copy full SHA for 2526693

• Tidied up widget and commented it for wider usage. Decoupled from SignUpForm

  wimdavies

  committed
  aa9a472

  Copy full SHA for aa9a472

• add tests for model and add comments to start tests for controller

  sharmine-s

  committed
  432bcac

  Copy full SHA for 432bcac

• Merge pull request #27 from sharmine-s/comments

  Show description for 75ba669
  camybish

  authored
  75ba669

  Copy full SHA for 75ba669

• Merge pull request #28 from sharmine-s/image-api

  Show description for e9432e4
  sharmine-s

  authored
  e9432e4

  Copy full SHA for e9432e4

• created a fetch for creating a comment

  michael-szczepanski

  committed
  2ef7508

  Copy full SHA for 2ef7508

• comments are now correctly assigned to posts

  michael-szczepanski

  committed
  2e02740

  Copy full SHA for 2e02740

• initial set up for the work

  wimdavies

  committed
  a857aec

  Copy full SHA for a857aec

• posts now somehow display

  michael-szczepanski

  committed
  c822c74

  Copy full SHA for c822c74

• basic intergration of widget into postcreateform, possibly broken

  ChristieGriffiths

  committed
  f77cb63

  Copy full SHA for f77cb63

• css added for comment to be consistent with post

  michael-szczepanski

  committed
  9347940

  Copy full SHA for 9347940

• fixed naming error; assigned imageUrl in PostCreateForm POST request body

  wimdavies

  committed
  1780bf5

  Copy full SHA for 1780bf5

• Implemented post imageURl storage on DB

  wimdavies

  committed
  c47fc8c

  Copy full SHA for c47fc8c

• Implemented imageUrl as <img> in Post.js

  wimdavies

  committed
  44a02a1

  Copy full SHA for 44a02a1

• added e2e cypress testing for sprint 2 features

  camybish

  committed
  7dd3583

  Copy full SHA for 7dd3583

• users can upload their avata when they sign up

  hanguyen21

  committed
  21d0f77

  Copy full SHA for 21d0f77

• Fixed issue with button type, copied in some basic css for the button

  wimdavies

  committed
  6bad912

  Copy full SHA for 6bad912

• CSS for comments

  michael-szczepanski

  committed
  ff990b6

  Copy full SHA for ff990b6

• added css for login, signup

  hanguyen21

  committed
  c0af4b3

  Copy full SHA for c0af4b3

• add height to image

  sarahc-dev

  committed
  3ea9f01

  Copy full SHA for 3ea9f01

Commits on Jun 15, 2023

• add preview image and ability to delete, remove package.json in root folder

  sarahc-dev

  committed
  1aea9f9

  Copy full SHA for 1aea9f9

• Changed button text; updated widget params to crop correctly and not close automatically

  wimdavies

  committed
  785dc23

  Copy full SHA for 785dc23

• Merge pull request #30 from sharmine-s/avata

  Show description for d884666
  sarahc-dev

  authored
  d884666

  Copy full SHA for d884666

• Fixed issue with duplicate images, by resetting imageUrl to empty string

  wimdavies

  committed
  ffaa12e

  Copy full SHA for ffaa12e

• Merge remote-tracking branch 'origin/main' into image-posts

  wimdavies

  committed
  0a4c1ca

  Copy full SHA for 0a4c1ca

• Updated empty post text error message to be more clear

  wimdavies

  committed
  8b33bc0

  Copy full SHA for 8b33bc0

• Continuing e2e testing

  camybish

  committed
  b24c771

  Copy full SHA for b24c771

• Merge pull request #31 from sharmine-s/image-posts

  Show description for a02a321
  wimdavies

  authored
  a02a321

  Copy full SHA for a02a321

• conflict resolutions

  michael-szczepanski

  committed
  20fbe8a

  Copy full SHA for 20fbe8a

• neverending story about merge conflicts

  michael-szczepanski

  committed
  6db1291

  Copy full SHA for 6db1291

• All the new files

  camybish

  committed
  e8316a9

  Copy full SHA for e8316a9

• style consistency in feed

  michael-szczepanski

  committed
  fcaa0ff

  Copy full SHA for fcaa0ff

• Merge pull request #29 from sharmine-s/create-and-view-comments

  Show description for 2787c71
  michael-szczepanski

  authored
  2787c71

  Copy full SHA for 2787c71

• fix bug where default avatar was not showing

  sarahc-dev

  committed
  bcb221e

  Copy full SHA for bcb221e

• Restored tests from yesterday

  camybish

  committed
  093222b

  Copy full SHA for 093222b

• Ready to update tests

  camybish

  committed
  3c78b67

  Copy full SHA for 3c78b67

• Merge pull request #32 from sharmine-s/bugfix-avatar

  Show description for c56f1d9
  sharmine-s

  authored
  c56f1d9

  Copy full SHA for c56f1d9

• Merge remote-tracking branch 'origin/main' into cy-testing

  camybish

  committed
  e111d9b

  Copy full SHA for e111d9b

• Adding extra files

  camybish

  committed
  439be49

  Copy full SHA for 439be49

• Figuring out how to mock an image upload

  camybish

  committed
  9f357d1

  Copy full SHA for 9f357d1

• comment testing

  hanguyen21

  committed
  694cc38

  Copy full SHA for 694cc38

• comments tested, uploads not

  camybish

  committed
  150762f

  Copy full SHA for 150762f