Code

Merge in iteration by Just5Coders#42

Code

Merged

jdnordy merged 138 commits intoteam-snapdesk:masterteam-snapdesk/snapdesk:masterfrom Just5Coders:masterJust5Coders/snapdesk_1:masterCopy head branch name to clipboardJun 9, 2020

+1,577-373

Commits

Commits on Feb 25, 2020

• Merge pull request #1 from team-snapdesk/master

  Show description for ce2dd4e
  skang1004

  authored
  ce2dd4e

  Copy full SHA for ce2dd4e

Commits on Feb 26, 2020

• fixed webpack not loading static images

  jdnordy

  committed
  0714c36

  Copy full SHA for 0714c36

• changed the routes in the html for static files

  jdnordy

  committed
  40b13cc

  Copy full SHA for 40b13cc

• Merge pull request #2 from jdnordy/master

  Show description for c6dbe60
  skang1004

  authored
  c6dbe60

  Copy full SHA for c6dbe60

• started converting css over into sass

  jdnordy

  committed
  2620a6a

  Copy full SHA for 2620a6a

• updated styling on login page

  jdnordy

  committed
  2e28281

  Copy full SHA for 2e28281

• added acceptTicket middleware to ticketsController.js and added route for /tickets/accept in api.js

  eamoranto

  committed
  28f2a35

  Copy full SHA for 28f2a35

• Merge pull request #3 from eamoranto/master

  Show description for b507eda
  skang1004

  authored
  b507eda

  Copy full SHA for b507eda

• added cancelTicket middleware to ticketsController and added api route handler for canceling tickets

  

  Kritika Sah

  authored and

  Kritika Sah

  committed
  5a79434

  Copy full SHA for 5a79434

• implemented accept_ticket & cancel_accept reducers

  arazulu

  committed
  18ec7e4

  Copy full SHA for 18ec7e4

• ticket actions for accept ticket

  skang1004

  committed
  8b3ed93

  Copy full SHA for 8b3ed93

• changes

  arazulu

  committed
  27c0360

  Copy full SHA for 27c0360

• Merge branch 'master' into cancel_controller

  skang1004

  authored
  45d5428

  Copy full SHA for 45d5428

• Merge pull request #4 from hellokritty/cancel_controller

  Show description for b86b94a
  skang1004

  authored
  b86b94a

  Copy full SHA for b86b94a

• styling changes

  jdnordy

  committed
  59856bb

  Copy full SHA for 59856bb

• Merge branch 'master' of https://github.com/Just5Coders/snapdesk_1 into feature1

  skang1004

  committed
  be7b4e7

  Copy full SHA for be7b4e7

• Merge pull request #5 from arazulu/aris_feature_branch

  Show description for 38b2397
  skang1004

  authored
  38b2397

  Copy full SHA for 38b2397

• tickets reducer

  skang1004

  committed
  6c49023

  Copy full SHA for 6c49023

• inserted closing bracket in ticketsController

  arazulu

  committed
  69a4b6d

  Copy full SHA for 69a4b6d

• Merge pull request #6 from jdnordy/styling

  Show description for 7445d6d
  skang1004

  authored
  7445d6d

  Copy full SHA for 7445d6d

• Merge pull request #7 from arazulu/aris_feature_branch

  Show description for 0b01e8b
  skang1004

  authored
  0b01e8b

  Copy full SHA for 0b01e8b

• merged from upstream, cleaned up the logic for delete_ticket in tickets reducer

  skang1004

  committed
  8de4930

  Copy full SHA for 8de4930

• cleaned up code for accept_ticket functionality

  arazulu

  committed
  c3e32f3

  Copy full SHA for c3e32f3

• Merge pull request #8 from skang1004/feature1

  Show description for e498618
  skang1004

  authored
  e498618

  Copy full SHA for e498618

• ticketsController.resloverTicket was added to ticketsController.js and tickets/resolved added to api.js

  eamoranto

  committed
  315b21c

  Copy full SHA for 315b21c

• Merge branch 'master' into aris_feature_branch

  skang1004

  authored
  1cca864

  Copy full SHA for 1cca864

