Code

Friends#25

Code

Open

Arshad-Siddiqui wants to merge 175 commits intomakersacademy:mainmakersacademy/acebook-mern-template:mainfrom Dmum303:friendsDmum303/acebook-team-bikini-bottom:friendsCopy head branch name to clipboard

+10,810-1,459

Commits

Commits on Oct 31, 2022

• Project set up

  saritahub

  committed
  a28b372

  Copy full SHA for a28b372

Commits on Nov 1, 2022

• Basic project setup

  Arshad-Siddiqui

  committed
  afeabd5

  Copy full SHA for afeabd5

• global CSS test

  Dmum303

  committed
  a0ae2fd

  Copy full SHA for a0ae2fd

• Added tests for making a post + posting in chronolically reverse order. Tests currently fail so need to implement method/function to fix

  AamirKhanDev

  committed
  2c1b954

  Copy full SHA for 2c1b954

Commits on Nov 2, 2022

• Created button in /posts. Need to next implement redirect onclick to the posts form

  AamirKhanDev

  committed
  db6093f

  Copy full SHA for db6093f

• Create post form

  Arshad-Siddiqui

  committed
  891454c

  Copy full SHA for 891454c

• Added fork

  AamirKhanDev

  committed
  0a1df4b

  Copy full SHA for 0a1df4b

• Merge pull request #1 from AamirKhanDev/FLnames

  Show description for 8e04950
  Arshad-Siddiqui

  authored
  8e04950

  Copy full SHA for 8e04950

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom into create_post

  Show description for 9d6cdb3
  Arshad-Siddiqui

  committed
  9d6cdb3

  Copy full SHA for 9d6cdb3

• updated nav bar

  piperrosearmstrong

  committed
  cf6b377

  Copy full SHA for cf6b377

• navigation bar

  Dmum303

  committed
  0994eff

  Copy full SHA for 0994eff

• Merge branch 'frontendexplore' of https://github.com/Dmum303/acebook-team-bikini-bottom into frontendexplore

  Dmum303

  committed
  6a7126d

  Copy full SHA for 6a7126d

• Change textarea to text

  Arshad-Siddiqui

  committed
  d7ed6a0

  Copy full SHA for d7ed6a0

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom

  Arshad-Siddiqui

  committed
  62ff91a

  Copy full SHA for 62ff91a

• Merge branch 'main' into frontendexplore

  Arshad-Siddiqui

  committed
  d102844

  Copy full SHA for d102844

• Merge pull request #2 from Dmum303/frontendexplore

  Show description for 5209c36
  Arshad-Siddiqui

  authored
  5209c36

  Copy full SHA for 5209c36

• Pulling main

  saritahub

  committed
  5009f76

  Copy full SHA for 5009f76

• Created comment file under Models

  saritahub

  committed
  f61a908

  Copy full SHA for f61a908

• Testing comments

  saritahub

  committed
  db23d22

  Copy full SHA for db23d22

• Create PostForm component

  Arshad-Siddiqui

  committed
  0e71c4a

  Copy full SHA for 0e71c4a

• Add body to PostForm component

  Arshad-Siddiqui

  committed
  8cab85b

  Copy full SHA for 8cab85b

• Merge branch 'main' into create_post

  Arshad-Siddiqui

  committed
  253c869

  Copy full SHA for 253c869

• Editing the comment controller

  saritahub

  committed
  6d7aa1c

  Copy full SHA for 6d7aa1c

• Merge branch 'main' into create_post

  Arshad-Siddiqui

  committed
  66cdace

  Copy full SHA for 66cdace

• Add Post form to app

  Arshad-Siddiqui

  committed
  a9e7bc0

  Copy full SHA for a9e7bc0

• Added some test examples for comment model

  saritahub

  committed
  18cc74b

  Copy full SHA for 18cc74b

• Refactor

  saritahub

  committed
  f2c928f

  Copy full SHA for f2c928f

• Amend typo for form event handler

  Arshad-Siddiqui

  committed
  c173f0f

  Copy full SHA for c173f0f

Commits on Nov 3, 2022

• Added date into schema for posts and also added test for date in posts.spec.js

  AamirKhanDev

  committed
  fae45fb

  Copy full SHA for fae45fb

• Merge pull request #3 from Dmum303/Testing-with-new-schema

  Show description for c72114f
  Dmum303

  authored
  c72114f

  Copy full SHA for c72114f

• Add FLnames and timestamps to user schema

  Arshad-Siddiqui

  committed
  1d0d908

  Copy full SHA for 1d0d908

