Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge in iteration by Just5Coders #42

Merged
merged 138 commits into from
Jun 9, 2020
Merged

Merge in iteration by Just5Coders #42

merged 138 commits into from
Jun 9, 2020

Conversation

jdnordy
Copy link
Contributor

@jdnordy jdnordy commented Jun 9, 2020

UPDATES

  1. updated styling to have a cleaner, more on brand look.
  2. added leader board functionality
  3. finished the whole ticket cycle (post/delete, accept/cancel, resolve/cancel).

skang1004 and others added 30 commits February 25, 2020 15:54
@skang1004
Merge pull request #1 from team-snapdesk/master
ce2dd4e 
Update SQL Creator
@jdnordy
fixed webpack not loading static images
0714c36
@jdnordy
changed the routes in the html for static files
40b13cc
@skang1004
Merge pull request #2 from jdnordy/master
c6dbe60 
fixed webpack dev server not loading static images
@jdnordy
started converting css over into sass
2620a6a
@jdnordy
updated styling on login page
2e28281
@eamoranto
added acceptTicket middleware to ticketsController.js and added route…
28f2a35 
… for /tickets/accept in api.js
@skang1004
Merge pull request #3 from eamoranto/master
b507eda 
added acceptTicket middleware to ticketsController.js and added route…
added cancelTicket middleware to ticketsController and added api rout…
5a79434 
…e handler for canceling tickets
@arazulu
implemented accept_ticket & cancel_accept reducers
18ec7e4
@skang1004
ticket actions for accept ticket
8b3ed93
@arazulu
changes
27c0360
@skang1004
Merge branch 'master' into cancel_controller
45d5428
@skang1004
Merge pull request #4 from hellokritty/cancel_controller
b86b94a 
added cancelTicket middleware to ticketsController and added api rout…
@jdnordy
styling changes
59856bb
@skang1004
Merge branch 'master' of https://github.com/Just5Coders/snapdesk_1 in…
be7b4e7 
…to feature1
@skang1004
Merge pull request #5 from arazulu/aris_feature_branch
38b2397 
Aris feature branch - created tickets: cancel_accept & accept reducers
@skang1004
tickets reducer
6c49023
@arazulu
inserted closing bracket in ticketsController
69a4b6d
@skang1004
Merge pull request #6 from jdnordy/styling
7445d6d 
Styling
@skang1004
Merge pull request #7 from arazulu/aris_feature_branch
0b01e8b 
inserted closing bracket in ticketsController
@skang1004
merged from upstream, cleaned up the logic for delete_ticket in ticke…
8de4930 
…ts reducer
@arazulu
cleaned up code for accept_ticket functionality
c3e32f3
@skang1004
Merge pull request #8 from skang1004/feature1
e498618 
Feature1
@eamoranto
ticketsController.resloverTicket was added to ticketsController.js an…
315b21c 
…d tickets/resolved added to api.js
@skang1004
Merge branch 'master' into aris_feature_branch
1cca864
added leaderdboard controller middleware and route handler
64bf919
@skang1004
Merge pull request #9 from arazulu/aris_feature_branch
dfe4096 
cleaned up code for accept_ticket functionality
@skang1004
Merge pull request #10 from eamoranto/resolve
b04185e 
ticketsController.resloverTicket was added to ticketsController.js an…
@skang1004
Merge branch 'master' into leaderboard_backend
251db69
jdnordy and others added 28 commits February 27, 2020 15:43
@jdnordy
styled topic selector
e2514e2
@skang1004
the close button now closes the modal window
f8d7a59
@skang1004
Merge pull request #35 from skang1004/feature17
5658a9b 
got rid of a couple error messages in the console
@jdnordy
updated selector
3ba8f3a
@skang1004
Merge pull request #36 from jdnordy/topic-dropdown-styling
c90bcce 
Topic dropdown styling
added styling for leaderboard table
55803b4
@skang1004
Merge branch 'master' into master
a2f1fa6
@skang1004
Merge pull request #37 from hellokritty/master
01ee59b 
added styling for leaderboard table
@jdnordy
some styling
5ac0119
@jdnordy
merge
7ee0229
@skang1004
Merge pull request #38 from jdnordy/topic-dropdown-styling
4c46a56 
updated selector
centered text within columns of leaderboard component
2f36518
@skang1004
Merge pull request #39 from hellokritty/master
991e8bd 
centered text within columns of leaderboard component
@jdnordy
working on styling of box
32d88bb
@jdnordy
merge
3dfb7d1
@jdnordy
finished
6ee9e96
@skang1004
Merge pull request #40 from jdnordy/ticket-box-styling
4f55579 
Ticket box styling
@eamoranto
fixed ticketsController.getActiveTickets to get data from tickets tha…
9be37a7 
…t have a null mentor_id
@jdnordy
finished bystander ticket box
32f66d4
@skang1004
Merge branch 'master' into mentorNameFix
d276593
@skang1004
Merge pull request #41 from eamoranto/mentorNameFix
95e6ee8 
fixed ticketsController.getActiveTickets to get data from tickets tha…
@skang1004
Merge branch 'master' into bystander-box
4176ccd
@skang1004
Merge pull request #42 from jdnordy/bystander-box
77cda2e 
finished bystander ticket box styling
@jdnordy
added some finishing touches
f769888
@jdnordy
add back in set intervals
990bc7d
@skang1004
Merge pull request #43 from jdnordy/refactor-styling
0eef434 
Refactor styling
@jdnordy
last minute bug fixes
af9627e
@skang1004
Merge pull request #44 from jdnordy/last-minute
9e1a499 
last minute bug fixes
dksheets
dksheets approved these changes Jun 9, 2020
View reviewed changes
Copy link
Collaborator

@dksheets dksheets left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new styling looks good, approved

@jdnordy jdnordy merged commit 63b8510 into team-snapdesk:master Jun 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dksheets dksheets dksheets approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jdnordy @dksheets @skang1004 @eamoranto @arazulu