Scripts and tweaks for webpack serving and building

.gitignore

@@ -7,7 +7,7 @@
 /coverage
 /coverage-selenium.json
 /docs*
-
+archive.tar.gz
+/*/dist
 *.cjsx.js
-
 /phantomjsdriver.log

.travis.yml

@@ -1,8 +1,13 @@
 # `sudo:false` for faster builds.
 sudo: false
 language: node_js
-node_js:
-  - "0.12.10"
+env:
+  - OX_PROJECT=tutor
+  - OX_PROJECT=coach
+  - OX_PROJECT=exercises
+  - OX_PROJECT=shared
+before_install:
+  - "npm install -g npm@^3"
 script:
   - npm run ci
 after_failure:

README.md

@@ -4,7 +4,7 @@
 [![dependency status][dependency-image]][dependency-url]
 [![dev dependency status][dev-dependency-image]][dev-dependency-url]
 
-The JavaScript client for openstax Tutor.
+The Front-end code for Openstax Tutor related projects
 
 ## Install
 
@@ -14,16 +14,16 @@ The JavaScript client for openstax Tutor.
   - If you don’t have `git` installed you can install homebrew and then `brew install git`
 1. `cd tutor-js` move into the checked out directory
 1. `npm install`
-1. `npm start`
+1. `npm run serve <project>` *(where <project is one of tutor|coach|exercises)*
 1. Point your browser to <http://localhost:8000> to use the mock data in `/api`
 
 
 ## Development
 
-- `npm start` starts up a local development webserver which rebuilds files when changed
-- `npm test` runs unit tests
+- `npm run serve <project>` starts up a local development webserver which rebuilds files when changed
+- `npm test` runs unit tests for all projects
 - `npm run coverage` generates a code coverage report
-- `gulp prod` builds minified files for production
+- `npm run build <project> archive` builds minified files for production
 
 Use `PORT=8000 npm start` to change the default webserver port.
 

bin/build

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+bin/checkinputs "$@"
+
+export OX_PROJECT=$1
+echo Building: $OX_PROJECT
+export NODE_ENV=production
+
+[ -d $OX_PROJECT/dist ] && rm -r $OX_PROJECT/dist
+
+webpack --progress --config webpack.config.js
+
+if [ $2 == "archive" ]; then
+    cd $OX_PROJECT
+   # credit/blame to: http://stackoverflow.com/questions/8201729/rename-files-to-md5-sum-extension-bash
+   for F in dist/*.min.*; do
+       mv $F `md5sum $F | perl -MFile::Basename -ne '($m, $f) = split(/\s+/,$_); $f=basename($f); $f =~ m/(.*?)\.(.*)/; print "dist/$1-$m.$2"'`
+   done
+   tar -czf ../archive.tar.gz dist/*
+fi

bin/checkinputs

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    echo "No project to build was given. usage:"
+    echo "$0 <tutor|exercises|coach>"
+    exit 1
+fi

bin/serve

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+bin/checkinputs "$@"
+
+export OX_PROJECT=$1
+echo Serving: $OX_PROJECT
+
+webpack-dev-server --progress --config webpack.config.js

bin/tdd

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+on_termination() {
+  echo killing webpack $WEBPACK_PID
+  kill -TERM $WEBPACK_PID 2>/dev/null
+}
+
+bin/checkinputs "$@"
+
+trap on_termination SIGTERM SIGINT
+
+export OX_PROJECT=$1
+echo TDD: $OX_PROJECT
+
+
+webpack-dev-server --config webpack.config.js &
+WEBPACK_PID=$!
+echo webpack started pid: $WEBPACK_PID
+
+
+karma start test/karma.config.js --auto-watch --no-single-run

bin/test

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+bin/checkinputs "$@"
+
+export OX_PROJECT=$1
+echo Test: $OX_PROJECT
+
+karma start test/karma.config.js --single-run

bin/test-ci

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ev
+
+# travis should be setting the OX_PROJECT variable
+# export OX_PROJECT='tutor'
+
+karma start test/karma.config.js --single-run

coach/configs/base.coffee

@@ -1,4 +1,2 @@
 module.exports =
   devPort: '3005'
-  basePath: 'coach'
-  devEntry: 'demo'

coach/configs/webpack.development.coffee

@@ -1,11 +1,7 @@
 module.exports =
   entry:
-    'demo.js': [
-      './coach/demo'
-    ]
-    'demo': [
-      './coach/resources/styles/demo.less'
-    ]
-    'main': [
-      './coach/resources/styles/main.less'
+    demo: [
+      'demo'
+      'resources/styles/main.less'
+      'resources/styles/demo.less'
     ]

coach/configs/webpack.production.coffee

@@ -3,7 +3,7 @@ webpackUMDExternal = require 'webpack-umd-external'
 
 module.exports =
   entry:
-    main: './coach/index'
+    main: 'index'
   output:
     filename: 'main.min.js'
   plugins: [

coach/index.html

@@ -2,10 +2,10 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF8">
-  <link rel="stylesheet" href="/assets/demo.css" />
-  <link rel="stylesheet" href="/assets/main.css" />
+  <link rel="stylesheet" href="./dist/demo.css" />
+  <link rel="stylesheet" href="./dist/main.css" />
   <script src="//cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&amp;delayStartupUntil=configured" async></script>
-  <script src="/assets/demo.js" async></script>
+  <script src="./dist/demo.js" async></script>
 </head>
 <body>
   <div class="container cc-demo" id="react-root-container">

coach/src/api/loader.coffee

@@ -1,5 +1,5 @@
 _ = require 'underscore'
-deepMerge = require 'lodash/object/merge'
+deepMerge = require 'lodash.merge'
 $ = require 'jquery'
 interpolate = require 'interpolate'
 

coach/src/breadcrumbs/index.cjsx

@@ -1,6 +1,6 @@
 React = require 'react'
 classnames = require 'classnames'
-{Breadcrumb} = require 'openstax-react-components'
+{Breadcrumb} = require 'shared'
 _ = require 'underscore'
 
 tasks = require '../task/collection'

coach/src/concept-coach/base.cjsx

@@ -4,7 +4,7 @@ _ = require 'underscore'
 classnames = require 'classnames'
 EventEmitter2 = require 'eventemitter2'
 
-{SmartOverflow, SpyMode} = require 'openstax-react-components'
+{SmartOverflow, SpyMode} = require 'shared'
 
 {Task} = require '../task'
 navigation = {Navigation} = require '../navigation'

coach/src/concept-coach/error-notification.cjsx

@@ -26,7 +26,7 @@ makeContactURL = (errors, windowContext) ->
 ErrorNotification = React.createClass
 
   getInitialState: ->
-    error: false, isShowingDetails: false
+    errors: false, isShowingDetails: false
 
   componentWillMount: ->
     api.channel.on 'error', @onError
@@ -69,7 +69,19 @@ ErrorNotification = React.createClass
 
   render: ->
     return null unless @state.errors
-    <BS.Modal className='errors' onRequestHide={@onHide} title="Error encountered">
+
+    modalProps = _.pick(@props, 'container')
+
+    <BS.Modal
+      {...modalProps}
+      className='errors'
+      show={not _.isEmpty(@state.errors)}
+      onHide={@onHide}>
+
+      <BS.Modal.Header closeButton>
+        <BS.Modal.Title>Error encountered</BS.Modal.Title>
+      </BS.Modal.Header>
+
       <div className='modal-body'>
         <p>
           An unexpected error has occured.  Please

coach/src/course/confirm-join.cjsx

@@ -5,7 +5,7 @@ RequestStudentId = require './request-student-id'
 
 Course = require './model'
 ErrorList = require './error-list'
-{AsyncButton} = require 'openstax-react-components'
+{AsyncButton} = require 'shared'
 
 ConfirmJoin = React.createClass
 

coach/src/course/enrollment-code-input.cjsx

@@ -5,7 +5,7 @@ ENTER = 'Enter'
 {CourseListing} = require './listing'
 ErrorList = require './error-list'
 Course = require './model'
-{AsyncButton} = require 'openstax-react-components'
+{AsyncButton} = require 'shared'
 User = require '../user/model'
 
 EnrollmentCodeInput = React.createClass

coach/src/course/request-student-id.cjsx

@@ -5,7 +5,7 @@ ENTER = 'Enter'
 User = require '../user/model'
 Course = require './model'
 ErrorList = require './error-list'
-{AsyncButton} = require 'openstax-react-components'
+{AsyncButton} = require 'shared'
 
 RequestStudentId = React.createClass
 

coach/src/course/update-student-identifier.cjsx

@@ -1,7 +1,7 @@
 _ = require 'underscore'
 React = require 'react'
 BS = require 'react-bootstrap'
-{AsyncButton} = require 'openstax-react-components'
+{AsyncButton} = require 'shared'
 ENTER = 'Enter'
 
 Course = require './model'

coach/src/exercise/index.cjsx

@@ -1,6 +1,6 @@
 React = require 'react'
 _ = require 'underscore'
-{Exercise, ChapterSectionMixin} = require 'openstax-react-components'
+{Exercise, ChapterSectionMixin} = require 'shared'
 
 {channel, getCurrentPanel} = exercises = require './collection'
 tasks = require '../task/collection'

coach/src/navigation/index.cjsx

@@ -1,14 +1,14 @@
 React = require 'react'
 BS = require 'react-bootstrap'
-{CloseButton} = require 'openstax-react-components'
+{CloseButton} = require 'shared'
 {CourseNameBase} = require './course-name'
 
 Course = require '../course/model'
 user = require '../user/model'
 {channel} = require './model'
 api = require '../api'
 UserMenu = require '../user/menu'
-{NotificationsBar} = require 'openstax-react-components'
+{NotificationsBar} = require 'shared'
 
 Navigation = React.createClass
   displayName: 'Navigation'

coach/src/progress/chapter.cjsx

@@ -2,7 +2,7 @@ React = require 'react'
 _ = require 'underscore'
 classnames = require 'classnames'
 
-{ChapterSectionMixin} = require 'openstax-react-components'
+{ChapterSectionMixin} = require 'shared'
 {PageProgress} = require './page'
 
 ChapterProgress = React.createClass

coach/src/progress/index.cjsx

@@ -2,7 +2,7 @@ React = require 'react'
 _ = require 'underscore'
 classnames = require 'classnames'
 
-{ChapterSectionMixin} = require 'openstax-react-components'
+{ChapterSectionMixin} = require 'shared'
 {Reactive} = require '../reactive'
 {ExerciseButton} = require '../buttons'
 {SectionProgress} = require './section'

coach/src/progress/page.cjsx

@@ -4,7 +4,7 @@ dateFormat = require 'dateformat'
 classnames = require 'classnames'
 EventEmitter2 = require 'eventemitter2'
 
-{ChapterSectionMixin, ResizeListenerMixin} = require 'openstax-react-components'
+{ChapterSectionMixin, ResizeListenerMixin} = require 'shared'
 {ExerciseProgress} = require './exercise'
 
 PageProgress = React.createClass

coach/src/task/index.cjsx

@@ -2,7 +2,7 @@ React = require 'react'
 EventEmitter2 = require 'eventemitter2'
 _ = require 'underscore'
 classnames = require 'classnames'
-{SpyMode} = require 'openstax-react-components'
+{SpyMode} = require 'shared'
 
 {channel} = tasks = require './collection'
 api = require '../api'

coach/src/task/review.cjsx

@@ -3,7 +3,7 @@ BS = require 'react-bootstrap'
 _ = require 'underscore'
 tasks = require './collection'
 
-{ChapterSectionMixin} = require 'openstax-react-components'
+{ChapterSectionMixin} = require 'shared'
 {ExerciseStep} = require '../exercise'
 {ExerciseButton, ContinueToBookButton, ReturnToBookButton} = require '../buttons'
 

coach/src/task/title.cjsx

@@ -3,7 +3,7 @@ _ = require 'underscore'
 classnames = require 'classnames'
 tasks = require './collection'
 
-{ChapterSectionMixin} = require 'openstax-react-components'
+{ChapterSectionMixin} = require 'shared'
 {GoToBookLink} = require '../buttons'
 
 TaskTitle = React.createClass

coach/src/user/menu.cjsx

@@ -1,7 +1,7 @@
 React = require 'react'
 BS = require 'react-bootstrap'
 EventEmitter2 = require 'eventemitter2'
-{CloseButton} = require 'openstax-react-components'
+{CloseButton} = require 'shared'
 
 Status = require './status-mixin'
 

coach/src/user/model.coffee

@@ -3,7 +3,7 @@ React = require 'react'
 EventEmitter2 = require 'eventemitter2'
 Course = require '../course/model'
 api = require '../api'
-{BootrapURLs, NotificationActions}  = require 'openstax-react-components'
+{BootrapURLs, NotificationActions}  = require 'shared'
 
 BLANK_USER =
   is_admin: false