• Add picture to Users Schema

  Arshad-Siddiqui

  committed
  f4b9084

  Copy full SHA for f4b9084

• Removed posts part from comments

  saritahub

  committed
  b1e6794

  Copy full SHA for b1e6794

• Add fields for first and last names on signup

  Arshad-Siddiqui

  committed
  b555d03

  Copy full SHA for b555d03

• Ammend some tests to check first and last names

  Arshad-Siddiqui

  committed
  adeca32

  Copy full SHA for adeca32

• Ammend User Spec to check for FL names

  Arshad-Siddiqui

  committed
  f429cf4

  Copy full SHA for f429cf4

• testing comment fields

  Dmum303

  committed
  58da208

  Copy full SHA for 58da208

• testied user field

  Dmum303

  committed
  3b82dc1

  Copy full SHA for 3b82dc1

• not sure what changed

  Dmum303

  committed
  cdd514a

  Copy full SHA for cdd514a

• Add friends and posts to User Schema

  Arshad-Siddiqui

  committed
  3259eb4

  Copy full SHA for 3259eb4

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom

  Arshad-Siddiqui

  committed
  ffd5a25

  Copy full SHA for ffd5a25

• Merge branch 'main' into signup_plus

  Arshad-Siddiqui

  committed
  482d296

  Copy full SHA for 482d296

• Amend all backend tests to use new signup

  Arshad-Siddiqui

  committed
  9cb6d80

  Copy full SHA for 9cb6d80

• Added post comment tests, currently failing

  saritahub

  committed
  b66c507

  Copy full SHA for b66c507

• Post comment test passed

  saritahub

  committed
  0357816

  Copy full SHA for 0357816

• Refactored post comment test

  saritahub

  committed
  7f518f3

  Copy full SHA for 7f518f3

• Add start of friendslist test

  Arshad-Siddiqui

  committed
  408149f

  Copy full SHA for 408149f

• Remove PostForm from being static in app

  Arshad-Siddiqui

  committed
  00c6bae

  Copy full SHA for 00c6bae

• Remove duplicate file

  Arshad-Siddiqui

  committed
  80e1614

  Copy full SHA for 80e1614

• Add PostForm to the bottom of feed

  Arshad-Siddiqui

  committed
  fc44e66

  Copy full SHA for fc44e66

• Add authorization to PostForm

  Arshad-Siddiqui

  committed
  5560e0f

  Copy full SHA for 5560e0f

• Fix post requests to make new post

  Arshad-Siddiqui

  committed
  5f7bb0c

  Copy full SHA for 5f7bb0c

• Merge branch 'main' into create_post

  Arshad-Siddiqui

  committed
  2406bb6

  Copy full SHA for 2406bb6

• Remove unneeded console.log

  Arshad-Siddiqui

  committed
  973ebdd

  Copy full SHA for 973ebdd

• change to post comment

  Dmum303

  committed
  891b3d8

  Copy full SHA for 891b3d8

• Merge pull request #4 from Dmum303/create_post

  Show description for 69071db
  Dmum303

  authored
  69071db

  Copy full SHA for 69071db

• Add container around each post

  Arshad-Siddiqui

  committed
  d109d70

  Copy full SHA for d109d70

• Merge branch 'main' into signup_plus

  Arshad-Siddiqui

  committed
  5831765

  Copy full SHA for 5831765

• Refactor Signup page

  Arshad-Siddiqui

  committed
  69de3cd

  Copy full SHA for 69de3cd

• Create TSConfig file

  Arshad-Siddiqui

  committed
  cec7449

  Copy full SHA for cec7449

• comment test

  Dmum303

  committed
  06340c2

  Copy full SHA for 06340c2

• Create Signup Form component

  Arshad-Siddiqui

  committed
  ba9259f

  Copy full SHA for ba9259f

• Return Signup Form to nav bar

  Arshad-Siddiqui

  committed
  313f8bb

  Copy full SHA for 313f8bb

• Format signup page code

  Arshad-Siddiqui

  committed
  64f5ce5

  Copy full SHA for 64f5ce5

• Re-align logo with sign up form

  Arshad-Siddiqui

  committed
  9fda105

  Copy full SHA for 9fda105

• Add Route for testing components

  Arshad-Siddiqui

  committed
  4fc877d

  Copy full SHA for 4fc877d

• Switch signup form to a class

  Arshad-Siddiqui

  committed
  5203d68

  Copy full SHA for 5203d68

Commits on Nov 4, 2022

• Reformat JSX

  Arshad-Siddiqui

  committed
  8f27b6c

  Copy full SHA for 8f27b6c

