Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit fce2fdd

Browse files
authored
Merge pull request #1018 from appirio-tech/dev
Listing lazy load and cognitive banner
2 parents 298d80e + 35a8134 commit fce2fdd

File tree

6 files changed

+62
-10
lines changed

6 files changed

+62
-10
lines changed

app/listings/listings.controller.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,10 @@ import { loadUser } from '../services/userv3.service.js'
3030
vm.myChallenges = []
3131
loadUser().then(function(token) {
3232
handle = UserService.getUserIdentity().handle
33-
// mock current user have this challenges
34-
vm.myChallenges.push({'id':30056409})
35-
vm.myChallenges.push({'id':30056067})
36-
vm.myChallenges.push({'id':16870})
3733

38-
// update auth flag
34+
// update auth flag and get challenges
3935
if(TcAuthService.isAuthenticated()) {
4036
getChallenges(handle)
41-
$scope.userProps = { isAuth: true, myChallenges: vm.myChallenges }
4237
}
4338
}, function(error) {
4439
// do nothing, just show non logged in state of navigation bar

app/my-dashboard/my-dashboard.jade

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55

66
.challenges(id="challenges", ui-view="my-challenges")
77

8+
.tco.tco17
9+
.tc-banner-placeholder.cognitive
10+
.container
11+
.img
12+
.description Learn about Cognitive technologies and get hands on experience as a member of the Topcoder Cognitive Community.
13+
a(href="https://cognitive.topcoder.com").cta.tc-btn-white.tc-btn-radius Learn More
14+
815
.tco.tco17
916
.tc-banner-placeholder.predix
1017
.subtitle Ready for the future? The Industrial Internet is here
@@ -19,9 +26,6 @@
1926
.subtitle The Ultimate Programming & Design tournament
2027
.description Earn your way to the USA!
2128
a(href="http://tco17.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More
22-
23-
.tco
24-
tc-banner(theme="black", banner-name="tco16")
2529

2630
.srms(id="srms", ui-view="srms", ng-show="dashboard.showSRMs")
2731

assets/css/directives/tc-banner.scss

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,57 @@ $tco-color-dark: #ea690b;
239239
margin-left: -250px;
240240
}
241241

242+
.tc-banner-placeholder.cognitive {
243+
background-image: url(../../images/cognitive-home-hero.jpg);
244+
background-size: cover;
245+
height: 352px;
246+
background-position: center 100%;
247+
background-repeat: no-repeat;
248+
background-color: #222222;
249+
z-index: 1;
250+
flex-direction: row;
251+
252+
.container {
253+
width: 50%;
254+
display: flex;
255+
flex-direction: column;
256+
align-items: flex-start;
257+
margin-left: 37px;
258+
height: 95%;
259+
justify-content: space-between;
260+
261+
.img {
262+
background-image: url(../../images/cognitive-home-hero-title.png);
263+
background-size: 100%;
264+
background-repeat: no-repeat;
265+
background-position: center 100%;
266+
height: 57px;
267+
width: 75%;
268+
}
269+
270+
.description {
271+
color: $white;
272+
margin: 0 30px 0 0;
273+
font-size: 24px;
274+
line-height: 29px;
275+
text-align: left;
276+
font-weight: 300;
277+
}
278+
279+
.cta {
280+
margin-top: 20px;
281+
}
282+
283+
.tc-btn-white {
284+
background-color: white;
285+
color: #0096FF;
286+
padding: 10px 20px;
287+
}
288+
289+
.tc-btn-radius {
290+
border-radius: 26px;
291+
}
292+
}
293+
}
294+
242295

34.9 KB
Loading

assets/images/cognitive-home-hero.jpg

162 KB
Loading

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"appirio-styles": "0.x.x",
5757
"appirio-tech-ng-iso-constants": "^1.0.6",
5858
"appirio-tech-ng-ui-components": "^2.1.2",
59-
"appirio-tech-react-components": "appirio-tech/react-components.git#cl-misc-fixes-2",
59+
"appirio-tech-react-components": "appirio-tech/react-components.git#cl-misc-fixes-3",
6060
"auth0-angular": "^4.1.0",
6161
"auth0-js": "^6.8.0",
6262
"d3": "^3.5.14",

0 commit comments

Comments
 (0)