Code

Error messages#21

Code

Open

tauqeer92 wants to merge 126 commits intomakersacademy:mainmakersacademy/acebook-mern-template:mainfrom kateusacova:error_messageskateusacova/acebook-the-incredibles:error_messagesCopy head branch name to clipboard

+11,241-317

Commits

Commits on Oct 31, 2022

• Linked Trello Board in the Card Wall section

  kateusacova

  authored
  38a4c22

  Copy full SHA for 38a4c22

• sign up css file linking with react

  

  Lauren Brabbin

  committed
  51056fa

  Copy full SHA for 51056fa

• Login page css

  Ollie-HB

  committed
  3797f13

  Copy full SHA for 3797f13

• Signup form styled

  tauqeer92

  committed
  57ecdb9

  Copy full SHA for 57ecdb9

• deleting html file

  

  Lauren Brabbin

  committed
  0eb6647

  Copy full SHA for 0eb6647

• Basic CSS for post, feed and app

  kateusacova

  committed
  59ff09b

  Copy full SHA for 59ff09b

• Merge pull request #1 from kateusacova/css-feed-and-post

  Show description for 3681ed6
  kateusacova

  authored
  3681ed6

  Copy full SHA for 3681ed6

• Merge pull request #2 from kateusacova/Login-page-css

  Show description for 9b651d5
  kateusacova

  authored
  9b651d5

  Copy full SHA for 9b651d5

Commits on Nov 1, 2022

• deleting screen shot

  

  Lauren Brabbin

  committed
  e85b8e9

  Copy full SHA for e85b8e9

• Merge pull request #3 from kateusacova/signup-css

  Show description for 64c64e2
  kateusacova

  authored
  64c64e2

  Copy full SHA for 64c64e2

• renaming sumbit button back to submit for signup page

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  17f0389

  Copy full SHA for 17f0389

• adding sign up button

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  c2f7fd2

  Copy full SHA for c2f7fd2

• post schema

  paulinejdavis

  committed
  5e62c21

  Copy full SHA for 5e62c21

• Merge pull request #4 from kateusacova/post_schema

  Show description for 193dffa
  paulinejdavis

  authored
  193dffa

  Copy full SHA for 193dffa

• css aligned across login, signup, posts

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  258f061

  Copy full SHA for 258f061

• centering the pages

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  8f445e7

  Copy full SHA for 8f445e7

• moved body css to app.css

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  d2b2ebf

  Copy full SHA for d2b2ebf

• likes and comments schema skeleton created

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  7587eee

  Copy full SHA for 7587eee

• Merge pull request #5 from kateusacova/css-merge

  Show description for 304392e
  laurenbrabbin

  authored
  304392e

  Copy full SHA for 304392e

• Name field created on schema and form

  tauqeer92

  committed
  7798518

  Copy full SHA for 7798518

• post model

  Nameo91

  committed
  65d27f5

  Copy full SHA for 65d27f5

• Merge pull request #6 from kateusacova/post

  Show description for e0946af
  Nameo91

  authored
  e0946af

  Copy full SHA for e0946af

• Merge branch 'main' into signup_form_schema

  tauqeer92

  authored
  1260a4e

  Copy full SHA for 1260a4e

• Merge pull request #7 from kateusacova/signup_form_schema

  Show description for 718f104
  tauqeer92

  authored
  718f104

  Copy full SHA for 718f104

• Merge pull request #8 from kateusacova/likes-and-comments-schemas

  Show description for e4686a8
  laurenbrabbin

  authored
  e4686a8

  Copy full SHA for e4686a8

• name added to the form and schema

  tauqeer92

  committed
  203cd76

  Copy full SHA for 203cd76

• adding name to user

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  ecce733

  Copy full SHA for ecce733

• adding name to user

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  720360d

  Copy full SHA for 720360d

• adding name to user

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  f4ebdb6

  Copy full SHA for f4ebdb6

• Merge pull request #9 from kateusacova/user-name

  Show description for f697bed
  laurenbrabbin

  authored
  f697bed

  Copy full SHA for f697bed

