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

Commit 76f7296

Browse files
committed
Merge pull request #751 from appirio-tech/add-member-search
Add member search
2 parents fea65aa + f23dc65 commit 76f7296

File tree

10 files changed

+79
-1
lines changed

10 files changed

+79
-1
lines changed

app/index.jade

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ html
77
meta(http-equiv="X-UA-Compatible", content="IE=edge, chrome=1")
88
meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no")
99
meta(name="fragment", content="!")
10+
script.
11+
(function(d) {
12+
var config = {
13+
kitId: 'gig7sjk',
14+
scriptTimeout: 3000,
15+
async: true
16+
},
17+
h=d.documentElement,t=setTimeout(function(){h.className=h.className.replace(/\bwf-loading\b/g,"")+" wf-inactive";},config.scriptTimeout),tk=d.createElement("script"),f=false,s=d.getElementsByTagName("script")[0],a;h.className+=" wf-loading";tk.src='https://use.typekit.net/'+config.kitId+'.js';tk.async=true;tk.onload=tk.onreadystatechange=function(){a=this.readyState;if(f||a&&a!="complete"&&a!="loaded")return;f=true;clearTimeout(t);try{Typekit.load(config)}catch(e){}};s.parentNode.insertBefore(tk,s)
18+
})(document);
1019

1120
include ../assets/scripts/google.analytics.jade
1221

app/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'babel-polyfill'
2+
13
require('angular')
24
require('auth0-js')
35
require('auth0-angular')
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import angular from 'angular'
2+
3+
(function() {
4+
'use strict'
5+
6+
angular.module('tc.search').directive('memberSearch', memberSearch)
7+
8+
var memberSearchPage = require('topcoder-app-r/src/indexTest').default
9+
10+
memberSearch.$inject = ['reactDirective']
11+
12+
function memberSearch(reactDirective) {
13+
return reactDirective(memberSearchPage)
14+
}
15+
})()

app/member-search/member-search.jade

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
div#member-search-wrapper
2+
member-search
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import angular from 'angular'
2+
3+
(function() {
4+
'use strict'
5+
6+
angular.module('tc.search', [])
7+
})()
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import angular from 'angular'
2+
3+
(function() {
4+
'use strict'
5+
6+
angular.module('tc.search').config([
7+
'$stateProvider',
8+
routes
9+
])
10+
11+
function routes($stateProvider) {
12+
var states = {
13+
'memberSearch': {
14+
url: '/search/members/',
15+
parent: 'root',
16+
template: require('./member-search')(),
17+
data: {
18+
title: 'Member Search'
19+
}
20+
}
21+
}
22+
for (var name in states) {
23+
var state = states[name]
24+
$stateProvider.state(name, state)
25+
}
26+
}
27+
})()

app/topcoder.module.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import angular from 'angular'
1717
'tc.skill-picker',
1818
'tc.sitemap',
1919
'tc.community',
20+
'tc.search',
2021
'ui.router',
2122
'blocks.logger',
2223
'blocks.exception',

assets/css/topcoder.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,3 +541,15 @@ $switch-inactive-color: $gray;
541541
right: $switch-handle-offset + $switch-handle-size -1;
542542
top: 0;
543543
}
544+
545+
// DELETE when moving member search back
546+
// Also delete TypeKit fonts from index.html
547+
// Also delete redux-logger and babel-polyfill from npm modules
548+
// also delete babel-polyfill from index.js
549+
#member-search-wrapper {
550+
font-family: Roboto !important;
551+
552+
.member-search-view {
553+
background-color: transparent;
554+
}
555+
}

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"devDependencies": {
1111
"angular-mocks": "^1.4.9",
1212
"appirio-tech-webpack-config": "^0.2.0",
13-
"babel-loader": "^6.2.1",
13+
"babel-polyfill": "^6.7.2",
1414
"bardjs": "^0.1.8",
1515
"bower": "^1.6.8",
1616
"chai": "^3.5.0",
@@ -32,6 +32,7 @@
3232
"mocha": "^2.4.5",
3333
"phantomjs-polyfill": "0.0.1",
3434
"phantomjs-prebuilt": "^2.1.3",
35+
"redux-logger": "^2.6.1",
3536
"sinon": "^1.17.3",
3637
"sinon-chai": "^2.8.0",
3738
"webpack": "1.x"
@@ -67,6 +68,7 @@
6768
"react-select": "1.0.0-beta8",
6869
"restangular": "^1.5.2",
6970
"tc-angular-ellipsis": "^0.1.6",
71+
"topcoder-app-r": "0.0.2",
7072
"xml2js": "^0.4.16",
7173
"zepto": "^1.0.1"
7274
}

webpack.tests.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ require('xml2js')
3030

3131
require('appirio-tech-ng-ui-components')
3232
require('appirio-tech-ng-iso-constants')
33+
require('topcoder-app-r/src/indexTest')
3334

3435
// Require Angular modules first
3536
requireContextFiles(require.context('./app/', true, /^.*\.module\.js$/igm))

0 commit comments

Comments
 (0)