Merge pull request #68 from appirio-tech/dev

Release dev to qa

Author: thabofletcher

Gruntfile.js

@@ -26,7 +26,8 @@ module.exports = function (grunt) {
     auth0Domain           : process.env.AUTH0_DOMAIN || 'topcoder-dev.auth0.com',
     auth0Callback         : 'no-callback-needed-without-social-login',
     submissionDownloadPath: '/review/actions/DownloadContestSubmission?uid=',
-    photoLinkLocation     : process.env.PHOTO_LINK_LOCATION || 'http://community.topcoder.com'
+    photoLinkLocation     : process.env.PHOTO_LINK_LOCATION || 'http://community.topcoder.com',
+    LIME_PROGRAM_ID       : 3445
   };
 
   // Define the configuration for all the tasks
@@ -55,7 +56,8 @@ module.exports = function (grunt) {
             auth0Domain           : appConfig.auth0Domain,
             auth0Callback         : appConfig.auth0Callback,
             submissionDownloadPath: appConfig.submissionDownloadPath,
-            photoLinkLocation     : appConfig.photoLinkLocation
+            photoLinkLocation     : appConfig.photoLinkLocation,
+            LIME_PROGRAM_ID       : appConfig.LIME_PROGRAM_ID
           }
         }
       },
@@ -73,7 +75,8 @@ module.exports = function (grunt) {
             auth0Domain           : 'topcoder-qa.auth0.com',
             auth0Callback         : appConfig.auth0Callback,
             submissionDownloadPath: appConfig.submissionDownloadPath,
-            photoLinkLocation     : appConfig.photoLinkLocation
+            photoLinkLocation     : appConfig.photoLinkLocation,
+            LIME_PROGRAM_ID       : appConfig.LIME_PROGRAM_ID
           }
         }
       },
@@ -91,7 +94,8 @@ module.exports = function (grunt) {
             auth0Domain           : 'topcoder.auth0.com',
             auth0Callback         : appConfig.auth0Callback,
             submissionDownloadPath: appConfig.submissionDownloadPath,
-            photoLinkLocation     : appConfig.photoLinkLocation
+            photoLinkLocation     : appConfig.photoLinkLocation,
+            LIME_PROGRAM_ID       : appConfig.LIME_PROGRAM_ID
           }
         }
       }

app/app.routes.coffee

@@ -1,6 +1,9 @@
 'use strict'
 
-routes = ($stateProvider, $urlRouterProvider, $httpProvider) ->
+routes = ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) ->
+
+  $locationProvider.html5Mode true
+
   states =
     landing:
       url         : '/'
@@ -9,7 +12,10 @@ routes = ($stateProvider, $urlRouterProvider, $httpProvider) ->
     learn:
       url         : '/learn'
       templateUrl : 'learn/learn.html'
-      controller  : 'learn'
+      #binded controller in view as workaround to use controller as vm style
+      #controllerAs property is working with coffee script
+      #more info: http://stackoverflow.com/questions/28953289/using-controller-as-with-the-ui-router-isnt-working-as-expected
+      #controller  : 'learn'
     login:
       url         : '/login?retUrl&retState'
       templateUrl : 'login/login.html'
@@ -44,5 +50,6 @@ angular.module('lime-topcoder').config [
   '$stateProvider'
   '$urlRouterProvider'
   '$httpProvider'
+  '$locationProvider'
   routes
 ]

app/challenges/challenges.jade

@@ -51,8 +51,8 @@ div(ng-controller="challenges as vm")
               .ca SUBMISSIONS
               .vl(ng-bind="challenge.numSubmissions")
           .actns
-            a.btn.secondary.btnReg(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop", target="_blank") Register
-            //a.lnkLiked
+            a.btn.secondary.btnReg(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop", target="_blank") View
+
             a.lnk(href='#view-challenges', du-smooth-scroll) View all challenges
 
   .challenges-section.landing-annon-page#view-challenges

app/content/css/app.scss

@@ -86,3 +86,7 @@ button {
 .padding-reset {
   padding: 0px;
 }
+
+.margin-left-2x {
+  margin-left: 10px;
+}

app/content/css/challenges.scss

@@ -1003,14 +1003,6 @@
                         font-size: 16px;
                         margin-right: 30px;
                     }
-                    .lnkLiked {
-                        height: 35px;
-                        width: 35px;
-                        background: #031625 url(../images/ico-heart.png) 50% 50% no-repeat;
-                        display: inline-block;
-                        border-radius: 3px;
-                        margin: 0 30px 0 16px;
-                    }
                     .lnk,
                     .lnk:hover {
                         line-height: 35px;

app/content/css/learn.scss

@@ -139,6 +139,12 @@
       position: absolute;
       top: 0;
     }
+
+    .badge-desc {
+      img.achieved {
+        vertical-align: middle;
+      }
+    }
   }
 
   .participant-badge:before {
@@ -305,6 +311,24 @@
     }
   }
 