• comment testing

  Dmum303

  committed
  345f0b8

  Copy full SHA for 345f0b8

• multiple comments tested

  Dmum303

  committed
  59fa261

  Copy full SHA for 59fa261

• Create sign up component and implement it on page

  Arshad-Siddiqui

  committed
  2f1e87c

  Copy full SHA for 2f1e87c

• working out comment controller

  Dmum303

  committed
  329b3f0

  Copy full SHA for 329b3f0

• Remove corrugated iron look

  Arshad-Siddiqui

  committed
  9cc386f

  Copy full SHA for 9cc386f

• Merge pull request #5 from Dmum303/signup_plus

  Show description for e6d46e3
  saritahub

  authored
  e6d46e3

  Copy full SHA for e6d46e3

• testing update comment controller

  Dmum303

  committed
  39ddd57

  Copy full SHA for 39ddd57

• Refactor

  saritahub

  committed
  4dd76b2

  Copy full SHA for 4dd76b2

• Add link between User and their Post

  Arshad-Siddiqui

  committed
  7b45212

  Copy full SHA for 7b45212

• Create footer position

  Arshad-Siddiqui

  committed
  ef45116

  Copy full SHA for ef45116

• testing update updatecomment bugs

  Dmum303

  committed
  b78f8eb

  Copy full SHA for b78f8eb

• testing comment bugs

  Dmum303

  committed
  b415680

  Copy full SHA for b415680

Commits on Nov 5, 2022

• stuck with routes

  Dmum303

  committed
  83adb6a

  Copy full SHA for 83adb6a

Commits on Nov 6, 2022

• passed tests for controller to update comment

  Dmum303

  committed
  84efbcc

  Copy full SHA for 84efbcc

• Have added comment with postman

  Dmum303

  committed
  3eb1d65

  Copy full SHA for 3eb1d65

• Save files to push

  Dmum303

  committed
  48ee941

  Copy full SHA for 48ee941

Commits on Nov 7, 2022

• Post comments backend completed

  Dmum303

  committed
  ef073b4

  Copy full SHA for ef073b4

• Merge branch 'main' into commentvad

  saritahub

  authored
  39d1a5d

  Copy full SHA for 39d1a5d

• Merge pull request #8 from Dmum303/commentvad

  Show description for 6e322e9
  Dmum303

  authored
  6e322e9

  Copy full SHA for 6e322e9

• updated comments con test with new user mod info

  Dmum303

  committed
  edae257

  Copy full SHA for edae257

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom into footer

  Arshad-Siddiqui

  committed
  5c5ba01

  Copy full SHA for 5c5ba01

• Add timestamps to posts

  Arshad-Siddiqui

  committed
  1c30d75

  Copy full SHA for 1c30d75

• Improve appearance of PostForm

  Arshad-Siddiqui

  committed
  eb5a969

  Copy full SHA for eb5a969

• Post lists reload on submission

  Arshad-Siddiqui

  committed
  d4a1489

  Copy full SHA for d4a1489

• Merge branch 'main' into user-to-post

  saritahub

  authored
  a4fd642

  Copy full SHA for a4fd642

• Merge pull request #9 from Dmum303/commentvad

  Show description for 8fcfc0f
  saritahub

  authored
  8fcfc0f

  Copy full SHA for 8fcfc0f

• Merge comments

  Arshad-Siddiqui

  committed
  a2c2e28

  Copy full SHA for a2c2e28

• Merge branch 'user-to-post' of github.com:Dmum303/acebook-team-bikini-bottom into user-to-post

  Arshad-Siddiqui

  committed
  b00650c

  Copy full SHA for b00650c

• Merge pull request #6 from Dmum303/user-to-post

  Show description for e85a3d2
  piperrosearmstrong

  authored
  e85a3d2

  Copy full SHA for e85a3d2

• Fix network errors related to reloads.

  Arshad-Siddiqui

  committed
  2281f53

  Copy full SHA for 2281f53

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom into footer

  Arshad-Siddiqui

  committed
  4087276

  Copy full SHA for 4087276

• Add a container around each post

  Arshad-Siddiqui

  committed
  4894cd9

  Copy full SHA for 4894cd9

• Did this commit

  Dmum303

  committed
  158f813

  Copy full SHA for 158f813

• Merge pull request #7 from Dmum303/footer

  Show description for 3af3163
  Dmum303

  authored
  3af3163

  Copy full SHA for 3af3163

• Comments front end

  Dmum303

  committed
  9b3c774

  Copy full SHA for 9b3c774

Commits on Nov 8, 2022

