added loader!
This commit is contained in:
1 parent
37209f6779
commit
cd28c44c00
13 files changed
+54
-19
No files matched your search
+3
-1
@@ -20,6 +20,8 @@
|
|||||||
"angular-leaflet-directive": "~0.7.7",
|
"angular-leaflet-directive": "~0.7.7",
|
||||||
"leaflet": "~0.7.2",
|
"leaflet": "~0.7.2",
|
||||||
"codemirror": "~3.19.0",
|
"codemirror": "~3.19.0",
|
||||||
"angular-ui-codemirror": "~0.1.1"
|
"angular-ui-codemirror": "~0.1.1",
|
||||||
|
"spin.js": "~2.0.1",
|
||||||
|
"angular-spinner": "~0.4.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
root = this;
|
root = this;
|
||||||
|
|
||||||
|
|
||||||
root.controllers.controller('collectionsCtrl', ['$scope', '$routeParams', '$http', ($scope, $routeParams, $http) ->
|
root.controllers.controller('collectionsCtrl', ['$scope', '$routeParams', '$rootScope', 'util', ($scope, $routeParams, $rootScope, util) ->
|
||||||
$scope.server = $routeParams.server
|
$scope.server = $routeParams.server
|
||||||
$scope.database = $routeParams.database
|
$scope.database = $routeParams.database
|
||||||
$scope.collections = []
|
$scope.collections = []
|
||||||
$http.get("/api/#{ $routeParams.server }/#{ $routeParams.database }/collections").then((res) ->
|
$rootScope.$broadcast("loading")
|
||||||
|
util.get("/api/#{ $routeParams.server }/#{ $routeParams.database }/collections").then((res) ->
|
||||||
$scope.collections = res.data
|
$scope.collections = res.data
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
root = this;
|
root = this;
|
||||||
|
|
||||||
|
|
||||||
root.controllers.controller('databasesCtrl', ['$scope', '$routeParams', '$http', ($scope, $routeParams, $http) ->
|
root.controllers.controller('databasesCtrl', ['$scope', '$routeParams', 'util', ($scope, $routeParams, util) ->
|
||||||
$scope.server = $routeParams.server
|
$scope.server = $routeParams.server
|
||||||
$scope.databases = []
|
$scope.databases = []
|
||||||
$http.get("/api/#{ $routeParams.server }/databases").then((res) ->
|
util.get("/api/#{ $routeParams.server }/databases").then((res) ->
|
||||||
$scope.databases = res.data
|
$scope.databases = res.data
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ testmongoJsToMongoJSON = () ->
|
|||||||
|
|
||||||
testmongoJsToMongoJSON()
|
testmongoJsToMongoJSON()
|
||||||
|
|
||||||
root.controllers.controller('documentCtrl', ['$scope', '$routeParams', '$http', ($scope, $routeParams, $http) ->
|
root.controllers.controller('documentCtrl', ['$scope', '$routeParams', 'util', ($scope, $routeParams, util) ->
|
||||||
$scope.idx = $routeParams.idx
|
$scope.idx = $routeParams.idx
|
||||||
$scope.doc = {}
|
$scope.doc = {}
|
||||||
$scope.idx = Number($routeParams.idx) or 1
|
$scope.idx = Number($routeParams.idx) or 1
|
||||||
@@ -83,7 +83,7 @@ root.controllers.controller('documentCtrl', ['$scope', '$routeParams', '$http',
|
|||||||
else if $routeParams.id
|
else if $routeParams.id
|
||||||
url = "#{ url }/_id/#{$routeParams.id}"
|
url = "#{ url }/_id/#{$routeParams.id}"
|
||||||
|
|
||||||
$http.get(url).then((res) ->
|
util.get(url).then((res) ->
|
||||||
$scope.doc = res.data.document
|
$scope.doc = res.data.document
|
||||||
$scope.meta = res.data.meta
|
$scope.meta = res.data.meta
|
||||||
).catch( (res) ->
|
).catch( (res) ->
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
root = this;
|
root = this;
|
||||||
|
|
||||||
|
|
||||||
root.controllers.controller('fieldCtrl', ['$scope', '$routeParams', '$http', ($scope, $routeParams, $http) ->
|
root.controllers.controller('fieldCtrl', ['$scope', '$routeParams', 'util', ($scope, $routeParams, util) ->
|
||||||
$scope.idx = $routeParams.idx
|
$scope.idx = $routeParams.idx
|
||||||
$scope.field = $routeParams.field
|
$scope.field = $routeParams.field
|
||||||
$scope.fields = []
|
$scope.fields = []
|
||||||
@@ -17,7 +17,7 @@ root.controllers.controller('fieldCtrl', ['$scope', '$routeParams', '$http', ($s
|
|||||||
url = "/api/#{ $routeParams.server }/#{ $routeParams.database }/#{ $routeParams.collection }"
|
url = "/api/#{ $routeParams.server }/#{ $routeParams.database }/#{ $routeParams.collection }"
|
||||||
url = "#{ url }/_id/#{$routeParams.id}"
|
url = "#{ url }/_id/#{$routeParams.id}"
|
||||||
|
|
||||||
$http.get(url).then((res) ->
|
util.get(url).then((res) ->
|
||||||
$scope.doc = res.data.document
|
$scope.doc = res.data.document
|
||||||
$scope.value = $scope.doc[$scope.field]
|
$scope.value = $scope.doc[$scope.field]
|
||||||
$scope.fields = _.keys($scope.doc)
|
$scope.fields = _.keys($scope.doc)
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ transformListOfGeoJsonToGeometryCollection = (resData, routeParams) ->
|
|||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
root.controllers.controller('geojsonmapCtrl', ['$scope', '$routeParams', '$location', '$http', ($scope, $routeParams, $location, $http) ->
|
root.controllers.controller('geojsonmapCtrl', ['$scope', '$routeParams', '$location', 'util', ($scope, $routeParams, $location, util) ->
|
||||||
$scope.geojson = {}
|
$scope.geojson = {}
|
||||||
$scope.geojsonData = {}
|
$scope.geojsonData = {}
|
||||||
$scope.idx = Number($routeParams.idx)
|
$scope.idx = Number($routeParams.idx)
|
||||||
@@ -75,7 +75,7 @@ root.controllers.controller('geojsonmapCtrl', ['$scope', '$routeParams', '$locat
|
|||||||
|
|
||||||
$scope.initSingleDocument = ()->
|
$scope.initSingleDocument = ()->
|
||||||
url = getSingleDataUrl($routeParams)
|
url = getSingleDataUrl($routeParams)
|
||||||
$http.get(url).then (res) ->
|
util.get(url).then (res) ->
|
||||||
geojson = res.data.document[$routeParams.key]
|
geojson = res.data.document[$routeParams.key]
|
||||||
if not geojson.properties
|
if not geojson.properties
|
||||||
geojson.properties = {}
|
geojson.properties = {}
|
||||||
@@ -88,7 +88,7 @@ root.controllers.controller('geojsonmapCtrl', ['$scope', '$routeParams', '$locat
|
|||||||
|
|
||||||
$scope.initAllDocuments = () ->
|
$scope.initAllDocuments = () ->
|
||||||
url = getAllDataUrl($routeParams)
|
url = getAllDataUrl($routeParams)
|
||||||
$http.get(url).then (res) ->
|
util.get(url).then (res) ->
|
||||||
$scope.meta = res.data.meta
|
$scope.meta = res.data.meta
|
||||||
$scope.geojsonData =
|
$scope.geojsonData =
|
||||||
data: transformListOfGeoJsonToGeometryCollection(res.data, $routeParams)
|
data: transformListOfGeoJsonToGeometryCollection(res.data, $routeParams)
|
||||||
|
|||||||
@@ -6,14 +6,14 @@ humanValueOfStatisticalAbreviation =
|
|||||||
var: "variance"
|
var: "variance"
|
||||||
|
|
||||||
|
|
||||||
root.controllers.controller('keyStatCtrl', ['$scope', '$routeParams', '$http', ($scope, $routeParams, $http) ->
|
root.controllers.controller('keyStatCtrl', ['$scope', '$routeParams', 'util', ($scope, $routeParams, util) ->
|
||||||
$scope.name = "didier!"
|
$scope.name = "didier!"
|
||||||
$scope.stats = []
|
$scope.stats = []
|
||||||
|
|
||||||
url = "/api/#{ $routeParams.server }/#{ $routeParams.database }/#{ $routeParams.collection }"
|
url = "/api/#{ $routeParams.server }/#{ $routeParams.database }/#{ $routeParams.collection }"
|
||||||
url = "#{ url }/stats/#{$routeParams.key}"
|
url = "#{ url }/stats/#{$routeParams.key}"
|
||||||
|
|
||||||
$http.get(url).then((res) ->
|
util.get(url).then((res) ->
|
||||||
for key, val of res.data
|
for key, val of res.data
|
||||||
$scope.stats.push({name: humanValueOfStatisticalAbreviation[key], value: val })
|
$scope.stats.push({name: humanValueOfStatisticalAbreviation[key], value: val })
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
root = this;
|
root = this;
|
||||||
|
|
||||||
|
|
||||||
root.controllers.controller('serversCtrl', ['$scope', '$http', ($scope, $http) ->
|
root.controllers.controller('serversCtrl', ['$scope', 'util', ($scope, util) ->
|
||||||
$scope.servers = []
|
$scope.servers = []
|
||||||
$http.get("/api/servers").then((res) ->
|
util.get("/api/servers").then((res) ->
|
||||||
$scope.servers = res.data
|
$scope.servers = res.data
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ joinArray = (a, b)->
|
|||||||
return a
|
return a
|
||||||
|
|
||||||
root.controllers.controller('topBarCtrl', ['$scope', '$location', ($scope, $location) ->
|
root.controllers.controller('topBarCtrl', ['$scope', '$location', ($scope, $location) ->
|
||||||
|
|
||||||
|
$scope.loading = false
|
||||||
|
|
||||||
$scope.$on('$routeChangeSuccess', (next, current) ->
|
$scope.$on('$routeChangeSuccess', (next, current) ->
|
||||||
$scope.path = _.filter($location.path().split("/"), (s) -> s)
|
$scope.path = _.filter($location.path().split("/"), (s) -> s)
|
||||||
if $scope.path[5] == "query"
|
if $scope.path[5] == "query"
|
||||||
@@ -23,4 +26,9 @@ root.controllers.controller('topBarCtrl', ['$scope', '$location', ($scope, $loca
|
|||||||
ret += "/#{ $scope.path[4] }"
|
ret += "/#{ $scope.path[4] }"
|
||||||
return ret
|
return ret
|
||||||
)
|
)
|
||||||
|
$scope.$on "loading", ()->
|
||||||
|
$scope.loading = true
|
||||||
|
|
||||||
|
$scope.$on "loadingFinished", ()->
|
||||||
|
$scope.loading = false
|
||||||
])
|
])
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
root = this
|
||||||
|
|
||||||
|
root.services.factory('util', ['$http', '$rootScope', ($http, $rootScope)->
|
||||||
|
service =
|
||||||
|
get: (params...) ->
|
||||||
|
$rootScope.$broadcast("loading")
|
||||||
|
return $http.get(params...).
|
||||||
|
finally( () ->
|
||||||
|
$rootScope.$broadcast("loadingFinished")
|
||||||
|
)
|
||||||
|
|
||||||
|
return service
|
||||||
|
|
||||||
|
]);
|
||||||
@@ -4,6 +4,7 @@ root = this;
|
|||||||
angular.module('vulture', [
|
angular.module('vulture', [
|
||||||
'ngRoute'
|
'ngRoute'
|
||||||
'ui.codemirror'
|
'ui.codemirror'
|
||||||
|
'angularSpinner'
|
||||||
'leaflet-directive'
|
'leaflet-directive'
|
||||||
'vulture.filters'
|
'vulture.filters'
|
||||||
'vulture.services'
|
'vulture.services'
|
||||||
|
|||||||
+11
-2
@@ -21,13 +21,18 @@
|
|||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<div ng-controller="topBarCtrl">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
<h3 style="font-family: 'Rock Salt', cursive;">
|
<h3 style="font-family: 'Rock Salt', cursive;">
|
||||||
<img src="images/vulture.svg" width="50px" style="margin-right: 100px; "> Vulture</h3>
|
<img src="images/vulture.svg" width="50px" style="margin-right: 100px; "> Vulture
|
||||||
|
<span style="position: absolute;left: 40px; top: 45px; z-index:-1;" ng-show="loading">
|
||||||
|
<span us-spinner="{radius:20, width:8, length: 16}"></span>
|
||||||
|
</span>
|
||||||
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row" ng-controller="topBarCtrl">
|
<div class="row" >
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
<ul class="breadcrumbs">
|
<ul class="breadcrumbs">
|
||||||
<li ng-repeat="p in path" ng-class="{current: $last, unavailable: getHistoryUrl($index)== ''}">
|
<li ng-repeat="p in path" ng-class="{current: $last, unavailable: getHistoryUrl($index)== ''}">
|
||||||
@@ -36,6 +41,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div ng-view></div>
|
<div ng-view></div>
|
||||||
|
|
||||||
@@ -47,12 +53,15 @@
|
|||||||
<script src="bower_components/foundation/js/foundation.js"></script>
|
<script src="bower_components/foundation/js/foundation.js"></script>
|
||||||
<script src="bower_components/angular-route/angular-route.js"></script>
|
<script src="bower_components/angular-route/angular-route.js"></script>
|
||||||
<script src="bower_components/angular-leaflet-directive/dist/angular-leaflet-directive.js"></script>
|
<script src="bower_components/angular-leaflet-directive/dist/angular-leaflet-directive.js"></script>
|
||||||
|
<script src="bower_components/spin.js/spin.js"></script>
|
||||||
|
<script src="bower_components/angular-spinner/angular-spinner.js"></script>
|
||||||
<script type="text/javascript" src="bower_components/angular-ui-codemirror/ui-codemirror.js"></script>
|
<script type="text/javascript" src="bower_components/angular-ui-codemirror/ui-codemirror.js"></script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<script src="js/vultureApp.js"></script>
|
<script src="js/vultureApp.js"></script>
|
||||||
<script src="js/filters.js"></script>
|
<script src="js/filters.js"></script>
|
||||||
|
<script src="js/services.js"></script>
|
||||||
<script src="js/controllers/homeCtrl.js"></script>
|
<script src="js/controllers/homeCtrl.js"></script>
|
||||||
<script src="js/controllers/serversCtrl.js"></script>
|
<script src="js/controllers/serversCtrl.js"></script>
|
||||||
<script src="js/controllers/databasesCtrl.js"></script>
|
<script src="js/controllers/databasesCtrl.js"></script>
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ Port: 8000
|
|||||||
# The address where the service will run. If you wish to run it on your computer, you
|
# The address where the service will run. If you wish to run it on your computer, you
|
||||||
# should use `localhost`. If you wish to share the service on your local network, you
|
# should use `localhost`. If you wish to share the service on your local network, you
|
||||||
# should use `0.0.0.0`
|
# should use `0.0.0.0`
|
||||||
ServingAddress: localhost
|
ServingAddress: 0.0.0.0
|
||||||
|
|
||||||
# The list of mongo servers. Each server is an object with a field *name* that will
|
# The list of mongo servers. Each server is an object with a field *name* that will
|
||||||
# be shown in the web user interface and a *url* field that points to the mongo server
|
# be shown in the web user interface and a *url* field that points to the mongo server
|
||||||
|
|||||||
Reference in new issue
Block a user