This commit is contained in:
arturo
2018-11-12 18:43:21 -06:00
parent 88db8dbb13
commit 021a931407
9 changed files with 97 additions and 25 deletions
+1
View File
@@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>PC Puma</title>
</head>
<body>
+3 -4
View File
@@ -1,9 +1,8 @@
const api = {}
api.url = 'http://63903cda.ngrok.io'
// api.url = 'http://09e6c379.ngrok.io'
api.url = 'http://venus.acatlan.unam.mx:3010'
api.isAuth = function () {
console.log('hola')
if (window.localStorage.pcpumaT && window.localStorage.pcpumaU) {
return true
}
@@ -14,4 +13,4 @@ api.exit = function () {
window.localStorage.usuario = null
}
module.exports = api
export default api
+49 -1
View File
@@ -1,10 +1,58 @@
<template lang="pug">
section
span resumen
table.table.is-fullwidth.is-hoverable.is-narrow
thead
tr
th Equipo
th Tipo
th Hora inicio
th Hora maximo
th Usuario
tbody
tr(v-for="p in prestamo")
td {{p.detalles[0].equipo.id}}
td {{p.equipo}}
td {{fecha(p.fh_in)}}
td {{maxFecha(p.fh_in)}}
td {{p.idUsuario}}
</template>
<script>
import api from '../../api'
const axios = require('axios')
export default {
data () {
return {
prestamo: []
}
},
methods: {
fecha: function(date){
let dt = new Date(date)
console.log(dt)
return `${dt.getMonth()+1}-${dt.getDate()} ${dt.getHours()}:${dt.getMinutes()} `
},
maxFecha: function(date){
let dt = new Date(date)
console.log(dt)
return `${dt.getMonth()+1}-${dt.getDate()} ${dt.getHours()+2}:${dt.getMinutes()+15} `
}
},
mounted () {
axios.get(api.url + '/prestamo', {
headers: {
'token': window.localStorage.pcpumaT
}
})
.then(response => {
console.log(response)
this.prestamo = response.data.data
})
.catch(error => {
console.log(error)
})
}
}
</script>
+1 -1
View File
@@ -66,7 +66,7 @@
<script>
import UmHeader from '../layout/Header.vue'
import UmFooter from '../layout/Footer.vue'
const api = require('../api')
import api from '../api'
const axios = require('axios')
export default {
components: {
+1 -2
View File
@@ -5,9 +5,8 @@
div.navbar-menu
div.navbar-start
router-link.navbar-item(to="/") Inicio
router-link.navbar-item(to="/") Prestamos
router-link.navbar-item(to="/equipo") Equipos
router-link.navbar-item(to="/") Usuarios
router-link.navbar-item(to="/usuario") Usuarios
div.navbar-end
div.navbar-item
a.button.is-u-golden(v-on:click='salir()')
+21 -15
View File
@@ -1,21 +1,22 @@
<template lang="pug">
main
um-header
.container
br
br
div.columns
div.column.is-12.has-text-centered
h1.is-size-2 Bienvenido A PC Puma
h2.is-size-3 Usuario
br
br
div.columns
.column.is-6.is-offset-3
resumen
div.columns
.column.is-10.is-offset-1
equipo
section
.container
br
br
div.columns
div.column.is-12.has-text-centered
h1.is-size-2 Bienvenido A PC Puma
h2.is-size-3 Usuario
br
br
div.columns
.column.is-6.is-offset-3
resumen
div.columns
.column.is-8.is-offset-2
equipo
um-footer
</template>
@@ -30,4 +31,9 @@ export default {
</script>
<style lang="css">
section{
display: flex;
min-height: 50vh;
flex-direction: column;
}
</style>
+1 -1
View File
@@ -30,7 +30,7 @@
<script>
import UnNotification from '../components/general/Notificacion.vue'
const api = require('../api')
import api from '../api'
const axios = require('axios')
export default {
components: {
+17
View File
@@ -0,0 +1,17 @@
<template lang="pug">
main
um-header
h1 Usuario
um-footer
</template>
<script>
import UmFooter from '../layout/Footer.vue'
import UmHeader from '../layout/Header.vue'
export default {
components: { UmHeader, UmFooter }
}
</script>
<style lang="css">
</style>
+3 -1
View File
@@ -3,10 +3,12 @@ import VueRouter from 'vue-router'
import Equipo from './layout/Equipo.vue'
import Inicio from './layout/Inicio.vue'
import Login from './layout/Login.vue'
import Usuario from './layout/Usuario.vue'
const routes = [
{ path: '/', component: Inicio, name: 'inicio' },
{ path: '/equipo', component: Equipo, name: 'equipo' },
{ path: '/login', component: Login, name: 'login' }
{ path: '/login', component: Login, name: 'login' },
{ path: '/usuario', component: Usuario, name: 'usuario' }
]
Vue.use(VueRouter)