Code

merging with yohan's master#12

Code

Merged

jv-cortez merged 33 commits intojv-cortez:masterjv-cortez/BuddyUp:masterfrom yowiputra:masteryowiputra/BuddyUp:masterCopy head branch name to clipboardAug 21, 2017

Commits

Commits on Aug 17, 2017

• general cleanup on server.js

  yowiputra

  committed
  a04618c

  Copy full SHA for a04618c

• changed seed file, changed skill column to seriousness, added queries on socket

  yowiputra

  committed
  517c52a

  Copy full SHA for 517c52a

• query based on similarity on seriousness level and got rid of query the current user themself

  howareyouhelen

  committed
  e672aed

  Copy full SHA for e672aed

• added slider to matchmakerpage value from 0 to 100 so users can adjust the value on slide as their seriousness

  howareyouhelen

  committed
  865c4b5

  Copy full SHA for 865c4b5

Commits on Aug 18, 2017

• modified default value as user's value, recieve server data on compatible users on the client side. change state as slider moves, presents compatible users on the match cards on matchmaker event so…

  Show description for 5770fee
  howareyouhelen

  committed
  5770fee

  Copy full SHA for 5770fee

• modified matchcards and fixed slider default value and value change

  howareyouhelen

  committed
  a5fac74

  Copy full SHA for a5fac74

Commits on Aug 19, 2017

• Created new form component and routing which allows users to edit their profile.

  johnwonghw

  committed
  45cbaf1

  Copy full SHA for 45cbaf1

• Merge pull request #17 from yowiputra/feature/profile

  Show description for a9a3462
  yowiputra

  authored
  a9a3462

  Copy full SHA for a9a3462

• Merge branch 'master' into feature/chat

  johnwonghw

  authored
  3562e08

  Copy full SHA for 3562e08

• Merge pull request #18 from jv-cortez/feature/chat

  Show description for 120d8eb
  johnwonghw

  authored
  120d8eb

  Copy full SHA for 120d8eb

• Added css back to popup box due to previous conflict merge.

  johnwonghw

  committed
  9b18252

  Copy full SHA for 9b18252

• broadcast onlineuser list to all users on connect, update and disconnect

  howareyouhelen

  committed
  de6ea83

  Copy full SHA for de6ea83

• filter on the client side, receives full onlineuser list and filters out themselves

  howareyouhelen

  committed
  09f4fe2

  Copy full SHA for 09f4fe2

• reconfigured token's username into currentUserName

  howareyouhelen

  committed
  ae68798

  Copy full SHA for ae68798

• set state for currentUserName

  howareyouhelen

  committed
  b5dfb11

  Copy full SHA for b5dfb11

Commits on Aug 20, 2017

• added function that console logs input field on submit

  johnwonghw

  committed
  1072d3e

  Copy full SHA for 1072d3e

• Merge pull request #19 from yowiputra/feature/chat

  Show description for ec2ec41
  howareyouhelen

  authored
  ec2ec41

  Copy full SHA for ec2ec41

• integrated first stage of inter-user activity

  yowiputra

  committed
  2336b8c

  Copy full SHA for 2336b8c

• Merge branch 'master' into feature/socket-query

  howareyouhelen

  authored
  720a6c3

  Copy full SHA for 720a6c3

• Merge pull request #20 from yowiputra/feature/socket-query

  Show description for f133fbf
  howareyouhelen

  authored
  f133fbf

  Copy full SHA for f133fbf

• fixed sending to each users' individual sockets

  yowiputra

  committed
  f3bde89

  Copy full SHA for f3bde89

• Deleted submit button due to bugs. Added socket listeners to send and receive messages. Needed to reformat how information is sent to popupbox component due to socket listeners.

  johnwonghw

  committed
  f9ac78a

  Copy full SHA for f9ac78a

• test

  johnwonghw

  committed
  68597bb

  Copy full SHA for 68597bb

• Eliminated remainging footer tags

  jv-cortez

  committed
  3b659f4

  Copy full SHA for 3b659f4

• removed unnecessary colons

  jv-cortez

  committed
  88e9088

  Copy full SHA for 88e9088

• fixed conflicts from pull request

  jv-cortez

  committed
  18b4149

  Copy full SHA for 18b4149

• resolved conflicts from pull request

  jv-cortez

  committed
  a010d80

  Copy full SHA for a010d80

• removed initial load query

  yowiputra

  committed
  76ba168

  Copy full SHA for 76ba168

Commits on Aug 21, 2017

• removed authenticated socket emit from client side

  yowiputra

  committed
  25f9214

  Copy full SHA for 25f9214

• Reverted changes to remove popup box for chat and instead add chatbox as a component directly to matmakerpage.

  johnwonghw

  committed
  47d09e0

  Copy full SHA for 47d09e0

• Merge branch 'feature/chat' into feature/chat

  jv-cortez

  authored
  d47009b

  Copy full SHA for d47009b

• Merge pull request #22 from yowiputra/feature/socket-query

  Show description for b18fb06
  jv-cortez

  authored
  b18fb06

  Copy full SHA for b18fb06

• Merge pull request #21 from yowiputra/feature/chat

  Show description for 313e0f8
  jv-cortez

  authored
  313e0f8

  Copy full SHA for 313e0f8