Skip to content

Commit 6353e97

Browse files
author
saharmehrpour
committed
changed structure of the client side to oobject-oriented, forward/back buttons are added and working
1 parent 91f0c0d commit 6353e97

13 files changed

Lines changed: 1060 additions & 639 deletions

‎.idea/workspace.xml‎

Lines changed: 418 additions & 312 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎website-client/chat.html‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
<body>
1212
<nav id="header_1">
1313
<div class="nav-wrapper">
14-
<ul id="nav-mobile" class="right hide-on-med-and-down">
14+
<ul class="left hide-on-med-and-down">
15+
<li><a id="back_button" class="inactive"> < </a></li>
16+
<li><a id="forward_button" class="inactive"> > </a></li>
17+
</ul>
18+
<ul class="right hide-on-med-and-down">
1519
<li><a id="link_generate_rules">Generate Rules</a></li>
1620
<li><a id="link_rule_result">Rule Results</a></li>
1721
<li><a id="link_lists">Rule and Tag list</a></li>
@@ -53,14 +57,12 @@ <h4>Tags</h4>
5357
</div>
5458
</div>
5559

56-
5760
<div id="ruleResults" class="main hidden">
5861
<div class="container rule-table">
5962
<div class="result" id="RT"></div>
6063
</div>
6164
</div>
6265

63-
6466
<div id="ruleGeneration" class="main hidden">
6567
<div class="rule-forms">
6668
Rule Description:<br>
@@ -91,12 +93,21 @@ <h4>Tags</h4>
9193

9294
<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
9395
<script type="text/javascript" src="js/d3/d3.js"></script>
94-
<script type="text/javascript" src="prototype.js"></script>
96+
<script type="text/javascript" src="js/prototype.js"></script>
97+
9598
<script type="text/javascript" src="utilities.js"></script>
96-
<script type="text/javascript" src="ruleExecutor.js"></script>
97-
<script type="text/javascript" src="ruleGenerator.js"></script>
98-
<script type="text/javascript" src="uiManipulation.js"></script>
99-
<script type="text/javascript" src="websocket_response_handler.js"></script>
99+
<script type="text/javascript" src="urlChangingHandling.js"></script>
100+
<script type="text/javascript" src="webSocketHandler.js"></script>
101+
102+
<script type="text/javascript" src="js/core/ruleExecutor.js"></script>
103+
104+
<script type="text/javascript" src="js/ui/ruleGenerator.js"></script>
105+
<script type="text/javascript" src="js/ui/ruleTable.js"></script>
106+
<script type="text/javascript" src="js/ui/tableOfContent.js"></script>
107+
108+
<!--<script type="text/javascript" src="uiManipulation.js"></script>-->
109+
<!--<script type="text/javascript" src="websocket_response_handler.js"></script>-->
110+
100111
<script type="text/javascript" src="main.js"></script>
101112
<script>let $jq = jQuery.noConflict();</script>
102113

‎website-client/css/style.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ nav input[type=text]:focus, nav input[type=text]:hover {
118118
float: right !important;
119119
}
120120

121+
.left {
122+
float: left !important;
123+
}
124+
121125
.green-blue {
122126
background-color: #41b6c4 !important;
123127
}
@@ -134,6 +138,10 @@ nav input[type=text]:focus, nav input[type=text]:hover {
134138
cursor: pointer;
135139
}
136140

141+
.inactive {
142+
color: #1d91c0 !important;
143+
}
144+
137145
/* forms */
138146

139147
input {

website-client/ruleExecutor.js renamed to website-client/js/core/ruleExecutor.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ function checkRules(xmlString, rules, ruleIndex) {
114114
rulesI['satisfiedChanged'] = prevMatching !== rulesI['satisfied'];
115115
rulesI['allChanged'] = (prevMatching + prevMissing) !== (rulesI['missing'] + rulesI['satisfied']);
116116

117-
updateDisplayResult(rules, ruleIndex);
118117
return rules;
119118
}
120119

website-client/prototype.js renamed to website-client/js/prototype.js

File renamed without changes.

website-client/ruleGenerator.js renamed to website-client/js/ui/ruleGenerator.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Created by saharmehrpour on 6/19/17.
33
*/
44

5-
function initRuleGenerator() {
5+
function RuleGenerator() {
66

77
setupForm();
88

@@ -12,6 +12,7 @@ function initRuleGenerator() {
1212
* setup the rule generating form by de/activating the inputs
1313
*/
1414
function setupForm() {
15+
1516
d3.select("#ruleGenerator").on("click", generateNewRule);
1617

1718
d3.select("#elements").on("change", function () {
@@ -97,12 +98,12 @@ function generateNewRule() {
9798
let ruleTableString = "\"ruleTable=" + JSON.stringify(ruleTable).substr(1);
9899

99100

100-
sendToServer("NewRule", ruleTableString);
101+
//sendToServer("NewRule", ruleTableString);
101102

102103
// No need - the server sends the message to update the rule results
103104
// // display the result
104105
// clearRuleTable();
105106
// for (let i = 0; i < ruleTable.length; i++) {
106107
// runXPathQuery(xml, ruleTable[i]);
107108
// }
108-
}
109+
};

0 commit comments

Comments
 (0)