diff --git a/app/directives/challenge-links/challenge-links.directive.js b/app/directives/challenge-links/challenge-links.directive.js index e5d4035de..04a25d70c 100644 --- a/app/directives/challenge-links/challenge-links.directive.js +++ b/app/directives/challenge-links/challenge-links.directive.js @@ -12,11 +12,6 @@ import angular from 'angular' scope: { challenge: '=', view: '=' - }, - link: function(scope, element, attrs) { - element.on('click', function() { - window.location.href = $(this).attr('href') - }) } } }) diff --git a/app/directives/history-graph/history-graph.directive.js b/app/directives/history-graph/history-graph.directive.js index d634cc885..9358cf80c 100644 --- a/app/directives/history-graph/history-graph.directive.js +++ b/app/directives/history-graph/history-graph.directive.js @@ -245,10 +245,10 @@ import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip.js return y } } - + /* render react tooltip component */ ReactDOM.unmountComponentAtNode(document.getElementById('chart-tooltip')) - ReactDOM.render( + ReactDOM.render(
@@ -259,7 +259,7 @@ import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip.js
, document.getElementById('chart-tooltip')) - + svg.selectAll('circle') .data(history) .enter() @@ -270,6 +270,7 @@ import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip.js .attr('cy', function(d) { return y(d.newRating) }) + .attr('r', 5.5) .attr('fill', function(d) { return ratingToColor($scope.colors, d.newRating) }) @@ -283,18 +284,18 @@ import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip.js else location.href = $filter('challengeLinks')({id: d.challengeId, 'track': $state.params.track, 'subTrack': $state.params.subTrack}, 'detail') }) - + /* update tooltip location on mouseover, feature currently not inbuilt in react tooltip component */ d3.select('#chart-tooltip') - .style('left', (d3.event.pageX-5) + 'px') + .style('left', (d3.event.pageX-5) + 'px') .style('top', (d3.event.pageY-5) + 'px') d3.select('#chart-tooltip .tooltip-container') - .style('left', '20px !important') + .style('left', '20px !important') .style('top', '-20px !important') d3.select('#chart-tooltip .tooltip-container .tooltip-pointer') - .style('left', '-5.5px !important') + .style('left', '-5.5px !important') .style('bottom', '25px !important') - + d3.select('#chart-tooltip .challenge-name').text($scope.historyChallenge) d3.select('#chart-tooltip .challenge-date').text(moment(d.ratingDate).format('MMM DD, YYYY')) d3.select('#chart-tooltip .tooltip-rating').text($scope.historyRating) @@ -307,7 +308,7 @@ import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip.js $scope.$digest() }) - /* hide tooltip when clicked anywhere outside */ + /* hide tooltip when clicked anywhere outside */ d3.select('body').on('click', function(){ if((d3.event.target.classList[0] != 'tooltip-target') && !$('#chart-tooltip .tooltip-container').hasClass('tooltip-hide') && (d3.event.target.tagName.toLowerCase()!='circle') && !(d3.event.target.tagName.toLowerCase()=='rect' && d3.event.target.classList[0] == 'hover')) { diff --git a/app/services/externalAccounts.service.js b/app/services/externalAccounts.service.js index 9df83d0c5..7e2417ccc 100644 --- a/app/services/externalAccounts.service.js +++ b/app/services/externalAccounts.service.js @@ -149,7 +149,8 @@ import _ from 'lodash' providerType: socialData.socialProvider, context: { handle: socialData.username, - accessToken: socialData.accessToken + accessToken: socialData.accessToken, + auth0UserId: profile.user_id } } if (socialData.accessTokenSecret) { diff --git a/assets/css/directives/history-graph.scss b/assets/css/directives/history-graph.scss index 3726d3614..8a093531d 100644 --- a/assets/css/directives/history-graph.scss +++ b/assets/css/directives/history-graph.scss @@ -91,7 +91,6 @@ } circle { - r: 5.5px; stroke: $white; stroke-width: 1.5px; } diff --git a/assets/css/directives/tc-banner.scss b/assets/css/directives/tc-banner.scss index d80ce4820..303b1033b 100644 --- a/assets/css/directives/tc-banner.scss +++ b/assets/css/directives/tc-banner.scss @@ -155,14 +155,22 @@ $tco-color-dark: #ea690b; padding-top: 50px; .title { - font-size: 36px; - margin-bottom: 5px; margin-top: 10px; + @include sofia-pro-bold; + color: $white; } .subtitle { margin-top: 20px; width: 450px; + font-size: 20px; + @extend .title; + @include sofia-pro-regular; + } + + .description { + margin-top: 20px; + margin-bottom: 5px; } .cta { diff --git a/package.json b/package.json index d9221dd78..72c20d151 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,6 @@ "topcoder-app-r": "^1.0.0", "xml2js": "^0.4.16", "zepto": "1.0.1", - "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#0.0.6" + "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#0.0.7" } }