Skip to content

Commit

Permalink
REVISED dashboard revised.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdkim committed Jan 3, 2017
1 parent e867828 commit 60fcf17
Show file tree
Hide file tree
Showing 22 changed files with 253 additions and 166 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
coverage/
doc/
log/

# Dependency directory
# Deployed apps should consider commenting this line out:
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules
npm-debug.log
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": {
"jQuery": "~2.1.1",
"Springy": "https://github.com/shigeruNakajima/springy.git#658208598d65019d36c1de1b6ba26eeb2f67561c",
"grapheditor": "^0.4.12",
"grapheditor": "^0.4.13",
"codemirror": "^5.19.0"
}
}
11 changes: 2 additions & 9 deletions lodqa-ws.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,11 @@ class LodqaWS < Sinatra::Base

get '/' do
logger.info "access"
@config = get_config(params)
@targets = get_targets

erb :index
end

get '/graphicator' do
@config = get_config(params)
@targets = get_targets

@query = params['query'] unless params['query'].nil?
@target = params['target'] unless params['target'].nil?
@target = params['target'] || @targets.first

if @query
parser_url = @config["parser_url"]
Expand Down Expand Up @@ -150,7 +143,7 @@ def ws_send(eventMachine, websocket, key, value)
end

def get_targets
response = RestClient.get settings.target_db + '.json'
response = RestClient.get settings.target_db + '/names.json'
if response.code == 200
(JSON.parse response).delete_if{|t| t["publicity"] == false}
else
Expand Down
72 changes: 51 additions & 21 deletions public/css/lodqa.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ a:hover {
position: absolute;
right: 0;
margin: 0 5px;
text-align: right;
}

#main-nav {
Expand Down Expand Up @@ -111,6 +112,10 @@ a:hover {
margin-top: 15px;
}

#announce section {
margin: 40px 10px;
}

.results {
position: absolute;
width: 740px;
Expand Down Expand Up @@ -169,7 +174,7 @@ nav a {

#query {
display: inline-block;
width: 410px;
width: 470px;
height: 30px;
padding: 0;
}
Expand All @@ -178,16 +183,10 @@ nav a {
width: 60px;
}

.dashboard__exapmle-button,
#graphicateButton {
display: inline-block;
height: 34px;
width: 80px;
}

#graphicateButton {
padding: 1px 0
}
.jsPlumb-container {
border: 1px solid green;
margin: 5px 0;
Expand Down Expand Up @@ -267,8 +266,8 @@ nav a {
}

h1 {
width: 20em;
margin-top: 10px;
width: 3em;
margin-top: 15px;
margin-bottom: 5px;
padding: 1px 5px;
white-space: nowrap;
Expand Down Expand Up @@ -303,18 +302,6 @@ h3 {
color: #88f;
}

#buttons {
text-align: right;
margin: 5px;
padding: 5px
}

#pages {
text-align: center;
margin: 5px;
padding: 5px
}

table.list {
border-style: none;
/*border: 1px solid gray;*/
Expand Down Expand Up @@ -439,3 +426,46 @@ input {
input [type="button"]{
font-family: Arial, Helvetica, sans-serif;
}


.button {
-moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
-webkit-box-shadow:inset 0px 1px 0px 0px #ffffff;
box-shadow:inset 0px 1px 0px 0px #ffffff;
background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #f9f9f9), color-stop(1, #e9e9e9));
background:-moz-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);
background:-webkit-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);
background:-o-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);
background:-ms-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);
background:linear-gradient(to bottom, #f9f9f9 5%, #e9e9e9 100%);
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e9e9e9',GradientType=0);
background-color:#f9f9f9;
-moz-border-radius:6px;
-webkit-border-radius:6px;
border-radius:6px;
border:1px solid #dcdcdc;
display:inline-block;
cursor:pointer;
color:#666666;
font-family:Arial;
font-size:15px;
font-weight:bold;
padding:6px;
text-decoration:none;
text-shadow:0px 1px 0px #ffffff;
}
.button:hover {
background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #e9e9e9), color-stop(1, #f9f9f9));
background:-moz-linear-gradient(top, #e9e9e9 5%, #f9f9f9 100%);
background:-webkit-linear-gradient(top, #e9e9e9 5%, #f9f9f9 100%);
background:-o-linear-gradient(top, #e9e9e9 5%, #f9f9f9 100%);
background:-ms-linear-gradient(top, #e9e9e9 5%, #f9f9f9 100%);
background:linear-gradient(to bottom, #e9e9e9 5%, #f9f9f9 100%);
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e9e9e9', endColorstr='#f9f9f9',GradientType=0);
background-color:#e9e9e9;
}
.button:active {
position:relative;
top:1px;
}

Binary file added public/images/dbcls-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 30 additions & 30 deletions public/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/nbdc-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 60fcf17

Please sign in to comment.