Posuzování shody dle MDR

diff --git a/app/index.html b/app/index.html index b921e14..ea0f313 100644 --- a/app/index.html +++ b/app/index.html @@ -7,8 +7,8 @@ Posuzování shody dle MDR - -

+ +

<%- script %> diff --git a/app/index.html b/app/index.html index b921e14..ea0f313 100644 --- a/app/index.html +++ b/app/index.html @@ -7,8 +7,8 @@ Posuzování shody dle MDR - -

+ +

<%- script %> diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala index a932514..e0e9297 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala @@ -94,7 +94,7 @@ .DirectoryPageConnector(state.users, state.actionBus) .apply ) - div(child <-- pageSplitter.$view) + div(cls := "h-full", child <-- pageSplitter.$view) // Pull in the stylesheet val css: Css.type = Css diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala index c47e0a1..8200bda 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala @@ -16,10 +16,11 @@ )(using Router[Page]): HtmlElement = val $maybeContent = $m.map(_.content).split(_ => ())((_, c, _) => c) div( - cls := "min-h-full", + cls := "h-full flex flex-col", NavigationBar($m.map(_.navigation)), PageHeader(actionBus), main( + cls := "flex-grow-1 overflow-y-auto", mods, child <-- $maybeContent.map(_.getOrElse(Loading)) ) diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala index 15ca387..3b316e1 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala @@ -16,7 +16,7 @@ def apply($m: Signal[ViewModel]): HtmlElement = div( - cls := "max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", + cls := "h-full overflow-y-auto max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", div( cls := "flex flex-col space-y-4", DetailOsoby($m.map(_.osoba)), diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala index 66f53f3..bc2316d 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala @@ -14,7 +14,7 @@ def render($m: Signal[ViewModel]): HtmlElement = div( - cls := "max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", + cls := "h-full overflow-y-auto max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", div( cls := "flex flex-col space-y-4", DetailOsoby.header($m.map(_.osoba)), diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala index ea02c98..7307d22 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala @@ -17,7 +17,7 @@ } yield (letter.toString, users.sortBy(_.prijmeni)) div( - cls := "max-w-7xl mx-auto", + cls := "h-full max-w-7xl mx-auto order-first flex flex-col flex-shrink-0", SearchForm(), Directory(byLetter) ) diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala index 37e95a4..73f915d 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala @@ -19,7 +19,7 @@ ul( role := "list", cls := "relative z-0 divide-y divide-gray-200", - children <-- $m.split(_.osobniCislo)((_, _, s) => UserRow.render(s)) + children <-- $m.split(_.osobniCislo)((_, _, s) => UserRow(s)) ) type ViewModel = List[(String, List[UserRow.ViewModel])] diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala index 547f23a..1d9617f 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala @@ -5,38 +5,41 @@ object SearchForm: def apply(): HtmlElement = - form( - cls := "p-4 mt-6 flex space-x-4", - action := "#", - div( - cls := "flex-1 min-w-0", - label( - forId := "search", - cls := "sr-only", - """Search""" - ), + div( + cls := "px-6 pt-4 pb-4", + form( + cls := "mt-6 flex space-x-4", + action := "#", div( - cls := "relative rounded-md shadow-sm", - div( - cls := "absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none", - Icons.solid.search().amend(svg.cls := "text-gray-400") + cls := "flex-1 min-w-0", + label( + forId := "search", + cls := "sr-only", + """Search""" ), - input( - tpe := "search", - name := "search", - idAttr := "search", - cls := "focus:ring-pink-500 focus:border-pink-500 block w-full pl-10 sm:text-sm border-gray-300 rounded-md", - placeholder := "Search" + div( + cls := "relative rounded-md shadow-sm", + div( + cls := "absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none", + Icons.solid.search().amend(svg.cls := "text-gray-400") + ), + input( + tpe := "search", + name := "search", + idAttr := "search", + cls := "focus:ring-pink-500 focus:border-pink-500 block w-full pl-10 sm:text-sm border-gray-300 rounded-md", + placeholder := "Search" + ) ) - ) - ), - button( - tpe := "submit", - cls := "inline-flex justify-center px-3.5 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-500", - Icons.solid.filter().amend(svg.cls := "text-gray-400"), - span( - cls := "sr-only", - """Search""" + ), + button( + tpe := "submit", + cls := "inline-flex justify-center px-3.5 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-500", + Icons.solid.filter().amend(svg.cls := "text-gray-400"), + span( + cls := "sr-only", + """Search""" + ) ) ) ) diff --git a/app/index.html b/app/index.html index b921e14..ea0f313 100644 --- a/app/index.html +++ b/app/index.html @@ -7,8 +7,8 @@ Posuzování shody dle MDR - -

+ +

