Skip to content
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ coverage
.idea
.env
npm-debug.log
.DS_Store
.DS_Store
dist
35 changes: 23 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
language: node_js
node_js:
- 5.2.0
- 5.5.0
install:
- npm install
script:
- npm run lint
- npm run lint && npm run build-navbar
sudo: false
before_deploy:
- npm-prepublish --verbose
deploy:
- provider: npm
email: "$NPM_EMAIL"
api_key: "$NPM_API_KEY"
- provider: s3
cache_control: private, no-store, no-cache, must-revalidate, max-age=0
detect_encoding: true
access_key_id: $AWS_KEY
secret_access_key: $AWS_SECRET
bucket: components.topcoder-dev.com
skip_cleanup: true
local_dir: dist
on:
tags: true
branch: dev
env:
matrix:
- CXX=g++-4.8
global:
# NPM_EMAIL
- secure: "kmo0afPY5HwJ5SryNY0XRRRekxd1teBR6lSiw2jtjU64sOdpjN7ZhGWy9q0lReGk6hloPfXewXRlpCbcDRFoxvJUdAbQoAN8gq/BxrwGmWlBepgUew1O6WLkpvqXCMe6lUmPEznjil2anjLHfm/cKiqwaY1n8MI+PSna6eNwAlffx72uPL1TzrijJjb7kKqTtjTHZzNiiUn2jZrc35G+MeryZmnd5xXV7cXgYb+flEMC5sDqhcO2aewYiCGMK2b3f7QDJFbGD4+v+HjN1XispJgCxDLTRLJ0HD8HPj87w/7s7PHqCuRUwga1Z2HTRDniqM7mb7TZ5RK990Olp4d1Fw/ApXhUEe4fwgTdN9PSwOzOrY4VGNyytYvJuMVqSVGIHx6Y2BuCt3gzPeM0ev8bjhE9PItYmDTr5FhNI1XLT7PKu+Ktp72bmdEVqNfnv7jXRKba9AeSBQVk70jKMpYAuGI/d/xXeaD2vImBhCflc0UArYfXf+JYMEwzhiMZQfq6csvg0UV/nlD9xidgBLt8QUGdFaQTjsQLt9CWbwcKM7/yFcfkOKEHrM5By1Do4gtSDxmK5F+81210YMO30OVwllHk/f+jOspti9EJv6r0vAZOkKXXL15VsyKQSrF/p6k+brVf0cQcnUMiSiNsl/aEftNW2ys5VCIRJcEol5bHt90="
# NPM_API_KEY
- secure: "OoRE9rbEzfAomE1h+PRDHJb0SgcyManma54qs72nwlBA3N4D+hV2Swy0xAidnVqdNvBlA4p9QmcrE0km+ZGVacFEhvleUGFDn5weWde2bukzkkdHtbaYQjyhxbrqfLA9G9vzs1BlHjhrR7Arl2TQuT21XnfagFBQ/LCgCRRu9yHHkZ4TejhuYu/9Fgdq08wnBpLZn7wllUq0OtrDgEgjK7avZ+yv5ob6zccxr3NAAchbdPJ2yUo82VvD+YdQaWbLq9ac5cwa0I6f/RuQUiZcLZItk/H3NuQqg32746QdwIqKpw5dh9wzddbckIK3WVsoJmE+7WpGAOgUU/TxmPijH6j1YwQ9uqcBGsax8RUFR+mG7imlS4YpL67K438JPUG7NCPgnN19zN/c+4WkVoKlLYEncyPp0C3sBbmauR0uuuVBWWUJL/1xBCuPyhT9JGXaocms/Ldshxr+TYf1tfQQ3uzs6wO3cniw3wIgXbgMF6NBwQdQpgUlSh++XJKgIG2I228GI3qMq8zJu/N/1oEKVkKkO8Z9Y3Vd5uo2VMbkp0KJJEfXnE8GZBBaajD+F8jONRQqYEDhK8EMYuqKhsQZMw3RgPtvOZNG+bhcnbElNnMjhd8CTKioKXAslkTP6Esi4Ce2PS6YR4CskjZaO7IT9KRqHvVZN42vlIVbhb2J0RI="
# DEV_AWS_KEY
- secure: a5X4QlY2JD/sJnEBkT5WwwfWjYKq3ldRf/+Dh5x2oHB0swGzYyFxzVlezddPF8xDML+CcVoLHkd8WNM2F7qcxHZTDC5spH/ym2gX6YlRwFRTTFBRCJehgYs8Vit/s14f8gkuVV8fe2ubMiV+fpAw80tb3E+t+nCckmXwe8gDqDbHto5VIozTiqDOV/WvkPzaRQofTeNzSqjrAH/iRq8hJUx16shCO2ccdiLu7rnOuys+UwjWFRyjdLP01UZXd5u6a5XK3vigLGPBAqsEwSMgScATJjNIHwYofE5Q3ztD85jz/JoQatQf7LCnQUqkLT+xldMkOZuTlTHvzmVUOl2WYpVxWV9hXwBemvyuRPPtzIrZkKXi6OUgvpYwGgWn8eS1qulB1DYPrUWBtIYGQoxEchfNlmcrCIJ7BrbL9xiNUM8J+ZCWtNS01eSapMHdhAIUMLEsAjxBY+ArLuYAD+URB0d+JZrr9cORGnrGDB+1wI12Z/Qu5LEDp/TMOisK2PXEsaqzlaazr9lj2FXTYJQyyFMMWzq1v1o5lZ5mEJ5ea36eGApV1iQNmPrg7omhDHwKtBpMDFQWZ0Y1SrkIk3QTX6JfzsrehwAhAK2fZ25EaC6zcppAo0ia5/VZoWzxHFQyhkC47hRrM7C6nCriQPDc9kKsmTSX5rp5e/DNpiZ67qM=
# DEV_AWS_SECRET
- secure: p+od0xD/9vpMbR2AI6gZWknNAtvvIfq6jXIF98DEsDlqrrMFv4SwtuXLlCmX5PBnB/cWOkwgRhymI7/3+fLrDC+wqlhDEWyzSpVOvAcVAb5LEP7IDen0W8kTj2q9I2VRX+keL7lxQCknAf/21sRZeJfJhLGR+O3NcytEdsjlpFCopA6luZYv1QSd+nRJiTsI7I69T0hr7jZk+YioyjEEp/4qzI2qyJH7E5Ry+DD3gXnC3zva48Huq6rvOtLpgFmio1b1rNAcA55Q9Y3vb1jJyZhKpRvtel9OM9ekTxANEGJVaMzxyZXT7EFTxwxS+ub5c2HRzxedMnD3tY29ku2JJx7Ofm+Yxt9DZXSK7EV99xxE71kIhI9lZFiWZviym08MHGc4pee6+Cl6ZkiV44v4XnwbgUq8GCOkmDMQBQtGhXq7dC6jB/r7P7CJs+DIGDF7qNt/xizVOC1THS8GUCN68aWMVperP+IlUXo5d2XekhO6vjHk6o44K8A1s7yblBWXj54B6NfJnBzUK2X0g6Y2xdW6tmoKtad1r1I3062skc+UiU+6m4fGS8pLFElJNj+8N7QANoEw9oJDZfuQ47uVQzPjAA1/qdcy3ksMek0siNFbpZnMqzOJTPf2Xe7YgKuCPg0QczESXIjOeEIU0om7SWmGEIuMFqt6obQW0M3VHn0=
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
2 changes: 1 addition & 1 deletion components/MenuBar/MenuBar.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { PropTypes, Component } from 'react'
import classNames from 'classNames'
import classNames from 'classnames'