• added leaderdboard controller middleware and route handler

  

  Kritika Sah

  authored and

  Kritika Sah

  committed
  64bf919

  Copy full SHA for 64bf919

• Merge pull request #9 from arazulu/aris_feature_branch

  Show description for dfe4096
  skang1004

  authored
  dfe4096

  Copy full SHA for dfe4096

• Merge pull request #10 from eamoranto/resolve

  Show description for b04185e
  skang1004

  authored
  b04185e

  Copy full SHA for b04185e

• Merge branch 'master' into leaderboard_backend

  skang1004

  authored
  251db69

  Copy full SHA for 251db69

• Merge pull request #11 from hellokritty/leaderboard_backend

  Show description for 22dcfa6
  skang1004

  authored
  22dcfa6

  Copy full SHA for 22dcfa6

• fixed syntax error in api.js, added require leaderboardController to api.js, fixed syntax error pertaining to exporting leaderboardController in leaderboardController.js

  eamoranto

  committed
  fb6da50

  Copy full SHA for fb6da50

• fixed syntax error in api.js, included require leaderboardController in api.js, fixed syntax error when exporting leaderboardController

  eamoranto

  committed
  24c4034

  Copy full SHA for 24c4034

• Merge pull request #12 from eamoranto/bugfix

  Show description for 9203ce5
  skang1004

  authored
  9203ce5

  Copy full SHA for 9203ce5

• after accept, other users are unable to click on that ticket. prop drilled userId

  skang1004

  committed
  4f76207

  Copy full SHA for 4f76207

• Merge pull request #13 from skang1004/feature3

  Show description for 6e26e2b
  skang1004

  authored
  6e26e2b

  Copy full SHA for 6e26e2b

• finished working on left-nav style

  jdnordy

  committed
  45ef02d

  Copy full SHA for 45ef02d

• Merge pull request #14 from jdnordy/style-left-nav

  Show description for 61cd184
  skang1004

  authored
  61cd184

  Copy full SHA for 61cd184

• updated leftnav component

  jdnordy

  committed
  39643f4

  Copy full SHA for 39643f4

• reformated rightnav

  jdnordy

  committed
  f473a83

  Copy full SHA for f473a83

• started working on right navbar styling

  jdnordy

  committed
  c9de42b

  Copy full SHA for c9de42b

• cancelAccept button changes status from pending to active, makes accept button clickable again

  skang1004

  committed
  9d07996

  Copy full SHA for 9d07996

• Merge pull request #15 from skang1004/feature5

  Show description for e449089
  eamoranto

  authored
  e449089

  Copy full SHA for e449089

• debugged the accept button and cleaned up code

  jdnordy

  committed
  ca0dfb3

  Copy full SHA for ca0dfb3

• Merge branch 'master' into debug

  jdnordy

  authored
  4cba4da

  Copy full SHA for 4cba4da

• Merge pull request #16 from jdnordy/debug

  Show description for 12330df
  skang1004

  authored
  12330df

  Copy full SHA for 12330df

• Merge branch 'style-left-nav' into style-right-nav

  jdnordy

  committed
  15bccd6

  Copy full SHA for 15bccd6

• added byTopic middleware to leaderboardController.js and route for leaderboard/topic to api.js

  eamoranto

  committed
  f9aa921

  Copy full SHA for f9aa921

• Merge pull request #17 from eamoranto/byTopic

  Show description for 0bb0aa7
  skang1004

  authored
  0bb0aa7

  Copy full SHA for 0bb0aa7

• fixed bug in cancelAccept

  jdnordy

  committed
  bb3864a

  Copy full SHA for bb3864a

• Merge pull request #18 from jdnordy/debug

  Show description for 4dec214
  skang1004

  authored
  4dec214

  Copy full SHA for 4dec214

• Merge branch 'style-right-nav' into style-feed-container

  jdnordy

  committed
  92f4121

  Copy full SHA for 92f4121

• minimal left navbar styling and snaps cursor on hover

  jdnordy

  committed
  3199952

  Copy full SHA for 3199952

