Integrating helion-ui-framework

cloudfoundry · Jan 7, 2016 · b00584a · b00584a
1 parent 35e227b
commit b00584a
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 npm-debug.log
 node_modules
 dist
+lib
diff --git a/Dockerfile b/Dockerfile
@@ -3,4 +3,4 @@ FROM node:4.2.3
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
-CMD [ "/bin/bash", "provision.sh" ]
+CMD [ "/bin/bash" ]
diff --git a/README.md b/README.md
@@ -5,7 +5,17 @@
 docker build -t stratos-ui .
 ```
 
-## Run docker container
+## Create and start docker container
 ```
-docker run -it --name stratos-ui -v $(pwd):/usr/src/app stratos-ui
+docker run -it --rm --name stratos-ui -v $(pwd):/usr/src/app -v $(pwd)/../helion-ui-framework:/usr/src/helion-ui-framework stratos-ui /bin/bash
+```
+
+## provision container
+```
+docker exec -d stratos-ui /bin/bash provision.sh
+```
+
+## ssh into the running container
+```
+docker exec -it stratos-ui /bin/bash
 ```
diff --git a/provision.sh b/provision.sh
@@ -6,5 +6,5 @@ TOOLS_DIR="$WORK_DIR/tools"
 cd $TOOLS_DIR
 npm install
 PATH=$PATH:$TOOLS_DIR/node_modules/.bin
-bower install --allow-root
-gulp
+node_modules/.bin/bower install --allow-root --force
+node_modules/.bin/gulp
diff --git a/src/index.html b/src/index.html
@@ -9,6 +9,6 @@
   <!-- inject:js -->
   <!-- endinject -->
 </head>
-<body ng-app="my-webapp" app>
+<body ng-app="green-box-ui" app>
 </body>
 </html>
diff --git a/src/index.module.js b/src/index.module.js
@@ -5,10 +5,11 @@
   ];
 
   var otherModules = [
+    'helion.framework'
   ];
 
   angular
-    .module('my-webapp', [
+    .module('green-box-ui', [
       'app'
     ]
     .concat(angularModules)

diff --git a/src/index.scss b/src/index.scss
@@ -1 +1,2 @@
+@import "lib/helion-ui-framework/framework";
 @import "app/app";
diff --git a/tools/gulpfile.js b/tools/gulpfile.js
@@ -15,12 +15,14 @@ var paths = {
 
 
 var jsSourceFiles = [
-  paths.src + '**/*.js',
+  paths.src + '**/*.js'
 ];
 
 
 var jsLibs = [
-  paths.dist + 'lib/angular/angular.js'
+  paths.dist + 'lib/angular/angular.js',
+  paths.dist + 'lib/helion-ui-framework/**/*.module.js',
+  paths.dist + 'lib/helion-ui-framework/**/*.js'
 ];
 
 
@@ -30,9 +32,7 @@ var plugins = [
 
 var jsFiles = [
   paths.dist + 'index.module.js',
-  paths.dist + 'framework/**/*.module.js',
   paths.dist + 'app/**/*.module.js',
-  paths.dist + 'framework/**/*.js',
   paths.dist + 'app/**/*.js',
   '!' + paths.dist + '**/*.mock.js',
   '!' + paths.dist + '**/*.spec.js'
@@ -50,8 +50,6 @@ var cssFiles = [
 
 
 var partials = [
-  paths.src + 'lib/**/*.html',
-  paths.src + 'framework/**/*.html',
   paths.src + 'app/**/*.html'
 ];
 
@@ -78,6 +76,13 @@ gulp.task('html', function () {
 });
 
 
+gulp.task('lib', function () {
+  return gulp
+    .src(paths.src + 'lib/**')
+    .pipe(gulp.dest(paths.dist + 'lib/'));
+});
+
+
 gulp.task('index:copy', function () {
   return gulp
     .src(paths.src + 'index.html')
@@ -111,6 +116,7 @@ gulp.task('default', function (next) {
     'js',
     'css',
     'html',
+    'lib',
     'index:copy',
     'index:inject',
     next