require('./MenuBar.scss')

Expand Down
6 changes: 3 additions & 3 deletions components/Navbar/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import QuickLinks from '../QuickLinks/QuickLinks'
import UserDropdownMenu from '../UserDropdownMenu/UserDropdownMenu'

const primaryNavigationItems = [
{img: '../components/MenuBar/nav-community.svg', text: 'Community', link: 'javascript:;'},
{img: '../components/MenuBar/nav-compete.svg', text: 'Compete', link: 'javascript:;', selected: true},
{img: '../components/MenuBar/nav-learn.svg', text: 'Learn', link: 'javascript:;'}
{img: require('./nav-community.svg'), text: 'Community', link: 'javascript:;'},
{img: require('./nav-compete.svg'), text: 'Compete', link: 'javascript:;', selected: true},
{img: require('./nav-learn.svg'), text: 'Learn', link: 'javascript:;'}
]

class Navbar extends Component {
Expand Down
3 changes: 0 additions & 3 deletions components/Navbar/Navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ $super-wide: 1376px;
background-color: $navbar-bg;
border-bottom: 1px solid $border-color;
padding: 10px 20px;
position: fixed;
top: 0;
left: 0;
width: 100%;

@media screen and (max-width: $mobile) {
Expand Down
14 changes: 14 additions & 0 deletions components/Navbar/nav-community.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions components/Navbar/nav-compete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions components/Navbar/nav-learn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions components/SearchBar/SearchBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ $active-icon-wrap-bg: #888894;
top: 43px;
left: 0;
width: 100%;
z-index: 1000;

strong {
font-weight: 600;
Expand Down
6 changes: 6 additions & 0 deletions index.coffee
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
Router = require './components/Router/Router.cjsx'

module.exports =
default: require './components/FileUploader/FileUploaderContainer.cjsx'
NavBar: require './components/Navbar/Navbar.jsx'
SearchBar: require './components/SearchBar/SearchBar.jsx'
UserDropdown: require './components/UserDropdownMenu/UserDropdownMenu.jsx'
TCFooter: require './components/TCFooter/TCFooter.jsx'
20 changes: 20 additions & 0 deletions navbar.webpack.config.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
webpackConfig = require 'appirio-tech-webpack-config'
webpack = require('webpack')

config = webpackConfig
dirname: __dirname
template: './index.html'
entry:
TCNavComponents: [
'./index.coffee'
]

config.output.filename = 'TCNavComponents.[name].js';
config.output.publicPath = 'http://local.topcoder.com/mf/js/app/header/partials/'
config.output.libraryTarget = 'var'
console.log config.output


config.externals = {"react" : "React"}

module.exports = config
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"build": "webpack --config webpack.config.js; cp example/index.html dist/",
"lint": "eslint --ext .js,.jsx .",
"test": "cross-env NODE_ENV=test mocha --reporter progress --compilers js:babel-core/register --require ignore-styles --recursive \"./components/**/*.spec.js\"",
"test:watch": "npm run test -- --watch"
"test:watch": "npm run test -- --watch",
"build-navbar": "webpack --config navbar.webpack.config.coffee; cp index.html dist/"
},
"dependencies": {
"appirio-styles": "0.0.25",
Expand All @@ -38,6 +39,9 @@
"react-dom": "^0.14.7",
"react-dropzone": "^3.3.2",
"react-redux": "^4.2.1",
"react-select": "^0.9.1"
"react-select": "^0.9.1",
"url-loader": "^0.5.7",
"img-loader": "^1.2.0",
"file-loader": "^0.8.4"
}
}