diff --git a/app/app.R b/app/app.R index 0afa7dc..f0d4bd1 100644 --- a/app/app.R +++ b/app/app.R @@ -40,7 +40,7 @@ server <- shinyServer(function(input, output, session){ column(12, navbarPage("", tabPanel(a("TakeCareApp",id='takeCareApp',class = "tab-link", href = route_link("home"))), - tabPanel(a("Firmy",id="tab1",class = "tab-link", href = route_link("profil"))), + tabPanel(a("Firmy",id="tab1",class = "tab-link", href = route_link("firmy"))), tabPanel(a("O nas",id="tab2",class = "tab-link", href = route_link("about"))), tabPanel(a("Obliczenia", id ="tab5",class="tab-link", href = route_link("calculator"))), tabPanel(a("Zaloguj",id="tab3",class="tab-link", href = route_link("login"))), diff --git a/app/firmy_module.R b/app/firmy_module.R new file mode 100644 index 0000000..0f08649 --- /dev/null +++ b/app/firmy_module.R @@ -0,0 +1,59 @@ +library(shiny) +library(magrittr) +library(ggplot2) +library(plotly) +library(DT) + +firmyUI <- function(id) { + ns <- NS(id) + fluidPage( + tags$head( + tags$style(HTML(" + @import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700'); + @import url('//fonts.googleapis.com/css2?family=Fjalla+One'); + + + + + "))), + + theme = "style.css", + + + # App title ---- + # App title ---- + + # h4("Aplikacja wspomagajaca diagnozowanie i monitorowanie stanu zdrowia", align = "center"), + + fluidRow( + column(12, align="center", + h1('Firmy') + ) + ), + + fluidRow(column(4, + div(div("GlaxoSmithKline"),img(src="gsk.png", href= "https://pl.gsk.com/pl/",height = 150, width = 150)))%>% tagAppendAttributes(class = 'column-tile'), + column(4, + div(div("Bayer"),img(src="bayer.png", href="https://www.bayer.com/pl/pl/poland-home", height = 150, width = 150)))%>% tagAppendAttributes(class = 'column-tile'), + column(4, + div(div("BioFarm"),img(src="biofarm.png", href= "https://www.biofarm.pl",height = 150, width = 150)))%>% tagAppendAttributes(class = 'column-tile') + + ) %>% tagAppendAttributes(id = 'row-tiles'), + + + + fluidRow( + column(12, + tags$span("© Copyright Wszystkie prawa zastrzeżone."))%>% tagAppendAttributes(id = 'column-copyright'), + + )%>% tagAppendAttributes(id = 'row-footer') + + + ) +} + +firmyServer <- function(input, output) { + + + +} diff --git a/app/routing_module.R b/app/routing_module.R index 873af68..097c87e 100644 --- a/app/routing_module.R +++ b/app/routing_module.R @@ -11,6 +11,7 @@ source("profil_module.R",encoding="utf-8") source("login_module.R",encoding="utf-8") source("register_module.R",encoding="utf-8") source("calculator.R", encoding = "utf-8") +source("firmy_module.R", encoding = "utf-8") @@ -20,6 +21,7 @@ profil_page <-profilUI(id="profil") login_page <-loginUI(id="login") register_page <-registerUI(id="register") calculator_page <- calculatorUI(id="calculator") +firmy_page <- firmyUI(id="firmy") router <- make_router( route("home", home_page,homeServer), @@ -27,7 +29,9 @@ router <- make_router( route("profil", profil_page,profilServer), route("login", login_page,loginServer), route("register", register_page,registerServer), - route("calculator", calculator_page, calculatorServer) + route("calculator", calculator_page, calculatorServer), + route("firmy", firmy_page, firmyServer) + ) diff --git a/app/www/bayer.png b/app/www/bayer.png new file mode 100644 index 0000000..187f581 Binary files /dev/null and b/app/www/bayer.png differ diff --git a/app/www/biofarm.png b/app/www/biofarm.png new file mode 100644 index 0000000..078c0c5 Binary files /dev/null and b/app/www/biofarm.png differ diff --git a/app/www/gsk.png b/app/www/gsk.png new file mode 100644 index 0000000..4dc56ea Binary files /dev/null and b/app/www/gsk.png differ