Added search. Refactored stuff

dpp · Feb 28, 2011 · 9145411 · 9145411
1 parent 2e165fe
commit 9145411
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 51 deletions.
diff --git a/samples/shopwithme/src/main/scala/code/comet/ListPages.scala b/samples/shopwithme/src/main/scala/code/comet/ListPages.scala
@@ -22,9 +22,7 @@ class ListPages extends CometActor {
    */
   def render = {
     "tbody *" #> SessionPresenceInfo.pages.map{
-      _._2.wholePath.mkString("/", "/", "")
-    }.map {
-      path => "td *" #> path
+      path => "td *" #> path._2
     }
   }
 

diff --git a/samples/shopwithme/src/main/scala/code/comet/WhatPage.scala b/samples/shopwithme/src/main/scala/code/comet/WhatPage.scala
@@ -16,7 +16,7 @@ import scala.xml.NodeSeq
  * A simple presence CometActor
  */
 class WhatPage extends CometActor {
-  private var thePath: Box[ParsePath] = Empty
+  private var thePath: Box[String] = Empty
   private var lastToken = Helpers.nextFuncName
 
   override def lifespan = Full(3 seconds)
@@ -47,7 +47,7 @@ class WhatPage extends CometActor {
    * the keeping the whole Req reference.
    */
   override protected def captureInitialReq(initialReq: Box[Req]) {
-    thePath = initialReq.map(_.path)
+    thePath = initialReq.map(_.uri)
     this.addPresence()
   }
 
@@ -126,7 +126,7 @@ private case class HeartBeat()
  * are being viewed
  */
 class PresenceInfo {
-  val pages = ValueCell[Set[(String, ParsePath)]](Set())
+  val pages = ValueCell[Set[(String, String)]](Set())
 }
 
 

diff --git a/samples/shopwithme/src/main/scala/code/lib/Cart.scala b/samples/shopwithme/src/main/scala/code/lib/Cart.scala
@@ -45,12 +45,12 @@ class Cart {
   /**
    * The current tax rate
    */
-  val taxRate = ValueCell(BigDecimal("0.5"))
+  val taxRate = ValueCell(BigDecimal("0.07"))
 
   /**
    * The contents of the cart
    */
-  val contents = ValueCell[Vector[CartItem]](Vector(CartItem(Item.items(2), 1), CartItem(Item.items(1), 2)))
+  val contents = ValueCell[Vector[CartItem]](Vector())
 
   /**
    * The subtotal

diff --git a/samples/shopwithme/src/main/scala/code/snippet/AllItemsPage.scala b/samples/shopwithme/src/main/scala/code/snippet/AllItemsPage.scala
@@ -12,18 +12,19 @@ import util._
 import Helpers._
 
 object AllItemsPage {
-  lazy val menu = Menu.i("Items") / "item"
+  lazy val menu = Menu.i("Items") / "item" >>
+  Loc.Snippet("Items", render)
 
   def render =
-    "tbody *" #> Item.items.map(item => {
-      "@name" #> ("a *" #> item.name &
-        "a [href]" #>
-        Menu.ParamMenuable.toLoc(AnItemPage.menu).calcHref(item)) &
-        "@description *" #> item.description &
-        "@price *" #> item.price.toString &
-        "@add_to_cart [onclick]" #>
-        SHtml.ajaxInvoke(() => TheCart.addItem(item))
-    })
+    "tbody *" #> renderItems(Item.items)
 
+  def renderItems(in: Seq[Item]) =
+    "tr" #> in.map(item => {
+      "a *" #> item.name &
+      "@description *" #> item.description &
+      "@price *" #> item.price.toString &
+      "a [href]" #> AnItemPage.menu.calcHref(item) &
+      "@add_to_cart [onclick]" #>
+      SHtml.ajaxInvoke(() => TheCart.addItem(item))})
 }
 
diff --git a/samples/shopwithme/src/main/scala/code/snippet/SearchPage.scala b/samples/shopwithme/src/main/scala/code/snippet/SearchPage.scala
@@ -5,9 +5,19 @@ import model.Item
 
 import net.liftweb._
 import http._
+import util._
+import Helpers._
 import sitemap._
+import Loc._
 
 object SearchPage {
-  def menu = Menu.i("Woof") / "search"
+  def menu = Menu.i("Search") / "search" >>
+  If(() => S.param("q").isDefined, "Need Search Term") >>
+  Snippet("Items", render)
+
+  def render = {
+    "tbody *" #> AllItemsPage.
+    renderItems(Item.search(S.param("q") openOr "*****^^^^"))
+  }
 }
 
diff --git a/samples/shopwithme/src/main/webapp/_items.html b/samples/shopwithme/src/main/webapp/_items.html
@@ -0,0 +1,10 @@
+<table class="lift:Items">
+  <tbody>
+    <tr>
+      <td name="name"><a href="#">Name</a></td>
+      <td name="description">Desc</td>
+      <td name="price">$50.00</td>
+      <td><button name="add_to_cart">Add to Cart</button></td>
+    </tr>
+  </tbody>
+</table>
diff --git a/samples/shopwithme/src/main/webapp/index.html b/samples/shopwithme/src/main/webapp/index.html
@@ -6,10 +6,8 @@
   </head>
   <body class="lift:content_id=main">
     <div id="main" class="lift:surround?with=default;at=content">
-
-      <div lift="AddRandom">Add something</div>
-
-    </div>
+      Some text about this application
+   </div>
   </body>
 </html>
 
diff --git a/samples/shopwithme/src/main/webapp/item.html b/samples/shopwithme/src/main/webapp/item.html
@@ -7,18 +7,8 @@
   <body class="lift:content_id=main">
     <div id="main" class="lift:surround?with=default;at=content">
 
-      <table class="lift:AllItemsPage">
-	<tbody>
-	  <tr>
-	    <td name="name"><a href="#">Name</a></td>
-	    <td name="description">Desc</td>
-	    <td name="price">$50.00</td>
-	    <td><button name="add_to_cart">Add to Cart</button></td>
-	  </tr>
-	</tbody>
-      </table>
-
-
+      <meta lift="embed?what=_items">
+
     </div>
   </body>
 </html>

diff --git a/samples/shopwithme/src/main/webapp/search.html b/samples/shopwithme/src/main/webapp/search.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+    <title>Home</title>
+  </head>
+  <body class="lift:content_id=main">
+    <div id="main" class="lift:surround?with=default;at=content">
+
+      <meta lift="embed?what=_items">
+
+    </div>
+  </body>
+</html>
diff --git a/samples/shopwithme/src/main/webapp/templates-hidden/default.html b/samples/shopwithme/src/main/webapp/templates-hidden/default.html
@@ -57,8 +57,14 @@
   </head>
   <body>
     <div class="container">
-      <div class="column span-12 last" style="text-align: right">
-        <h1 class="alt">app<img alt="" id="ajax-loader" style="display:none; margin-bottom: 0px; margin-left: 5px" src="/images/ajax-loader.gif"></h1>
+      <div class="column span-12" style="text-align: right">
+        <h1 class="alt">Shop with Me<img alt="" id="ajax-loader"
+  style="display:none; margin-bottom: 0px; margin-left: 5px"
+  src="/images/ajax-loader.gif"></h1>
+      </div>
+      <div class="column span-11 last">
+	<span style="float: right"><form action="/search"><input
+  name="q"><input type="submit" value="search"></form></span>
       </div>
 
       <hr>
@@ -99,20 +105,6 @@ <h1 class="alt">app<img alt="" id="ajax-loader" style="display:none; margin-bott
 
 	<br/>
 
-	<div style="border: 1px solid #ccc">
-	  I'm on pages:
-
-	  <div lift="comet?type=ListPages" >
-	    <table id="listPagesContents">
-	      <tbody id="page_list_tbody">
-		<tr><td>an item</td></tr>
-	      </tbody>
-	    </table>
-	  </div>
-	</div>
-
-	<br>
-
 	<div>
 	  <button lift="Link.request">Share Cart</button>
 	</div>