Merge pull request #41 from appirio-tech/feature/bundle-navbar-component

vikasrohit · vikasrohit · commit 99294b882a4d · 2016-03-18T15:33:42.000+05:30
Feature/bundle navbar component
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ coverage
 .idea
 .env
 npm-debug.log
-.DS_Store
+.DS_Store
+dist
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/components/MenuBar/MenuBar.jsx b/components/MenuBar/MenuBar.jsx
@@ -1,5 +1,5 @@
 import React, { PropTypes, Component } from 'react'
-import classNames from 'classNames'
+import classNames from 'classnames'
 
 require('./MenuBar.scss')
 
diff --git a/components/Navbar/Navbar.jsx b/components/Navbar/Navbar.jsx
@@ -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 {
diff --git a/components/Navbar/Navbar.scss b/components/Navbar/Navbar.scss
@@ -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) {
diff --git a/components/Navbar/nav-community.svg b/components/Navbar/nav-community.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.6 (26304) - http://www.bohemiancoding.com/sketch -->
+    <title>nav-community</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Scaling" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Components---Desktop" transform="translate(-1045.000000, -446.000000)" stroke="#394146" stroke-width="2">
+            <g id="nav-community" transform="translate(1046.000000, 447.000000)">
+                <path d="M7,2.54545455 C5.6,2.54545455 4.45454545,1.4 4.45454545,0 L1.90909091,0 C0.827272727,0 0,0.827272727 0,1.90909091 L0,6 L3,6 L3,14 L11,14 L11,6 L14,6 L14,1.90909091 C14,0.827272727 13.1727273,0 12.0909091,0 L9.54545455,0 C9.54545455,1.4 8.4,2.54545455 7,2.54545455 Z" id="Stroke-35"></path>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/components/Navbar/nav-compete.svg b/components/Navbar/nav-compete.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.6 (26304) - http://www.bohemiancoding.com/sketch -->
+    <title>nav-compete</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Scaling" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Components---Desktop" transform="translate(-1093.000000, -446.000000)" fill="#888894">
+            <path d="M1106,450 C1107.10457,450 1108,449.104569 1108,448 C1108,446.895431 1107.10457,446 1106,446 C1104.89543,446 1104,446.895431 1104,448 C1104,449.104569 1104.89543,450 1106,450 Z M1108.70703,451.292969 C1108.31641,450.902344 1107.68359,450.902344 1107.29297,451.292969 L1106,452.585938 L1101.70703,448.292969 C1101.43848,448.023926 1101.04199,447.930664 1100.68359,448.05127 L1097.68359,449.05127 C1097.15967,449.226074 1096.87646,449.79248 1097.05127,450.316406 C1097.22607,450.840332 1097.78955,451.125 1098.31641,450.94873 L1100.72998,450.144043 L1101.63129,451.045349 L1099.65625,453.020019 C1099.17285,453.503906 1098.93457,454.171875 1099.00195,454.852539 C1099.06982,455.532227 1099.43457,456.139648 1100.08398,456.566895 L1101.55811,457.359863 L1100.16797,459.445313 C1099.86182,459.904785 1099.98584,460.525879 1100.44531,460.832031 C1100.90324,461.137753 1101.52518,461.014575 1101.83203,460.554688 L1103.83203,457.554688 C1104.15901,457.064226 1103.99244,456.39897 1103.47363,456.119141 L1101.11182,454.854004 C1100.96707,454.757242 1100.95029,454.554594 1101.0708,454.434082 L1103.04541,452.459473 L1105.29297,454.707031 C1105.68361,455.097668 1106.31639,455.097668 1106.70703,454.707031 L1108.70703,452.707031 C1109.09766,452.316406 1109.09766,451.683594 1108.70703,451.292969 Z M1097.29297,456.292969 L1093.29297,460.292969 C1092.90234,460.683594 1092.90234,461.316406 1093.29297,461.707031 C1093.48828,461.902344 1093.74414,462 1094,462 C1094.25586,462 1094.51172,461.902344 1094.70703,461.707031 L1098.70703,457.707031 C1099.09766,457.316406 1099.09766,456.683594 1098.70703,456.292969 C1098.31641,455.902344 1097.68359,455.902344 1097.29297,456.292969 Z" id="nav-compete"></path>
+        </g>
+    </g>
+</svg>
diff --git a/components/Navbar/nav-learn.svg b/components/Navbar/nav-learn.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.6 (26304) - http://www.bohemiancoding.com/sketch -->
+    <title>nav-learn</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Scaling" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Components---Desktop" transform="translate(-1138.000000, -445.000000)">
+            <g id="nav-learn" transform="translate(1139.000000, 446.000000)">
+                <path d="M8.43876364,2.46356364 C6.3144,1.54865455 3.75585455,1.95883636 2.02058182,3.69410909 C1.66494545,4.04974545 1.37185455,4.4432 1.12749091,4.85701818 L3.61985455,7.35010909" id="Stroke-4043" stroke="#888894" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M13.5184727,7.52029091 C14.4566545,9.65265455 14.0522909,12.2330182 12.3061091,13.9792 C11.9504727,14.3348364 11.5570182,14.6279273 11.1424727,14.8722909 L8.62756364,12.3581091" id="Stroke-4045" stroke="#888894" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M6.64916364,13.4647273 L2.53498182,9.35054545 C2.53498182,9.35054545 6.04916364,0.608 15.9058909,0.0938181818 C15.3488,9.90763636 6.64916364,13.4647273 6.64916364,13.4647273 L6.64916364,13.4647273 Z" id="Stroke-4047" stroke="#888894" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M8.19192727,5.75083636 C8.75992727,5.18283636 9.68065455,5.18283636 10.2486545,5.75083636 C10.8166545,6.31883636 10.8166545,7.23956364 10.2486545,7.80756364 C9.68065455,8.37556364 8.75992727,8.37556364 8.19192727,7.80756364 C7.62392727,7.23956364 7.62392727,6.31883636 8.19192727,5.75083636 L8.19192727,5.75083636 Z" id="Stroke-4049" fill="#888894"></path>
+                <path d="M1.15330909,12.7896727 C1.72130909,12.2216727 2.64203636,12.2216727 3.21003636,12.7896727 C3.77803636,13.3576727 3.77803636,14.2784 3.21003636,14.8464 C2.64203636,15.4144 0.727127273,15.2725818 0.727127273,15.2725818 C0.727127273,15.2725818 0.585309091,13.3576727 1.15330909,12.7896727 L1.15330909,12.7896727 Z" id="Stroke-4051" stroke="#888894" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/components/SearchBar/SearchBar.scss b/components/SearchBar/SearchBar.scss
@@ -132,6 +132,7 @@ $active-icon-wrap-bg: #888894;
     top: 43px;
     left: 0;
     width: 100%;
+    z-index: 1000;
 
     strong {
       font-weight: 600;
diff --git a/index.coffee b/index.coffee
@@ -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'
diff --git a/navbar.webpack.config.coffee b/navbar.webpack.config.coffee
@@ -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
diff --git a/package.json b/package.json
@@ -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",
@@ -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"
   }
 }
