Move PageSettingsMenu to RightSidebar

woost · Aug 21, 2019 · 6acbade · 6acbade
1 parent 13bcb13
commit 6acbade
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/webApp/src/main/scala/wust/webApp/views/PageHeader.scala b/webApp/src/main/scala/wust/webApp/views/PageHeader.scala
@@ -194,7 +194,7 @@ object PageHeader {
 
     VDomModifier(
       pinButton,
-      PageSettingsMenu(channelId).apply(buttonStyle, fontSize := "20px"),
+    // PageSettingsMenu(channelId).apply(buttonStyle, fontSize := "20px"),
     )
   }
 

diff --git a/webApp/src/main/scala/wust/webApp/views/PageSettingsMenu.scala b/webApp/src/main/scala/wust/webApp/views/PageSettingsMenu.scala
@@ -44,7 +44,7 @@ object PageSettingsMenu {
     GlobalState.graph().pinnedNodeIdx(userIdx).contains(channelIdx)
   }
 
-  private def sidebarMenuItems(channelId: NodeId)(implicit ctx: Ctx.Owner) = {
+  def sidebarMenuItems(channelId: NodeId)(implicit ctx: Ctx.Owner) = {
     val isBookmarked = nodeIsBookmarked( channelId)
 
     val channelAsNode: Rx[Option[Node]] = Rx {

diff --git a/webApp/src/main/scala/wust/webApp/views/RightSidebar.scala b/webApp/src/main/scala/wust/webApp/views/RightSidebar.scala
@@ -1,6 +1,5 @@
 package wust.webApp.views
 
-import acyclic.file
 import fontAwesome.freeSolid
 import outwatch.dom._
 import outwatch.dom.dsl._
@@ -187,7 +186,15 @@ object RightSidebar {
           flexDirection.column,
           justifyContent.flexStart,
           boxShadow := "none", //explicitly overwrite boxshadow from accordion.
-        )
+        ),
+      div(
+        cls := "ui secondary menu",
+        flexWrap.wrap,
+        flexDirection.column,
+        height := "600px",
+        justifyContent.spaceAround,
+        PageSettingsMenu.sidebarMenuItems(focusPref.nodeId)
+      )
     )
   }
   private def viewContent(focusPref: FocusPreference, parentIdAction: Option[NodeId] => Unit, nodeStyle: PageStyle, viewRender: ViewRenderLike)(implicit ctx: Ctx.Owner) = {