• Merge pull request #19 from jdnordy/style-right-nav

  Show description for 1fbdb8e
  skang1004

  authored
  1fbdb8e

  Copy full SHA for 1fbdb8e

• Merge branch 'master' into style-feed-container

  jdnordy

  committed
  9632782

  Copy full SHA for 9632782

• added scroll back into feed container

  jdnordy

  committed
  31805ee

  Copy full SHA for 31805ee

• Merge pull request #20 from jdnordy/style-feed-container

  Show description for 9fd69e4
  skang1004

  authored
  9fd69e4

  Copy full SHA for 9fd69e4

• added SHOW_MODAL constant

  jdnordy

  committed
  05f3a7c

  Copy full SHA for 05f3a7c

• changed const show modal to toggle modal

  jdnordy

  committed
  e0e0ea0

  Copy full SHA for e0e0ea0

• added reducer logic for modal

  jdnordy

  committed
  aaf459e

  Copy full SHA for aaf459e

• finished action creator for toggleModal

  jdnordy

  committed
  22967e1

  Copy full SHA for 22967e1

Commits on Feb 27, 2020

• prop drilled toggleModal action creator into MenteeTicketBox

  jdnordy

  committed
  400e258

  Copy full SHA for 400e258

• updated addTicket middleware to add tag with post, updated middleware getActiveTickets to display the tag

  eamoranto

  committed
  cb7e733

  Copy full SHA for cb7e733

• Merge pull request #21 from eamoranto/addTopic

  Show description for ee8491c
  skang1004

  authored
  ee8491c

  Copy full SHA for ee8491c

• changed leaderboardController.getLeaderBoard in leaderboardController.js to sum the total snaps and only display users a single time

  eamoranto

  committed
  3118c0b

  Copy full SHA for 3118c0b

• Merge pull request #22 from eamoranto/leaderboard

  Show description for a88d576
  skang1004

  authored
  a88d576

  Copy full SHA for a88d576

• updated variable names of modal

  jdnordy

  committed
  ea04eb4

  Copy full SHA for ea04eb4

• added feedback box in modal

  jdnordy

  committed
  e72306e

  Copy full SHA for e72306e

• finished resolve modal

  jdnordy

  committed
  98f1967

  Copy full SHA for 98f1967

• merged in source of truth

  jdnordy

  committed
  b4c9a63

  Copy full SHA for b4c9a63

• finished resolved

  jdnordy

  committed
  5776db9

  Copy full SHA for 5776db9

• Merge pull request #23 from jdnordy/resolve-modal

  Show description for 1eb2e79
  skang1004

  authored
  1eb2e79

  Copy full SHA for 1eb2e79

• beginnings of css grid

  jdnordy

  committed
  295cf9b

  Copy full SHA for 295cf9b

• created leaderboard: component, action type, action creator, reducer, container, and component

  

  Kritika Sah

  authored and

  Kritika Sah

  committed
  68db81e

  Copy full SHA for 68db81e

• added leaderboard frontend: action type, action creater, container, component, reducer

  

  Kritika Sah

  authored and

  Kritika Sah

  committed
  c5ab7f9

  Copy full SHA for c5ab7f9

• Merge branch 'master' into fe_leaderByTopic

  skang1004

  authored
  d2012ce

  Copy full SHA for d2012ce

• Merge pull request #24 from hellokritty/fe_leaderByTopic

  Show description for f268ff8
  skang1004

  authored
  f268ff8

  Copy full SHA for f268ff8

• added res.locals.LeaderboardTopic to line 43 in leaderboardController.js

  eamoranto

  committed
  bf1ec46

  Copy full SHA for bf1ec46

• Merge pull request #25 from eamoranto/bugfixes

  Show description for 1ebf72d
  skang1004

  authored
  1ebf72d

  Copy full SHA for 1ebf72d

• centered ticket container and scroll

  jdnordy

  committed
  c90e1a9

  Copy full SHA for c90e1a9

