Code

Css time line#516

Code

Open

AlexBuzea wants to merge 168 commits intomakersacademy:mainmakersacademy/acebook-node-template:mainfrom MMal87:cssTimeLineMMal87/acebook-neutral:cssTimeLineCopy head branch name to clipboard

+8,217-1,104

Commits

Commits on Jun 12, 2023

• Adding test docs folder and docs

  Swright88

  committed
  6a83034

Commits on Jun 13, 2023

• Reversed posts

  Swright88

  committed
  695b1a7

• Install dotenv

  cutetofuu

  committed
  3cb3a40

• Set up production environment

  cutetofuu

  committed
  cdc17ed

• Add first and last names

  cutetofuu

  committed
  57982b6

• Merge branch 'main' into mongodb-setup

  cutetofuu

  committed
  bb69b3d

• Merge pull request #1 from MMal87/mongodb-setup

  Show description for 322ac35
  cutetofuu

  authored
  322ac35

• changes

  Chrishall17

  committed
  cbc2ab1

• working on posts and comments

  MMal87

  committed
  05da992

Commits on Jun 14, 2023

• working on comments

  MMal87

  committed
  f609f27

• changes

  Chrishall17

  committed
  be596ed

• add seed data to development, create profile page/routes

  

  Alex Buzea

  committed
  783fd87

• Add login and signup links

  cutetofuu

  committed
  376c233

• Install bcrypt

  cutetofuu

  committed
  54aec43

• Add password hashing feature

  cutetofuu

  committed
  a991cef

• comments working

  MMal87

  committed
  eba3db6

• draft posts tests

  Swright88

  committed
  f17c9fa

• implement list of friends and non-friends on profile page first draft

  

  Alex Buzea

  committed
  87d82d0

• ability to add and remove friends from database and show on html page

  

  Alex Buzea

  committed
  ed399e3

• Update seed data

  cutetofuu

  committed
  9a21f63

• like button work

  MMal87

  committed
  2614eab

• "css and password validation"

  Chrishall17

  committed
  9c6eee2

Commits on Jun 15, 2023

• Merge branch 'tester-ch' into main

  Chrishall17

  authored
  983e89d

• Merge pull request #2 from MMal87/main

  Show description for 2bd6624
  Chrishall17

  authored
  2bd6624

• ready to merge

  Chrishall17

  committed
  23a92b1

• Merge pull request #3 from MMal87/tester-ch

  Show description for 1274bb9
  Chrishall17

  authored
  1274bb9

• Created a couple of tests, added input on show.hbs

  PHagan23

  committed
  8eaafd9

• "changes"

  Chrishall17

  committed
  11cd474

• when user submits add friend it goes into friend requests section for the user requested for, updates the database. Once accepted the request database update to add users in each others friends fie…

  Show description for da65184
  

  Alex Buzea

  committed
  da65184

• changes to likes

  MMal87

  committed
  7e92548

• likes

  MMal87

  committed
  b8e3bc9

• "changes"

  Chrishall17

  committed
  916111c

• Merge pull request #4 from MMal87/tester-ch

  Show description for f7eea29
  Chrishall17

  authored
  f7eea29

• added tests

  PHagan23

  committed
  70ffa0d

• changes

  Chrishall17

  committed
  d91efa1

• Add login and signup error messages

  cutetofuu

  committed
  8b24f6b

• Merge pull request #5 from MMal87/tester-ch

  Show description for 4e85664
  Chrishall17

  authored
  4e85664

• Merge branch 'main' into signup-validation

  cutetofuu

  committed
  665f935

• likes and comments

  MMal87

  committed
  0b82e3e

• likes

  MMal87

  committed
  a4c7568

• edited likebutton name

  MMal87

  committed
  9d8f035

• likebutton

  MMal87

  committed
  5c05679

• fix bug and page now updates after accepting friend request to reflect the data in the database

  

  Alex Buzea

  committed
  e6ef101

