Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesviegas authored Jun 24, 2018
2 parents 08ca28c + bc7a83f commit 2f65896
Show file tree
Hide file tree
Showing 12 changed files with 281 additions and 64 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- file:fileserver
- exam:examserver
extra_hosts:
- "staticserver:10.100.10.180"
- "staticserver:172.16.27.156"
networks:
- thisnet
depends_on:
Expand Down
126 changes: 83 additions & 43 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@
"dependencies": {
"axios": "^0.18.0",
"material-design-icons-iconfont": "^3.0.3",
"moment": "^2.22.2",
"pdf-to-text": "0.0.6",
"pdftohtmljs": "^0.5.2",
"register-service-worker": "^1.0.0",
"vue": "^2.5.16",
"vue-moment": "^4.0.0",
"vue-pdf": "^3.3.1",
"vue-router": "^3.0.1",
"vuetify": "^1.0.19",
"vuex": "^3.0.1"
Expand Down
10 changes: 3 additions & 7 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-app>
<v-navigation-drawer v-if="this.$store.state.token" persistent :clipped="clipped" v-model="drawer" enable-resize-watcher fixed>
<v-navigation-drawer v-if="this.$store.state.token" temporary :clipped="clipped" v-model="drawer" enable-resize-watcher fixed>
<v-list>
<v-list-tile value="true" v-for="(item, i) in items" :key="i" @click="linkto(item.linkpath)">
<v-list-tile-action>
Expand All @@ -25,21 +25,17 @@
</template>

<script>
import Toolbar from './menu/Toolbar'
import Footer from './menu/Footer'
import NavigationDrawer from './menu/NavigationDrawer'
export default {
components: {
Toolbar,
Footer,
NavigationDrawer
Footer
},
data() {
return {
title: 'MVP-Saúde',
clipped: false,
drawer: true,
drawer: false,
fixed: false,
items: [
{
Expand Down
Loading

0 comments on commit 2f65896

Please sign in to comment.