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

Tom cloak #60

Merged
merged 2 commits into from
Jul 30, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/profile/develop/develop.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
vm.domain = CONSTANTS.domain;
vm.challenges = [];
vm.profile = {};
vm.loading = true;

activate();

Expand All @@ -28,6 +29,9 @@
vm.challenges = data;
});
});
if (vm.altResolve) {
vm.deferred.resolve(vm);
}
}

}
Expand Down
5 changes: 4 additions & 1 deletion app/profile/develop/develop.jade
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.profile-develop-container
.profile-develop-container(ng-hide='vm.loading', ng-cloak)
hr
h1.type Develop: {{vm.subTrack}}
hr
Expand Down Expand Up @@ -33,6 +33,9 @@
challenge-tile(challenge="challenge", domain="vm.domain")

.stats(ng-show="vm.viewing == 'stats'")
.graphs
img(src="images/rating-graphs.png")

h2.detailed Detailed Stats

ul.vertical-stats
Expand Down
17 changes: 15 additions & 2 deletions app/profile/profile.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
vm.title = "Profile";
vm.message = "Message"
vm.profile = {};
vm.loading = true;
vm.userHandle = userHandle;

activate(vms);
Expand Down Expand Up @@ -42,12 +43,24 @@
// until horizontal scroll is implemented
vm.skills = skills.skills;
vm.categories = ProfileService.getRanks(vm.stats);
vm.loading = false;
});
});
}

$scope.initProfile = function(vm) {
vms.push(vm);
$scope.initProfile = function(newVm) {
if (!vm.stats) {
vms.push(newVm);
} else {
newVm.profile = vm.profile;
newVm.stats = vm.stats;
newVm.numProjects = vm.numProjects;
newVm.numWins = vm.numWins;
newVm.skills = vm.skills;
newVm.categories = vm.categories;
newVm.altResolve = true;
newVm.loading = false;
}
}

}
Expand Down
4 changes: 2 additions & 2 deletions app/profile/profile.jade
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.profile-header-container
.profile-header-container(ng-hide="vm.loading", ng-cloak)
.left
profile-widget(profile="vm.profile", edit-profile-link="vm.showEditProfileLink")
.right
h4 member for {{vm.tenure}} years

ui-view
ui-view(ng-hide="vm.loading", ng-cloak)
8 changes: 8 additions & 0 deletions assets/css/profile/develop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
font-size: 18px;
}
.stats {
.graphs {
display: flex;
flex-direction: row;
justify-content: center;
img {
width: 700px;
}
}
h2.detailed {
margin: 50px auto 25px auto;
text-align: center;
Expand Down
Binary file added assets/images/rating-graphs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.