Skip to content

Commit

Permalink
refresh button
Browse files Browse the repository at this point in the history
  • Loading branch information
@bluestreak01
bluestreak01 committed May 24, 2016
1 parent 76f38bf commit 4a6d380
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 186 deletions.
191 changes: 9 additions & 182 deletions core/src/main/resources/site/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,187 +26,14 @@
~ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
~ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
~ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--><!--suppress HtmlUnknownTag --><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>QuestDB - Console</title><link rel="apple-touch-icon" href="apple-touch-icon.png"><!-- Place favicon.ico in the root directory --><link rel="stylesheet" href="styles/qdb.css"><script type="text/javascript">history.pushState(null, null, 'index.html');
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--><!--suppress HtmlUnknownTag --><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>QuestDB - Console</title><link rel="apple-touch-icon" href="apple-touch-icon.png"><!-- Place favicon.ico in the root directory --><link rel="stylesheet" href="styles/qdb.css"><script type="text/javascript">/*
Disable "back" button.
On some platforms use left to right swipe
to "go back", which interferes with scrolling grid from side to side
accidental swipe would clear state of javascript app, which is inconvenient.
User can still go back via browser's menu system.
*/
history.pushState(null, null, 'index.html');
window.addEventListener('popstate', function () {
history.pushState(null, null, 'index.html');
});</script>
</head>
<body class="mini-navbar pace-done">
<div id="wrapper">
<nav class="navbar-default navbar-static-side" role="navigation">
<div class="sidebar-collapse">
<ul class="nav metismenu" id="side-menu">
<li class="nav-header">
<div class="dropdown profile-element"><a data-toggle="dropdown" class="dropdown-toggle"
href="#"><span class="clear"><h3>QuestDB</h3></span></a>
</div>
<div class="logo-element">QDB</div>
</li>
<li><a id="sql-editor" href="#"><i class="fa fa-table"></i> <span
class="nav-label">SQL Console</span></a></li>
<li><a id="file-upload" href="#"><i class="fa fa-upload"></i> <span class="nav-label">Data import</span></a>
</li>
<li><a href="#"><i class="fa fa-pie-chart"></i> <span class="nav-label">Analytics</span></a></li>
</ul>
</div>
</nav>
<div id="page-wrapper" class="gray-bg">
<div class="row border-bottom">
<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary" href="#"><i
class="fa fa-bars"></i></a></div>
<ul class="nav navbar-top-links navbar-right">
<li><span class="m-r-sm text-muted welcome-message">Welcome to QuestDB Console</span></li>
<li><a href="#"><i class="fa fa-sign-out"></i> Log out</a></li>
</ul>
</nav>
</div>
<div class="row wrapper border-bottom white-bg page-heading js-sql-panel">
<div class="col-lg-10"><h3>SQL Console</h3></div>
</div>
<div class="wrapper wrapper-content js-sql-panel">
<div class="row">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-content">
<div class="m-b-sm">
<button class="btn btn-white btn-sm m-r-sm js-query-run"><i class="fa fa-play"></i>Run
</button>
<button class="btn btn-white btn-sm js-query-refresh"><i class="fa fa-refresh"></i>
</button>
<button class="btn btn-white btn-sm js-query-export"><i class="fa fa-download"></i>
</button>
<div class="export-input-container"><input id="export-url" class="js-export-url"
type="text"></div>
<button type="button" class="btn btn-white btn-sm js-export-copy-url"
data-clipboard-target="#export-url"><i class="fa fa-files-o"></i></button>
<button data-toggle="button" type="button"
class="btn btn-white btn-sm js-editor-toggle-invisible"><i
class="fa fa-paragraph"></i></button>
</div><!--<div id="debug"></div>-->
<div id="sqlEditor" class="editor border-rounded-top-half"></div>
<div class="query-progress-spinner js-query-spinner"></div>
<div class="query-message query-message-ok js-query-message-panel">
<div class="query-time"><i class="fa fa-clock-o"></i>
<div class="js-query-time">-</div>
</div>
<div class="js-query-message-text"></div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-content">
<div id="grid">
<div class="qg-header-row"></div>
<div class="qg-viewport">
<div class="qg-canvas"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row wrapper border-bottom white-bg page-heading js-import-panel">
<div class="col-lg-10"><h3>Data import</h3></div>
</div>
<div class="wrapper wrapper-content js-import-panel">
<div class="row">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-content">
<div id="dragTarget" class="drag-target drag-idle"><h2>Drag files here to import</h2></div>
<div class="m-b-sm">
<button id="btnImportClearSelected" class="btn btn-white btn-sm" disabled="disabled"><i
class="fa fa-remove"></i>Clear
</button>
<button id="btnRetry" class="btn btn-white btn-sm" title disabled="disabled"><i
class="fa fa-upload"></i></button>
<button id="btnImportCancel" class="btn btn-white btn-sm" title disabled="disabled"><i
class="fa fa-stop"></i></button>
</div>
<div id="import-file-list"></div>
</div>
</div>
</div>
</div>
<div class="row" id="import-detail">
<div class="col-lg-12">
<div class="js-import-editor">
<div class="ibox">
<div class="ibox-content">
<div class="row">
<div class="col-lg-12">
<div class="stats-switcher-viewport">
<div class="stats-switcher">
<div class="row vertical-align import-imported-table">
<div class="col-xs-3"><i class="fa fa-table fa-2x"></i></div>
<div class="col-xs-9 text-right"><h3 class="font-bold"><i
class="fa fa-link"></i><span
class="js-import-tab-name"></span></h3></div>
</div>
<div class="import-stats">
<div class="import-imported-stats pull-right"><i
class="fa fa-thumbs-o-down"></i>&nbsp;<span
class="js-rejected-row-count">1023003</span> rows
</div>
<div class="import-imported-stats"><i class="fa fa-thumbs-o-up"></i>&nbsp;<span
class="js-imported-row-count">15000000</span> rows
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="import-stats-chart">
<div class="import-rejected pull-right"></div>
<div class="import-imported"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="grid">
<div class="ud-header-row">
<div class="ud-header gh-1"><i class="fa fa-hashtag"></i></div>
<div class="ud-header gh-2">Column name</div>
<div class="ud-header gh-3">Type</div>
<div class="ud-header gh-4">Errors</div>
</div>
<div class="ud-canvas"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-danger js-import-error">
<div class="panel-heading">Import failed</div>
<div class="panel-body">
<div class="col-sm-7 js-message">Server rejected file due to unsupported file format.</div>
<div class="col-sm-5 ud-btn-group js-import-error-btn-group">
<form method="get"><label><input type="radio" name="importAction" value="append"
class="js-btn-append"> Append</label><label><input
type="radio" name="importAction" value="overwrite" class="js-btn-overwrite">
Overwrite</label><label><input type="radio" name="importAction" value="cancel"
class="js-btn-cancel"> Cancel</label></form>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="footer">
<div><strong>Copyright</strong> Appsicle Ltd. &copy; 2014-2016</div>
</div>
</div>
</div>
<script src="scripts/qdb.js"></script>
</body>
</html>
});</script></head><body class="mini-navbar pace-done"><div id="wrapper"><nav class="navbar-default navbar-static-side" role="navigation"><div class="sidebar-collapse"><ul class="nav metismenu" id="side-menu"><li class="nav-header"><div class="dropdown profile-element"><a data-toggle="dropdown" class="dropdown-toggle" href="#"><span class="clear"><h3>QuestDB</h3></span></a></div><div class="logo-element">QDB</div></li><li><a id="sql-editor" href="#"><i class="fa fa-table"></i> <span class="nav-label">SQL Console</span></a></li><li><a id="file-upload" href="#"><i class="fa fa-upload"></i> <span class="nav-label">Data import</span></a></li><li><a href="#"><i class="fa fa-pie-chart"></i> <span class="nav-label">Analytics</span></a></li></ul></div></nav><div id="page-wrapper" class="gray-bg"><div class="row border-bottom"><nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0"><div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary" href="#"><i class="fa fa-bars"></i></a></div><ul class="nav navbar-top-links navbar-right"><li><span class="m-r-sm text-muted welcome-message">Welcome to QuestDB Console</span></li><li><a href="#"><i class="fa fa-sign-out"></i> Log out</a></li></ul></nav></div><div class="row wrapper border-bottom white-bg page-heading js-sql-panel"><div class="col-lg-10"><h3>SQL Console</h3></div></div><div class="wrapper wrapper-content js-sql-panel"><div class="row"><div class="col-lg-12"><div class="ibox"><div class="ibox-content"><div class="m-b-sm"><button class="btn btn-white btn-sm m-r-sm js-query-run"><i class="fa fa-play"></i>Run</button> <button class="btn btn-white btn-sm js-query-refresh"><i class="fa fa-refresh"></i></button> <button class="btn btn-white btn-sm js-query-export"><i class="fa fa-download"></i></button><div class="export-input-container"><label for="export-url" style="display: none"></label><input id="export-url" class="js-export-url" type="text"></div><button type="button" class="btn btn-white btn-sm js-export-copy-url" data-clipboard-target="#export-url"><i class="fa fa-files-o"></i></button> <button data-toggle="button" type="button" class="btn btn-white btn-sm js-editor-toggle-invisible"><i class="fa fa-paragraph"></i></button></div><!--<div id="debug"></div>--><div id="sqlEditor" class="editor border-rounded-top-half"></div><div class="query-progress-spinner js-query-spinner"></div><div class="query-message query-message-ok js-query-message-panel"><div class="query-time"><i class="fa fa-clock-o"></i><div class="js-query-time">-</div></div><div class="js-query-message-text"></div></div></div></div></div></div><div class="row"><div class="col-lg-12"><div class="ibox"><div class="ibox-content"><div id="grid"><div class="qg-header-row"></div><div class="qg-viewport"><div class="qg-canvas"></div></div></div></div></div></div></div></div><div class="row wrapper border-bottom white-bg page-heading js-import-panel"><div class="col-lg-10"><h3>Data import</h3></div></div><div class="wrapper wrapper-content js-import-panel"><div class="row"><div class="col-lg-12"><div class="ibox"><div class="ibox-content"><div id="dragTarget" class="drag-target drag-idle"><h2>Drag files here to import</h2></div><div class="m-b-sm"><button id="btnImportClearSelected" class="btn btn-white btn-sm" disabled="disabled"><i class="fa fa-remove"></i>Clear</button> <button id="btnRetry" class="btn btn-white btn-sm" title disabled="disabled"><i class="fa fa-upload"></i></button> <button id="btnImportCancel" class="btn btn-white btn-sm" title disabled="disabled"><i class="fa fa-stop"></i></button></div><div id="import-file-list"></div></div></div></div></div><div class="row" id="import-detail"><div class="col-lg-12"><div class="js-import-editor"><div class="ibox"><div class="ibox-content"><div class="row"><div class="col-lg-12"><div class="stats-switcher-viewport"><div class="stats-switcher"><div class="row vertical-align import-imported-table"><div class="col-xs-3"><i class="fa fa-table fa-2x"></i></div><div class="col-xs-9 text-right"><h3 class="font-bold"><i class="fa fa-link"></i><span class="js-import-tab-name"></span></h3></div></div><div class="import-stats"><div class="import-imported-stats pull-right"><i class="fa fa-thumbs-o-down"></i>&nbsp;<span class="js-rejected-row-count">1023003</span> rows</div><div class="import-imported-stats"><i class="fa fa-thumbs-o-up"></i>&nbsp;<span class="js-imported-row-count">15000000</span> rows</div></div></div></div></div><div class="row"><div class="col-lg-12"><div class="import-stats-chart"><div class="import-rejected pull-right"></div><div class="import-imported"></div></div></div></div><div class="row"><div class="col-lg-12"><div class="grid"><div class="ud-header-row"><div class="ud-header gh-1"><i class="fa fa-hashtag"></i></div><div class="ud-header gh-2">Column name</div><div class="ud-header gh-3">Type</div><div class="ud-header gh-4">Errors</div></div><div class="ud-canvas"></div></div></div></div></div></div></div></div><div class="panel panel-danger js-import-error"><div class="panel-heading">Import failed</div><div class="panel-body"><div class="col-sm-7 js-message">Server rejected file due to unsupported file format.</div><div class="col-sm-5 ud-btn-group js-import-error-btn-group"><form method="get"><label><input type="radio" name="importAction" value="append" class="js-btn-append"> Append</label><label><input type="radio" name="importAction" value="overwrite" class="js-btn-overwrite"> Overwrite</label><label><input type="radio" name="importAction" value="cancel" class="js-btn-cancel"> Cancel</label></form></div></div></div></div></div></div><div class="footer"><div><strong>Copyright</strong> Appsicle Ltd. &copy; 2014-2016</div></div></div></div><script src="scripts/qdb.js"></script></body></html>
4 changes: 2 additions & 2 deletions core/src/main/resources/site/public/scripts/qdb.js
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions ui/app/scripts/grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,11 @@
}
});
$(document).on('grid.focus', focusCell);
$(document).on('grid.refresh', function () {
if (query) {
$(document).trigger(qdb.MSG_QUERY_EXEC, {q: query});
}
});
}

bind();
Expand Down
4 changes: 2 additions & 2 deletions ui/app/scripts/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@

/* eslint-disable no-new */
new Clipboard('.js-export-copy-url');
$('.js-export-copy-url').click(function () {
document.execCommand('copy');
$('.js-query-refresh').click(function () {
$(document).trigger('grid.refresh');
});
}

Expand Down

0 comments on commit 4a6d380

Please sign in to comment.