Code

Css changes1-signup and login changes#69

Code

Open

JamesJPaterson wants to merge 129 commits intomakersacademy:mainmakersacademy/acebook-mern-template:mainfrom abodian:css-changes1abodian/acebook-team-water:css-changes1Copy head branch name to clipboard

+9,482-1,979

Commits

Commits on Feb 8, 2023

• input placeholders added, non functional

  abodian

  committed
  3c5d5b4

• added post button

  MartaBia

  committed
  77db070

• added post text box

  MartaBia

  committed
  bef723d

• removed comments before pull request

  MartaBia

  committed
  e8a68c5

• token generator tests failing

  abodian

  committed
  e266e84

• first and last name added and tests passing

  abodian

  committed
  0893c2e

• added defaultValue to allow typing on text box

  MartaBia

  committed
  047cea6

• navbar ltd functionality

  UserChi

  committed
  47e5850

• Merge pull request #1 from abodian/03/user-can-post

  Show description for 732a0ba
  MartaBia

  authored
  732a0ba

• error message shows when login credentials incorrect

  abodian

  committed
  f525c03

• made the navbar folder clearer

  UserChi

  committed
  6521097

Commits on Feb 9, 2023

• Merge pull request #3 from abodian/05/login-page

  Show description for 6964ada
  UserChi

  authored
  6964ada

• merge resolution

  sirdavy

  committed
  f1b6306

• Merge pull request #2 from abodian/01/sign-up-page

  Show description for fdd46d1
  sirdavy

  authored
  fdd46d1

• Merge branch 'main' into 02/navbar-non_functuality

  sirdavy

  authored
  18714ea

• Merge pull request #4 from abodian/02/navbar-non_functuality

  Show description for 0f232fe
  sirdavy

  authored
  0f232fe

• small conflict on sign up page resolved

  sirdavy

  committed
  520cd80

• Merge pull request #5 from abodian/navbar2

  Show description for 470d096
  MartaBia

  authored
  470d096

• added function to post text box/button and added nav bar

  sirdavy

  committed
  fcae856

• Merge pull request #6 from abodian/4-add-functionality-to-post

  Show description for c85e93c
  sirdavy

  authored
  c85e93c

• login page fixed

  IAmNotAbbas

  committed
  e889d71

• Testing for posting

  sirdavy

  committed
  9dea689

• Merge pull request #7 from abodian/fix_login

  Show description for 1d0a3d1
  sirdavy

  authored
  1d0a3d1

• Update making_a_post.cy.js

  MartaBia

  authored
  1393486

• Merge pull request #8 from abodian/testingposting

  Show description for 44aa864
  MartaBia

  authored
  44aa864

• one extra test line

  sirdavy

  committed
  d5d067d

• Merge pull request #9 from abodian/testingposting2

  Show description for 2e6d054
  UserChi

  authored
  2e6d054

• cypress making post e2e test passes

  abodian

  committed
  2c837d8

• non functional like and comment button added, timeline sits in center with bordered posts

  abodian

  committed
  2de535c

• added text wrap to .postContent and improved overall look

  abodian

  committed
  da1c320

Commits on Feb 10, 2023

• Merge pull request #10 from abodian/fix-failing-cypress-post-tests

  Show description for e58a989
  JamesJPaterson

  authored
  e58a989

• Merge pull request #11 from abodian/07/reformat-feed

  Show description for 4979655
  sirdavy

  authored
  4979655

• username stored in database but only after manual input, shows on post

  abodian

  committed
  5b2a25a

• user email stored in localStorage

  abodian

  committed
  7307cf2

• get route added to users route file

  abodian

  committed
  42651bf

• user controller find method created and tested

  abodian

  committed
  b765c54

• user first and last name now accessible in local storage

  abodian

  committed
  ef2a6d5

• user name is stored in the post document when submitted

  abodian

  committed
  285a5e4

Commits on Feb 13, 2023

• username shows on posts

  abodian

  committed
  131ce40

• ready for review

  abodian

  committed
  5825156

• Merge branch 'main' into 06/add-username-jwt-method

  abodian

  authored
  5ebfab5

• Merge pull request #12 from abodian/06/add-username-jwt-method

  Show description for 64491b3
  abodian

  authored
  64491b3

• minor changes

  abodian

  committed
  44c6fc6

• Added logic and route to delete a post

  

  MartaBia

  authored and

  abodian

  committed
  0cc1e32

• updated route

  

  MartaBia

  authored and

  abodian

  committed
  0b7d7e3

• added delete button with functionality

  

  MartaBia

  authored and

  abodian

  committed
  30b880e

• refactored

  

  MartaBia

  authored and

  abodian

  committed
  b625b7f

• Added cypress test

  

  MartaBia

  authored and

  abodian

  committed
  8afd8ef

• post rebase commit

  abodian

  committed
  8efdd22

• added comment to schema

  abodian

  committed
  65903b9

• merged with previous code

  MartaBia

  committed
  d24b37a

• articles removed from post model

  abodian

  committed
  00b4972

• Merge pull request #13 from abodian/06/delete-posts-rebased

  Show description for 7996dd8
  MartaBia

  authored
  7996dd8

• comment field and button added, css amended

  abodian

  committed
  58781e2

• Merge branch 'main' into 09-comment-on-posts

  abodian

  committed
  a471257

• moved post functionality to post model

  abodian

  committed
  95650f4

• likes button added and post appearance altered

  sirdavy

  committed
  40a0dda

• Added controller and route for comment

  MartaBia

  committed
  54890ab

• backend functionality is working

  abodian

  committed
  01b92f6

• both pots unit test passing but e2e delete failing

  sirdavy

  committed
  b3a675e

• minor tweaks

  sirdavy

  committed
  d16a914

