Working on skills

tladendo · tladendo · commit 3d9e0810a358 · 2015-09-18T10:48:31.000-05:00
diff --git a/app/directives/skill-tile/skill-tile.directive.jade b/app/directives/skill-tile/skill-tile.directive.jade
@@ -1,7 +1,7 @@
 a(ng-click="enableHide && toggle()")
 
   i.colored(ng-show="icon", ng-class="icon") 
-  i.default(ng-hide="icon") {}
+  img.default(ng-hide="icon", src="/images/ico-code-c.svg")
   .name {{skill.tagName}} [{{skill.score}}]
   spam(ng-if="skill.hidden") Hidden
 
diff --git a/app/index.jade b/app/index.jade
@@ -33,11 +33,9 @@ html
     link(rel="stylesheet", href="assets/css/settings/edit-profile.css")
     link(rel="stylesheet", href="assets/css/settings/account-info.css")
     link(rel="stylesheet", href="assets/css/profile/subtrack.css")
-    link(rel="stylesheet", href="assets/css/profile/subtrack.desktop.css")
     link(rel="stylesheet", href="assets/css/profile/header.css")
     link(rel="stylesheet", href="assets/css/profile/badges.css")
     link(rel="stylesheet", href="assets/css/profile/about.css")
-    link(rel="stylesheet", href="assets/css/profile/about.desktop.css")
     link(rel="stylesheet", href="assets/css/peer-review/reviewStatus.css")
     link(rel="stylesheet", href="assets/css/peer-review/readOnlyScorecard.css")
     link(rel="stylesheet", href="assets/css/peer-review/peer-review.css")
@@ -58,14 +56,12 @@ html
     link(rel="stylesheet", href="assets/css/directives/tc-section.css")
     link(rel="stylesheet", href="assets/css/directives/tc-paginator.css")
     link(rel="stylesheet", href="assets/css/directives/srm-tile.css")
+    link(rel="stylesheet", href="assets/css/directives/skill-tile.css")
     link(rel="stylesheet", href="assets/css/directives/profile-widget.css")
-    link(rel="stylesheet", href="assets/css/directives/profile-widget.desktop.css")
     link(rel="stylesheet", href="assets/css/directives/history-graph.css")
-    link(rel="stylesheet", href="assets/css/directives/history-graph.desktop.css")
     link(rel="stylesheet", href="assets/css/directives/external-link-data.css")
     link(rel="stylesheet", href="assets/css/directives/external-account.css")
     link(rel="stylesheet", href="assets/css/directives/distribution-graph.css")
-    link(rel="stylesheet", href="assets/css/directives/distribution-graph.desktop.css")
     link(rel="stylesheet", href="assets/css/directives/challenge-tiles.css")
     link(rel="stylesheet", href="assets/css/directives/badge-tooltip.css")
     link(rel="stylesheet", href="assets/css/account/reset-password.css")
diff --git a/app/profile/about/about.controller.js b/app/profile/about/about.controller.js
@@ -32,6 +32,8 @@
       profileVm.skillsPromise.then(function() {
         // show section if user is viewing his/her own profile OR if we have data
         vm.skills = profileVm.skills;
+        console.log('skills:')
+        console.log(profileVm.skills)
         vm.displaySection.skills = profileVm.showEditProfileLink || !!vm.skills.length;
       });
     }
diff --git a/app/profile/about/about.jade b/app/profile/about/about.jade
@@ -10,19 +10,10 @@
     hr
     h3.activity Skills &amp; Technologies  
     .list(ng-show="profileVm.skills && profileVm.skills.length > 0")
-      .leftButton(
-        ng-click="vm.shiftSkills(-1)",
-        ng-show="vm.skillIndex > 0"
-      ) &#9664;
 
-      .skill(ng-repeat="skill in profileVm.skills.slice(vm.skillIndex, vm.skillIndex + 5)")
+      .skill(ng-repeat="skill in profileVm.skills")
         skill-tile(skill="skill")
 
-      .rightButton(
-        ng-click="vm.shiftSkills(1)",
-        ng-show="vm.skillIndex < vm.skills.length - 5"
-      ) &#9654;
-  
     .empty-state(ng-show="profileVm.skills && profileVm.skills.length == 0")
       .action-text show us your skills &amp; tools, we'd love that!
       
