Skip to content

Added a Custom Query field #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added a Custom Query field #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

/* WEST */
.ui-layout-west .title { color:#777; padding:5px 0 5px 8px; }
.ui-layout-west .domains { min-height: 80px; }
.ui-layout-west .contents .domain { position:relative; cursor:pointer; padding:3px 5px 3px 10px; color:#141314; text-shadow:#e0e0e0 1px 1px 0; }
.ui-layout-west .contents .domain.selected {
color:#FFFFF5; text-shadow:#555 0 1px 0;
Expand All @@ -51,6 +52,9 @@
.ui-layout-west .contents .domain-name-wrapper { margin-left:20px; margin-right:30px; }
.ui-layout-west .loading-icon { display:none; position:absolute; top:50px; left:0; right:0; text-align:center; }

.ui-layout-west .queries form { padding: 0px 0px 0px 8px }
.ui-layout-west .queries textarea { display: block; width: 90%; min-height: 50px;}

/* NORTH */
.ui-layout-north {
background: #777 !important; /* for non-css3 browsers */
Expand Down Expand Up @@ -96,9 +100,20 @@
</div>

<div class="ui-layout-west">
<div class='title'>Domains</div>
<div class='loading-icon'><img src='img/ajax.gif'/></div>
<div class='contents'></div>
<div class="domains">
<div class='title'>Domains</div>
<div class='loading-icon'><img src='img/ajax.gif'/></div>
<div class='contents'>
</div>
</div>

<div class='queries'>
<div class='title'>Custom Query</div>
<form action="#" class="execute_query">
<textarea name="query"></textarea>
<button>Go</button>
</form>
</div>
</div>

<div class="ui-layout-center">
Expand Down
16 changes: 11 additions & 5 deletions public/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,12 @@ $(function(){
}

// getItems()
function getItems($obj){
function getItems(url, queryData){
$('.ui-layout-center .contents').html('');
$('.ui-layout-center .loading-icon').show();
var domainName = $obj.find('.domain-name').html();
var theData = getCredentialsInput();
theData.domain = domainName;
$.get('/get.items', theData, function(data){
$.extend(theData, queryData);
$.get(url, theData, function(data){
$('.ui-layout-center .loading-icon').hide();
displayData(data);
}, 'json');
Expand All @@ -153,7 +152,14 @@ $(function(){
$('.domain.selected').removeClass('selected');
$(this).addClass('selected');

getItems($(this));
getItems('/get.items', {domain: $(this).find('.domain-name').html()});
});

// click: execute query
$('form.execute_query').submit(function(e) {
e.preventDefault();
var query = $(this).find('[name=query]').val();
getItems('/get.query', {query: query});
});

// click: about button
Expand Down
9 changes: 8 additions & 1 deletion server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ app.get('/get.domains', function(req, res){
var j=i;
sdb.select("select count(*) from `"+resDomains[j] + "`", function(errCount, resCount, metaCount){
if (errCount) throw errCount.Message;

var obj = {};
obj.name = resDomains[j];
obj.count = resCount[0].Count;
Expand All @@ -45,6 +45,13 @@ app.get('/get.items', function(req, res){
});
});

app.get('/get.query', function(req, res) {
var sdb = new simpledb.SimpleDB({ keyid:req.query.keyid, secret: req.query.secret});
sdb.select(req.query.query, function(_err, _res, _meta){
res.send(_res);
});
});

app.listen(port, ip);

console.log('Listening on http://'+ip+':'+port);