fix: change to Appsilon styling

Appsilon · Feb 21, 2024 · 55dbbdd · 55dbbdd
1 parent de7ce9b
commit 55dbbdd
Show file tree

Hide file tree

Showing 14 changed files with 194 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 .Ruserdata
+.DS_Store
diff --git a/app/logic/__init__.R b/app/logic/__init__.R
diff --git a/app/main.R b/app/main.R
@@ -25,6 +25,7 @@ box::use(
   app/view/mod_app_table,
   app/view/mod_job_list,
   app/view/mod_logs,
+  app/view/mod_header,
   app/logic/api_utils[get_app_list]
 )
 
@@ -33,17 +34,27 @@ ui <- function(id) {
   ns <- NS(id)
   fluidPage(
     class = "dashboard-body",
+    mod_header$ui("header"),
     div(
-      class = "app-table",
-      mod_app_table$ui(ns("app_table"))
-    ),
-    div(
-      class = "job-list",
-      uiOutput(ns("job_list_pane"))
-    ),
-    div(
-      class = "logs",
-      uiOutput(ns("logs_pane"))
+      class = "dashboard-container",
+      div(
+        class = "app-table",
+        mod_app_table$ui(ns("app_table"))
+      ),
+      div(
+        class = "vertical-line"
+      ),
+      div(
+        class = "job-list",
+        uiOutput(ns("job_list_pane"))
+      ),
+      div(
+        class = "vertical-line"
+      ),
+      div(
+        class = "logs",
+        uiOutput(ns("logs_pane"))
+      )
     )
   )
 }
@@ -54,6 +65,8 @@ server <- function(id) {
 
     ns <- session$ns
 
+    mod_header$server("header")
+
     state <- reactiveValues()
     state$selected_app <- reactive({})
     state$selected_job <- reactive({})

diff --git a/app/static/appsilon-logo.png b/app/static/appsilon-logo.png
diff --git a/app/static/css/app.min.css b/app/static/css/app.min.css