• Merge pull request #26 from jdnordy/styling-feedContainer

  Show description for 40ba76c
  skang1004

  authored
  40ba76c

  Copy full SHA for 40ba76c

• updated the action creator for toggle modal

  jdnordy

  committed
  64a9a35

  Copy full SHA for 64a9a35

• updated the ticket reducer case for toggle modal

  jdnordy

  committed
  a9c3496

  Copy full SHA for a9c3496

• removed modal from mentee ticket box and clean up the code a bit

  jdnordy

  committed
  924ee39

  Copy full SHA for 924ee39

• cleaned up code in ticket creator

  jdnordy

  committed
  6b9d28c

  Copy full SHA for 6b9d28c

• added modal component in feed conatiner

  jdnordy

  committed
  e936120

  Copy full SHA for e936120

• created a new resolve modal component

  jdnordy

  committed
  f01dc99

  Copy full SHA for f01dc99

• Merge pull request #27 from jdnordy/modal-debug

  Show description for e9c9117
  skang1004

  authored
  e9c9117

  Copy full SHA for e9c9117

• fixed query for leaderboardController.byTopic, changed ticketsController.getActiveTickets to get the mentor and mentee name, added p tag to include the mentee's name in BystandardTicketBox

  eamoranto

  committed
  03b189e

  Copy full SHA for 03b189e

• Merge branch 'master' into displayName

  skang1004

  authored
  91a3abb

  Copy full SHA for 91a3abb

• progress on ticket creator

  jdnordy

  committed
  f04bcf0

  Copy full SHA for f04bcf0

• added dropdown menu for choosing a topic, connects to the database

  skang1004

  committed
  e588a0a

  Copy full SHA for e588a0a

• Merge pull request #28 from eamoranto/displayName

  Show description for 5ede70c
  skang1004

  authored
  5ede70c

  Copy full SHA for 5ede70c

• Merge branch 'master' into feature12

  skang1004

  authored
  3755840

  Copy full SHA for 3755840

• Merge pull request #29 from skang1004/feature12

  Show description for de8ec8e
  skang1004

  authored
  de8ec8e

  Copy full SHA for de8ec8e

• topic is shown in mentee ticket box and repositioned the layout of each ticket

  skang1004

  committed
  572da6d

  Copy full SHA for 572da6d

• Merge pull request #30 from skang1004/feature13

  Show description for 27a59b4
  skang1004

  authored
  27a59b4

  Copy full SHA for 27a59b4

• finished ticket-creator

  jdnordy

  committed
  8053681

  Copy full SHA for 8053681

• merged in changes from new updates

  jdnordy

  committed
  77473ba

  Copy full SHA for 77473ba

• fixed bugg with scroll bar

  jdnordy

  committed
  7b93b92

  Copy full SHA for 7b93b92

• Merge pull request #31 from jdnordy/style-ticket-creator

  Show description for 95199c6
  skang1004

  authored
  95199c6

  Copy full SHA for 95199c6

• added setInterval to the LeaderBoard.jsx file to get the leaderboard to refresh automatically

  eamoranto

  committed
  accd150

  Copy full SHA for accd150

• Merge branch 'master' into setTimerLeader

  skang1004

  authored
  0cbad0e

  Copy full SHA for 0cbad0e

• Merge pull request #32 from eamoranto/setTimerLeader

  Show description for 53921b8
  skang1004

  authored
  53921b8

  Copy full SHA for 53921b8

• changed the order of ticket headers

  skang1004

  committed
  4fa2ee0

  Copy full SHA for 4fa2ee0

• Merge pull request #33 from skang1004/master

  Show description for dda98ff
  skang1004

  authored
  dda98ff

  Copy full SHA for dda98ff

• fixed scrolling issue and only showing bystander tickets

  jdnordy

  committed
  7f4b311

  Copy full SHA for 7f4b311

• Merge pull request #34 from jdnordy/style-ticket-creator

  Show description for f7aa60d
  skang1004

  authored
  f7aa60d

  Copy full SHA for f7aa60d

• created separate sass file for ticketCreator

  jdnordy

  committed
  22e1967

  Copy full SHA for 22e1967