+
+  @media only screen and (max-width: 568px) {
+    .newsletter-form {
+      width: auto;
+
+      .mktoFormRow .mktoFormCol {
+        width: 100%;
+
+        .mktoFieldWrap {
+          width: 100%;
+        }
+      }
+      input {
+        width: 100% !important;
+      }
+    }
+}
+
   @media only screen and (max-width: 640px) {
     .newsletter-form-wrapper {
       padding-left: 0;

app/content/images/ico-okay-check.png

@@ -35,6 +35,7 @@
 - jsFiles.push('services/countries.service')
 - jsFiles.push('services/helpers.service')
 - jsFiles.push('services/challenge.service')
+- jsFiles.push('services/member-cert.service')
 - jsFiles.push('services/user.service')
 - jsFiles.push('directives/checkbox')
 - jsFiles.push('directives/requiredDropdown')
@@ -44,7 +45,9 @@
 doctype html
 html
   head
+    base(href="/")
     meta(charset="utf-8")
+    meta(name="fragment", content="!")
 
     title topcoder iOS Member Program
 
@@ -115,7 +118,7 @@ html
     include layout/header.jade
 
     .view-container(ui-view, ng-class="$state.current.name", autoscroll="true")
-    .view-container-loading(ng-show="main.loggingIn")
+    .view-container-loading(ng-show="main.loading")
       div.circle-3-loading
         span.loading-wrapper
           span.outer-circle

app/index.jade

@@ -5,10 +5,10 @@ footer.login-footer.footer
 
       ul
         li
-          a(href='http://topcoder.com/community/how-it-works/privacy-policy/') Privacy Policy
+          a(href='http://www.{{main.domain}}/community/how-it-works/privacy-policy/') Privacy Policy
         li |
         li
-          a(href='http://topcoder.com/community/how-it-works/terms/') Terms
+          a(href='http://www.{{main.domain}}/community/how-it-works/terms/') Terms
 
     section.social
       a.fb-icon(href='https://www.facebook.com/topcoder')

app/layout/footer.jade

@@ -5,7 +5,7 @@ main = ($scope, $state, ENV, AuthService, UserService) ->
   vm.domain = ENV.domain
 
   vm.loggedInUser = null
-  vm.loggingIn = false
+  vm.loading = false
 
   vm.updatePhotoLink = () ->
     user = vm.loggedInUser
@@ -26,16 +26,24 @@ main = ($scope, $state, ENV, AuthService, UserService) ->
       true
     false
 
+  loginHandlers = {}
+  vm.addLoginEventHandler = (name, handler) ->
+    loginHandlers[name] = handler
+
   vm.activate = () ->
     if AuthService.isAuthenticated()
-      vm.loggingIn = true
+      vm.loading = true
       UserService.getLoggedInUser()
       .then (data) ->
-        vm.loggingIn = false
+        vm.loading = false
         vm.loggedInUser = data.data
+        for name of loginHandlers
+          handler = loginHandlers[name]
+          if (handler && typeof handler == 'function')
+            handler vm.loggedInUser
         vm.updatePhotoLink()
       .catch (error) ->
-        vm.loggingIn = false
+        vm.loading = false
         UserService.getUsername()
         .then (data) ->
           vm.loggedInUser =

app/layout/main.coffee

@@ -1,12 +1,75 @@
 'use strict'
 
-learn = ($state) ->
+learn = ($scope, ENV, MemberCertService, $state) ->
   MktoForms2.loadForm '//app-abc.marketo.com', '921-UOU-112', 1944, (form) ->
     form.onSuccess () ->
       $state.go 'confirmNewsletter'
       false
 
+  vm = this
+  vm.registered = false
+  vm.registrationSuccess = false
+  vm.registrationError = null
+  main = $scope.$parent.main
+
+  vm.checkRegStatus = () ->
+    if !main.loggedInUser
+      vm.registered = false
+      return
+    main.loading = true
+    request =
+      userId: main.loggedInUser.uid
+      programId: ENV.LIME_PROGRAM_ID
+    MemberCertService.getProgramForUser(request)
+    .then (response) ->
+      # set off loading flag
+      main.loading = false
+      console.log response
+      registered = false
+      if response.status == 200
+        result = response.data.result
+        program = result?.content
+        if program
+          vm.registered = true
+
+    .catch (error) ->
+      # TODO show error
+      main.loading = false
+      vm.registered = false
+    
+
+  vm.registerForProgram = () ->
+    vm.registrationError = null
+    if !main.loggedInUser
+      vm.registrationError = 'Please login to participate'
+      return
+    main.loading = true
+    request =
+      userId: main.loggedInUser.uid
+      programId: ENV.LIME_PROGRAM_ID
+    MemberCertService.registerForProgram(request)
+    .then (response) ->
+      # set off loading flag
+      main.loading = false
+      if response.status == 200
+        vm.registrationSuccess = true
+        vm.registered = true
+
+    .catch (error) ->
+      # TODO show error
+      main.loading = false
+      vm.registered = false
+      vm.registrationSuccess = false
+
+  # registers login even handler to handle timing of multiple ajax calls
+  main.addLoginEventHandler('learn', vm.checkRegStatus)
+  # check status on load
+  vm.checkRegStatus()
+
 angular.module('lime-topcoder').controller 'learn', [
+  '$scope'
+  'ENV'
+  'MemberCertService'
   '$state'
   learn
 ]