From 021a931407fe14690a6cabc9b63bee34fac074bf Mon Sep 17 00:00:00 2001
From: arturo <arturo8gll@gmail.com>
Date: Mon, 12 Nov 2018 18:43:21 -0600
Subject: [PATCH] dist

---
 public/index.html                |  1 +
 src/api.js                       |  7 ++---
 src/components/inicio/Equipo.vue | 50 +++++++++++++++++++++++++++++++-
 src/layout/Equipo.vue            |  2 +-
 src/layout/Header.vue            |  3 +-
 src/layout/Inicio.vue            | 36 +++++++++++++----------
 src/layout/Login.vue             |  2 +-
 src/layout/Usuario.vue           | 17 +++++++++++
 src/routes.js                    |  4 ++-
 9 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 src/layout/Usuario.vue
diff --git a/public/index.html b/public/index.html
index efc7e8b..2166b48 100644
--- a/public/index.html
+++ b/public/index.html
@@ -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>
diff --git a/src/api.js b/src/api.js
index 64d611b..3cde7bb 100644
--- a/src/api.js
+++ b/src/api.js
@@ -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
diff --git a/src/components/inicio/Equipo.vue b/src/components/inicio/Equipo.vue
index a838269..857f752 100644
--- a/src/components/inicio/Equipo.vue
+++ b/src/components/inicio/Equipo.vue
@@ -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>
 
diff --git a/src/layout/Equipo.vue b/src/layout/Equipo.vue
index 3adc841..0346965 100644
--- a/src/layout/Equipo.vue
+++ b/src/layout/Equipo.vue
@@ -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: {
diff --git a/src/layout/Header.vue b/src/layout/Header.vue
index e011d5f..ea44772 100644
--- a/src/layout/Header.vue
+++ b/src/layout/Header.vue
@@ -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()')
diff --git a/src/layout/Inicio.vue b/src/layout/Inicio.vue
index 8c8df3b..fc55e6d 100644
--- a/src/layout/Inicio.vue
+++ b/src/layout/Inicio.vue
@@ -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>
diff --git a/src/layout/Login.vue b/src/layout/Login.vue
index c0430a2..490c488 100644
--- a/src/layout/Login.vue
+++ b/src/layout/Login.vue
@@ -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: {
diff --git a/src/layout/Usuario.vue b/src/layout/Usuario.vue
new file mode 100644
index 0000000..8a03cf2
--- /dev/null
+++ b/src/layout/Usuario.vue
@@ -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>
diff --git a/src/routes.js b/src/routes.js
index 3d23022..5388bfa 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -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)
 
