Skip to content

Commit

Permalink
Merge pull request #74 from ZihengSun/master
Browse files Browse the repository at this point in the history 
interface redesign
  • Loading branch information
@ZihengSun
ZihengSun authored Jun 17, 2020
2 parents 21ab17c + b4ea1bc commit e9ba4fc
Show file tree
Hide file tree
Showing 75 changed files with 3,840 additions and 266 deletions.
84 changes: 55 additions & 29 deletions WebContent/WEB-INF/views/geoweaver.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@

<link rel="stylesheet" href="../geoweaver/codemirror/lib/codemirror.css" />

<link rel="stylesheet" href="../geoweaver/codemirror/theme/xq-dark.css">
<link rel="stylesheet" href="../geoweaver/codemirror/theme/xq-light.css">
<link rel="stylesheet" href="../geoweaver/codemirror/theme/yeti.css">
<link rel="stylesheet" href="../geoweaver/codemirror/theme/idea.css">
<link rel="stylesheet" href="../geoweaver/codemirror/theme/darcula.css">
<link rel="stylesheet" href="../geoweaver/codemirror/theme/yonce.css">
<link rel="stylesheet" href="../geoweaver/codemirror/theme/zenburn.css">

<link href="https://danielmg.org/assets/demo/uploader/css/jquery.dm-uploader.min.css?v=v10" rel="stylesheet" />

<link href="https://danielmg.org/assets/demo/uploader/css/main.css?v=v10" rel="stylesheet" />
Expand Down Expand Up @@ -108,11 +116,11 @@

</head>

<body style="cursor: auto;">
<body style="cursor: auto; padding:0;">

<div id="jsframe-container"></div>

<div class="main">
<div class="container" style="margin:0; padding:0; width:100%; height:100%;">

<!-- Top menu bar -->

Expand Down Expand Up @@ -206,37 +214,54 @@



<div class="row" style="height:calc(100% - 50px); top: 50px; margin: 0; padding: 0;">
<!-- <div class="row" style="height:calc(100vh - 50px); top: 50px; margin: 0; padding: 0;"> -->
<div class="row" style="height:calc(100vh - 50px); top: 50px; margin: 0; padding: 0;">


<!-- Workspace -->

<div class="col col-md-9" style="height:100%; margin: 0; padding:0;">

<div class="tab">
<button class="tablinks" id="main-general-tab" onclick="openCity(event, 'main-general')">General</button>
<button class="tablinks" id="main-workspace-tab" onclick="openCity(event, 'workspace')">Workflow</button>
<button class="tablinks" id="main-console-tab" onclick="openCity(event, 'main-console')">Console</button>
</div>

<!-- <div id="London" class="tabcontent">
<h3>London</h3>
<p>London is the capital city of England.</p>
</div> -->

<div id="main-general" class="tabcontent" style="height:100%; left:0; margin:0;">
<h2>Welcome to Geoweaver! </h2>
</div>
<div class="tab">
<button class="tablinks" id="main-general-tab" onclick="openCity(event, 'main-general')">General</button>
<button class="tablinks" id="main-host-tab" onclick="openCity(event, 'main-host-info')">Host</button>
<button class="tablinks" id="main-process-tab" onclick="openCity(event, 'main-process-info')">Process</button>
<button class="tablinks" id="main-workflow-tab" onclick="openCity(event, 'main-workflow-info')">Workflow</button>
<button class="tablinks" id="main-workspace-tab" onclick="openCity(event, 'workspace')">Workflow Builder</button>
<button class="tablinks" id="main-console-tab" onclick="openCity(event, 'main-console')">Console</button>
</div>

<div id="main-console" class="tabcontent" style="height:100%; left:0; margin:0;">
<h2>logging information and errors</h2>
<div id="log-window">



</div>

</div>
<div id="main-general" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;">
<div id="main-general-content" style="height:100%;overflow-y: scroll; padding: 5px;">
<h2>Welcome to Geoweaver! </h2>
</div>
</div>

