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

Add member search #751

Merged
merged 7 commits into from
Mar 18, 2016
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
9 changes: 9 additions & 0 deletions app/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ html
meta(http-equiv="X-UA-Compatible", content="IE=edge, chrome=1")
meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no")
meta(name="fragment", content="!")
script.
(function(d) {
var config = {
kitId: 'gig7sjk',
scriptTimeout: 3000,
async: true
},
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)
})(document);

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

Expand Down
2 changes: 2 additions & 0 deletions app/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'babel-polyfill'

require('angular')
require('auth0-js')
require('auth0-angular')
Expand Down
15 changes: 15 additions & 0 deletions app/member-search/member-search.directive.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import angular from 'angular'

(function() {
'use strict'

angular.module('tc.search').directive('memberSearch', memberSearch)

var memberSearchPage = require('topcoder-app-r/src/indexTest').default

memberSearch.$inject = ['reactDirective']

function memberSearch(reactDirective) {
return reactDirective(memberSearchPage)
}
})()
2 changes: 2 additions & 0 deletions app/member-search/member-search.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
div#member-search-wrapper
member-search
7 changes: 7 additions & 0 deletions app/member-search/member-search.module.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import angular from 'angular'

(function() {
'use strict'

angular.module('tc.search', [])
})()
27 changes: 27 additions & 0 deletions app/member-search/member-search.routes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import angular from 'angular'

(function() {
'use strict'

angular.module('tc.search').config([
'$stateProvider',
routes
])

function routes($stateProvider) {
var states = {
'memberSearch': {
url: '/search/members/',
parent: 'root',
template: require('./member-search')(),
data: {
title: 'Member Search'
}
}
}
for (var name in states) {
var state = states[name]
$stateProvider.state(name, state)
}
}
})()
1 change: 1 addition & 0 deletions app/topcoder.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import angular from 'angular'
'tc.skill-picker',
'tc.sitemap',
'tc.community',
'tc.search',
'ui.router',
'blocks.logger',
'blocks.exception',
Expand Down
12 changes: 12 additions & 0 deletions assets/css/topcoder.scss
Original file line number Diff line number Diff line change
Expand Up @@ -541,3 +541,15 @@ $switch-inactive-color: $gray;
right: $switch-handle-offset + $switch-handle-size -1;
top: 0;
}

// DELETE when moving member search back
// Also delete TypeKit fonts from index.html
// Also delete redux-logger and babel-polyfill from npm modules
// also delete babel-polyfill from index.js
#member-search-wrapper {
font-family: Roboto !important;

.member-search-view {
background-color: transparent;
}
}
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"angular-mocks": "^1.4.9",
"appirio-tech-webpack-config": "^0.2.0",
"babel-loader": "^6.2.1",
"babel-polyfill": "^6.7.2",
"bardjs": "^0.1.8",
"bower": "^1.6.8",
"chai": "^3.5.0",
Expand All @@ -32,6 +32,7 @@
"mocha": "^2.4.5",
"phantomjs-polyfill": "0.0.1",
"phantomjs-prebuilt": "^2.1.3",
"redux-logger": "^2.6.1",
"sinon": "^1.17.3",
"sinon-chai": "^2.8.0",
"webpack": "1.x"
Expand Down Expand Up @@ -67,6 +68,7 @@
"react-select": "1.0.0-beta8",
"restangular": "^1.5.2",
"tc-angular-ellipsis": "^0.1.6",
"topcoder-app-r": "0.0.2",
"xml2js": "^0.4.16",
"zepto": "^1.0.1"
}
Expand Down
1 change: 1 addition & 0 deletions webpack.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ require('xml2js')

require('appirio-tech-ng-ui-components')
require('appirio-tech-ng-iso-constants')
require('topcoder-app-r/src/indexTest')

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