Merge pull request openshift#947 from sym3tri/coreosweb-cleanup

coreos-web cleanup

README.md

@@ -155,16 +155,16 @@ Update existing backend dependencies:
 
 Add new frontend dependencies:
 ```
-rm npm-shrinkwrap
+rm npm-shrinkwrap.json
 npm install --save the-dependency
 npm shrinkwrap
-npm run gulp js-deps
+npm run gulp js-package
 ```
 
 Update existing frontend dependencies:
 ```
-rm npm-shrinkwrap
+rm npm-shrinkwrap.json
 npm install --save the-dependency
 npm shrinkwrap
-npm run gulp js-deps
+npm run gulp js-package
 ```

frontend/gulpfile.js

@@ -157,8 +157,13 @@ gulp.task('templates', () => {
  .pipe(gulp.dest(distDir));
 });
 
+gulp.task('fonts', () => {
+ return gulp.src('public/fonts/*')
+ .pipe(gulp.dest(distDir + '/fonts'));
+});
+
 // Copy any static assets.
-gulp.task('assets', () => {
+gulp.task('assets', ['fonts'], () => {
  return gulp.src('public/imgs/*')
  .pipe(gulp.dest(distDir + '/imgs'));
 });
@@ -201,7 +206,6 @@ gulp.task('html', ['sha'], () => {
  var h = {
  'js': `static/build.${CURRENT_SHA}.min.js`,
  'css': `static/build.${CURRENT_SHA}.css`,
- 'css-coreos-web': 'static/lib/coreos-web/coreos.css'
  };
  if (process.env.NODE_ENV !== 'production') {
  h['analytics'] = '';

frontend/public/app.js

@@ -7,6 +7,11 @@ import { combineReducers } from 'redux';
 
 import './components/react-wrapper';
 
+// Make moment available via angular DI.
+angular.module('moment', []).factory('moment', function($window) {
+ return $window.moment;
+});
+
 // The main app module.
 angular.module('bridge', [
  // angular deps
@@ -34,6 +39,7 @@ angular.module('bridge', [
  'bridge.react-wrapper',
  'core.pkg',
  'heapster',
+ 'moment',
 ])
 .config(function($compileProvider, $routeProvider, $locationProvider, $httpProvider,
  configSvcProvider, errorMessageSvcProvider, flagSvcProvider,

frontend/public/index.html

@@ -15,9 +15,6 @@
  <link rel="shortcut icon" href="static/lib/mochi/img/favicons/tectonic/favicon-96x96.png">
  <link rel="stylesheet" href="static/lib/core-icons/core-icons.css">
 
- <!-- build:css-coreos-web -->
- <link rel="stylesheet" href="static/lib/coreos-web/coreos.css">
- <!-- endbuild -->
  <!-- build:css -->
  <link rel="stylesheet" href="static/dist/app-bundle.css">
  <!-- endbuild -->