mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
This commit is contained in:
Jan Steemann
commit
c3b0caaca8
|
|
@ -44,7 +44,14 @@
|
|||
|
||||
app.del("/foxxes/:key", function (req, res) {
|
||||
res.json(foxxes.uninstall(req.params("key")));
|
||||
});
|
||||
}).pathParam("key", {
|
||||
description: "The _key attribute, where the information of this Foxx-Install is stored.",
|
||||
dataType: "string",
|
||||
required: true,
|
||||
allowMultiple: false
|
||||
}).nickname("Foxxes")
|
||||
.summary("Uninstall a Foxx.")
|
||||
.notes("This function is used to uninstall a foxx.");
|
||||
|
||||
app.put("/foxxes/:key", function (req, res) {
|
||||
var content = JSON.parse(req.requestBody),
|
||||
|
|
@ -55,15 +62,22 @@
|
|||
} else {
|
||||
res.json(foxxes.deactivate());
|
||||
}
|
||||
});
|
||||
}).pathParam("key", {
|
||||
description: "The _key attribute, where the information of this Foxx-Install is stored.",
|
||||
dataType: "string",
|
||||
required: true,
|
||||
allowMultiple: false
|
||||
}).nickname("Foxxes")
|
||||
.summary("List of all foxxes.")
|
||||
.notes("This function simply returns the list of all running"
|
||||
+ " foxxes and supplies the paths for the swagger documentation");
|
||||
|
||||
|
||||
app.get('/foxxes', function (req, res) {
|
||||
res.json(foxxes.viewAll());
|
||||
}).nickname("Foxxes")
|
||||
.summary("List of all foxxes.")
|
||||
.notes("This function simply returns the list of all running"
|
||||
+ " foxxes and supplies the information for the application viewer");
|
||||
.summary("Update a foxx.")
|
||||
.notes("Used to either activate/deactivate a foxx, or change the mount point.");
|
||||
|
||||
app.get('/swagger', function (req, res) {
|
||||
res.json(swagger.list());
|
||||
|
|
|
|||
|
|
@ -0,0 +1,172 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<!-- ArangoDB web interface -->
|
||||
|
||||
<meta charset="utf-8">
|
||||
<title>ArangoDB Web Interface</title>
|
||||
<meta name="description" content="ArangoDB Admin Web Interface">
|
||||
<meta name="author" content="Heiko Kernbach">
|
||||
|
||||
<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
|
||||
<link href='css/swagger/hightlight.default.css' media='screen' rel='stylesheet' type='text/css'/>
|
||||
<link href='css/swagger/screen.css' media='screen' rel='stylesheet' type='text/css'/>
|
||||
|
||||
<link href="css/bootstrap.css" rel="stylesheet">
|
||||
<link href="css/jquery-ui-1.9.2.custom.css" rel="stylesheet">
|
||||
<link href="css/layout.css" rel="stylesheet">
|
||||
<link href="css/jquery.dataTables.css" rel="stylesheet">
|
||||
<link href="css/nv.d3.css" rel="stylesheet">
|
||||
<link href="css/navigationView.css" rel="stylesheet">
|
||||
<link href="css/footerView.css" rel="stylesheet">
|
||||
<link href="css/shellView.css" rel="stylesheet">
|
||||
<link href="css/queryView.css" rel="stylesheet">
|
||||
<link href="css/dashboardView.css" rel="stylesheet">
|
||||
<link href="css/logsView.css" rel="stylesheet">
|
||||
<link href="css/collectionsView.css" rel="stylesheet">
|
||||
<link href="css/collectionsItemView.css" rel="stylesheet">
|
||||
<link href="css/collectionView.css" rel="stylesheet">
|
||||
<link href="css/documentsView.css" rel="stylesheet">
|
||||
<link href="css/documentView.css" rel="stylesheet">
|
||||
<link href="css/documentSourceView.css" rel="stylesheet">
|
||||
<link href="css/swaggerView.css" rel="stylesheet">
|
||||
<link href="css/foxxView.css" rel="stylesheet">
|
||||
|
||||
<link href="css/jquery.snippet.css" rel="stylesheet">
|
||||
<link href="css/jquery.gritter.css" rel="stylesheet">
|
||||
<link href="css/modal.css" rel="stylesheet">
|
||||
<link href="css/ansi.css" rel="stylesheet">
|
||||
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div id="content" class="span12>"></div>
|
||||
</div>
|
||||
|
||||
<div id="modalPlaceholder">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<footer class="footer">
|
||||
</footer>
|
||||
|
||||
<!-- libs -->
|
||||
<script src="js/lib/jquery-1.8.3.js"></script>
|
||||
<script src="js/lib/jquery-ui-1.9.2.custom.js"></script>
|
||||
<script src="js/lib/jquery.dataTables.js"></script>
|
||||
<script src="js/lib/jquery.autogrow.js"></script>
|
||||
<script src="js/lib/jquery.jeditable.js"></script>
|
||||
<script src="js/lib/jquery.jeditable.autogrow.js"></script>
|
||||
<script src="js/lib/jquery.snippet.js"></script>
|
||||
<script src="js/lib/jquery.gritter.js"></script>
|
||||
<script src='js/lib/jquery.slideto.min.js' type='text/javascript'></script>
|
||||
<script src='js/lib/jquery.wiggle.min.js' type='text/javascript'></script>
|
||||
<script src='js/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
|
||||
|
||||
<script src='js/lib/handlebars-1.0.rc.1.js' type='text/javascript'></script>
|
||||
|
||||
<script src="js/lib/underscore.js"></script>
|
||||
|
||||
<script src="js/lib/backbone-1.0.0.js"></script>
|
||||
|
||||
<script src="js/lib/d3.v3.js"></script>
|
||||
<script src="js/lib/nv.d3.js"></script>
|
||||
|
||||
|
||||
<script src="js/lib/ColVis.js"></script>
|
||||
<script src="js/lib/ejs_fulljslint.js"></script>
|
||||
<script src="js/lib/ejs_0.9_alpha_1_production.js"></script>
|
||||
<script src="js/lib/bootstrap.js"></script>
|
||||
<script src="js/lib/bootstrap-pagination.js"></script>
|
||||
<script src="src/ace.js"></script>
|
||||
<script src="js/lib/jqconsole.min.js"></script>
|
||||
<script src="js/lib/splitter.js"></script>
|
||||
|
||||
<script src='js/lib/swagger.js' type='text/javascript'></script>
|
||||
<script src='js/lib/swagger-ui.js' type='text/javascript'></script>
|
||||
<script src='js/lib/highlight.7.3.pack.js' type='text/javascript'></script>
|
||||
|
||||
|
||||
<!-- arango -->
|
||||
<script src="js/arango/arango.js"></script>
|
||||
|
||||
<!-- arangodb js files -->
|
||||
<script src="js/shell/browser.js"></script>
|
||||
|
||||
<script src="js/modules/org/arangodb/arango-collection-common.js"></script>
|
||||
<script src="js/modules/org/arangodb/arango-collection.js"></script>
|
||||
<script src="js/modules/org/arangodb/arango-database.js"></script>
|
||||
<script src="js/modules/org/arangodb/arango-error-common.js"></script>
|
||||
<script src="js/modules/org/arangodb/arango-error.js"></script>
|
||||
<script src="js/modules/org/arangodb/arango-query-cursor.js"></script>
|
||||
<script src="js/modules/org/arangodb/arango-statement-common.js"></script>
|
||||
<script src="js/modules/org/arangodb/arango-statement.js"></script>
|
||||
<script src="js/modules/org/arangodb/arangosh.js"></script>
|
||||
<script src="js/modules/org/arangodb/graph-common.js"></script>
|
||||
<script src="js/modules/org/arangodb/graph.js"></script>
|
||||
<script src="js/modules/org/arangodb/mimetypes.js"></script>
|
||||
<script src="js/modules/org/arangodb/simple-query-common.js"></script>
|
||||
<script src="js/modules/org/arangodb/simple-query.js"></script>
|
||||
<script src="js/modules/org/arangodb/graph/traversal.js"></script>
|
||||
<script src="js/modules/org/arangodb-common.js"></script>
|
||||
<script src="js/modules/org/arangodb.js"></script>
|
||||
|
||||
<script src="js/bootstrap/errors.js"></script>
|
||||
<script src="js/bootstrap/monkeypatches.js"></script>
|
||||
<script src="js/bootstrap/module-internal.js"></script>
|
||||
<script src="js/client/bootstrap/module-internal.js"></script>
|
||||
|
||||
<script src="js/shell/print.js"></script>
|
||||
<script src="js/client/client.js"></script>
|
||||
|
||||
<!-- models -->
|
||||
<script src="js/models/arangoCollection.js"></script>
|
||||
<script src="js/models/arangoDocument.js"></script>
|
||||
<script src="js/models/arangoLog.js"></script>
|
||||
<script src="js/models/foxx.js"></script>
|
||||
|
||||
<!-- collections -->
|
||||
<script src="js/collections/arangoCollections.js"></script>
|
||||
<script src="js/collections/arangoDocuments.js"></script>
|
||||
<script src="js/collections/arangoDocument.js"></script>
|
||||
<script src="js/collections/arangoLogs.js"></script>
|
||||
<script src="js/collections/foxxCollection.js"></script>
|
||||
|
||||
<!-- views -->
|
||||
<script src="js/views/navigationView.js"></script>
|
||||
<script src="js/views/footerView.js"></script>
|
||||
<script src="js/views/queryView.js"></script>
|
||||
<script src="js/views/shellView.js"></script>
|
||||
<script src="js/views/aboutView.js"></script>
|
||||
<script src="js/views/dashboardView.js"></script>
|
||||
<script src="js/views/collectionsView.js"></script>
|
||||
<script src="js/views/collectionView.js"></script>
|
||||
<script src="js/views/newCollectionView.js"></script>
|
||||
<script src="js/views/collectionsItemView.js"></script>
|
||||
<script src="js/views/documentsView.js"></script>
|
||||
<script src="js/views/documentView.js"></script>
|
||||
<script src="js/views/documentSourceView.js"></script>
|
||||
<script src="js/views/logsView.js"></script>
|
||||
<script src="js/views/foxxActiveView.js"></script>
|
||||
<script src="js/views/foxxActiveListView.js"></script>
|
||||
<script src="js/views/foxxInstalledView.js"></script>
|
||||
<script src="js/views/foxxInstalledListView.js"></script>
|
||||
<script src="js/views/foxxEditView.js"></script>
|
||||
<script src="js/views/appDocumentationView.js"></script>
|
||||
|
||||
<!-- router -->
|
||||
<script src="js/routers/router.js"></script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -5,6 +5,93 @@
|
|||
"apps": {
|
||||
"/": "aardvark.js"
|
||||
},
|
||||
|
||||
"assets": {
|
||||
"index.html": {
|
||||
"files": [
|
||||
"index.html"
|
||||
]
|
||||
},
|
||||
|
||||
"app.js": {
|
||||
"files": [
|
||||
"../../html/admin/js/lib/jquery-1.8.3.js",
|
||||
"../../html/admin/js/lib/jquery-ui-1.9.2.custom.js",
|
||||
"../../html/admin/js/lib/jquery.dataTables.js",
|
||||
"../../html/admin/js/lib/jquery.autogrow.js",
|
||||
"../../html/admin/js/lib/jquery.jeditable.js",
|
||||
"../../html/admin/js/lib/jquery.jeditable.autogrow.js",
|
||||
"../../html/admin/js/lib/jquery.snippet.js",
|
||||
"../../html/admin/js/lib/jquery.gritter.js",
|
||||
"../../html/admin/js/lib/jquery.slideto.min.js",
|
||||
"../../html/admin/js/lib/jquery.wiggle.min.js",
|
||||
"../../html/admin/js/lib/jquery.ba-bbq.min.js",
|
||||
"../../html/admin/js/lib/handlebars-1.0.rc.1.js",
|
||||
"../../html/admin/js/lib/underscore.js",
|
||||
"../../html/admin/js/lib/backbone-1.0.0.js",
|
||||
"../../html/admin/js/lib/d3.v3.js",
|
||||
"../../html/admin/js/lib/nv.d3.js",
|
||||
"../../html/admin/js/lib/ColVis.js",
|
||||
"../../html/admin/js/lib/ejs_fulljslint.js",
|
||||
"../../html/admin/js/lib/ejs_0.9_alpha_1_production.js",
|
||||
"../../html/admin/js/lib/bootstrap.js",
|
||||
"../../html/admin/js/lib/bootstrap-pagination.js",
|
||||
"../../html/admin/src/ace.js",
|
||||
"../../html/admin/js/lib/jqconsole.min.js",
|
||||
"../../html/admin/js/lib/splitter.js",
|
||||
"../../html/admin/js/lib/swagger.js",
|
||||
"../../html/admin/js/lib/swagger-ui.js",
|
||||
"../../html/admin/js/lib/highlight.7.3.pack.js",
|
||||
"../../html/admin/js/arango/arango.js",
|
||||
"../../html/admin/js/shell/browser.js",
|
||||
"../../html/admin/js/modules/org/**",
|
||||
"../../html/admin/js/bootstrap/errors.js",
|
||||
"../../html/admin/js/bootstrap/monkeypatches.js",
|
||||
"../../html/admin/js/bootstrap/module-internal.js",
|
||||
"../../html/admin/js/client/bootstrap/module-internal.js",
|
||||
"../../html/admin/js/shell/print.js",
|
||||
"../../html/admin/js/client/client.js",
|
||||
"../../html/admin/js/models/**",
|
||||
"../../html/admin/js/collections/**",
|
||||
"../../html/admin/js/views/**",
|
||||
"../../html/admin/js/routers/**"
|
||||
]
|
||||
},
|
||||
|
||||
"style.css": {
|
||||
"files": [
|
||||
"../../html/admin/css/swagger/hightlight.default.css",
|
||||
"../../html/admin/css/swagger/screen.css",
|
||||
"../../html/admin/css/bootstrap.css",
|
||||
"../../html/admin/css/jquery-ui-1.9.2.custom.css",
|
||||
"../../html/admin/css/layout.css",
|
||||
"../../html/admin/css/jquery.dataTables.css",
|
||||
"../../html/admin/css/nv.d3.css",
|
||||
"../../html/admin/css/navigationView.css",
|
||||
"../../html/admin/css/footerView.css",
|
||||
"../../html/admin/css/shellView.css",
|
||||
"../../html/admin/css/queryView.css",
|
||||
"../../html/admin/css/dashboardView.css",
|
||||
"../../html/admin/css/logsView.css",
|
||||
"../../html/admin/css/collectionsView.css",
|
||||
"../../html/admin/css/collectionsItemView.css",
|
||||
"../../html/admin/css/collectionView.css",
|
||||
"../../html/admin/css/documentsView.css",
|
||||
"../../html/admin/css/documentView.css",
|
||||
"../../html/admin/css/documentSourceView.css",
|
||||
"../../html/admin/css/swaggerView.css",
|
||||
"../../html/admin/css/foxxView.css",
|
||||
"../../html/admin/css/jquery.snippet.css",
|
||||
"../../html/admin/css/jquery.gritter.css",
|
||||
"../../html/admin/css/modal.css",
|
||||
"../../html/admin/css/ansi.css"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
"files": {
|
||||
"/img" : "../../html/admin/img/**"
|
||||
},
|
||||
|
||||
"models": "models"
|
||||
}
|
||||
|
|
@ -162,7 +162,7 @@
|
|||
<script src="js/views/foxxInstalledView.js"></script>
|
||||
<script src="js/views/foxxInstalledListView.js"></script>
|
||||
<script src="js/views/foxxEditView.js"></script>
|
||||
<script src="js/views/swaggerView.js"></script>
|
||||
<script src="js/views/appDocumentationView.js"></script>
|
||||
|
||||
<!-- router -->
|
||||
<script src="js/routers/router.js"></script>
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ $(document).ready(function() {
|
|||
"logs" : "logs",
|
||||
"about" : "about",
|
||||
"application/:key" : "applicationEdit",
|
||||
"applications/running" : "applicationsActive",
|
||||
"applications/installed" : "applicationsInstalled",
|
||||
"applications/swagger" : "swagger"
|
||||
"applications/available" : "applicationsAvailable",
|
||||
"applications/documentation" : "applicationsDocumentation"
|
||||
|
||||
},
|
||||
initialize: function () {
|
||||
|
|
@ -156,7 +156,7 @@ $(document).ready(function() {
|
|||
});
|
||||
},
|
||||
|
||||
applicationsInstalled: function() {
|
||||
applicationsAvailable: function() {
|
||||
if (this.foxxList === undefined) {
|
||||
this.foxxList = new window.FoxxCollection();
|
||||
}
|
||||
|
|
@ -169,7 +169,7 @@ $(document).ready(function() {
|
|||
this.naviView.selectMenuItem('applications-menu');
|
||||
},
|
||||
|
||||
applicationsActive: function() {
|
||||
applicationsInstalled: function() {
|
||||
if (this.foxxList === undefined) {
|
||||
this.foxxList = new window.FoxxCollection();
|
||||
}
|
||||
|
|
@ -199,11 +199,11 @@ $(document).ready(function() {
|
|||
|
||||
},
|
||||
|
||||
swagger: function() {
|
||||
if (this.swaggerView === undefined) {
|
||||
this.swaggerView = new window.SwaggerView();
|
||||
applicationsDocumentation: function() {
|
||||
if (this.appDocuView === undefined) {
|
||||
this.appDocuView = new window.AppDocumentationView();
|
||||
}
|
||||
this.swaggerView.render();
|
||||
this.appDocuView.render();
|
||||
this.naviView.selectMenuItem('applications-menu');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<ul class="thumbnails2">
|
||||
<div id="transparentHeader">
|
||||
<h4>Swagger</h4>
|
||||
<h4>API - Documentation</h4>
|
||||
</div>
|
||||
</ul>
|
||||
<div class="form-actions">
|
||||
|
|
@ -8,9 +8,13 @@
|
|||
<table>
|
||||
<tr>
|
||||
<th class="collectionTh">Name:</th>
|
||||
<th class="collectionTh"><%=appInfos[1] %></th>
|
||||
<th class="collectionTh"><strong><%=appInfos[1] %></strong></th>
|
||||
</tr>
|
||||
<tr id="collectionSizeBox">
|
||||
<tr>
|
||||
<th class="collectionTh"> </th>
|
||||
<th class="collectionTh"> </th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="collectionTh">Mount-Point:</th>
|
||||
<th class="collectionTh"><input type="text" id="change-mount-point" name="mountpoint" value="<%=attributes.mount%>" disabled/></th>
|
||||
<th><a class="modalTooltips" title="The path where the App can be reached."><i class="icon-info-sign"></i></a></th>
|
||||
|
|
@ -41,10 +45,12 @@
|
|||
</div>
|
||||
<div id="colFooter" class="modal-footer">
|
||||
<button id="uninstall" class="btn btn-danger pull-left">Uninstall</button>
|
||||
<button id="change" class="btn btn-success pull-right" disabled>Save</button>
|
||||
<%if (attributes.active) {%>
|
||||
<button id="deactivate" class="btn btn-warning pull-right" style="margin-right:8px">Deactive</button>
|
||||
<button id="deactivate" class="btn btn-warning pull-right" style="margin-right:8px" disabled>Deactive</button>
|
||||
<%} else {%>
|
||||
<button id="activate" class="btn btn-success pull-right" style="margin-right:8px">Activate</button>
|
||||
<button id="activate" class="btn btn-success pull-right" style="margin-right:8px" disabled>Activate</button>
|
||||
<%}%>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
<li class="dashboard-menu" style="visibility:hidden"><a href="#dashboard">Dashboard</a></li>
|
||||
<li class="dropdown applications-menu"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Applications<b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#applications/running">Running</a></li>
|
||||
<li><a href="#applications/installed">Installed</a></li>
|
||||
<li><a href="#applications/swagger">Swagger</a></li>
|
||||
<li><a href="#applications/available">Available</a></li>
|
||||
<li><a href="#applications/documentation">Documentation</a></li>
|
||||
</ul>
|
||||
<li class="collections-menu"><a href="#">Collections</a></li>
|
||||
<li class="query-menu"><a href="#query">AQL Editor</a></li>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
window.SwaggerView = Backbone.View.extend({
|
||||
window.AppDocumentationView = Backbone.View.extend({
|
||||
|
||||
el: '#content',
|
||||
template: new EJS({url: '/_admin/html/js/templates/swaggerView.ejs'}),
|
||||
template: new EJS({url: '/_admin/html/js/templates/appDocumentationView.ejs'}),
|
||||
|
||||
initialize: function() {
|
||||
window.swaggerUi = new SwaggerUi({
|
||||
this.swaggerUi = new SwaggerUi({
|
||||
discoveryUrl:"../../aardvark/swagger",
|
||||
apiKey: false,
|
||||
dom_id:"swagger-ui-container",
|
||||
|
|
@ -12,17 +12,17 @@ window.SwaggerView = Backbone.View.extend({
|
|||
supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch', 'head'],
|
||||
onComplete: function(swaggerApi, swaggerUi){
|
||||
if(console) {
|
||||
console.log("Loaded SwaggerUI")
|
||||
console.log(swaggerApi);
|
||||
console.log(swaggerUi);
|
||||
}
|
||||
console.log("Loaded SwaggerUI")
|
||||
console.log(swaggerApi);
|
||||
console.log(swaggerUi);
|
||||
}
|
||||
$('pre code').each(function(i, e) {hljs.highlightBlock(e)});
|
||||
},
|
||||
onFailure: function(data) {
|
||||
if(console) {
|
||||
console.log("Unable to Load SwaggerUI");
|
||||
console.log(data);
|
||||
}
|
||||
console.log("Unable to Load SwaggerUI");
|
||||
console.log(data);
|
||||
}
|
||||
},
|
||||
docExpansion: "none"
|
||||
});
|
||||
|
|
@ -30,7 +30,7 @@ window.SwaggerView = Backbone.View.extend({
|
|||
|
||||
render: function(){
|
||||
$(this.el).html(this.template.render({}));
|
||||
window.swaggerUi.load();
|
||||
this.swaggerUi.load();
|
||||
return this;
|
||||
}
|
||||
});
|
||||
Loading…
Reference in New Issue