From 06d95295b332d8640a6ef6d4334a6d1a8e95cbe3 Mon Sep 17 00:00:00 2001
From: mxrco <yosoymarco3@gmail.com>
Date: Tue, 29 Dec 2020 00:23:39 -0600
Subject: [PATCH 1/4] =?UTF-8?q?peque=C3=B1os=20cambios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/error.vue              | 30 +++++++++++++++---------------
 pages/admin/index.vue          |  1 -
 pages/admin/programa/index.vue | 11 +++++++++--
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/layouts/error.vue b/layouts/error.vue
index 7fdbfc0..4d1d6d3 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -1,27 +1,27 @@
 <template>
   <section class="hero is-light is-bold is-fullheight">
     <div class="container hero-body">
-      <div class="container columns">
-        <div class="column animate__animated animate__fadeIn animate__slow">
-          <transition name="slide-fade" appear>
+      <transition name="slide-fade" appear>
+        <div class="container columns">
+          <div class="column animate__animated animate__fadeIn animate__slow">
             <b-image
               class="image"
               :src="require('@/assets/404.webp')"
               alt="404 image"
             ></b-image>
-          </transition>
+          </div>
+          <div class="column">
+            <h1 class="title">
+              ERROR 404 LA PÁGINA NO HA SIDO ENCONTRADA
+            </h1>
+            <a href="/">
+              <b-button class="is-dark" outlined
+                >Ir a la página principal</b-button
+              >
+            </a>
+          </div>
         </div>
-        <div class="column">
-          <h1 class="title">
-            ERROR 404 LA PÁGINA NO HA SIDO ENCONTRADA
-          </h1>
-          <a href="/">
-            <b-button class="is-dark" outlined
-              >Ir a la página principal</b-button
-            >
-          </a>
-        </div>
-      </div>
+      </transition>
     </div>
   </section>
 </template>
diff --git a/pages/admin/index.vue b/pages/admin/index.vue
index 7127b31..50d3e59 100644
--- a/pages/admin/index.vue
+++ b/pages/admin/index.vue
@@ -6,7 +6,6 @@
           Ver programas
         </b-button>
       </div>
-
       <div class="pb-0">
         <p class="title is-three-fifths is-offset-one-fifth">
           Servicios Sociales
diff --git a/pages/admin/programa/index.vue b/pages/admin/programa/index.vue
index 47e4bc4..8a57ceb 100644
--- a/pages/admin/programa/index.vue
+++ b/pages/admin/programa/index.vue
@@ -3,7 +3,9 @@
     <p class="is-size-2 mb-5">Programas de Servicio Social</p>
     <b-button class="is-info" @click="regresar()">Regresar</b-button>
     <CargaMasiva />
-    <b-button class="my-4 is-info">Descargar plantilla</b-button>
+    <a :href="link">
+      <b-button class="my-4 is-info">Descargar plantilla</b-button>
+    </a>
     <TablaResponsables />
   </div>
 </template>
@@ -16,10 +18,15 @@ export default {
     tablaResponsables,
     cargaMasiva
   },
+  data(){
+    return {
+      link: `${process.env.api}/plantilla.csv`
+    }
+  },
   methods: {
     regresar() {
       localStorage.removeItem("idRegistro");
-      this.$router.push("./");
+      this.$router.push("/admin");
     },
   },
 };

From 6570ecaa371fb5cd237081c0ef4007ec76a78cb9 Mon Sep 17 00:00:00 2001
From: mxrco <yosoymarco3@gmail.com>
Date: Wed, 30 Dec 2020 22:15:38 -0600
Subject: [PATCH 2/4] beforeCreates

---
 components/admin/servicio/documento.vue               |  2 +-
 components/admin/servicio/vistaServicio.vue           |  1 -
 pages/admin/programa/infoResponsable/index.vue        | 11 +++++++++--
 .../infoResponsable/{edit => modificar}/index.vue     |  9 +++++++--
 pages/admin/servicio/index.vue                        |  5 +++++
 pages/admin/servicio/modificar/index.vue              |  5 +++++
 6 files changed, 27 insertions(+), 6 deletions(-)
 rename pages/admin/programa/infoResponsable/{edit => modificar}/index.vue (83%)