• Change what is stored in friends array

  Arshad-Siddiqui

  committed
  68f14f8

  Copy full SHA for 68f14f8

• Move sign up form to login page

  Arshad-Siddiqui

  committed
  5d33632

  Copy full SHA for 5d33632

• Add font-awesome to project

  Arshad-Siddiqui

  committed
  7dd074b

  Copy full SHA for 7dd074b

• Add logout logo and refresh signup form

  Arshad-Siddiqui

  committed
  3311260

  Copy full SHA for 3311260

• Change favicon

  Arshad-Siddiqui

  committed
  7f454da

  Copy full SHA for 7f454da

• Comments fronted working

  Dmum303

  committed
  5dddbca

  Copy full SHA for 5dddbca

• Merge pull request #10 from Dmum303/footer

  Show description for b730fa8
  Dmum303

  authored
  b730fa8

  Copy full SHA for b730fa8

• minor adj

  Dmum303

  committed
  278ce55

  Copy full SHA for 278ce55

• Set up friend requests.

  Arshad-Siddiqui

  committed
  382c4d8

  Copy full SHA for 382c4d8

• Likes Model TDD Complete

  piperrosearmstrong

  committed
  6e0ec7c

  Copy full SHA for 6e0ec7c

• Likes Backend Completed

  piperrosearmstrong

  committed
  378ab4d

  Copy full SHA for 378ab4d

• Create working friend request form

  Arshad-Siddiqui

  committed
  c43c988

  Copy full SHA for c43c988

• Create backend for friend requests

  Arshad-Siddiqui

  committed
  193d984

  Copy full SHA for 193d984

• minor adj2

  Dmum303

  committed
  7420200

  Copy full SHA for 7420200

Commits on Nov 9, 2022

• comments sorted

  Dmum303

  committed
  78daeff

  Copy full SHA for 78daeff

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

  Dmum303

  committed
  ed08eab

  Copy full SHA for ed08eab

• Merge pull request #11 from Dmum303/frontendcomments

  Show description for 163aa0c
  Arshad-Siddiqui

  authored
  163aa0c

  Copy full SHA for 163aa0c

• Merged latest main comment/post features, and integrated photo upload

  saritahub

  committed
  106a912

  Copy full SHA for 106a912

• Bug: New message form duplicated

  saritahub

  committed
  d0caeff

  Copy full SHA for d0caeff

• Merge branch 'main' of https://github.com/Dmum303/acebook-team-bikini-bottom into likes3

  piperrosearmstrong

  committed
  7e04a56

  Copy full SHA for 7e04a56

• Testing PostForm image

  saritahub

  committed
  a0a225b

  Copy full SHA for a0a225b

• Merge pull request #12 from Dmum303/likes3

  Show description for 799411c
  Arshad-Siddiqui

  authored
  799411c

  Copy full SHA for 799411c

• Reinstalled firebase, duplicated message bug still present

  saritahub

  committed
  48b62a7

  Copy full SHA for 48b62a7

• Added CSS for the uploaded image

  saritahub

  committed
  ee05c8c

  Copy full SHA for ee05c8c

• Remove duplicate friends

  Arshad-Siddiqui

  committed
  5bacf10

  Copy full SHA for 5bacf10

• Remove test route for FriendsForm

  Arshad-Siddiqui

  committed
  b93bcde

  Copy full SHA for b93bcde

• Have logo link to login page

  Arshad-Siddiqui

  committed
  c8e7e37

  Copy full SHA for c8e7e37

• EmbedFriendsForm in Feed

  Arshad-Siddiqui

  committed
  c884f4d

  Copy full SHA for c884f4d

• Update class for friends form btn

  Arshad-Siddiqui

  committed
  fc4e579

  Copy full SHA for fc4e579

• Update CSS for previous class change

  Arshad-Siddiqui

  committed
  b24a7ef

  Copy full SHA for b24a7ef

• Fix file names of friends components

  Arshad-Siddiqui

  committed
  06d72ca

  Copy full SHA for 06d72ca

• Improve consistency between single field forms

  Arshad-Siddiqui

  committed
  4c13e23

  Copy full SHA for 4c13e23

• Add further consistency

  Arshad-Siddiqui

  committed
  8b4ccbe

  Copy full SHA for 8b4ccbe

• Create get Friends route

  Arshad-Siddiqui

  committed
  0f1d580

  Copy full SHA for 0f1d580

• hide comments complete

  Dmum303

  committed
  2d967e0

  Copy full SHA for 2d967e0

• Testing express routes for image upload

  saritahub

  committed
  ca7b689

  Copy full SHA for ca7b689