Commits on Feb 14, 2023

• Added timestamps

  IAmNotAbbas

  committed
  1bbffcf

• Update deleting_a_post.cy.js

  JamesJPaterson

  authored
  698db1f

• added files to gitignore

  sirdavy

  committed
  a715877

• Merge pull request #15 from abodian/timestamp

  Show description for e9412fd
  JamesJPaterson

  authored
  e9412fd

• got rid of screenshots

  JamesJPaterson

  committed
  3f94b3b

• .DS_Store banished!

  sirdavy

  committed
  163a98b

• Merge pull request #16 from abodian/rmvscreenshot

  Show description for 012eb76
  JamesJPaterson

  authored
  012eb76

• screenshots folder removed

  sirdavy

  committed
  e6e6384

• all functionality in place

  abodian

  committed
  fa27b41

• Merge branch 'main' into 06/likes-button-330pm

  MartaBia

  authored
  3fa3197

• Merge pull request #14 from abodian/06/likes-button-330pm

  Show description for 8bd7a77
  sirdavy

  authored
  8bd7a77

• amended post content box by changing from input to textarea

  abodian

  committed
  26ea6c4

• Revert "06/likes button 330pm"

  abodian

  authored
  022e87f

• Revert "Added timestamps"

  abodian

  authored
  e0f9bd3

• Revert "got rid of screenshots"

  abodian

  authored
  5411d82

• Merge pull request #19 from abodian/revert-16-rmvscreenshot

  Show description for fd9c309
  abodian

  authored
  fd9c309

• Merge pull request #18 from abodian/revert-15-timestamp

  Show description for 7025f06
  abodian

  authored
  7025f06

• Merge pull request #17 from abodian/revert-14-06/likes-button-330pm

  Show description for 381750f
  abodian

  authored
  381750f

• minor changes

  abodian

  committed
  da7eab2

• removed cypress file

  abodian

  committed
  42cbbe9

• Merge pull request #20 from abodian/09-comment-on-posts

  Show description for c24aae1
  abodian

  authored
  c24aae1

• timestamp added to posts

  abodian

  committed
  c59807b

• Merge pull request #21 from abodian/add-timestamp

  Show description for c38b700
  abodian

  authored
  c38b700

• like button added (non functional, shows as counter)

  abodian

  committed
  f369748

• minor change to text area

  abodian

  committed
  af6765b

• input text align moved to left

  abodian

  committed
  b3401a6

• front end cypress unit tests added to and passing

  abodian

  committed
  b2787bc

• making a post e2e cypress test fixed

  abodian

  committed
  554c688

• delete post e2e cypress test passing

  abodian

  committed
  c73e488

• can save a post api jest test passing

  abodian

  committed
  cc86b56

• added logo and title to client tab header

  abodian

  committed
  afc59cd

• minor changes to navbar

  abodian

  committed
  78723f6

• minor changes

  abodian

  committed
  c0fe970

• posts show in desc chronological order

  abodian

  committed
  afcf75b

Commits on Feb 15, 2023

• Merge pull request #22 from abodian/11/desc-chrono-order

  Show description for 652c9f4
  abodian

  authored
  652c9f4

• build script added

  abodian

  committed
  78f2f54

• minor change

  abodian

  committed
  5ac168d

• branch setup

  abodian

  committed
  154908e

• cloudinary setup in server file app.js

  abodian

  committed
  a78f570

• multer middleware added to app.js

  abodian

  committed
  70950a4

• like button working but needs tweaks

  sirdavy

  committed
  c5cff6b

• likes now storing user id in array

  sirdavy

  committed
  322d657

• minor changes

  sirdavy

  committed
  c780594

• eslintignore

  abodian

  committed
  4024643

• likes and unlikes buttons added

  sirdavy

  committed
  0a83c56

• able to upload an image to cloudinary using postman from the backend

  abodian

  committed
  c45fbb9

• Merge pull request #23 from abodian/likes-sorted

  Show description for c05197b
  sirdavy

  authored
  c05197b

• fix daves prolapse

  abodian

  committed
  ba3cc80

• fixed issues with changing branch

  abodian

  committed
  6c41863

• can submit an image to cloudinary from frontend

  abodian

  committed
  710d4dc

• allpassing but deleting a post needs a line to clear db

  sirdavy

  committed
  c2a5d4b

• images show on front page as posts

  abodian

  committed
  aebd3ca

• pre pull request

  abodian

  committed
  bd94705

• profile page frontend basic

  abodian

  committed
  13e4c5a

• can edit your bio

  abodian

  committed
  a92adcd

• profile button added to navbar

  abodian

  committed
  8c6dcb1

• default no bio message shows before user writes a bio

  abodian

  committed
  1ba5551

Commits on Feb 16, 2023

• Merge pull request #24 from abodian/liking-button-tests-5pm

  Show description for 606e087
  sirdavy

  authored
  606e087

• Merge pull request #26 from abodian/15/profile-page

  Show description for 0d4ddd3
  abodian

  authored
  0d4ddd3

• api as env variables, dotenv-safe implemented

  abodian

  committed
  3e37a68

• Merge branch 'main' into 12/user-can-upload-photos-as-posts

  abodian

  committed
  ac21e91

• conflicts resolved

  abodian

  committed
  18bd539

• Merge pull request #25 from abodian/12/user-can-upload-photos-as-posts

  Show description for 261d0e5
  abodian

  authored
  261d0e5

• removed api key files

  abodian

  committed
  5449a49

• css for login and signup pages plus background for posts page

  UserChi

  committed
  af3b635

• css change

  UserChi

  committed
  8af3e83

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

  Show description for 99dcb5e
  UserChi

  committed
  99dcb5e

• css changes to login and signup pages

  UserChi

  committed
  91412bd