Skip to content

Commit 8886438

Browse files
committed
Remove rootUrl
1 parent b9d6fc9 commit 8886438

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

app/server/static/components/annotationMixin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as marked from 'marked';
22
import VueJsonPretty from 'vue-json-pretty';
33
import isEmpty from 'lodash.isempty';
4-
import HTTP, { rootUrl, defaultHttpClient } from './http';
4+
import HTTP, { defaultHttpClient } from './http';
55

66
const getOffsetFromUrl = (url) => {
77
const offsetMatch = url.match(/[?#].*offset=(\d+)/);
@@ -174,7 +174,7 @@ export default {
174174
HTTP.get().then((response) => {
175175
this.guideline = response.data.guideline;
176176
});
177-
defaultHttpClient.get(`${rootUrl}/v1/me`).then((response) => {
177+
defaultHttpClient.get('/v1/me').then((response) => {
178178
this.isSuperuser = response.data.is_superuser;
179179
});
180180
this.submit();

app/server/static/components/http.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ const HTTP = axios.create({
77
baseURL: `/v1/${baseUrl}`,
88
});
99

10-
export const rootUrl = window.location.href.split('/').slice(0, 3).join('/');
1110
export const defaultHttpClient = axios.create();
1211
export default HTTP;

app/server/static/components/projects.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120

121121
<script>
122122
import { title, daysAgo } from './filter';
123-
import { rootUrl, defaultHttpClient } from './http';
123+
import { defaultHttpClient } from './http';
124124
125125
export default {
126126
filters: { title, daysAgo },
@@ -150,8 +150,8 @@ export default {
150150
151151
created() {
152152
Promise.all([
153-
defaultHttpClient.get(`${rootUrl}/v1/projects`),
154-
defaultHttpClient.get(`${rootUrl}/v1/me`),
153+
defaultHttpClient.get('/v1/projects'),
154+
defaultHttpClient.get('/v1/me'),
155155
]).then(([projects, me]) => {
156156
this.items = projects.data;
157157
this.username = me.data.username;
@@ -161,7 +161,7 @@ export default {
161161
162162
methods: {
163163
deleteProject() {
164-
defaultHttpClient.delete(`${rootUrl}/v1/projects/${this.project.id}`).then(() => {
164+
defaultHttpClient.delete(`/v1/projects/${this.project.id}`).then(() => {
165165
this.isDelete = false;
166166
const index = this.items.indexOf(this.project);
167167
this.items.splice(index, 1);
@@ -195,9 +195,9 @@ export default {
195195
guideline: 'Please write annotation guideline.',
196196
resourcetype: this.resourceType(),
197197
};
198-
defaultHttpClient.post(`${rootUrl}/v1/projects`, payload)
198+
defaultHttpClient.post('/v1/projects', payload)
199199
.then((response) => {
200-
window.location = `${rootUrl}/projects/${response.data.id}/docs/create`;
200+
window.location = `/projects/${response.data.id}/docs/create`;
201201
})
202202
.catch((error) => {
203203
this.projectTypeError = '';

0 commit comments

Comments
 (0)