• Update stylesheet links

  cutetofuu

  committed
  9e68988

• Update error message

  cutetofuu

  committed
  0b61a7b

• likes on index page

  MMal87

  committed
  61fa331

• Merge branch 'main' into tuesday

  ClaudiaGC1339

  authored
  fa1ede2

• Merge pull request #7 from MMal87/tuesday

  Show description for 9704f5c
  ClaudiaGC1339

  authored
  9704f5c

• Add form validation with regex

  cutetofuu

  committed
  65e0f4a

• Merge branch 'main' to signup-validation

  cutetofuu

  committed
  07a1111

• fixed some styling issues

  

  Alex Buzea

  committed
  22d62f9

• Merge branch 'main' into mongoose

  AlexBuzea

  authored
  9ba2005

• Merge pull request #8 from MMal87/mongoose

  Show description for 74f0516
  AlexBuzea

  authored
  74f0516

• Update routes

  cutetofuu

  committed
  2b25996

• Merge branch 'main' into signup-validation

  cutetofuu

  committed
  dc750fe

• Merge pull request #6 from MMal87/signup-validation

  Show description for 78803e8
  cutetofuu

  authored
  78803e8

Commits on Jun 16, 2023

• Update seed data with hashed passwords

  cutetofuu

  committed
  7ed740e

• Merge pull request #9 from MMal87/update-seed-data

  Show description for e24fa8b
  cutetofuu

  authored
  e24fa8b

• Add user to seed data

  cutetofuu

  committed
  ebb2155

• Merge branch 'main' of https://github.com/MMal87/acebook-neutral into update-seed-data

  cutetofuu

  committed
  892919c

• Merge pull request #10 from MMal87/update-seed-data

  Show description for 037b447
  cutetofuu

  authored
  037b447

• fix remove friend

  Show description for d75a31f
  

  Alex Buzea

  committed
  d75a31f

• added authors

  MMal87

  committed
  921eda1

• added names and timestamps to posts and comments

  MMal87

  committed
  cd026f1

• fix bug where use

  Show description for 8c968a1
  

  Alex Buzea

  committed
  8c968a1

• multer install

  MMal87

  committed
  d232189

• add sentFriendRequests field to user model in order to evaluate whethere a request was sent to that user already and if it was to not allow to Add Friend again, not fully implemented yet

  

  Alex Buzea

  committed
  e142210

• "Added more tests"

  Swright88

  committed
  a8b9a09

• Merge pull request #11 from MMal87/mongoose2

  Show description for 3a91d80
  AlexBuzea

  authored
  3a91d80

• fixed commit

  Swright88

  committed
  723330b

• working on uploading images

  MMal87

  committed
  adb630e

• Merge pull request #12 from MMal87/authorsOnPosts

  Show description for e689155
  AlexBuzea

  authored
  e689155

Commits on Jun 19, 2023

• added integration tests, started structing test folders, added test notes for tickets to raise

  PHagan23

  committed
  a2f7395

• added tests

  PHagan23

  committed
  0875f74

• data adding datato mongodb and uploading jpeg

  MMal87

  committed
  54ff535

• most recent version

  

  Alex Buzea

  committed
  b61a846

• updated version

  

  Alex Buzea

  committed
  8ebfc58

• images

  MMal87

  committed
  b7372c4

• Update user seed data

  cutetofuu

  committed
  58166c2

• Add logic to show friends posts

  cutetofuu

  committed
  2dee8e6

• fix bug with Add Friend button, friend request persists now

  

  Alex Buzea

  committed
  b4132db

• Remove comments

  cutetofuu

  committed
  0457ac7

• tidied up code

  

  Alex Buzea

  committed
  e226a92

• fixed issue with remove friend button so that it reflects the current friends

  

  Alex Buzea

  committed
  563fabc

