Merge branch 'dev' into submissions-header

Author: Nick Litwin

.version

@@ -1 +1 @@
-v1.0.17
+v1.0.18

README.md

@@ -91,6 +91,23 @@ SCSS Files
   - Use variables, mixins, and classes as much as possible from our [style guide](https://github.com/appirio-tech/styles)
   - Reuse our [UI Components](https://github.com/appirio-tech/ng-ui-components)
   - When adding media queries, nest them inside the element, rather than creating a new section
+  ```
+  .box {
+    height: 50px;
+    width: 50px;
+    @media screen and (min-width: 768px) {
+      height: 100px;
+      width: 100px;
+    }
+    
+    .inside-box {
+      font-size: 14px;
+      @media screen and (min-width: 768px) {
+        font-size: 18px;
+      }
+    }
+  }
+  ```
   - This repository uses flexbox for arranging content. The use of any extra CSS libraries should be discussed with the team
 
 JavaScript

app/directives/external-account/external-link-data.directive.jade

@@ -2,7 +2,7 @@
   .external-link-tile(ng-repeat="account in linkedAccountsData", ng-class="{'external-link-tile--editable' : editable, 'external-link-tile--pending' : account.status === 'PENDING' || account.data.status === 'PENDING'}", ng-click="openLink(account)")
     .top
       .ext-link-tile_edit-header(ng-show="editable && account.provider === 'weblink'")
-        .ext-link-tile_edit-header_delete(ng-click="confirmDeletion(account)", ng-class="{'ext-link-tile_edit-header_delete--disabled': account.deletingAccount || account.status === 'PENDING'}")
+        .ext-link-tile_edit-header_delete(ng-click="confirmDeletion(account)", ng-class="{'ext-link-tile_edit-header_delete--disabled': account.deletingAccount || account.status === 'PENDING'}", prevent-event-propagation)
       div.logo
         i.fa(ng-class="(account|providerData:'className') || 'fa-globe'")
       h2 {{account|providerData:"displayName"}}

app/filters/challengeLinks.filter.js

@@ -16,7 +16,7 @@
           case 'forums':
             return String.supplant('https://apps.{domain}/forums/?module=ThreadList&forumID={forumId}', data);
           case 'registrants':
-            return String.supplant('https://community.{domain}/longcontest/?module=ViewStandings&rd={roundId}', data);
+            return String.supplant('https://community.{domain}/longcontest/?module=ViewRegistrants&rd={roundId}', data);
           case 'detail':
             return String.supplant('https://community.{domain}/longcontest/stats/?module=ViewOverview&rd={roundId}', data);
         }

app/filters/filters.spec.js

@@ -95,7 +95,7 @@ describe('filters', function() {
       };
       expect(challengeLinksFilter(_ch, 'detail')).to.be.equal('https://community.'+domain+'/longcontest/stats/?module=ViewOverview&rd=3');
       expect(challengeLinksFilter(_ch, 'forums')).to.be.equal('https://apps.'+domain+'/forums/?module=ThreadList&forumID=2');
-      expect(challengeLinksFilter(_ch, 'registrants')).to.be.equal('https://community.'+domain+'/longcontest/?module=ViewStandings&rd=3');
+      expect(challengeLinksFilter(_ch, 'registrants')).to.be.equal('https://community.'+domain+'/longcontest/?module=ViewRegistrants&rd=3');
     });
   });
 

app/services/tcAuth.service.js

@@ -3,11 +3,12 @@
 
   angular.module('tc.services').factory('TcAuthService', TcAuthService);
 
-  TcAuthService.$inject = ['CONSTANTS', 'auth', 'AuthTokenService', '$rootScope', '$q', '$log', '$timeout', 'UserService', 'Helpers', 'ApiService', 'store'];
+  TcAuthService.$inject = ['CONSTANTS', 'auth', 'AuthTokenService', '$rootScope', '$q', '$log', '$timeout', 'UserService', 'Helpers', 'ApiService', 'store', '$http'];
 
-  function TcAuthService(CONSTANTS, auth, AuthTokenService, $rootScope, $q, $log, $timeout, UserService, Helpers, ApiService, store) {
+  function TcAuthService(CONSTANTS, auth, AuthTokenService, $rootScope, $q, $log, $timeout, UserService, Helpers, ApiService, store, $http) {
     $log = $log.getInstance("TcAuthServicetcAuth");
     var auth0 = auth;
+    var apiUrl = CONSTANTS.AUTH_API_URL;
     var service = {
       login: login,
       socialLogin: socialLogin,
@@ -162,10 +163,29 @@
     }
 
     function logout() {
+      // options for DELETE http call
+      var logoutOptions = {
+        url: apiUrl + '/authorizations/1',
+        method: 'DELETE',
+        headers: {
+          'Authorization': "Bearer " + AuthTokenService.getV3Token()
+        }
+      };
+
+
+      // logout of all browsers
       return $q(function(resolve, reject) {
+        // remove local token
         AuthTokenService.removeTokens();
         $rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_OUT);
         resolve();
+//        $http(logoutOptions).then(function(res) {
+//          $log.log('logout successful');
+//          resolve();
+//        }).catch(function(resp) {
+//          $log.error('logout error');
+//          reject();
+//        });
       });
     }
 

app/sitemap/sitemap.jade

@@ -23,7 +23,7 @@
         li 
           a(href="/community/design") Design
         li  
-          a(href="/community/devlopment") Development
+          a(href="/community/development") Development
         li 
           a(href="/community/data-science") Data Science
         li 

assets/css/directives/external-link-deletion-confirm.scss

@@ -27,7 +27,7 @@
 }
 
 .deletion-confirmation-message {
-  @include merriweather-sans-regular;//TODO use sansbook font
+  @include font-with-weight('Merriweather Sans', 300);
 
   .deletion-confirmation-account-title {
     font-style: italic;