Code

Forgotten password page created#92

Code

Open

MaxAllan-Smith wants to merge 65 commits intomakersacademy:mainmakersacademy/acebook-mern-template:mainfrom edwardfgt:Forgotten-Password-Pageedwardfgt/acebook:Forgotten-Password-PageCopy head branch name to clipboard

+4,947-274

Commits

Commits on Mar 7, 2023

• create homepage route and basic navbar

  edwardfgt

  committed
  e2a4d61

• add logic for navbar updating when user signsout

  edwardfgt

  committed
  80ed053

• Created CreatePost.js

  forreya

  committed
  456eaef

• add logic for signin, move setToken method and logout method to app.js

  edwardfgt

  committed
  3c6d319

• remove redundant home button

  edwardfgt

  committed
  bb20c6c

• create e2e tests for navbar

  edwardfgt

  committed
  c22269b

• Merge pull request #1 from edwardfgt/create-post

  Show description for 77adfaa
  edwardfgt

  authored
  77adfaa

• update test naming

  edwardfgt

  committed
  7c8a17c

• merge new code into navbar branch

  edwardfgt

  committed
  7bac5f6

Commits on Mar 8, 2023

• revert to c22269b to continue working without errors

  edwardfgt

  committed
  8f9e754

• add comments on reasoning for navbar logic

  edwardfgt

  committed
  b68065a

• update UserSchema to include firstName & lastName

  edwardfgt

  committed
  ff88ac6

• update signup form and post request to include new user information

  edwardfgt

  committed
  e4d8c77

• update all API tests to include new signup fields

  edwardfgt

  committed
  eb97fa2

• update frontend signup tests to include new fields

  edwardfgt

  committed
  04e49ff

• add bootstrap stling to login and signup page

  edwardfgt

  committed
  e162453

• add error message for incorrect login details

  edwardfgt

  committed
  1cafc5d

• Fixed minor bug

  forreya

  committed
  254f66d

• Merge pull request #2 from edwardfgt/create-post

  Show description for 84a0086
  edwardfgt

  authored
  84a0086

• test storing email in localstorage

  edwardfgt

  committed
  96e4321

• merged from main

  edwardfgt

  committed
  0da6b81

• add createPost and feed components onto the homepage

  edwardfgt

  committed
  907e5f1

Commits on Mar 9, 2023

• fix CreatePost.js

  edwardfgt

  committed
  07ec948

• feed auto refereshes when new post is made

  edwardfgt

  committed
  5188935

• start creating tests for createPost.js but commented out for the time being

  edwardfgt

  committed
  dee5ead

• Merge pull request #3 from edwardfgt/navbar

  Show description for e979744
  edwardfgt

  authored
  e979744

• merge fix with main

  edwardfgt

  committed
  511dcaf

• Merge pull request #4 from edwardfgt/createPostFix

  Show description for 3bc86d0
  edwardfgt

  authored
  3bc86d0

• Branch Update

  MaxAllan-Smith

  committed
  1f3cbf3

• ?

  MaxAllan-Smith

  committed
  89ef879

• Update

  MaxAllan-Smith

  committed
  cfa740a

• Updated the nav bar with some design and functionality. Logout handle needs to be fixed

  MaxAllan-Smith

  committed
  3669d32

• Updated index.js to run bootsrap

  MaxAllan-Smith

  committed
  c9ec8f8

• Merge branch 'Basic-Design' into Basic-Posts-Design

  MaxAllan-Smith

  committed
  7fed13b

• Updated index.js, removed import for bootstrap

  MaxAllan-Smith

  committed
  cea6ffe

• Completed the final BASIC design for feed page.

  MaxAllan-Smith

  committed
  97a1074

• Merge pull request #5 from edwardfgt/Basic-Design

  Show description for 3323aa7
  edwardfgt

  authored
  3323aa7

• Merge pull request #6 from edwardfgt/Basic-Posts-Design

  Show description for b4276bf
  edwardfgt

  authored
  b4276bf

• Fixed refresh bug, added UserContext, system now stores user info in localstorage after login, posts model now includes time created and time updated

  forreya

  committed
  31c0159

• Merge branch 'main' into add-features

  forreya

  authored
  44fdc1e

Commits on Mar 10, 2023

• Merge pull request #7 from edwardfgt/add-features

  Show description for 57d43dd
  edwardfgt

  authored
  57d43dd

• Added some basic CSS for the homepage. Functionality still needs to be implemeneted.

  MaxAllan-Smith

  committed
  e72fdfe

Commits on Mar 11, 2023

• fix token.spec.js broken test

  edwardfgt

  committed
  3c6c1ea

• fix current frontend e2e tests

  edwardfgt

  committed
  e658192

• create e2e test for creating a new post (with refresh) and add extra test cases to loginForm

  edwardfgt

  committed
  e93c79a

• add date & time to posts and update post.cy.js component test

  edwardfgt

  committed
  b953786

• update e2e tests with extra condition

  edwardfgt

  committed
  4e0d03a

• update post schema, post controller and post component so poster first name populates and posts return in the correct order

  edwardfgt

  committed
  cb2bd06

Commits on Mar 12, 2023

• create model, crontroller and route for liking a post

  edwardfgt

  committed
  b04b82f

• implement like button and handleLike method to Post.js component

  edwardfgt

  committed
  852aba8

• display number of likes by each post, add logic to display unlike button if post is already liked

  edwardfgt

  committed
  fdd2289

• create unlike controller and handleUnlike method

  edwardfgt

  committed
  2a5128f

• update controllers to stop user liking or unliking more than once

  edwardfgt

  committed
  c21018c

• posts auto update when liked or unliked

  edwardfgt

  committed
  07ca613

• fix bug on homepage

  edwardfgt

  committed
  9ab138f

• Merge pull request #8 from edwardfgt/Design-Homepage

  Show description for 0a577b1
  edwardfgt

  authored
  0a577b1

• merge Max css with weekendChanges

  edwardfgt

  committed
  1df746c

• fix class naming issue

  edwardfgt

  committed
  b3d2722

Commits on Mar 13, 2023

• Merge pull request #9 from edwardfgt/weekendChanges

  Show description for 36abc91
  edwardfgt

  authored
  36abc91

• Implemeneted basi CSS design to the login form

  MaxAllan-Smith

  committed
  47dbcac

• Added a flashing message to the screen when log in details are enetered incorrectly

  MaxAllan-Smith

  committed
  bd8bc49

• Added video to homepage. Design

  MaxAllan-Smith

  committed
  1c73dd0

• Added a forgotten-password page

  MaxAllan-Smith

  committed
  909dd02

• Updated branch

  MaxAllan-Smith

  committed
  d2c4f8c

• Created Forgotten Password page. Not functional.

  MaxAllan-Smith

  committed
  41b8d14