Skip to content
This repository has been archived by the owner on Sep 1, 2021. It is now read-only.

Commit

Permalink
Hotfixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
curtisdelicata committed May 29, 2021
1 parent 617ecb6 commit c2a9449
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
24 changes: 13 additions & 11 deletions pages/gedcom-export/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,33 @@
};
},
methods: {
handleExportFiles() {
this.$axios
async handleExportFiles() {
await this.$axios
.$post("/api/gedcom-export", {}, {
headers: {
'content-type': 'multipart/form-data',
'Access-Control-Allow-Origin': '*'
}
})
this.inProgress = true;
this.isLoading = false;
this.generatedFile = response.file;
this.inProgress = true;
this.isLoading = false;
this.generatedFile = response.file;
// this.interval = setInterval(() => {
// this.checkJobCompleted();
// }, 3000)
.catch(error => {
// this.interval = setInterval(() => {
// this.checkJobCompleted();
// }, 3000)
.
catch(error => {
this.error = true;
this.inProgress = false;
this.errors = error.response.data.errors;
});
},
async checkJobCompleted() {
this.$axios
.$post("/api/check-gedcom-export", {}, {
await this.$axios
.$post("/api/check-gedcom-export", {}, {
headers: {
'content-type': 'multipart/form-data',
'Access-Control-Allow-Origin': '*'
Expand Down
5 changes: 3 additions & 2 deletions pages/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ import {
} from 'vuelidate/lib/validators'
import Loading from 'vue-loading-overlay';
import 'vue-loading-overlay/dist/vue-loading.css';
import response from "core-js/internals/is-forced";
export default {
middleware: 'guest',
components: {
Expand Down Expand Up @@ -147,11 +148,11 @@ export default {
},
methods: {
loginSocial(provider) {
async loginSocial(provider) {
this.provider = provider
const newWindow = openWindow('', 'message')
let url = '/api/login/' + provider;
this.$axios.get(url)
await this.$axios.get(url)
newWindow.location.href = response.data;
.catch(error => {});
},
Expand Down
2 changes: 1 addition & 1 deletion pages/pedigree/show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default {
this.isLoading = true
try {
await const response = await this.$axios.$get("/api/pedigree/show")
const response = await this.$axios.$get("/api/pedigree/show")
this.data = response
this.isLoading = false
Expand Down

0 comments on commit c2a9449

Please sign in to comment.