first test with docker
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
import axios from 'axios'
|
||||
import config from '../config'
|
||||
import store from './store'
|
||||
const api = axios.create({
|
||||
baseURL: config.apiurl,
|
||||
baseURL: '/api',
|
||||
withCredentials: false,
|
||||
responseType: 'json',
|
||||
headers: {
|
||||
|
||||
@@ -13,14 +13,13 @@
|
||||
import { mapState, mapActions } from 'vuex';
|
||||
import api from '@/api'
|
||||
import filters from '@/filters'
|
||||
import config from '../../config'
|
||||
|
||||
export default {
|
||||
props: ['event'],
|
||||
computed: {
|
||||
...mapState(['user']),
|
||||
imgPath () {
|
||||
return this.event.image_path && config.apiurl + '/../' + this.event.image_path
|
||||
return this.event.image_path && this.event.image_path
|
||||
},
|
||||
mine () {
|
||||
return this.event.userId === this.user.id
|
||||
|
||||
@@ -30,13 +30,12 @@
|
||||
import { mapState, mapActions } from 'vuex';
|
||||
import api from '@/api'
|
||||
import filters from '@/filters'
|
||||
import config from '../../config'
|
||||
|
||||
export default {
|
||||
computed: {
|
||||
...mapState(['user']),
|
||||
imgPath () {
|
||||
return this.event.image_path && config.apiurl + '/../' + this.event.image_path
|
||||
return this.event.image_path && this.event.image_path
|
||||
},
|
||||
mine () {
|
||||
return this.event.userId === this.user.id || this.user.is_admin
|
||||
|
||||
@@ -52,7 +52,6 @@
|
||||
</template>
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
import config from '../../config'
|
||||
import path from 'path'
|
||||
import filters from '../filters'
|
||||
import Calendar from '@/components/Calendar'
|
||||
@@ -97,10 +96,10 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
return `${config.apiurl}/export/${this.type}${query}`
|
||||
return `${process.env.BASE_URL}/api/export/${this.type}${query}`
|
||||
},
|
||||
imgPath (event) {
|
||||
return event.image_path && config.apiurl + '/../' + event.image_path
|
||||
return event.image_path && event.image_path
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
|
||||
Reference in New Issue
Block a user