Commits on Nov 2, 2022

• finally everything works

  tauqeer92

  committed
  4645a42

  Copy full SHA for 4645a42

• fixed signup

  tauqeer92

  committed
  2a1dda9

  Copy full SHA for 2a1dda9

• creating new branch

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  afab3b5

  Copy full SHA for afab3b5

• created the create post button

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  6941a6f

  Copy full SHA for 6941a6f

• created postForm page

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  d47065d

  Copy full SHA for d47065d

• create post box

  Nameo91

  committed
  6c35678

  Copy full SHA for 6c35678

• Merge pull request #10 from kateusacova/postfeed

  Show description for 04780a1
  Nameo91

  authored
  04780a1

  Copy full SHA for 04780a1

• Merge branch 'main' into post-interface

  laurenbrabbin

  authored
  5e5fec7

  Copy full SHA for 5e5fec7

• Merge pull request #11 from kateusacova/post-interface

  Show description for 9655ddb
  laurenbrabbin

  authored
  9655ddb

  Copy full SHA for 9655ddb

• removing duplicate handleNameChange in signup form

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  389b8e7

  Copy full SHA for 389b8e7

• updating feed.js frontend

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  fefc52b

  Copy full SHA for fefc52b

Commits on Nov 3, 2022

• create post frontend

  Nameo91

  committed
  616217e

  Copy full SHA for 616217e

• Merge pull request #12 from kateusacova/create_post_frontend

  Show description for d8d1aec
  Nameo91

  authored
  d8d1aec

  Copy full SHA for d8d1aec

• merging signup and login body into the same class

  

  Lauren Brabbin

  committed
  9990463

  Copy full SHA for 9990463

• sign up form test working

  paulinejdavis

  committed
  2e2cbf2

  Copy full SHA for 2e2cbf2

• login and sign up page consistent

  

  Lauren Brabbin

  committed
  f358c2f

  Copy full SHA for f358c2f

• Merge pull request #13 from kateusacova/signup_test

  Show description for b671163
  paulinejdavis

  authored
  b671163

  Copy full SHA for b671163

• splitting post webpage into 3 classes

  

  Lauren Brabbin

  committed
  83fa46f

  Copy full SHA for 83fa46f

• merging to main branch

  

  Lauren Brabbin

  committed
  9715b3d

  Copy full SHA for 9715b3d

• Merge pull request #14 from kateusacova/css-classes

  Show description for 61f8aa2
  laurenbrabbin

  authored
  61f8aa2

  Copy full SHA for 61f8aa2

• API tests pass except posts

  tauqeer92

  committed
  c10bb62

  Copy full SHA for c10bb62

• Merge pull request #15 from kateusacova/tests

  Show description for d25676b
  tauqeer92

  authored
  d25676b

  Copy full SHA for d25676b

• fetching api for post

  Nameo91

  committed
  3b5ea0c

  Copy full SHA for 3b5ea0c

• Merge branch 'main' into post_fectching_api

  Nameo91

  authored
  46df689

  Copy full SHA for 46df689

• Merge pull request #16 from kateusacova/post_fectching_api

  Show description for 31b28a1
  Nameo91

  authored
  31b28a1

  Copy full SHA for 31b28a1

• resolving merge conflicts in feed.js

  

  Lauren Brabbin

  committed
  0ef18ed

  Copy full SHA for 0ef18ed

• footer put into app.js

  

  Lauren Brabbin

  committed
  37149bb

  Copy full SHA for 37149bb

• post css looking better

  

  Lauren Brabbin

  committed
  c4d1b4e

  Copy full SHA for c4d1b4e

• password encryption

  paulinejdavis

  committed
  149cffb

  Copy full SHA for 149cffb

• nav bar framework set up

  

  Lauren Brabbin

  committed
  35f63d5

  Copy full SHA for 35f63d5

• nav bar framework set up

  

  Lauren Brabbin

  committed
  494c548

  Copy full SHA for 494c548

• print user name and image

  Nameo91

  committed
  2a3d9ac

  Copy full SHA for 2a3d9ac

