diff --git a/app/listings/listings.controller.js b/app/listings/listings.controller.js index 6f42e1103..feef90d51 100755 --- a/app/listings/listings.controller.js +++ b/app/listings/listings.controller.js @@ -30,15 +30,10 @@ import { loadUser } from '../services/userv3.service.js' vm.myChallenges = [] loadUser().then(function(token) { handle = UserService.getUserIdentity().handle - // mock current user have this challenges - vm.myChallenges.push({'id':30056409}) - vm.myChallenges.push({'id':30056067}) - vm.myChallenges.push({'id':16870}) - // update auth flag + // update auth flag and get challenges if(TcAuthService.isAuthenticated()) { getChallenges(handle) - $scope.userProps = { isAuth: true, myChallenges: vm.myChallenges } } }, function(error) { // do nothing, just show non logged in state of navigation bar diff --git a/app/my-dashboard/my-dashboard.jade b/app/my-dashboard/my-dashboard.jade index 6a050a922..3da90e1cf 100644 --- a/app/my-dashboard/my-dashboard.jade +++ b/app/my-dashboard/my-dashboard.jade @@ -5,6 +5,13 @@ .challenges(id="challenges", ui-view="my-challenges") + .tco.tco17 + .tc-banner-placeholder.cognitive + .container + .img + .description Learn about Cognitive technologies and get hands on experience as a member of the Topcoder Cognitive Community. + a(href="https://cognitive.topcoder.com").cta.tc-btn-white.tc-btn-radius Learn More + .tco.tco17 .tc-banner-placeholder.predix .subtitle Ready for the future? The Industrial Internet is here @@ -19,9 +26,6 @@ .subtitle The Ultimate Programming & Design tournament .description Earn your way to the USA! a(href="http://tco17.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More - - .tco - tc-banner(theme="black", banner-name="tco16") .srms(id="srms", ui-view="srms", ng-show="dashboard.showSRMs") diff --git a/assets/css/directives/tc-banner.scss b/assets/css/directives/tc-banner.scss index 980a64622..3cd03af54 100644 --- a/assets/css/directives/tc-banner.scss +++ b/assets/css/directives/tc-banner.scss @@ -239,4 +239,57 @@ $tco-color-dark: #ea690b; margin-left: -250px; } +.tc-banner-placeholder.cognitive { + background-image: url(../../images/cognitive-home-hero.jpg); + background-size: cover; + height: 352px; + background-position: center 100%; + background-repeat: no-repeat; + background-color: #222222; + z-index: 1; + flex-direction: row; + + .container { + width: 50%; + display: flex; + flex-direction: column; + align-items: flex-start; + margin-left: 37px; + height: 95%; + justify-content: space-between; + + .img { + background-image: url(../../images/cognitive-home-hero-title.png); + background-size: 100%; + background-repeat: no-repeat; + background-position: center 100%; + height: 57px; + width: 75%; + } + + .description { + color: $white; + margin: 0 30px 0 0; + font-size: 24px; + line-height: 29px; + text-align: left; + font-weight: 300; + } + + .cta { + margin-top: 20px; + } + + .tc-btn-white { + background-color: white; + color: #0096FF; + padding: 10px 20px; + } + + .tc-btn-radius { + border-radius: 26px; + } + } +} + diff --git a/assets/images/cognitive-home-hero-title.png b/assets/images/cognitive-home-hero-title.png new file mode 100644 index 000000000..a281d23fa Binary files /dev/null and b/assets/images/cognitive-home-hero-title.png differ diff --git a/assets/images/cognitive-home-hero.jpg b/assets/images/cognitive-home-hero.jpg new file mode 100644 index 000000000..3ebda9a1f Binary files /dev/null and b/assets/images/cognitive-home-hero.jpg differ diff --git a/package.json b/package.json index 63161ef11..d043c86d6 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "appirio-styles": "0.x.x", "appirio-tech-ng-iso-constants": "^1.0.6", "appirio-tech-ng-ui-components": "^2.1.2", - "appirio-tech-react-components": "appirio-tech/react-components.git#cl-misc-fixes-2", + "appirio-tech-react-components": "appirio-tech/react-components.git#cl-misc-fixes-3", "auth0-angular": "^4.1.0", "auth0-js": "^6.8.0", "d3": "^3.5.14",