Merge pull request #93 from visdesignlab/client-dev

Add client-side graph search.
visdesignlab · Sep 20, 2018 · 8d8845d · 8d8845d
2 parents c8acd1f + 3aa54f6
commit 8d8845d
Show file tree

Hide file tree

Showing 40 changed files with 805,946 additions and 190,238 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -6,12 +6,12 @@
     "browser": true,
     "jasmine": true
   },
-  "ecmaFeatures": {
-    "modules": true
-  },
   "globals": {
     "angular": true,
     "module": true,
     "inject": true
+  },
+  "parserOptions": {
+    "sourceType": "module"
   }
 }
diff --git a/bower.json b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "connectivityMatrixJs",
+  "name": "graffinity",
   "version": "0.0.0",
   "dependencies": {
     "angular-animate": "~1.5.5",
@@ -27,15 +27,16 @@
     "angular-bootstrap": "^2.1.3",
     "ng-tags-input": "^3.1.1",
     "angular-ui-select": "^0.19.4",
-    "file-saver": "^1.3.3"
+    "file-saver": "FileSaver#1.3.4"
   },
   "devDependencies": {
-    "angular-mocks": "~1.4.2"
+    "angular-mocks": "~1.5.5"
   },
   "overrides": {
     "bootstrap": {
       "main": [
         "dist/css/bootstrap.css",
+        "dist/js/bootstrap.min.js",
         "dist/fonts/glyphicons-halflings-regular.eot",
         "dist/fonts/glyphicons-halflings-regular.svg",
         "dist/fonts/glyphicons-halflings-regular.ttf",
@@ -44,7 +45,14 @@
       ]
     },
     "fontawesome": {
-      "main": "css/font-awesome.css"
+      "main": [
+        "css/font-awesome.css",
+        "fonts/fontawesome-webfont.eot",
+        "fonts/fontawesome-webfont.svg",
+        "fonts/fontawesome-webfont.ttf",
+        "fonts/fontawesome-webfont.woff",
+        "fonts/fontawesome-webfont.woff2"
+      ]
     },
     "ng-tags-input": {
       "main": [

diff --git a/gulp/build.js b/gulp/build.js
@@ -82,8 +82,8 @@ gulp.task('other', function () {
   });
 
   return gulp.src([
-    path.join(conf.paths.src, '/**/*'),
-    path.join('!' + conf.paths.src, '/**/*.{html,css,js}')
+    path.join(conf.paths.src, '/**/*.json'),
+    path.join(conf.paths.src, '/**/ext/*.js')
   ])
     .pipe(fileFilter)
     .pipe(gulp.dest(path.join(conf.paths.dist, '/')));

diff --git a/gulpfile.js b/gulpfile.js
@@ -8,6 +8,7 @@
 
 var gulp = require('gulp');
 var wrench = require('wrench');
+const ghPages = require('gulp-gh-pages');
 
 /**
  *  This will load all js or coffee files in the gulp directory
@@ -27,3 +28,11 @@ wrench.readdirSyncRecursive('./gulp').filter(function(file) {
 gulp.task('default', ['clean'], function () {
   gulp.start('build');
 });
+
+/**
+ * Push to branch gh-pages.
+ */
+gulp.task('deploy', function() {
+  return gulp.src('./dist/**/*')
+    .pipe(ghPages());
+});