diff --git a/components/admin/servicio/documento.vue b/components/admin/servicio/documento.vue
index 85d1187..47cf331 100644
--- a/components/admin/servicio/documento.vue
+++ b/components/admin/servicio/documento.vue
@@ -43,7 +43,7 @@ export default {
     title: String,
     link: String,
     idDoc: Number,
-    doc: Object,
+    doc: String,
     status: Number,
   },
   data() {
diff --git a/components/admin/servicio/vistaServicio.vue b/components/admin/servicio/vistaServicio.vue
index 05d97ed..07a1b69 100644
--- a/components/admin/servicio/vistaServicio.vue
+++ b/components/admin/servicio/vistaServicio.vue
@@ -303,7 +303,6 @@ export default {
   async created() {
     await this.obtenerRegistro();
   },
-  beforeCreate() {},
 };
 </script>
 
diff --git a/pages/admin/programa/infoResponsable/index.vue b/pages/admin/programa/infoResponsable/index.vue
index 29e6fe1..2558736 100644
--- a/pages/admin/programa/infoResponsable/index.vue
+++ b/pages/admin/programa/infoResponsable/index.vue
@@ -24,7 +24,7 @@
     <div class="">
       <b-button
         class="boton is-info my-5"
-        @click="$router.push('./infoResponsable/edit')"
+        @click="$router.push('admin/programa/infoResponsable/modificar')"
       >
         Editar información
       </b-button>
@@ -74,12 +74,19 @@ export default {
       });
     },
     regresar() {
-      this.$router.push("/admin");
+      this.$router.push("/admin/programa");
+      localStorage.removeItem("idResponsable");
+      localStorage.removeItem("nombre");
       localStorage.removeItem("correo");
     },
   },
   created () {
     this.obtenerProgramas()
+  },
+  beforeCreate(){
+    if(!localStorage.getItem("idResponsable")){
+      this.$router.push("/admin/programa")
+    }
   }
 };
 </script>
diff --git a/pages/admin/programa/infoResponsable/edit/index.vue b/pages/admin/programa/infoResponsable/modificar/index.vue
similarity index 83%
rename from pages/admin/programa/infoResponsable/edit/index.vue
rename to pages/admin/programa/infoResponsable/modificar/index.vue
index 5f4c821..b994876 100644
--- a/pages/admin/programa/infoResponsable/edit/index.vue
+++ b/pages/admin/programa/infoResponsable/modificar/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <b-button class="boton is-info my-5" @click="$router.push('./')">
+    <b-button class="boton is-info my-5" @click="$router.push('/admin/programa/infoResponsable')">
       Regresar
     </b-button>
     <p class="is-size-2">Editar información del responsable</p>
@@ -12,7 +12,7 @@
       <b-input type="email" v-model="nuevo.correo" :placeholder="viejo.correo">
       </b-input>
     </b-field>
-    <b-button class="boton is-info my-5" @click="$router.push('./')">
+    <b-button class="boton is-info my-5" @click="$router.push('/admin/programa/infoResponsable')">
       Regresar
     </b-button>
     <b-button class="boton is-info my-5" v-if="mostrar()" @click="editarResponsable()">
@@ -65,6 +65,11 @@ export default {
         return true;
       }
     }
+  },
+  beforeCreate(){
+    if(!localStorage.getItem("idResponsable")){
+      this.$router.push("/admin/programa")
+    }
   }
 }
 </script>
diff --git a/pages/admin/servicio/index.vue b/pages/admin/servicio/index.vue
index 604dc9e..17624e2 100644
--- a/pages/admin/servicio/index.vue
+++ b/pages/admin/servicio/index.vue
@@ -11,5 +11,10 @@ export default {
   components: {
     vistaServicio,
   },
+  beforeCreate(){
+    if(!window.localStorage.getItem("idServicio")){
+      this.$router.push("/admin")
+    }
+  }
 };
 </script>
