Merge branch 'development' of https://github.com/TNOCS/csWeb into dev…

…elopment
TNOCS · Oct 28, 2015 · f0ced02 · f0ced02
2 parents 6cb36f0 + 9c94c2f
commit f0ced02
Show file tree

Hide file tree

Showing 9 changed files with 334 additions and 229 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ csDataGatherer/node_modules/
 csDataGatherer/public/includes/
 csDataGatherer/Scripts/
 csDataGatherer/importers.json
+dist/
 
 node_modules/
 

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,13 @@
+from node:4
+
+RUN npm install -g npm
+RUN npm install -g typescript@1.6.2 bower gulp node-gyp
+RUN apt-get update && apt-get install libkrb5-dev
+
+EXPOSE 3002:3002
+RUN mkdir /app
+WORKDIR /app
+COPY ./ /app/
+RUN ./updateAll.sh
+WORKDIR /app/example
+CMD node server.js
diff --git a/bower.json b/bower.json
@@ -0,0 +1,66 @@
+{
+    "name": "csWeb",
+    "version": "0.1.1",
+    "main": "dist/csComp/csComp.js",
+    "ignore": [
+        "csComp",
+        "csServerComp",
+        "example",
+        "docs",
+        "test",
+        "bower.json",
+        "gulp.js",
+        "Dockerfile",
+        "package.json",
+        "README.md",
+        ".bithoundrc",
+        ".editorconfig",
+        ".gitignore",
+        ".travis.yml",
+        "LICENSE",
+        "install_karma.bat",
+        "updateAll.bat",
+        "updateAll.sh"
+    ],
+    "dependencies": {
+      "angular": "~1.4.4",
+      "angular-animate": "~1.4.4",
+      "angular-bootstrap": "~0.12.0",
+      "angular-cookies": "~1.4.4",
+      "angular-local-storage": "~0.1.5",
+      "angular-mocks": "~1.4.4",
+      "angular-sanitize": "~1.4.4",
+      "angular-translate": "~2.6.0",
+      "angular-ui-router": "~0.2.13",
+      "angular-ui-select": "~0.12.0",
+      "angular-utils-pagination": "~0.3.1",
+      "async": "~0.9.0",
+      "awesome-bootstrap-checkbox": "~0.1.2",
+      "bootstrap": "~3.3.5",
+      "bootstrap-vertical-tabs": "~1.2.0",
+      "chroma-js": "~0.5.8",
+      "crossfilter": "~1.3.9",
+      "d3": "~3.5.5",
+      "d3-tip": "~0.6.6",
+      "Font-Awesome": "*",
+      "interact": "~1.2.6",
+      "jquery": "~2.1.3",
+      "jquery-ui": "~1.11.2",
+      "leaflet": "~0.7.3",
+      "leaflet-ajax": "~1.1.0",
+      "leaflet.locatecontrol": "~0.30.0",
+      "leaflet.markercluster": "0.4.0-hotfix.1",
+      "moment": "~2.9.0",
+      "pnotify": "~2.0.1",
+      "spectrum": "~1.5.2",
+      "togeojson": "~0.12.1",
+      "topojson": "~1.6.19",
+      "underscore": "~1.7.0"
+    },
+    "devDependencies": {
+    },
+    "resolutions": {
+      "angular": "~1.4.4",
+      "d3": "~3.5.5"
+    }
+}
diff --git a/csComp/directives/Navigate/SearchClasses.ts b/csComp/directives/Navigate/SearchClasses.ts
@@ -0,0 +1,15 @@
+module Search {
+
+    export class NavigateSteps{
+
+    }
+
+    export class NavigateState{
+        state : any;
+    }
+
+    export interface INavigateProvider {
+      title: string;
+      url:   string;
+    }
+}
diff --git a/csServerComp/tsconfig.json b/csServerComp/tsconfig.json
@@ -18,104 +18,104 @@
         "!./Classes/*.d.ts"
     ],
     "files": [
-        "./Classes/Feature.ts",
-        "./Scripts/typings/async/async.d.ts",
-        "./Scripts/typings/bcrypt/bcryptjs.d.ts",
-        "./Scripts/typings/body-parser/body-parser.d.ts",
-        "./Scripts/typings/cors/cors.d.ts",
-        "./Scripts/typings/cs/cs-offline-search.d.ts",
-        "./Scripts/typings/express/express.d.ts",
-        "./Scripts/typings/form-data/form-data.d.ts",
-        "./Scripts/typings/fs-extra/fs-extra.d.ts",
-        "./Scripts/typings/hypertimer/hypertimer.d.ts",
-        "./Scripts/typings/jquery/jquery.d.ts",
-        "./Scripts/typings/JSONStream/JSONStream.d.ts",
-        "./Scripts/typings/jwt-simple/jwt-simple.d.ts",
-        "./Scripts/typings/mongodb/mongodb.d.ts",
-        "./Scripts/typings/mqtt/mqtt-router.d.ts",
-        "./Scripts/typings/mqtt/mqtt.d.ts",
-        "./Scripts/typings/node/node.d.ts",
-        "./Scripts/typings/pg/pg.d.ts",
-        "./Scripts/typings/proj4/proj4.d.ts",
-        "./Scripts/typings/request/request.d.ts",
-        "./Scripts/typings/socketio/socket.io.d.ts",
-        "./Scripts/typings/sqlite3/sqlite3.d.ts",
-        "./Scripts/typings/underscore/underscore.d.ts",
-        "./Scripts/typings/winston/winston.d.ts",
-        "./Scripts/typings/xml2js/xml2js.d.ts",
-        "./ServerComponents/api/ApiManager.ts",
-        "./ServerComponents/api/ApiServiceManager.ts",
-        "./ServerComponents/api/AuthAPI.ts",
-        "./ServerComponents/api/BaseConnector.ts",
-        "./ServerComponents/api/config.ts",
-        "./ServerComponents/api/FileStorage.ts",
-        "./ServerComponents/api/IApiService.ts",
-        "./ServerComponents/api/IApiServiceManager.ts",
-        "./ServerComponents/api/imb.ts",
-        "./ServerComponents/api/ImbAPI.ts",
-        "./ServerComponents/api/MongoDB.ts",
-        "./ServerComponents/api/MqttAPI.ts",
-        "./ServerComponents/api/qlobber.ts",
-        "./ServerComponents/api/RestAPI.ts",
-        "./ServerComponents/api/SocketIOAPI.ts",
-        "./ServerComponents/bus/MessageBus.ts",
-        "./ServerComponents/configuration/ConfigurationService.ts",
-        "./ServerComponents/configuration/IConfiguration.ts",
-        "./ServerComponents/creator/AccessibilityService.ts",
-        "./ServerComponents/creator/IGeoJsonFeature.ts",
-        "./ServerComponents/creator/IProjectRepositoryService.ts",
-        "./ServerComponents/creator/MapLayerFactory.ts",
-        "./ServerComponents/creator/ProjectRepositoryService.ts",
-        "./ServerComponents/creator/ProxyService.ts",
-        "./ServerComponents/creator/RssService.ts",
-        "./ServerComponents/database/BagDatabase.ts",
-        "./ServerComponents/database/IBagAddress.ts",
-        "./ServerComponents/database/IBagOptions.ts",
-        "./ServerComponents/database/LocalBag.ts",
-        "./ServerComponents/database/Location.ts",
-        "./ServerComponents/dynamic/ClientConnection.ts",
-        "./ServerComponents/dynamic/DataSource.ts",
-        "./ServerComponents/dynamic/DynamicLayer.ts",
-        "./ServerComponents/dynamic/DynamicProject.ts",
-        "./ServerComponents/dynamic/LayerDirectory.ts",
-        "./ServerComponents/helpers/conrec.ts",
-        "./ServerComponents/helpers/DateUtils.ts",
-        "./ServerComponents/helpers/GeoJSON.ts",
-        "./ServerComponents/helpers/Rss.ts",
-        "./ServerComponents/helpers/RssGeoJSON.ts",
-        "./ServerComponents/helpers/StringExt.ts",
-        "./ServerComponents/helpers/typestate.ts",
-        "./ServerComponents/helpers/Utils.ts",
-        "./ServerComponents/import/AggregateOpportunitiesToGeoJsonTransformer.ts",
-        "./ServerComponents/import/AggregateOpportunitiesToOrganisationTransformer.ts",
-        "./ServerComponents/import/BagDetailsTransformer.ts",
-        "./ServerComponents/import/BaseTransformer.ts",
-        "./ServerComponents/import/BushalteAggregateTransformer.ts",
-        "./ServerComponents/import/CliImporter.ts",
-        "./ServerComponents/import/CollateStreamTransformer.ts",
-        "./ServerComponents/import/CsvSaveTransformer.ts",
-        "./ServerComponents/import/CsvToJsonTransformer.ts",
-        "./ServerComponents/import/FieldFilterTransformer.ts",
-        "./ServerComponents/import/FieldSplitTransformer.ts",
-        "./ServerComponents/import/GeoJsonAggregateTransformer.ts",
-        "./ServerComponents/import/GeoJsonFeaturesTransformer.ts",
-        "./ServerComponents/import/GeoJsonOutputTransformer.ts",
-        "./ServerComponents/import/GeoJsonSaveTransformer.ts",
-        "./ServerComponents/import/GeoJsonSplitTransformer.ts",
-        "./ServerComponents/import/IImport.ts",
-        "./ServerComponents/import/IImporterRepositoryService.ts",
-        "./ServerComponents/import/Importer.ts",
-        "./ServerComponents/import/ImporterRepositoryService.ts",
-        "./ServerComponents/import/IsoLines.ts",
-        "./ServerComponents/import/IStore.ts",
-        "./ServerComponents/import/ITransform.ts",
-        "./ServerComponents/import/KvKToJsonTransformer.ts",
-        "./ServerComponents/import/MergeGeoJsonTransformer.ts",
-        "./ServerComponents/import/RepeatEnum.ts",
-        "./ServerComponents/import/SplitAdresTransformer.ts",
-        "./ServerComponents/import/Store.ts",
-        "./ServerComponents/rules/Rule.ts",
-        "./ServerComponents/rules/RuleEngine.ts",
-        "./ServerComponents/rules/WorldState.ts"
+        "Classes/Feature.ts",
+        "Scripts/typings/async/async.d.ts",
+        "Scripts/typings/bcrypt/bcryptjs.d.ts",
+        "Scripts/typings/body-parser/body-parser.d.ts",
+        "Scripts/typings/cors/cors.d.ts",
+        "Scripts/typings/cs/cs-offline-search.d.ts",
+        "Scripts/typings/express/express.d.ts",
+        "Scripts/typings/form-data/form-data.d.ts",
+        "Scripts/typings/fs-extra/fs-extra.d.ts",
+        "Scripts/typings/hypertimer/hypertimer.d.ts",
+        "Scripts/typings/jquery/jquery.d.ts",
+        "Scripts/typings/JSONStream/JSONStream.d.ts",
+        "Scripts/typings/jwt-simple/jwt-simple.d.ts",
+        "Scripts/typings/mongodb/mongodb.d.ts",
+        "Scripts/typings/mqtt/mqtt-router.d.ts",
+        "Scripts/typings/mqtt/mqtt.d.ts",
+        "Scripts/typings/node/node.d.ts",
+        "Scripts/typings/pg/pg.d.ts",
+        "Scripts/typings/proj4/proj4.d.ts",
+        "Scripts/typings/request/request.d.ts",
+        "Scripts/typings/socketio/socket.io.d.ts",
+        "Scripts/typings/sqlite3/sqlite3.d.ts",
+        "Scripts/typings/underscore/underscore.d.ts",
+        "Scripts/typings/winston/winston.d.ts",
+        "Scripts/typings/xml2js/xml2js.d.ts",
+        "ServerComponents/api/ApiManager.ts",
+        "ServerComponents/api/ApiServiceManager.ts",
+        "ServerComponents/api/AuthAPI.ts",
+        "ServerComponents/api/BaseConnector.ts",
+        "ServerComponents/api/config.ts",
+        "ServerComponents/api/FileStorage.ts",
+        "ServerComponents/api/IApiService.ts",
+        "ServerComponents/api/IApiServiceManager.ts",
+        "ServerComponents/api/imb.ts",
+        "ServerComponents/api/ImbAPI.ts",
+        "ServerComponents/api/MongoDB.ts",
+        "ServerComponents/api/MqttAPI.ts",
+        "ServerComponents/api/qlobber.ts",
+        "ServerComponents/api/RestAPI.ts",
+        "ServerComponents/api/SocketIOAPI.ts",
+        "ServerComponents/bus/MessageBus.ts",
+        "ServerComponents/configuration/ConfigurationService.ts",
+        "ServerComponents/configuration/IConfiguration.ts",
+        "ServerComponents/creator/AccessibilityService.ts",
+        "ServerComponents/creator/IGeoJsonFeature.ts",
+        "ServerComponents/creator/IProjectRepositoryService.ts",
+        "ServerComponents/creator/MapLayerFactory.ts",
+        "ServerComponents/creator/ProjectRepositoryService.ts",
+        "ServerComponents/creator/ProxyService.ts",
+        "ServerComponents/creator/RssService.ts",
+        "ServerComponents/database/BagDatabase.ts",
+        "ServerComponents/database/IBagAddress.ts",
+        "ServerComponents/database/IBagOptions.ts",
+        "ServerComponents/database/LocalBag.ts",
+        "ServerComponents/database/Location.ts",
+        "ServerComponents/dynamic/ClientConnection.ts",
+        "ServerComponents/dynamic/DataSource.ts",
+        "ServerComponents/dynamic/DynamicLayer.ts",
+        "ServerComponents/dynamic/DynamicProject.ts",
+        "ServerComponents/dynamic/LayerDirectory.ts",
+        "ServerComponents/helpers/conrec.ts",
+        "ServerComponents/helpers/DateUtils.ts",
+        "ServerComponents/helpers/GeoJSON.ts",
+        "ServerComponents/helpers/Rss.ts",
+        "ServerComponents/helpers/RssGeoJSON.ts",
+        "ServerComponents/helpers/StringExt.ts",
+        "ServerComponents/helpers/typestate.ts",
+        "ServerComponents/helpers/Utils.ts",
+        "ServerComponents/import/AggregateOpportunitiesToGeoJsonTransformer.ts",
+        "ServerComponents/import/AggregateOpportunitiesToOrganisationTransformer.ts",
+        "ServerComponents/import/BagDetailsTransformer.ts",
+        "ServerComponents/import/BaseTransformer.ts",
+        "ServerComponents/import/BushalteAggregateTransformer.ts",
+        "ServerComponents/import/CliImporter.ts",
+        "ServerComponents/import/CollateStreamTransformer.ts",
+        "ServerComponents/import/CsvSaveTransformer.ts",
+        "ServerComponents/import/CsvToJsonTransformer.ts",
+        "ServerComponents/import/FieldFilterTransformer.ts",
+        "ServerComponents/import/FieldSplitTransformer.ts",
+        "ServerComponents/import/GeoJsonAggregateTransformer.ts",
+        "ServerComponents/import/GeoJsonFeaturesTransformer.ts",
+        "ServerComponents/import/GeoJsonOutputTransformer.ts",
+        "ServerComponents/import/GeoJsonSaveTransformer.ts",
+        "ServerComponents/import/GeoJsonSplitTransformer.ts",
+        "ServerComponents/import/IImport.ts",
+        "ServerComponents/import/IImporterRepositoryService.ts",
+        "ServerComponents/import/Importer.ts",
+        "ServerComponents/import/ImporterRepositoryService.ts",
+        "ServerComponents/import/IsoLines.ts",
+        "ServerComponents/import/IStore.ts",
+        "ServerComponents/import/ITransform.ts",
+        "ServerComponents/import/KvKToJsonTransformer.ts",
+        "ServerComponents/import/MergeGeoJsonTransformer.ts",
+        "ServerComponents/import/RepeatEnum.ts",
+        "ServerComponents/import/SplitAdresTransformer.ts",
+        "ServerComponents/import/Store.ts",
+        "ServerComponents/rules/Rule.ts",
+        "ServerComponents/rules/RuleEngine.ts",
+        "ServerComponents/rules/WorldState.ts"
     ]
 }