• fixed bug where when adding a friend and removing another one, it was resetting the add friend and could send request again when shouldn't

  

  Alex Buzea

  committed
  18a3596

• added tests

  PHagan23

  committed
  823515e

• Merge pull request #13 from MMal87/mongoose3

  Show description for cb83026
  AlexBuzea

  authored
  cb83026

• Merge branch 'main' of https://github.com/MMal87/acebook-neutral into only-show-friends-posts

  cutetofuu

  committed
  5c82b33

• Update user seed data

  cutetofuu

  committed
  96f7aef

• Merge pull request #14 from MMal87/only-show-friends-posts

  Show description for e9257d3
  cutetofuu

  authored
  e9257d3

• Merge pull request #15 from MMal87/phagan_testing

  Show description for d28ae15
  PHagan23

  authored
  d28ae15

• Added more unit tests

  Swright88

  committed
  7f4685e

• Merge branch 'main' into uploadingImagesAsPosts

  cutetofuu

  committed
  69f406a

Commits on Jun 20, 2023

• styling

  Chrishall17

  committed
  719e162

• Add display image functionality

  cutetofuu

  committed
  666f006

• Merge branch 'main' of https://github.com/MMal87/acebook-neutral into uploadingImagesAsPostsV2

  cutetofuu

  committed
  c2ebef2

• Remove comments and console.logs

  cutetofuu

  committed
  efb637d

• style login page

  

  Alex Buzea

  committed
  48eddbe

• changes

  Chrishall17

  committed
  a68327c

• tests

  Chrishall17

  committed
  e43678f

• changes

  Chrishall17

  committed
  9031305

• tests

  Chrishall17

  committed
  2e88f39

• 10am Tue 20 June

  

  SirDougy

  authored and

  Chrishall17

  committed
  505f559

• .

  

  SirDougy

  authored and

  Chrishall17

  committed
  cfa82e9

• add sentFriendRequests field to user model in order to evaluate whethere a request was sent to that user already and if it was to not allow to Add Friend again, not fully implemented yet

  

  Alex Buzea

  authored and

  Chrishall17

  committed
  82353e5

• updates

  Chrishall17

  committed
  8d9757b

• updates

  Chrishall17

  committed
  cdcfb23

• updates

  Chrishall17

  committed
  ac2df52

• updates

  Chrishall17

  committed
  4dc6db5

• updates

  Chrishall17

  committed
  fe1152b

• added tests

  

  PHagan23

  authored and

  Chrishall17

  committed
  e2ffb61

• added tests

  

  PHagan23

  authored and

  Chrishall17

  committed
  431d34b

• changes

  Chrishall17

  committed
  b54be41

• add sentFriendRequests field to user model in order to evaluate whethere a request was sent to that user already and if it was to not allow to Add Friend again, not fully implemented yet

  

  Alex Buzea

  authored and

  Chrishall17

  committed
  e78fe3e

• added authors

  

  MMal87

  authored and

  Chrishall17

  committed
  057eedc

• Update user seed data

  

  cutetofuu

  authored and

  Chrishall17

  committed
  66ef01a

• added tests

  

  PHagan23

  authored and

  Chrishall17

  committed
  681aff7

• added tests

  

  PHagan23

  authored and

  Chrishall17

  committed
  22d0399

• updates

  Chrishall17

  committed
  0b5c552

• fixed post text link

  Swright88

  committed
  b17b68f

• style signup page

  

  Alex Buzea

  committed
  0b6babc

• updates

  Chrishall17

  committed
  f5d203a

• Merge branch 'main' into uploadingImagesAsPostsV2

  cutetofuu

  committed
  b15b9de

• Merge branch 'uploadingImagesAsPostsV2' of https://github.com/MMal87/acebook-neutral into uploadingImagesAsPostsV3

  cutetofuu

  committed
  afe651a

• Fix single post page

  cutetofuu

  committed
  a7d9219