diff --git a/pages/admin/servicio/modificar/index.vue b/pages/admin/servicio/modificar/index.vue
index 463dd52..376ed7a 100644
--- a/pages/admin/servicio/modificar/index.vue
+++ b/pages/admin/servicio/modificar/index.vue
@@ -10,5 +10,10 @@ export default {
   components: {
     Form,
   },
+  beforeCreate(){
+    if(!window.localStorage.getItem("idServicio")){
+      this.$router.push("/admin")
+    }
+  }
 };
 </script>

From 279f75d6a9b65e3e91fb317ac335b94e588db3dc Mon Sep 17 00:00:00 2001
From: mxrco <yosoymarco3@gmail.com>
Date: Tue, 5 Jan 2021 02:04:07 -0600
Subject: [PATCH 3/4] componente regresar

---
 components/admin/servicio/modificar/form.vue  | 13 ++++---
 components/admin/servicio/vistaServicio.vue   | 36 ++++++++++---------
 components/botonRegresar.vue                  | 29 +++++++++++++++
 pages/admin/programa/index.vue                | 16 ++++-----
 .../admin/programa/infoResponsable/index.vue  | 30 ++++++++--------
 .../infoResponsable/modificar/index.vue       | 17 +++++----
 6 files changed, 90 insertions(+), 51 deletions(-)
 create mode 100644 components/botonRegresar.vue

diff --git a/components/admin/servicio/modificar/form.vue b/components/admin/servicio/modificar/form.vue
index f7bd87e..2ba8897 100644
--- a/components/admin/servicio/modificar/form.vue
+++ b/components/admin/servicio/modificar/form.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <b-button class="is-info" @click="regresar()">Regresar</b-button>
+    <BotonRegresar :path="'/admin/servicio'" />
     <br /><br />
     <p class="is-size-2">Editar información del alumno</p>
     <br />
@@ -135,11 +135,13 @@
         </b-upload>
       </b-field>
       <br />
-      <b-button class="is-info" @click="regresar()">Regresar</b-button>
       <b-button v-if="mostrar()" @click="actualizarDialog()" class="is-info"
         >Actualizar Datos</b-button
       >
       <b-button v-else disabled class="is-info">Actualizar Datos</b-button>
+      <div>
+        <BotonRegresar :path="'/admin/servicio'" />
+      </div>
       <b-loading
         :is-full-page="true"
         v-model="isLoading"
@@ -153,8 +155,12 @@
 import axios from "axios";
 import moment from "moment";
 import validator from "validator";