diff --git a/assets/css/directives/skill-tile.scss b/assets/css/directives/skill-tile.scss
@@ -0,0 +1,3 @@
+skill-tile {
+  border: 1px solid #f0f0f0;
+}
diff --git a/assets/images/ico-code-c.svg b/assets/images/ico-code-c.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>ico-code-c</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" stop-opacity="0.5" offset="0%"></stop>
+            <stop stop-color="#000000" stop-opacity="0.5" offset="100%"></stop>
+        </linearGradient>
+        <rect id="path-2" x="0" y="0" width="48" height="48" rx="1.5999999"></rect>
+    </defs>
+    <g id="ASSETS-EXPORT" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="ico-code-c" sketch:type="MSLayerGroup">
+            <g id="Rectangle-140">
+                <use stroke="#99CC00" stroke-width="3.19999981" fill="#3D3D3D" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
+                <use stroke="none" fill-opacity="0.300000012" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            </g>
+            <path d="M15.6360005,31.1839999 C14.9800006,31.1839999 14.7880006,30.9439999 14.7880006,30.064 C14.7880006,29.2 14.8520006,28.4320001 14.8520006,27.4560002 C14.8520006,26.2400002 14.4680006,25.7760003 13.6680006,25.5840003 L13.6680006,25.5200003 C14.4680006,25.3280003 14.8520006,24.8640003 14.8520006,23.6480004 C14.8520006,22.6720004 14.7880006,21.9040005 14.7880006,21.0400005 C14.7880006,20.1600006 14.9800006,19.9200006 15.6360005,19.9200006 L15.9400005,19.9200006 L15.9400005,18.6720007 L14.9320006,18.6720007 C13.5240007,18.6720007 12.8840007,19.2160006 12.8840007,20.9440005 C12.8840007,22.0800005 13.0440007,22.6720004 13.0440007,23.6800004 C13.0440007,24.2400003 12.7080007,24.8320003 11.6680008,24.8640003 L11.6680008,26.2400002 C12.7080007,26.2720002 13.0440007,26.8640002 13.0440007,27.4240002 C13.0440007,28.4320001 12.8840007,29.0240001 12.8840007,30.16 C12.8840007,31.8879999 13.5240007,32.4319999 14.9320006,32.4319999 L15.9400005,32.4319999 L15.9400005,31.1839999 L15.6360005,31.1839999 Z M17.9080004,28.7200001 C17.9080004,29.552 18.5000004,30.192 19.3160003,30.192 C20.1320003,30.192 20.7400002,29.552 20.7400002,28.7200001 C20.7400002,27.8720001 20.1320003,27.2320002 19.3160003,27.2320002 C18.5000004,27.2320002 17.9080004,27.8720001 17.9080004,28.7200001 L17.9080004,28.7200001 Z M23.2040001,28.7200001 C23.2040001,29.552 23.812,30.192 24.628,30.192 C25.4439999,30.192 26.0519999,29.552 26.0519999,28.7200001 C26.0519999,27.8720001 25.4439999,27.2320002 24.628,27.2320002 C23.812,27.2320002 23.2040001,27.8720001 23.2040001,28.7200001 L23.2040001,28.7200001 Z M28.5159998,28.7200001 C28.5159998,29.552 29.1079997,30.192 29.9239997,30.192 C30.7399996,30.192 31.3479996,29.552 31.3479996,28.7200001 C31.3479996,27.8720001 30.7399996,27.2320002 29.9239997,27.2320002 C29.1079997,27.2320002 28.5159998,27.8720001 28.5159998,28.7200001 L28.5159998,28.7200001 Z M33.0599995,31.1839999 L33.0599995,32.4319999 L34.0679994,32.4319999 C35.4759993,32.4319999 36.1159993,31.8879999 36.1159993,30.16 C36.1159993,29.0240001 35.9559993,28.4320001 35.9559993,27.4240002 C35.9559993,26.8640002 36.2919993,26.2720002 37.3319992,26.2400002 L37.3319992,24.8640003 C36.2919993,24.8320003 35.9559993,24.2400003 35.9559993,23.6800004 C35.9559993,22.6720004 36.1159993,22.0800005 36.1159993,20.9440005 C36.1159993,19.2160006 35.4759993,18.6720007 34.0679994,18.6720007 L33.0599995,18.6720007 L33.0599995,19.9200006 L33.3639995,19.9200006 C34.0359994,19.9200006 34.2119994,20.1600006 34.2119994,21.0400005 C34.2119994,21.9040005 34.1479994,22.6720004 34.1479994,23.6480004 C34.1479994,24.8640003 34.5319994,25.3280003 35.3319994,25.5200003 L35.3319994,25.5840003 C34.5319994,25.7760003 34.1479994,26.2400002 34.1479994,27.4560002 C34.1479994,28.4320001 34.2119994,29.2 34.2119994,30.064 C34.2119994,30.9439999 34.0359994,31.1839999 33.3639995,31.1839999 L33.0599995,31.1839999 Z" id="{…}" fill="#99CC00" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`profileVm.skillsPromise.then(function() {`
`33`	`33`	`// show section if user is viewing his/her own profile OR if we have data`
`34`	`34`	`vm.skills = profileVm.skills;`
	`35`	`+ console.log('skills:')`
	`36`	`+ console.log(profileVm.skills)`
`35`	`37`	`vm.displaySection.skills = profileVm.showEditProfileLink \|\| !!vm.skills.length;`
`36`	`38`	`});`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+skill-tile {`
	`2`	`+ border: 1px solid #f0f0f0;`
	`3`	`+}`