marge update

This commit is contained in:
Rafał Piskorski 2020-12-19 23:14:08 +01:00
commit 8136196b60
8 changed files with 90 additions and 13 deletions

View File

@ -4,9 +4,13 @@ library(ggplot2)
library(plotly)
library(DT)
ui <- fluidPage(
aboutUI <- function(id){
ns <- NS(id)
fluidPage(
tags$head(
tags$link(rel = "stylesheet", type = "text/css", href = "authors.css")
tags$link(rel = "stylesheet", type = "text/css", href = "style.css")
),
mainPanel(
p(id="div0","Kim jesteśmy?"),
@ -18,13 +22,15 @@ ui <- fluidPage(
p(id="div4","Robert Tarnas"),
p(id="dif1"),
p(id="div5","Rafał Piskorski"),
p(id="dif2")
p(id="dif2"),
)
)
}
server <- function(input, output, session) {
aboutServer <- function(input, output, session) {
}
shinyApp(ui = ui, server = server)

View File

@ -48,10 +48,11 @@ 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("Zaloguj",id="tab3",class="tab-link", href = route_link("login"))),
tabPanel(a("Rejestracja",id="tab4",class="tab-link", href = route_link("register"))))
tabPanel(a("Rejestracja",id="tab4",class="tab-link", href = route_link("register")))),
@ -66,8 +67,10 @@ server <- shinyServer(function(input, output, session){
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("O nas",id="tab2",class = "tab-link", href = route_link("about"))),
tabPanel(a("Kalkulator", id ="tab5",class="tab-link", href = route_link("calculator"))),
tabPanel(a("Wyloguj",id="tab3",class = "tab-link")),
tabPanel(a("Profil",id="tab4",class="tab-link", href = route_link("profil"))))
tabPanel(a("Profil",id="tab4",class="tab-link", href = route_link("profil")))),

View File

@ -4,7 +4,9 @@ library(ggplot2)
library(plotly)
library(DT)
ui <- fluidPage(
calculatorUI <- function(id){
ns <- NS(id)
fluidPage(
titlePanel("Kalkulator wskaźnika ryzyka nowotworu jajnika (IOTA LR2)"),
sidebarLayout(
sidebarPanel(
@ -30,8 +32,9 @@ ui <- fluidPage(
)
)
)
}
server <- function(input, output, session) {
calculatorServer <- function(input, output, session) {
output$selected_var <- renderText({
input$update
@ -88,4 +91,3 @@ server <- function(input, output, session) {
})
}
shinyApp(ui = ui, server = server)

59
app/firmy_module.R Normal file
View File

@ -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) {
}

View File

@ -6,10 +6,12 @@ library(plotly)
library(DT)
source("home_module.R",encoding="utf-8")
source("about_module.R",encoding="utf-8")
source("about.R",encoding="utf-8")
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")
@ -18,13 +20,18 @@ about_page <-aboutUI(id="about")
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),
route("about", about_page,aboutServer),
route("profil", profil_page,profilServer),
route("login", login_page,loginServer),
route("register", register_page,registerServer)
route("register", register_page,registerServer),
route("calculator", calculator_page, calculatorServer),
route("firmy", firmy_page, firmyServer)
)

BIN
app/www/bayer.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

BIN
app/www/biofarm.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/www/gsk.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB