Просмотр исходного кода

Added standardized icon interface.

Thomas Flucke 2 лет назад
Родитель
Сommit
9521083185

+ 1 - 0
server/app/views/viewLoader.scala.html

@@ -10,6 +10,7 @@
   @webJarsUtil.locate("jquery-ui.min.css").css()
   @webJarsUtil.locate("bootstrap.min.js").script()
   @webJarsUtil.locate("Sortable.min.js").script()
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
   <script src="https://SortableJS.github.io/Sortable/Sortable.js"></script>
   <style type="text/css">
     .scala-typeahead,

+ 21 - 0
webClient/src/main/scala/com/weEat/views/Icon.scala

@@ -0,0 +1,21 @@
+package com.weEat.view
+
+import com.raquo.laminar.api.L._
+
+object Icon {
+  def apply(icon: String)(callback: (org.scalajs.dom.Event) => Unit) =
+    span(paddingLeft := "7px",
+      i(
+        cls := s"fa fa-solid fa-$icon",
+        cursor := "pointer",
+        onClick.stopPropagation --> callback
+      )
+    )
+
+  def placeholder = span(paddingLeft := "7px", i(cls := s"fa fa-solid"))
+
+  def view(callback: (org.scalajs.dom.Event) => Unit) = Icon("eye")(callback)
+  def edit(callback: (org.scalajs.dom.Event) => Unit) = Icon("pencil")(callback)
+  def fork(callback: (org.scalajs.dom.Event) => Unit) = Icon("copy")(callback)
+  def delete(callback: (org.scalajs.dom.Event) => Unit) = Icon("trash")(callback)
+}

+ 2 - 1
webClient/src/main/scala/com/weEat/views/UsdaImporter.scala

@@ -60,7 +60,8 @@ object UsdaImporter extends View[Option[String]] {
     val searchBar: SearchBar[Seq[Signal[Option[Seq[SearchResultFood]]]]] =
       SearchBar((term) =>
         USDAController.getFoodsSearch(term, Seq(
-          Branded, Foundation, SRLegacy
+          // Branded,
+          Foundation, SRLegacy
         ).map(_.toString), pageSize = Some(SEARCH_PAGE_SIZE))().map {
           case SearchResult(criteria, n, cur, tot, baseList) =>
             Val(Some(baseList)) +: