Skip to content

Commit

Permalink
final v
Browse files Browse the repository at this point in the history
  • Loading branch information
yiqiang committed May 6, 2018
1 parent 0b4b9da commit 001c62f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 13 deletions.
2 changes: 2 additions & 0 deletions data/intro.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
World War II (WW2), was a global war that lasted from 1939 to 1945, although related conflicts began earlier. The vast majority of the world's countries—including all of the great powers—eventually formed two opposing military alliances: the Allies and the Axis. It was the most global war in history; it directly involved more than 100 million people from over 30 countries. World War II was the deadliest conflict in human history, marked by 50 to 85 million fatalities, most of which were civilians in the Soviet Union and China. It included massacres, the genocide of the Holocaust, strategic bombing, starvation, disease, and the only use of nuclear weapons in warfare.
<br>World War II changed the political alignment and social structure of the world. The victorious great powers—China, France, the Soviet Union, the United Kingdom, and the United States—became the permanent members of the United Nations Security Council. The Soviet Union and the United States emerged as rival superpowers, setting the stage for the Cold War, which lasted for the next 46 years. Meanwhile, the influence of European great powers waned, while the decolonisation of Africa and Asia began.
4 changes: 3 additions & 1 deletion server.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ts_df <- read_csv("data/monthly_obs_count.csv", col_types = list("start_month" =
load("data/groupColors.rda")
load("data/ajmatrix.rda")
allies_axis_text <- read_file("data/axis_allies.txt")
intro_text <- read_file("data/intro.txt")
####Sever####
shinyServer(function(input, output, session) {
target_map <- SharedData$new(df_target, key = ~id, group = "grp1")
Expand Down Expand Up @@ -206,6 +207,7 @@ shinyServer(function(input, output, session) {
})

output$allies_axis <- renderText(allies_axis_text)

output$intro <- renderText((intro_text))
output$instruction <- renderText(paste("Use the selection tool on the map to highlight the target area and update plots"))
})

34 changes: 22 additions & 12 deletions ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,24 @@ shinyUI(dashboardPage(
tabName = "timeline",
icon = icon("line-chart")
),
menuItem(
"Alliance",
tabName = "alliance",
icon = icon("fighter-jet")),
menuItem(
"Map",
tabName = "maps",
icon = icon("globe")
),
menuItem(
"Alliance",
tabName = "alliance",
icon = icon("fighter-jet")
)
)
),
))
),
dashboardBody(
tabItems(
tabItem(
tabName = "maps",
fluidRow(
tags$style("#instruction {font-size:15px;
font-style:italic; }"),
column(width = 5, htmlOutput("instruction"))),
fluidRow(
box(
width = "100%",
Expand Down Expand Up @@ -75,9 +77,17 @@ shinyUI(dashboardPage(
tabName = "timeline",
fluidRow(
box(title = tags$b("Count of Bombing Mission in WW2"), solidHeader = TRUE,
plotlyOutput("timeseries"), width = 12)
))
)
)
plotlyOutput("timeseries"), width = 12)),
fluidRow(box(title = tags$b("WW2 Introduction"), status = "primary",
solidHeader = F, collapsible = F, width = 12,
fluidRow(
tags$style("#allies_axis {font-size:15px;
display:block; }"),
column(width = 9, htmlOutput("intro")),
column(width = 3, align = "center",
img(src = "uss_arizona_burning_sinking-P.jpeg", height = '170px', width = '240px')))
)
))
))
)
)
Binary file added www/uss_arizona_burning_sinking-P.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 001c62f

Please sign in to comment.