+import botonRegresar from "../../../botonRegresar";
 
 export default {
+  components: {
+    botonRegresar,
+  },
   data() {
     return {
       idServicio: localStorage.getItem("idServicio"),
@@ -250,9 +256,6 @@ export default {
           break;
       }
     },
-    regresar() {
-      this.$router.push("/admin/servicio");
-    },
     actualizar() {
       this.isLoading = true;
       const data = {};
diff --git a/components/admin/servicio/vistaServicio.vue b/components/admin/servicio/vistaServicio.vue
index 07a1b69..346a382 100644
--- a/components/admin/servicio/vistaServicio.vue
+++ b/components/admin/servicio/vistaServicio.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="container">
     <div class="mb-5">
-      <b-button class="boton is-info" @click="regresar()">
-        Regresar
-      </b-button>
+      <BotonRegresar 
+        :path="'/admin'" 
+        :deleteFromLocalStorage="['idServicio']"
+      />
     </div>
     <TituloServicio :status="alumno.Status.idStatus" />
     <DatosPrograma :programa="alumno.Programa" />
@@ -18,7 +19,7 @@
       <br /><br />
       <TituloStatus :status="alumno.Status.idStatus" />
       <div v-if="alumno.cartaAceptacion">
-        <Documento  
+        <Documento
           :title="'Ver carta de aceptación'"
           :link="linkCartaAceptacion"
           :doc="alumno.cartaAceptacion"
@@ -26,8 +27,8 @@
           :status="alumno.Status.idStatus"
         />
       </div>
-      <div v-if="alumno.cartaTermino" style="margin-top: 10px">     
-        <Documento  
+      <div v-if="alumno.cartaTermino" style="margin-top: 10px">
+        <Documento
           :title="'Ver carta de término'"
           :link="linkCartaTermino"
           :doc="alumno.cartaTermino"
@@ -36,7 +37,7 @@
         />
       </div>
       <div v-if="alumno.informeGlobal" style="margin-top: 10px">
-        <Documento  
+        <Documento
           :title="'Ver informe global de actividades'"
           :link="linkInformeGlobal"
           :doc="alumno.InformeGlobal"
@@ -80,9 +81,6 @@
           Confirmar
         </b-button>
       </div>
-      <b-button class="is-info" @click="regresar()">
-        Regresar
-      </b-button>
       <b-button class="is-danger" @click="enviarCancel = !enviarCancel">
         Cancelar
       </b-button>
@@ -104,6 +102,12 @@
       <b-button v-else-if="enviarCancel" disabled>
         Cancelar servicio
       </b-button>
+      <div>
+        <BotonRegresar 
+        :path="'/admin'" 
+        :deleteFromLocalStorage="['idServicio']"
+      />
+      </div>
       <b-loading
         :is-full-page="true"
         v-model="isLoading"
@@ -119,7 +123,8 @@ import tituloServicio from "./tituloServicio";
 import tituloStatus from "./tituloStatus";
 import datosPrograma from "./datosPrograma";
 import datosPersonales from "./datosPersonales";
-import documento from './documento'
+import documento from "./documento";
+import botonRegresar from "../../botonRegresar";
 
 export default {
   components: {
@@ -127,7 +132,8 @@ export default {
     datosPrograma,
     datosPersonales,
     tituloStatus,
-    documento
+    documento,
+    botonRegresar,
   },
   data() {
     return {
@@ -294,11 +300,7 @@ export default {
         ariaRole: "alertdialog",
         ariaModal: true,
       });
-    },
-    regresar() {
-      this.$router.push("/admin");
-      localStorage.removeItem("idServicio");
-    },
+    }
   },
   async created() {
     await this.obtenerRegistro();
diff --git a/components/botonRegresar.vue b/components/botonRegresar.vue
new file mode 100644
index 0000000..f8b7705
--- /dev/null
+++ b/components/botonRegresar.vue
@@ -0,0 +1,29 @@
+<template>
+  <b-button
+    class="boton border-info my-5"
+    type="is-info is-light "
+    icon-left="arrow-left-box"
+    @click="regresar()"
+  >
+    Regresar
+  </b-button>
+</template>
+
+<script>
+export default {
+  props: {
+    path: String,
+    deleteFromLocalStorage: Array,
+  },
+  methods: {
+    regresar() {
+      if (this.deleteFromLocalStorage) {
+        for (let i = 0; i < this.deleteFromLocalStorage.length; i++) {
+          localStorage.removeItem(this.deleteFromLocalStorage[i]);
+        }
+      }
+      this.$router.push(this.path);
+    },
+  },
+};
+</script>
diff --git a/pages/admin/programa/index.vue b/pages/admin/programa/index.vue
index 8a57ceb..7f3dfbd 100644
--- a/pages/admin/programa/index.vue
+++ b/pages/admin/programa/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <p class="is-size-2 mb-5">Programas de Servicio Social</p>
-    <b-button class="is-info" @click="regresar()">Regresar</b-button>
+    <BotonRegresar 
+      :path="'/admin'"
+    />
     <CargaMasiva />
     <a :href="link">
       <b-button class="my-4 is-info">Descargar plantilla</b-button>
@@ -13,21 +15,17 @@
 <script>
 import tablaResponsables from "../../../components/admin/servicio/programa/tablaResponsables";
 import cargaMasiva from "../../../components/admin/servicio/programa/cargaMasiva";
+import botonRegresar from "../../../components/botonRegresar";
 export default {
   components: {
     tablaResponsables,
-    cargaMasiva
+    cargaMasiva,
+    botonRegresar
   },
   data(){
     return {
       link: `${process.env.api}/plantilla.csv`
     }
-  },
-  methods: {
-    regresar() {
-      localStorage.removeItem("idRegistro");
-      this.$router.push("/admin");
-    },
-  },
+  }
 };
 </script>
diff --git a/pages/admin/programa/infoResponsable/index.vue b/pages/admin/programa/infoResponsable/index.vue
index 2558736..45a3f6e 100644
--- a/pages/admin/programa/infoResponsable/index.vue
+++ b/pages/admin/programa/infoResponsable/index.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="container">
-    <b-button class="boton is-info my-5" @click="regresar()">
-      Regresar
-    </b-button>
+    <BotonRegresar 
+      :path="'/admin/programa'"
+      :deleteFromLocalStorage="['correo','idResponsable','nombre']"
+    />
     <p class="is-size-2 mb-4"> Información del responsable</p>
     <p class="is-size-4 mb-4"> <strong>Nombre: </strong> {{ nombre }}</p>
     <p class="is-size-4 mb-4"> <strong>Correo: </strong> {{ correo }}</p>
@@ -24,20 +25,27 @@
     <div class="">
       <b-button
         class="boton is-info my-5"
-        @click="$router.push('admin/programa/infoResponsable/modificar')"
+        tag="router-link"
+        to="/admin/programa/infoResponsable/modificar"
       >
         Editar información
       </b-button>
     </div>
-    <b-button class="boton is-info my-5" @click="regresar()">
-      Regresar
-    </b-button>
+    <BotonRegresar 
+      :path="'/admin/programa'"
+      :deleteFromLocalStorage="['correo','idResponsable','nombre']"
+    />
   </div>
 </template>
 
 <script>
 import axios from "axios";
+import botonRegresar from "../../../../components/botonRegresar";
+
 export default {
+  components: {
+    botonRegresar
+  },
   data() {
     return {
       idResponsable: localStorage.getItem("idResponsable"),
@@ -72,13 +80,7 @@ export default {
         ariaRole: "alertdialog",
         ariaModal: true,
       });
-    },
-    regresar() {
-      this.$router.push("/admin/programa");
-      localStorage.removeItem("idResponsable");
-      localStorage.removeItem("nombre");
-      localStorage.removeItem("correo");
-    },
+    }
   },
   created () {
     this.obtenerProgramas()
diff --git a/pages/admin/programa/infoResponsable/modificar/index.vue b/pages/admin/programa/infoResponsable/modificar/index.vue
index b994876..ccbe3e2 100644
--- a/pages/admin/programa/infoResponsable/modificar/index.vue
+++ b/pages/admin/programa/infoResponsable/modificar/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="container">
-    <b-button class="boton is-info my-5" @click="$router.push('/admin/programa/infoResponsable')">
-      Regresar
-    </b-button>
+    <BotonRegresar 
+      :path="'/admin/programa/infoResponsable'"
+    />
     <p class="is-size-2">Editar información del responsable</p>
     <b-field label="Nombre">
       <b-input type="text" v-model="nuevo.nombre" :placeholder="viejo.nombre">
@@ -12,9 +12,9 @@
       <b-input type="email" v-model="nuevo.correo" :placeholder="viejo.correo">
       </b-input>
     </b-field>
-    <b-button class="boton is-info my-5" @click="$router.push('/admin/programa/infoResponsable')">
-      Regresar
-    </b-button>
+    <BotonRegresar 
+      :path="'/admin/programa/infoResponsable'"
+    />
     <b-button class="boton is-info my-5" v-if="mostrar()" @click="editarResponsable()">
       Editar responsable
     </b-button>
@@ -31,9 +31,13 @@
 
 <script>
 import validator from 'validator'
+import botonRegresar from '../../../../../components/botonRegresar'
 //import axios from 'axios'
 
 export default {
+  components: {
+    botonRegresar
+  },
   data () {
     return {
       viejo: {
@@ -46,6 +50,7 @@ export default {
         correo: ""
       },
       idServicio: localStorage.getItem('idServicio'),
+      token: localStorage.getItem('token'),
       isLoading: false
     }
   },

From d9563134b28d0a53fb71eba5b9ad9a507b174851 Mon Sep 17 00:00:00 2001
From: mxrco <yosoymarco3@gmail.com>
Date: Tue, 5 Jan 2021 02:26:47 -0600
Subject: [PATCH 4/4] carga masiva 2

---
 components/admin/servicio/modificar/form.vue  |  2 +-
 .../admin/servicio/programa/cargaMasiva.vue   | 62 ++++++++++++++++---
 layouts/error.vue                             | 15 +++--
 3 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/components/admin/servicio/modificar/form.vue b/components/admin/servicio/modificar/form.vue
index 2ba8897..4680302 100644
--- a/components/admin/servicio/modificar/form.vue
+++ b/components/admin/servicio/modificar/form.vue
@@ -145,7 +145,7 @@
       <b-loading
         :is-full-page="true"
         v-model="isLoading"
-        :can-cancel="true"
+        :can-cancel="false"
       ></b-loading>
     </div>
   </div>
diff --git a/components/admin/servicio/programa/cargaMasiva.vue b/components/admin/servicio/programa/cargaMasiva.vue
index 0be646e..06ac9eb 100644
--- a/components/admin/servicio/programa/cargaMasiva.vue
+++ b/components/admin/servicio/programa/cargaMasiva.vue
@@ -27,30 +27,72 @@
       >Enviar archivo</b-button
     >
     <b-button v-else disabled class="is-info">Enviar archivo</b-button>
+    <b-loading
+      :is-full-page="true"
+      v-model="isLoading"
+      :can-cancel="false"
+    ></b-loading>
   </div>
 </template>
 
 <script>
 export default {
-  data(){
-    return{
-      csv: {}
-    }
+  data() {
+    return {
+      csv: {},
+      isLoading: false,
+      toastType: null,
+      toastMessage: null,
+    };
   },
   methods: {
     validarExt() {
       const extPermitidas = /(.csv)$/i;
       if (!extPermitidas.exec(this.csv.name)) {
-        this.dangerToast();
+        this.toastType = 'is-danger'
+        this.toastMessage = 'Asegurate de ingresar un archivo .CSV'
+        this.toast();
         this.csv = {};
       }
     },
-    dangerToast() {
+    toast() {
       this.$buefy.toast.open({
-        message: "Asegurate de ingresar un archivo .CSV",
-        type: "is-danger",
+        message: this.toastMessage,
+        type: this.toastType,
       });
     },
-  }
-}
+    dialog() {
+      this.$buefy.dialog.confirm({
+        title: "Carga masiva",
+        message: "¿Seguro(a) que quiere enviar este archivo?",
+        confirmText: "Confirmar",
+        cancelText: "Cancelar",
+        type: "is-success",
+        hasIcon: true,
+        onConfirm: () => this.enviarCargaMasiva(),
+      });
+    },
+    enviarCargaMasiva () {
+      this.isLoading = true;
+      const formData = new FormData();
+      if (this.cartaAceptacion) {
+        formData.append("cartaAceptacion", this.cartaAceptacion);
+      }
+      axios
+        .put(`${process.env.api}/programa/carga_masiva`, formData)
+        .then((res) => {
+          this.isLoading = false;
+          this.toastType = 'is-success'
+          this.toastMessage = 'Se ha enviado la carga masiva con éxito'
+          this.toast();
+        })
+        .catch((err) => {
+          this.isLoading = false;
+          this.toastType = 'is-danger'
+          this.toastMessage = err.response.data.message
+          this.toast()
+        });
+    },
+  },
+};
 </script>
diff --git a/layouts/error.vue b/layouts/error.vue
index 4d1d6d3..e5764c6 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -14,11 +14,9 @@
             <h1 class="title">
               ERROR 404 LA PÁGINA NO HA SIDO ENCONTRADA
             </h1>
-            <a href="/">
-              <b-button class="is-dark" outlined
-                >Ir a la página principal</b-button
-              >
-            </a>
+            <b-button class="is-dark" outlined @click="cerrarSesion()"
+              >Ir a la página principal
+            </b-button>
           </div>
         </div>
       </transition>
@@ -29,6 +27,13 @@
 <script>
 export default {
   layout: "login",
+  methods: {
+    cerrarSesion() {
+      localStorage.clear();
+
+      this.$router.push("/");
+    },
+  },
 };
 </script>