added new basic search demo. cleaned up search code

bevry · Jun 15, 2012 · 9418df3 · 9418df3
1 parent 8e88e98
commit 9418df3
Show file tree

Hide file tree

Showing 11 changed files with 401 additions and 67 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<!-- Configuration -->
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+
+	<!-- Information -->
+	<title>Query-Engine Demo</title>
+
+	<!-- Styles -->
+	<style>
+		h2 {
+			font-size: 150%;
+			padding: 0;
+			margin: 0;
+		}
+		.pad,.editor {
+			width: 100%;
+			height: 600px;
+			margin:0;
+			padding:0;
+		}
+		.pad {
+			width: 50%;
+			padding-bottom:10px;
+		}
+		.editor {
+			border: 1px solid #AAA;
+		}
+		.code.pad {
+			float:left;
+		}
+		.result.pad {
+			float:right;
+		}
+	</style>
+</head>
+<body>
+
+	<!-- Header -->
+	<div class="header">
+		<h1><a href="https://github.com/bevry/query-engine">Query Engine</a></h1>
+		<p>Query-Engine is a <a href="http://www.mongodb.org/display/DOCS/Advanced+Queries">NoSQL</a> and <a href="http://www.mongodb.org/">MongoDb</a> compliant query engine. It can run on the server-side with <a href="http://nodejs.org/">Node.js</a>, or on the client-side within web browsers.</p>
+	</div>
+
+	<p>
+		<a href="code.html">code demo</a>
+	</p>
+
+	<p>
+		<a href="search.html">search demo</a>
+	</p>
+
+	<p>
+		<a href="visual-search.html">visual search demo</a>
+	</p>
+</body>
+</html>
diff --git a/demo/search.html b/demo/search.html
@@ -5,10 +5,6 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 
-	<!-- Stylesheets-->
-	<link rel="stylesheet" href="lib/visualsearch/build/visualsearch-datauri.css" />
-	<link rel="stylesheet" href="lib/visualsearch/build/visualsearch.css" />
-
 	<!-- Information -->
 	<title>Query-Engine Search Demo</title>
 
@@ -39,7 +35,8 @@
 			float:right;
 		}
 		#searchbar {
-			padding-bottom:1em;
+			width:100%;
+			margin-bottom:1em;
 		}
 	</style>
 </head>
@@ -51,7 +48,7 @@ <h1><a href="https://github.com/bevry/query-engine">Query Engine</a></h1>
 		<p>Query-Engine is a <a href="http://www.mongodb.org/display/DOCS/Advanced+Queries">NoSQL</a> and <a href="http://www.mongodb.org/">MongoDb</a> compliant query engine. It can run on the server-side with <a href="http://nodejs.org/">Node.js</a>, or on the client-side within web browsers.</p>
 
 		<!-- Search Bar -->
-		<div id="searchbar"/>
+		<input type="text" id="searchbar"/>
 	</div>
 
 	<!-- Content -->
@@ -74,11 +71,6 @@ <h2>Result:</h2>
 	<script src="lib/js2coffee.js"></script>
 	<script src="lib/ace/ace.js"></script>
 	<script src="lib/ace/mode-coffee.js"></script>
-	<script src="lib/visualsearch/build/visualsearch.js"></script>
-	<script src="lib/visualsearch/vendor/jquery.ui.core.js"></script>
-	<script src="lib/visualsearch/vendor/jquery.ui.widget.js"></script>
-	<script src="lib/visualsearch/vendor/jquery.ui.position.js"></script>
-	<script src="lib/visualsearch/vendor/jquery.ui.autocomplete.js"></script>
 	<script src="../out/lib/query-engine.js"></script>
 	<script src="../out/demo/search.js"></script>
 

diff --git a/demo/visual-search.html b/demo/visual-search.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<!-- Configuration -->
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+
+	<!-- Stylesheets-->
+	<link rel="stylesheet" href="lib/visualsearch/build/visualsearch-datauri.css" />
+	<link rel="stylesheet" href="lib/visualsearch/build/visualsearch.css" />
+
+	<!-- Information -->
+	<title>Query-Engine Visual Search Demo</title>
+
+	<!-- Styles -->
+	<style>
+		h2 {
+			font-size: 150%;
+			padding: 0;
+			margin: 0;
+		}
+		.pad,.editor {
+			width: 100%;
+			height: 600px;
+			margin:0;
+			padding:0;
+		}
+		.pad {
+			width: 50%;
+			padding-bottom:10px;
+		}
+		.editor {
+			border: 1px solid #AAA;
+		}
+		.code.pad {
+			float:left;
+		}
+		.result.pad {
+			float:right;
+		}
+		#searchbar {
+			padding-bottom:1em;
+		}
+	</style>
+</head>
+<body>
+
+	<!-- Header -->
+	<div class="header">
+		<h1><a href="https://github.com/bevry/query-engine">Query Engine</a></h1>
+		<p>Query-Engine is a <a href="http://www.mongodb.org/display/DOCS/Advanced+Queries">NoSQL</a> and <a href="http://www.mongodb.org/">MongoDb</a> compliant query engine. It can run on the server-side with <a href="http://nodejs.org/">Node.js</a>, or on the client-side within web browsers.</p>
+
+		<!-- Search Bar -->
+		<div id="searchbar"/>
+	</div>
+
+	<!-- Content -->
+	<div class="content">
+		<div class="pad code">
+			<h2>Code:</h2>
+			<pre id="code" class="editor code"></pre>
+		</div>
+		<div class="pad result">
+			<h2>Result:</h2>
+			<pre id="result" class="editor result"></pre>
+		</div>
+	</div>
+
+	<!-- Scripts -->
+	<script src="lib/coffeescript.js"></script>
+	<script src="lib/jquery.js"></script>
+	<script src="lib/underscore.js"></script>
+	<script src="lib/backbone.js"></script>
+	<script src="lib/js2coffee.js"></script>
+	<script src="lib/ace/ace.js"></script>
+	<script src="lib/ace/mode-coffee.js"></script>
+	<script src="lib/visualsearch/build/visualsearch.js"></script>
+	<script src="lib/visualsearch/vendor/jquery.ui.core.js"></script>
+	<script src="lib/visualsearch/vendor/jquery.ui.widget.js"></script>
+	<script src="lib/visualsearch/vendor/jquery.ui.position.js"></script>
+	<script src="lib/visualsearch/vendor/jquery.ui.autocomplete.js"></script>
+	<script src="../out/lib/query-engine.js"></script>
+	<script src="../out/demo/visual-search.js"></script>
+
+</body>
+</html>
diff --git a/out/demo/search.js b/out/demo/search.js
diff --git a/out/demo/visual-search.js b/out/demo/visual-search.js
diff --git a/out/lib/query-engine.js b/out/lib/query-engine.js
diff --git a/out/test/live.test.js b/out/test/live.test.js