raw upload done, style and controlls updated (84a7572e) · Commits · Stephanie Wegscheidl / cocoVisR

cocoVisR.Rproj

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		Version: 1.0

		RestoreWorkspace: Default
		SaveWorkspace: Default
		AlwaysSaveHistory: Default

		EnableCodeIndexing: Yes
		UseSpacesForTab: Yes
		NumSpacesForTab: 2
		Encoding: UTF-8

		RnwWeave: Sweave
		LaTeX: pdfLaTeX

dashboard/server.R

+17 −0

Original line number	Diff line number	Diff line
		@@ -11,4 +11,21 @@ library(shiny)

		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
		#}
		}

dashboard/ui.R

+46 −32

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ library(shinydashboard)
		library(leaflet)

		ui <- dashboardPage(
		skin="purple",

		dashboardHeader(title="CoCoVisR"),
		dashboardSidebar(
		sidebarMenu(
		@@ -14,43 +16,76 @@ ui <- dashboardPage(
		)
		),
		dashboardBody(
		#tags$head(
		# tags$link(rel = "stylesheet", type = "text/css", href = "custom.css")
		#),

		tabItems(
		# Upload tab content
		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
		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
		tabItem(tabName = "dashboard",
		h2("This is the Dashboard"),
		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",
		status = "primary",
		status= "warning",
		solidHeader = TRUE,
		collapsible = TRUE,
		plotOutput("plot1", height = 250)),
		#},

		box(title="Map",
		status = "primary",
		status = "warning",
		solidHeader = TRUE,
		collapsible = TRUE,
		plotOutput("plot1", height = 250)),
		box(title="Timeline",
		status = "primary",
		status = "warning",
		solidHeader = TRUE,
		collapsible = TRUE,plotOutput("plot3", height = 250)),
		box(title="Linechart",
		status = "primary",
		status = "warning",
		solidHeader = TRUE,
		collapsible = TRUE,plotOutput("plot4", height = 250))
		#box(
		# title = "Controls",
		#sliderInput("slider", "Number of observations:", 1, 100, 50)
		#)

		)
		),

		@@ -62,24 +97,3 @@ 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)

dashboard/www/custom.css

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		.main-header .logo {
		font-family: "Georgia", Times, "Times New Roman", serif;
		font-weight: bold;
		font-size: 32px;
		}
		No newline at end of file

www/custom.css

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		/*.main-header .logo {
		font-family: "Georgia", Times, "Times New Roman", serif;
		font-weight: bold;
		font-size: 32px;
		}
		*/
		No newline at end of file