Commits on Nov 4, 2022

• including post and user in likes and comment schema

  

  Lauren Brabbin

  committed
  5acc811

  Copy full SHA for 5acc811

• basic navbar set up

  

  Lauren Brabbin

  committed
  e3deefd

  Copy full SHA for e3deefd

• creating nav bar css folder

  

  Lauren Brabbin

  committed
  125e7fe

  Copy full SHA for 125e7fe

• creating navbar css file

  

  Lauren Brabbin

  committed
  9433c26

  Copy full SHA for 9433c26

• Merge branch 'main' into populate_user

  Nameo91

  authored
  da9bddf

  Copy full SHA for da9bddf

• Merge pull request #20 from kateusacova/populate_user

  Show description for 6ebee50
  Nameo91

  authored
  6ebee50

  Copy full SHA for 6ebee50

• Merge branch 'main' into css-nav

  laurenbrabbin

  authored
  1b7163a

  Copy full SHA for 1b7163a

• Merge pull request #21 from kateusacova/css-nav

  Show description for 75713ba
  laurenbrabbin

  authored
  75713ba

  Copy full SHA for 75713ba

• hassle

  paulinejdavis

  committed
  e582e3c

  Copy full SHA for e582e3c

• more hassle

  paulinejdavis

  committed
  3356924

  Copy full SHA for 3356924

• renaming navbar files

  

  Lauren Brabbin

  committed
  97569c7

  Copy full SHA for 97569c7

• Merge branch 'main' into bcrypt_pd

  kateusacova

  authored
  b2d980d

  Copy full SHA for b2d980d

• Merge pull request #24 from kateusacova/bcrypt_pd

  Show description for 02e4077
  kateusacova

  authored
  02e4077

  Copy full SHA for 02e4077

• bcrypt bug

  Nameo91

  committed
  76af487

  Copy full SHA for 76af487

• Merge pull request #25 from kateusacova/bcrypt_problem

  Show description for 89c00fe
  Nameo91

  authored
  89c00fe

  Copy full SHA for 89c00fe

• Latest main branch - all working

  kateusacova

  committed
  6446a1b

  Copy full SHA for 6446a1b

• Likes added to Post model, basic model test passing

  Ollie-HB

  committed
  676910a

  Copy full SHA for 676910a

• debug log in encryption

  Nameo91

  committed
  e91bd8c

  Copy full SHA for e91bd8c

• Merge pull request #26 from kateusacova/log_in_encryption

  Show description for 3369520
  Nameo91

  authored
  3369520

  Copy full SHA for 3369520

Commits on Nov 5, 2022

• Partly completed css for posts and comments

  kateusacova

  committed
  57022b2

  Copy full SHA for 57022b2

• Merge pull request #27 from kateusacova/comments-css

  Show description for ebf350a
  kateusacova

  authored
  ebf350a

  Copy full SHA for ebf350a

• Merge branch 'main' into likes

  kateusacova

  authored
  80817a4

  Copy full SHA for 80817a4

• Merge pull request #28 from kateusacova/likes

  Show description for 6584645
  kateusacova

  authored
  6584645

  Copy full SHA for 6584645

Commits on Nov 6, 2022

• comments show on console

  tauqeer92

  committed
  72435a1

  Copy full SHA for 72435a1

Commits on Nov 7, 2022

• adding like count from database into post.js

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  1126d37

  Copy full SHA for 1126d37

• updating css so create a post element does not overlap with posts

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  dd59614

  Copy full SHA for dd59614

• recentering login and signup box

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  13c6809

  Copy full SHA for 13c6809

• CSS and encryption fix

  kateusacova

  committed
  c6d1d22

  Copy full SHA for c6d1d22

• CSS and encryption fix

  kateusacova

  committed
  c983b5d

  Copy full SHA for c983b5d

• Merge branch 'main' into css-rework

  kateusacova

  authored
  5b9da6b

  Copy full SHA for 5b9da6b

• Merge pull request #29 from kateusacova/css-rework

  Show description for 1634b47
  kateusacova

  authored
  1634b47

  Copy full SHA for 1634b47