• Merge pull request #18 from MMal87/uploadingImagesAsPostsV3

  Show description for d804c97
  cutetofuu

  authored
  d804c97

• style homepage

  

  Alex Buzea

  committed
  2159c8a

• tried adding pic upload to profile page

  MMal87

  committed
  8bd7036

• going to database but not displaying on page

  MMal87

  committed
  b1c553c

• added error message when trying to create an empty post

  MMal87

  committed
  a733fba

Commits on Jun 21, 2023

• New style

  

  Alex Buzea

  committed
  24ad391

• new style

  

  Alex Buzea

  committed
  4f5cf6b

• fixed profile page issue

  

  Alex Buzea

  committed
  a668440

• Merge pull request #20 from MMal87/new_style

  Show description for 5581371
  AlexBuzea

  authored
  5581371

• Merge branch 'tester-ch-2' of https://github.com/MMal87/acebook-neutral into tester-ch-2

  SirDougy

  committed
  880d7a9

• test headings

  Chrishall17

  committed
  87bf3ee

• merging with uploadprofile photo branch

  MMal87

  committed
  2d3787b

• fixed reject friend request button

  

  Alex Buzea

  committed
  c125898

• Merge pull request #21 from MMal87/profile_reject

  Show description for 63beddc
  AlexBuzea

  authored
  63beddc

• changes

  Chrishall17

  committed
  5ad9cdd

• name test

  Chrishall17

  committed
  32b19a7

• working on profilepictures

  MMal87

  committed
  cc82bd2

• fixed issue with posts upload

  MMal87

  committed
  7e1ffc1

• changes to emptypostvalidation

  MMal87

  committed
  ccbfc3f

• Merge pull request #22 from MMal87/emptyPostError

  Show description for b88f5f4
  MMal87

  authored
  b88f5f4

• Add initial photo upload logic

  cutetofuu

  committed
  5fd32e6

• Merge pull request #23 from MMal87/tester-ch-2

  Show description for 3a172ba
  SirDougy

  authored
  3a172ba

• Add more photo upload logic

  cutetofuu

  committed
  7171200

• Updating tests

  Swright88

  committed
  c51d7d5

• styling for profile

  

  Alex Buzea

  committed
  8a97f1f

• Add profile photo uploader

  cutetofuu

  committed
  862be3e

• ..

  SirDougy

  committed
  6735f97

• Merge branch 'main' into photoUploadProfilePage

  cutetofuu

  committed
  19191d6

• Merge branch 'main' of https://github.com/MMal87/acebook-neutral into photoUploadProfilePage

  cutetofuu

  committed
  9b7783a

• Merge pull request #24 from MMal87/photoUploadProfilePage

  Show description for 4806522
  cutetofuu

  authored
  4806522

• Merge branch 'main' into styling_profile

  AlexBuzea

  authored
  252355b

• Merge pull request #25 from MMal87/styling_profile

  Show description for c2024a7
  AlexBuzea

  authored
  c2024a7

• comments empty comment validation

  MMal87

  committed
  851e96b

• took text out of textarea html in show

  MMal87

  committed
  0c4192c

• added check for already existing email

  MMal87

  committed
  0a9a5b3

• pulled from main

  MMal87

  committed
  c818f3e

Commits on Jun 22, 2023

• Merge pull request #26 from MMal87/duplicateEmailError

  Show description for 3fc7fca
  MMal87

  authored
  3fc7fca

• Merge pull request #27 from MMal87/commentsValidator

  Show description for df6a4d8
  MMal87

  authored
  df6a4d8

• uncommented users

  MMal87

  committed
  adeb3c5

• put in names on profile page

  MMal87

  committed
  51b32fc

• css changes

  MMal87

  committed
  c852aa1

• timeline styling and profile photo upload added to profile page

  

  Alex Buzea

  committed
  c6a284e

• finish profile page

  

  Alex Buzea

  committed
  334afbf