• Remove unneeded commentForm import

  Arshad-Siddiqui

  committed
  11ab1aa

  Copy full SHA for 11ab1aa

• messing with css

  Dmum303

  committed
  bad4792

  Copy full SHA for bad4792

• Add friendslist to the feed page

  Arshad-Siddiqui

  committed
  1b1f467

  Copy full SHA for 1b1f467

• Create friend card

  Arshad-Siddiqui

  committed
  184a806

  Copy full SHA for 184a806

• Display friends in feed

  Arshad-Siddiqui

  committed
  3a6bd9f

  Copy full SHA for 3a6bd9f

• start flexbox

  Dmum303

  committed
  46fa6d3

  Copy full SHA for 46fa6d3

• Add plus button to form element

  Arshad-Siddiqui

  committed
  a725a98

  Copy full SHA for a725a98

• Restructure to allow friends to reload

  Arshad-Siddiqui

  committed
  44eabb6

  Copy full SHA for 44eabb6

• Prevent user from adding themselves

  Arshad-Siddiqui

  committed
  4a3dd6b

  Copy full SHA for 4a3dd6b

• Migrate signup CSS to main CSS file

  Arshad-Siddiqui

  committed
  41e0781

  Copy full SHA for 41e0781

• Remove call to unneeded CSS file

  Arshad-Siddiqui

  committed
  ae5ea67

  Copy full SHA for ae5ea67

• Create some CSS variables

  Arshad-Siddiqui

  committed
  09d288a

  Copy full SHA for 09d288a

• Switch position of posts and friends

  Arshad-Siddiqui

  committed
  9c3b456

  Copy full SHA for 9c3b456

• Split FriendCard into image and text

  Arshad-Siddiqui

  committed
  da57a65

  Copy full SHA for da57a65

• Add form class to forms

  Arshad-Siddiqui

  committed
  54fa100

  Copy full SHA for 54fa100

• Rework CSS for many buttons

  Arshad-Siddiqui

  committed
  6427c95

  Copy full SHA for 6427c95

• Add CSS to friend card

  Arshad-Siddiqui

  committed
  cdb8824

  Copy full SHA for cdb8824

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom into friends

  Arshad-Siddiqui

  committed
  fa5f0e2

  Copy full SHA for fa5f0e2

• Remove duplicate post form

  Arshad-Siddiqui

  committed
  77c1ea0

  Copy full SHA for 77c1ea0

• Add style to post card

  Arshad-Siddiqui

  committed
  8998500

  Copy full SHA for 8998500

Commits on Nov 10, 2022

• Refactor

  saritahub

  committed
  0193418

  Copy full SHA for 0193418

• Photos added to posts

  saritahub

  committed
  2d188e2

  Copy full SHA for 2d188e2

• Image style amended

  saritahub

  committed
  f036907

  Copy full SHA for f036907

• next com

  Dmum303

  committed
  bfebbae

  Copy full SHA for bfebbae

• Add lines between friends

  Arshad-Siddiqui

  committed
  c6f0b08

  Copy full SHA for c6f0b08

• Merge branch 'main' into final-photo-upload

  Arshad-Siddiqui

  authored
  18032e2

  Copy full SHA for 18032e2

• Merge pull request #13 from Dmum303/final-photo-upload

  Show description for 773d407
  Arshad-Siddiqui

  authored
  773d407

  Copy full SHA for 773d407

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom

  Arshad-Siddiqui

  committed
  0d6e957

  Copy full SHA for 0d6e957

• Merge branch 'main' into commentstyletest2

  Dmum303

  committed
  3dc9b13

  Copy full SHA for 3dc9b13

• Removed comment from css

  Dmum303

  committed
  a5188e0

  Copy full SHA for a5188e0

• Merge pull request #15 from Dmum303/commentstyletest2

  Show description for 9fb0588
  Dmum303

  authored
  9fb0588

  Copy full SHA for 9fb0588

• Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom

  Arshad-Siddiqui

  committed
  71e7c71

  Copy full SHA for 71e7c71

• Merge branch 'main' into friends

  Arshad-Siddiqui

  committed
  4ba4a3f

  Copy full SHA for 4ba4a3f

• Import Friends component

  Arshad-Siddiqui

  committed
  f76fc3f

  Copy full SHA for f76fc3f

• Remove duplicate CommentForm

  Arshad-Siddiqui

  committed
  c983793

  Copy full SHA for c983793

• Add form class to form forms

  Arshad-Siddiqui

  committed
  9e8c974

  Copy full SHA for 9e8c974