• shaded heart comment

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  8b5fedf

  Copy full SHA for 8b5fedf

• Merge branch 'main' into comments

  kateusacova

  authored
  1f35fdc

  Copy full SHA for 1f35fdc

• Merge pull request #30 from kateusacova/comments

  Show description for d749155
  kateusacova

  authored
  d749155

  Copy full SHA for d749155

• id adding to like count in console but not database

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  d018ea1

  Copy full SHA for d018ea1

• displaying comments in progress

  Nameo91

  committed
  e09c6ae

  Copy full SHA for e09c6ae

• Merge pull request #31 from kateusacova/display_comments

  Show description for c993def
  Nameo91

  authored
  c993def

  Copy full SHA for c993def

• commiting end of day work

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  a5270b7

  Copy full SHA for a5270b7

• deleting likes model

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  ddf2114

  Copy full SHA for ddf2114

• adding upload image on sign up form

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  5a9e9f4

  Copy full SHA for 5a9e9f4

• posting image in progress

  Nameo91

  committed
  ba8d4bc

  Copy full SHA for ba8d4bc

• renaming as img

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  29f4109

  Copy full SHA for 29f4109

• Merge pull request #32 from kateusacova/signup-image

  Show description for 925bab9
  laurenbrabbin

  authored
  925bab9

  Copy full SHA for 925bab9

• Merge pull request #33 from kateusacova/post_image

  Show description for f7e5c57
  Nameo91

  authored
  f7e5c57

  Copy full SHA for f7e5c57

Commits on Nov 8, 2022

• Fixes done

  kateusacova

  committed
  f589d7a

  Copy full SHA for f589d7a

• Merge pull request #34 from kateusacova/image-buttons-and-post-message-fix

  Show description for 949d143
  kateusacova

  authored
  949d143

  Copy full SHA for 949d143

• likes now adding to database

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  315ff27

  Copy full SHA for 315ff27

• likes count increasing with every like without refreshing page

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  714f4e0

  Copy full SHA for 714f4e0

• importing both shaded and regular heart

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  023b722

  Copy full SHA for 023b722

• shaded button implemented but not fully working

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  e1f06ab

  Copy full SHA for e1f06ab

• All working

  kateusacova

  committed
  9324bd4

  Copy full SHA for 9324bd4

• upload image

  Nameo91

  committed
  37a6f78

  Copy full SHA for 37a6f78

Commits on Nov 9, 2022

• shaded heart working

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  8f6c184

  Copy full SHA for 8f6c184

• Merge pull request #35 from kateusacova/comments-and-session-info

  Show description for f59c8e7
  kateusacova

  authored
  f59c8e7

  Copy full SHA for f59c8e7

• Merge branch 'main' into likes

  kateusacova

  authored
  4e8f357

  Copy full SHA for 4e8f357

• Merge pull request #36 from kateusacova/likes

  Show description for e66317f
  kateusacova

  authored
  e66317f

  Copy full SHA for e66317f

• Merge branch 'main' into upload_image

  kateusacova

  authored
  10d390c

  Copy full SHA for 10d390c

• Merge pull request #37 from kateusacova/upload_image

  Show description for 4b86b03
  kateusacova

  authored
  4b86b03

  Copy full SHA for 4b86b03

• Session info imported into Post

  kateusacova

  committed
  c70db97

  Copy full SHA for c70db97

• Sign up error fixed and sessions added

  kateusacova

  committed
  8217923

  Copy full SHA for 8217923

• user can only like once

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  15eee0e

  Copy full SHA for 15eee0e

• unliking works

  

  Lauren Brabbin

  authored and

  Lauren Brabbin

  committed
  3af3bfc

  Copy full SHA for 3af3bfc

• Merge pull request #38 from kateusacova/unliking

  Show description for d92d32a
  laurenbrabbin

  authored
  d92d32a

  Copy full SHA for d92d32a

• Error messages completed

  tauqeer92

  committed
  57c29a7

  Copy full SHA for 57c29a7