<div id="main-host-info" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;">
<div id="main-host-content" style="height:100%; overflow-y: scroll; padding: 5px; ">
<h2>Please select a host on the right panel! </h2>
</div>
</div>

<div id="main-process-info" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;">
<div id="main-process-content" style="height:100%; overflow-y: scroll; padding: 5px;">
<h2>Please select a process on the right panel!</h2>
</div>
</div>

<div id="main-workflow-info" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;">
<div id="main-workflow-content" style="overflow-y: scroll; padding: 5px; ">
<h2>Please select a workflow on the right panel!</h2>
</div>
</div>

<div id="main-console" class="tabcontent" style="height:100%; left:0; margin:0;">
<h2>logging information and errors</h2>
<div id="log-window">

</div>

</div>

<div id="workspace" class="tabcontent" style="height:100%; margin: 0;padding: 0;">

Expand Down Expand Up @@ -315,7 +340,7 @@ <h2>logging information and errors</h2>
</div>


<div class="col col-md-3 small-height" id="sidemenu" style="height:100vh; margin: 0;padding: 0;">
<div class="col col-sm-3 col-md-3 col-lg-3 small-height" id="sidemenu" style="height:100vh; margin: 0;padding: 0;">

<div class="nav-side-menu">

Expand Down Expand Up @@ -418,15 +443,16 @@ <h2>logging information and errors</h2>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.settings.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.toolbar.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.menu.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.general.js"></script>
<script src="../geoweaver/js/edu.gmu.csiss.geoweaver.main.js"></script>

<script>

function switchTab(ele, name){

console.log("Turn on the tab " + name)
console.log("Turn on the tab " + name)

var i, tabcontent, tablinks;
var i, tabcontent, tablinks;
tabcontent = document.getElementsByClassName("tabcontent");
for (i = 0; i < tabcontent.length; i++) {
tabcontent[i].style.display = "none";
Expand Down
125 changes: 63 additions & 62 deletions WebContent/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,64 @@
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
<display-name>Geoweaver</display-name>
<absolute-ordering />
<servlet>
<servlet-name>GetInputDetailsServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.GetInputDetailsServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>GetInputDetailsServlet</servlet-name>
<url-pattern>/GetInputDetailsServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>FetchProductListServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.FetchProductListServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>FetchProductListServlet</servlet-name>
<url-pattern>/FetchProductListServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>OrderCheckingServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.OrderCheckingServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>OrderCheckingServlet</servlet-name>
<url-pattern>/OrderCheckingServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ServiceUnregistrationServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceUnregistrationServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ServiceUnregistrationServlet</servlet-name>
<url-pattern>/ServiceUnregistrationServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ServiceRegisterServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceRegisterServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ServiceRegisterServlet</servlet-name>
<url-pattern>/ServiceRegisterServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>MetadataQueryServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.MetadataQueryServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MetadataQueryServlet</servlet-name>
<url-pattern>/MetadataQueryServlet</url-pattern>
</servlet-mapping>
<!--
<servlet>
<servlet-name>GetInputDetailsServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.GetInputDetailsServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>GetInputDetailsServlet</servlet-name>
<url-pattern>/GetInputDetailsServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>FetchProductListServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.FetchProductListServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>FetchProductListServlet</servlet-name>
<url-pattern>/FetchProductListServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>OrderCheckingServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.OrderCheckingServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>OrderCheckingServlet</servlet-name>
<url-pattern>/OrderCheckingServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ServiceUnregistrationServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceUnregistrationServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ServiceUnregistrationServlet</servlet-name>
<url-pattern>/ServiceUnregistrationServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ServiceRegisterServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceRegisterServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ServiceRegisterServlet</servlet-name>
<url-pattern>/ServiceRegisterServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>MetadataQueryServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.MetadataQueryServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MetadataQueryServlet</servlet-name>
<url-pattern>/MetadataQueryServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>VirtualProductQueryServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.VirtualProductQueryServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>VirtualProductQueryServlet</servlet-name>
<url-pattern>/VirtualProductQueryServlet</url-pattern>
</servlet-mapping>
-->
<servlet>
<servlet-name>FileUploadServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.FileUploadServlet</servlet-class>
Expand All @@ -66,20 +76,8 @@
<servlet-name>FileUploadServlet</servlet-name>
<url-pattern>/FileUploadServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>VirtualProductQueryServlet</servlet-name>
<servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.VirtualProductQueryServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>VirtualProductQueryServlet</servlet-name>
<url-pattern>/VirtualProductQueryServlet</url-pattern>
</servlet-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>default.html</welcome-file>
<welcome-file>default.htm</welcome-file>
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>


<servlet>
<servlet-name>spring-webmvc</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
Expand Down Expand Up @@ -125,5 +123,8 @@
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>default.html</welcome-file>
<welcome-file>default.htm</welcome-file>
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>
</web-app>
41 changes: 41 additions & 0 deletions WebContent/geoweaver/codemirror/theme/3024-day.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
Name: 3024 day
Author: Jan T. Sott (http://github.com/idleberg)
CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
*/

.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }

.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }

.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }

