1
0

fixed config

This commit is contained in:
konrad
2018-09-08 21:19:46 +02:00
parent 6a33ad90b5
commit 00362dcf7b
3 changed files with 27 additions and 85 deletions

View File

@ -1,47 +0,0 @@
/* eslint-disable */
import axios from "axios";
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
export default {
initConfig() {
//this.config = {VIKUNJA_API_BASE_URL: '/api/v1/'}
axios.get('config.json')
.then(function (response) {
/*console.log('response', response.data);
console.log('self', self.config);
self.config = response.data*/
// eslint-disable-next-line
//console.log(response.data);
localStorage.removeItem('config')
localStorage.setItem('config', JSON.stringify(response.data))
})
.catch(function (error) {
// eslint-disable-next-line
console.log(error);
})
/*console.log('final', conf.data);
return conf.data*/
},
async configReady() {
while(!localStorage.getItem('config')){
await sleep(100);
}
return true
},
get() {
this.configReady()
return JSON.parse(localStorage.getItem('config'))
},
VIKUNJA_API_BASE_URL: '/api/v1/'
}

View File

@ -1,21 +1,6 @@
import axios from 'axios'
//let config = require('../../siteconfig.json')
//import config from '../config/dev.env'
//import Vue from 'vue'
import config from '../config'
config.initConfig()
let conf = config.get()
/*
conf.then(function (r) {
// eslint-disable-next-line
console.log(r)
})*/
config.configReady()
// eslint-disable-next-line
console.log(conf)
let config = require('../../public/config.json')
export const HTTP = axios.create({
baseURL: conf.VIKUNJA_API_BASE_URL
baseURL: config.VIKUNJA_API_BASE_URL
})