diff --git a/example/gulpfile.js b/example/gulpfile.js
@@ -45,7 +45,8 @@ gulp.task('clean', function(cb) {
     gulp.task('sass', function () {
         gulp.src(path2csWeb + 'csComp/includes/css/*.scss')
         .pipe(sass().on('error', sass.logError))
-        .pipe(gulp.dest(path2csWeb + 'csComp/includes/css/'));
+        .pipe(gulp.dest(path2csWeb + 'csComp/includes/css/'))
+        .pipe(gulp.dest(path2csWeb + 'dist/csComp'));
     });
 
 gulp.task('deploy-githubpages', function() {
@@ -67,7 +68,8 @@ gulp.task('built_csComp', function() {
         // ]))
         // .pipe(debug({title: 'after ordering:'}))
         .pipe(concat('csComp.js'))
-        .pipe(gulp.dest('./public/cs/js'));
+        .pipe(gulp.dest('./public/cs/js'))
+        .pipe(gulp.dest(path2csWeb + 'dist/csComp'));
 });
 
 gulp.task('compile_all', function() {
@@ -156,6 +158,7 @@ gulp.task('create_templateCache', function() {
     gulp.src(path2csWeb + 'csComp/**/*.tpl.html')
         .pipe(templateCache(options))
         .pipe(gulp.dest('public/cs/js'))
+        .pipe(gulp.dest(path2csWeb + 'dist/csComp'));
 })
 
 gulp.task('gh_pages', function() {
@@ -348,22 +351,25 @@ gulp.task('include_js', function() {
         //     title: 'include_js:'
         // }))
         .pipe(plumber())
-        .pipe(changed('./public/cs/js/'))
-        .pipe(gulp.dest('./public/cs/js'));
+        //.pipe(changed('./public/cs/js/'))
+        .pipe(gulp.dest('./public/cs/js'))
+        .pipe(gulp.dest(path2csWeb + 'dist/csComp/js'));
 });
 
 gulp.task('include_css', function() {
     gulp.src(path2csWeb + 'csComp/includes/css/*.*')
         .pipe(plumber())
-        .pipe(changed('./public/cs/css/'))
-        .pipe(gulp.dest('./public/cs/css'));
+        //.pipe(changed('./public/cs/css/'))
+        .pipe(gulp.dest('./public/cs/css'))
+        .pipe(gulp.dest(path2csWeb + 'dist/csComp/css'));
 });
 
 gulp.task('include_images', function() {
     gulp.src(path2csWeb + 'csComp/includes/images/**/*.*')
         .pipe(plumber())
-        .pipe(changed('./public/cs/images/'))
-        .pipe(gulp.dest('./public/cs/images/'));
+        //.pipe(changed('./public/cs/images/'))
+        .pipe(gulp.dest('./public/cs/images/'))
+        .pipe(gulp.dest(path2csWeb + 'dist/csComp/images'));
 });
 
 gulp.task('watch', function() {

diff --git a/example/package.json b/example/package.json
@@ -37,7 +37,7 @@
     "xml2js": "^0.4.9"
   },
   "devDependencies": {
-    "coveralls": "^2.11.2",
+    "coveralls": "^2.11.4",
     "del": "^1.2.0",
     "gulp": "^3.9.0",
     "gulp-angular-templatecache": "^1.6.0",