.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }

.cm-s-3024-day span.cm-comment { color: #cdab53; }
.cm-s-3024-day span.cm-atom { color: #a16a94; }
.cm-s-3024-day span.cm-number { color: #a16a94; }

.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
.cm-s-3024-day span.cm-keyword { color: #db2d20; }
.cm-s-3024-day span.cm-string { color: #fded02; }

.cm-s-3024-day span.cm-variable { color: #01a252; }
.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
.cm-s-3024-day span.cm-def { color: #e8bbd0; }
.cm-s-3024-day span.cm-bracket { color: #3a3432; }
.cm-s-3024-day span.cm-tag { color: #db2d20; }
.cm-s-3024-day span.cm-link { color: #a16a94; }
.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }

.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
39 changes: 39 additions & 0 deletions WebContent/geoweaver/codemirror/theme/3024-night.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
Name: 3024 night
Author: Jan T. Sott (http://github.com/idleberg)
CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
*/

.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }

.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }

.cm-s-3024-night span.cm-comment { color: #cdab53; }
.cm-s-3024-night span.cm-atom { color: #a16a94; }
.cm-s-3024-night span.cm-number { color: #a16a94; }

.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
.cm-s-3024-night span.cm-keyword { color: #db2d20; }
.cm-s-3024-night span.cm-string { color: #fded02; }

.cm-s-3024-night span.cm-variable { color: #01a252; }
.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
.cm-s-3024-night span.cm-def { color: #e8bbd0; }
.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
.cm-s-3024-night span.cm-tag { color: #db2d20; }
.cm-s-3024-night span.cm-link { color: #a16a94; }
.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }

.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
32 changes: 32 additions & 0 deletions WebContent/geoweaver/codemirror/theme/abcdef.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }

.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
.cm-s-abcdef span.cm-atom { color: #77F; }
.cm-s-abcdef span.cm-number { color: violet; }
.cm-s-abcdef span.cm-def { color: #fffabc; }
.cm-s-abcdef span.cm-variable { color: #abcdef; }
.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
.cm-s-abcdef span.cm-property { color: #fedcba; }
.cm-s-abcdef span.cm-operator { color: #ff0; }
.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
.cm-s-abcdef span.cm-string { color: #2b4; }
.cm-s-abcdef span.cm-meta { color: #C9F; }
.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
.cm-s-abcdef span.cm-builtin { color: #30aabc; }
.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
.cm-s-abcdef span.cm-tag { color: #FFDD44; }
.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
.cm-s-abcdef span.cm-error { color: #FF0000; }
.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
.cm-s-abcdef span.cm-link { color: blueviolet; }

.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
Loading

0 comments on commit e9ba4fc

Please sign in to comment.