<%- script %> diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala index a932514..e0e9297 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala @@ -94,7 +94,7 @@ .DirectoryPageConnector(state.users, state.actionBus) .apply ) - div(child <-- pageSplitter.$view) + div(cls := "h-full", child <-- pageSplitter.$view) // Pull in the stylesheet val css: Css.type = Css diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala index c47e0a1..8200bda 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/components/PageLayout.scala @@ -16,10 +16,11 @@ )(using Router[Page]): HtmlElement = val $maybeContent = $m.map(_.content).split(_ => ())((_, c, _) => c) div( - cls := "min-h-full", + cls := "h-full flex flex-col", NavigationBar($m.map(_.navigation)), PageHeader(actionBus), main( + cls := "flex-grow-1 overflow-y-auto", mods, child <-- $maybeContent.map(_.getOrElse(Loading)) ) diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala index 15ca387..3b316e1 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailPage.scala @@ -16,7 +16,7 @@ def apply($m: Signal[ViewModel]): HtmlElement = div( - cls := "max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", + cls := "h-full overflow-y-auto max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", div( cls := "flex flex-col space-y-4", DetailOsoby($m.map(_.osoba)), diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala index 66f53f3..bc2316d 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/detail/DetailParametruPage.scala @@ -14,7 +14,7 @@ def render($m: Signal[ViewModel]): HtmlElement = div( - cls := "max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", + cls := "h-full overflow-y-auto max-w-7xl mx-auto px-4 py-6 sm:px-6 lg:px-8", div( cls := "flex flex-col space-y-4", DetailOsoby.header($m.map(_.osoba)), diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala index ea02c98..7307d22 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/DirectoryPage.scala @@ -17,7 +17,7 @@ } yield (letter.toString, users.sortBy(_.prijmeni)) div( - cls := "max-w-7xl mx-auto", + cls := "h-full max-w-7xl mx-auto order-first flex flex-col flex-shrink-0", SearchForm(), Directory(byLetter) ) diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala index 37e95a4..73f915d 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/Directory.scala @@ -19,7 +19,7 @@ ul( role := "list", cls := "relative z-0 divide-y divide-gray-200", - children <-- $m.split(_.osobniCislo)((_, _, s) => UserRow.render(s)) + children <-- $m.split(_.osobniCislo)((_, _, s) => UserRow(s)) ) type ViewModel = List[(String, List[UserRow.ViewModel])] diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala index 547f23a..1d9617f 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/SearchForm.scala @@ -5,38 +5,41 @@ object SearchForm: def apply(): HtmlElement = - form( - cls := "p-4 mt-6 flex space-x-4", - action := "#", - div( - cls := "flex-1 min-w-0", - label( - forId := "search", - cls := "sr-only", - """Search""" - ), + div( + cls := "px-6 pt-4 pb-4", + form( + cls := "mt-6 flex space-x-4", + action := "#", div( - cls := "relative rounded-md shadow-sm", - div( - cls := "absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none", - Icons.solid.search().amend(svg.cls := "text-gray-400") + cls := "flex-1 min-w-0", + label( + forId := "search", + cls := "sr-only", + """Search""" ), - input( - tpe := "search", - name := "search", - idAttr := "search", - cls := "focus:ring-pink-500 focus:border-pink-500 block w-full pl-10 sm:text-sm border-gray-300 rounded-md", - placeholder := "Search" + div( + cls := "relative rounded-md shadow-sm", + div( + cls := "absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none", + Icons.solid.search().amend(svg.cls := "text-gray-400") + ), + input( + tpe := "search", + name := "search", + idAttr := "search", + cls := "focus:ring-pink-500 focus:border-pink-500 block w-full pl-10 sm:text-sm border-gray-300 rounded-md", + placeholder := "Search" + ) ) - ) - ), - button( - tpe := "submit", - cls := "inline-flex justify-center px-3.5 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-500", - Icons.solid.filter().amend(svg.cls := "text-gray-400"), - span( - cls := "sr-only", - """Search""" + ), + button( + tpe := "submit", + cls := "inline-flex justify-center px-3.5 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-500", + Icons.solid.filter().amend(svg.cls := "text-gray-400"), + span( + cls := "sr-only", + """Search""" + ) ) ) ) diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/UserRow.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/UserRow.scala index 84f0ab5..39da83e 100644 --- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/UserRow.scala +++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/pages/directory/components/UserRow.scala @@ -14,13 +14,13 @@ container: HtmlElement = div() ) - def render($m: Signal[ViewModel]): HtmlElement = + def apply($m: Signal[ViewModel]): HtmlElement = inline def avatarImage = Avatar($m.map(_.img)).avatarImage(10) li( div( - cls := "relative px-6 py-5 flex items-center space-x-3 hover:bg-gray-50 focus-within:ring-2 focus-within:ring-inset focus-within:ring-pink-500", + cls := "bg-white relative px-6 py-5 flex items-center space-x-3 hover:bg-gray-50 focus-within:ring-2 focus-within:ring-inset focus-within:ring-pink-500", div( cls := "flex-shrink-0", child <-- avatarImage