• got rid of a couple error messages in the console

  skang1004

  committed
  ae8f4b2

  Copy full SHA for ae8f4b2

• styled topic selector

  jdnordy

  committed
  e2514e2

  Copy full SHA for e2514e2

• the close button now closes the modal window

  skang1004

  committed
  f8d7a59

  Copy full SHA for f8d7a59

• Merge pull request #35 from skang1004/feature17

  Show description for 5658a9b
  skang1004

  authored
  5658a9b

  Copy full SHA for 5658a9b

• updated selector

  jdnordy

  committed
  3ba8f3a

  Copy full SHA for 3ba8f3a

• Merge pull request #36 from jdnordy/topic-dropdown-styling

  Show description for c90bcce
  skang1004

  authored
  c90bcce

  Copy full SHA for c90bcce

Commits on Feb 28, 2020

• added styling for leaderboard table

  

  Kritika Sah

  authored and

  Kritika Sah

  committed
  55803b4

  Copy full SHA for 55803b4

• Merge branch 'master' into master

  skang1004

  authored
  a2f1fa6

  Copy full SHA for a2f1fa6

• Merge pull request #37 from hellokritty/master

  Show description for 01ee59b
  skang1004

  authored
  01ee59b

  Copy full SHA for 01ee59b

• some styling

  jdnordy

  committed
  5ac0119

  Copy full SHA for 5ac0119

• merge

  jdnordy

  committed
  7ee0229

  Copy full SHA for 7ee0229

• Merge pull request #38 from jdnordy/topic-dropdown-styling

  Show description for 4c46a56
  skang1004

  authored
  4c46a56

  Copy full SHA for 4c46a56

• centered text within columns of leaderboard component

  

  Kritika Sah

  authored and

  Kritika Sah

  committed
  2f36518

  Copy full SHA for 2f36518

• Merge pull request #39 from hellokritty/master

  Show description for 991e8bd
  skang1004

  authored
  991e8bd

  Copy full SHA for 991e8bd

• working on styling of box

  jdnordy

  committed
  32d88bb

  Copy full SHA for 32d88bb

• merge

  jdnordy

  committed
  3dfb7d1

  Copy full SHA for 3dfb7d1

• finished

  jdnordy

  committed
  6ee9e96

  Copy full SHA for 6ee9e96

• Merge pull request #40 from jdnordy/ticket-box-styling

  Show description for 4f55579
  skang1004

  authored
  4f55579

  Copy full SHA for 4f55579

• fixed ticketsController.getActiveTickets to get data from tickets that have a null mentor_id

  eamoranto

  committed
  9be37a7

  Copy full SHA for 9be37a7

• finished bystander ticket box

  jdnordy

  committed
  32f66d4

  Copy full SHA for 32f66d4

• Merge branch 'master' into mentorNameFix

  skang1004

  authored
  d276593

  Copy full SHA for d276593

• Merge pull request #41 from eamoranto/mentorNameFix

  Show description for 95e6ee8
  skang1004

  authored
  95e6ee8

  Copy full SHA for 95e6ee8

• Merge branch 'master' into bystander-box

  skang1004

  authored
  4176ccd

  Copy full SHA for 4176ccd

• Merge pull request #42 from jdnordy/bystander-box

  Show description for 77cda2e
  skang1004

  authored
  77cda2e

  Copy full SHA for 77cda2e

• added some finishing touches

  jdnordy

  committed
  f769888

  Copy full SHA for f769888

• add back in set intervals

  jdnordy

  committed
  990bc7d

  Copy full SHA for 990bc7d

• Merge pull request #43 from jdnordy/refactor-styling

  Show description for 0eef434
  skang1004

  authored
  0eef434

  Copy full SHA for 0eef434

• last minute bug fixes

  jdnordy

  committed
  af9627e

  Copy full SHA for af9627e

• Merge pull request #44 from jdnordy/last-minute

  Show description for 9e1a499
  skang1004

  authored
  9e1a499

  Copy full SHA for 9e1a499