Skip to content

Commit

Permalink
[MERGE] Sprint 13
Browse files Browse the repository at this point in the history
Sprint 13
  • Loading branch information
matheusbsilva committed Jun 11, 2018
2 parents d9a50bc + 6dfa44e commit 68dc34c
Show file tree
Hide file tree
Showing 49 changed files with 2,549 additions and 1,035 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{vue,html}]
indent_size = 2
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/*
build/*
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p align="justify"> O Tropical Hazards Business Intelligence é um sistema cujo a finalidade é auxiliar os pesquisadores e profissionais de saúde do Núcleo de Medicina Tropical da UnB, permitindo o gerenciamento e compartilhamento de dados e indicadores referentes às doenças tropicais. O sistema foi projetado de modo a permitir que os profissionais possam fazer análises estatísticas, compartilhar informações gerenciadas em dashboards e disponibilizar esses dados para o público.</p>

## Deploy
[Homolog](http://159.65.190.38)
[Homolog](http://159.203.102.150)

## Documentação

Expand All @@ -36,4 +36,4 @@ $ docker network ls
$ docker-compose up
```

#### 4 - O seu serviço estara rodando em "http://localhost:8080"
#### 4 - O seu serviço estara rodando em "http://localhost:8080"
4 changes: 2 additions & 2 deletions config/prod.env.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
'use strict'
module.exports = {
NODE_ENV: '"production"',
HOST: '"http://159.65.190.38"',
API_HOST: '"http://159.65.190.38/api"'
HOST: '"http://159.203.102.150"',
API_HOST: '"http://159.203.102.150/api"'
}
23 changes: 9 additions & 14 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,17 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>Observ</title>
<link rel="stylesheet" href="css/home.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/css/materialize.min.css">
<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
rel="stylesheet"
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
crossorigin="anonymous">
</script>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Oxygen|Titillium+Web" rel="stylesheet">
</head>
<link rel="stylesheet" href="css/home.css">
<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
rel="stylesheet"
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
crossorigin="anonymous">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Oxygen|Titillium+Web" rel="stylesheet">
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
<script src="js/home.js"></script>
<script src="js/home.js"></script>
</body>
</html>

0 comments on commit 68dc34c

Please sign in to comment.