Commit 84a7572e authored by Stephanie's avatar Stephanie

raw upload done, style and controlls updated

parent 043f6b13
Version: 1.0
RestoreWorkspace: Default
SaveWorkspace: Default
AlwaysSaveHistory: Default
EnableCodeIndexing: Yes
UseSpacesForTab: Yes
NumSpacesForTab: 2
Encoding: UTF-8
RnwWeave: Sweave
LaTeX: pdfLaTeX
...@@ -11,4 +11,21 @@ library(shiny) ...@@ -11,4 +11,21 @@ library(shiny)
server <- function(input, output) { server <- function(input, output) {
set.seed(122) set.seed(122)
#histdata <- rnorm(500)
#output$plot1 <- renderPlot({
#data <- histdata[seq_len(input$slider)]
#hist(data)
#})
##MAP
#m <- leaflet()
#m <- addTiles(m)
#x=1
#for(x in 1:2019){
#m <- addMarkers(m,lng=longitude[x], lat=latitude[x]) #addPolylines does not work
#x=x+1}
#m
#}
} }
...@@ -4,6 +4,8 @@ library(shinydashboard) ...@@ -4,6 +4,8 @@ library(shinydashboard)
library(leaflet) library(leaflet)
ui <- dashboardPage( ui <- dashboardPage(
skin="purple",
dashboardHeader(title="CoCoVisR"), dashboardHeader(title="CoCoVisR"),
dashboardSidebar( dashboardSidebar(
sidebarMenu( sidebarMenu(
...@@ -14,43 +16,76 @@ ui <- dashboardPage( ...@@ -14,43 +16,76 @@ ui <- dashboardPage(
) )
), ),
dashboardBody( dashboardBody(
#tags$head(
# tags$link(rel = "stylesheet", type = "text/css", href = "custom.css")
#),
tabItems( tabItems(
# Upload tab content # Upload tab content
tabItem(tabName = "upload", tabItem(tabName = "upload",
h2("Upload here") h2("Upload here:"),
fileInput("file1", "Select CoConUT Data (*.json):",
multiple = FALSE,
accept = c(
"text/json",
"text/comma-separated-values,text/plain",
".json")),
fileInput("file2", "Select CoCoQuest Data (*.json):",
multiple = FALSE,
accept = c(
"text/json",
"text/comma-separated-values,text/plain",
".json"))
), ),
# Controlls tab content # Controlls tab content
tabItem(tabName = "controlls", tabItem(tabName = "controlls",
h2("Controlls here") h2("Controlls here:"),
checkboxInput("histogram", "Histogram", FALSE),
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE),
checkboxInput("timeline", "Timeline", FALSE),
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE),
checkboxInput("map", "Map", FALSE),
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE),
checkboxInput("lingegraph","Linegraph",FALSE)
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE)
), ),
# Dashboard tab content # Dashboard tab content
tabItem(tabName = "dashboard", tabItem(tabName = "dashboard",
h2("This is the Dashboard"), h2("This is the Dashboard"),
fluidRow( fluidRow(
#tabBox(
#title = "First tabBox",
# The id lets us use input$tabset1 on the server to find the current tab
#id = "tabset1", height = "250px",
#tabPanel("Tab1", "First tab content"),
#tabPanel("Tab2", "Tab content 2")
#),
#if(menuitem$controls$histogram ==TRUE){
box( title="Histogram", box( title="Histogram",
status = "primary", status= "warning",
solidHeader = TRUE, solidHeader = TRUE,
collapsible = TRUE, collapsible = TRUE,
plotOutput("plot1", height = 250)), plotOutput("plot1", height = 250)),
#},
box(title="Map", box(title="Map",
status = "primary", status = "warning",
solidHeader = TRUE, solidHeader = TRUE,
collapsible = TRUE, collapsible = TRUE,
plotOutput("plot1", height = 250)), plotOutput("plot1", height = 250)),
box(title="Timeline", box(title="Timeline",
status = "primary", status = "warning",
solidHeader = TRUE, solidHeader = TRUE,
collapsible = TRUE,plotOutput("plot3", height = 250)), collapsible = TRUE,plotOutput("plot3", height = 250)),
box(title="Linechart", box(title="Linechart",
status = "primary", status = "warning",
solidHeader = TRUE, solidHeader = TRUE,
collapsible = TRUE,plotOutput("plot4", height = 250)) collapsible = TRUE,plotOutput("plot4", height = 250))
#box(
# title = "Controls",
#sliderInput("slider", "Number of observations:", 1, 100, 50)
#)
) )
), ),
...@@ -61,25 +96,4 @@ ui <- dashboardPage( ...@@ -61,25 +96,4 @@ ui <- dashboardPage(
)) ))
) )
\ No newline at end of file
#server <- function(input, output) {
# set.seed(122)
#histdata <- rnorm(500)
#output$plot1 <- renderPlot({
#data <- histdata[seq_len(input$slider)]
#hist(data)
#})
##MAP
#m <- leaflet()
#m <- addTiles(m)
#x=1
#for(x in 1:2019){
#m <- addMarkers(m,lng=longitude[x], lat=latitude[x]) #addPolylines does not work
#x=x+1}
#m
#}
#shinyApp(ui, server)
.main-header .logo {
font-family: "Georgia", Times, "Times New Roman", serif;
font-weight: bold;
font-size: 32px;
}
\ No newline at end of file
/*.main-header .logo {
font-family: "Georgia", Times, "Times New Roman", serif;
font-weight: bold;
font-size: 32px;
}
*/
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment