Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
callidus
mc_frontend
Commits
b74bbd53
Commit
b74bbd53
authored
Oct 08, 2018
by
Konstantin Schulz
Browse files
fixed proxy URL building issue
parent
7d1129ad
Changes
3
Show whitespace changes
Inline
Side-by-side
ionic.config.json
View file @
b74bbd53
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
"proxies"
:
[
"proxies"
:
[
{
{
"path"
:
"/mc-service"
,
"path"
:
"/mc-service"
,
"proxyUrl"
:
"http://localhost:5000/
mc/api/v1.0
"
"proxyUrl"
:
"http://localhost:5000/"
}
}
],
],
"type"
:
"ionic-angular"
"type"
:
"ionic-angular"
...
...
src/assets/config.json
View file @
b74bbd53
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
"backendApiRawtextPath"
:
"rawtext"
,
"backendApiRawtextPath"
:
"rawtext"
,
"backendApiValidReffPath"
:
"validReff"
,
"backendApiValidReffPath"
:
"validReff"
,
"backendBaseUrl"
:
""
,
"backendBaseUrl"
:
""
,
"backendProxy
URl
"
:
"mc-service"
,
"backendProxy
Path
"
:
"mc-service
/mc/api/v1.0
"
,
"callidusProjectUrl"
:
"https://www.projekte.hu-berlin.de/de/callidus"
,
"callidusProjectUrl"
:
"https://www.projekte.hu-berlin.de/de/callidus"
,
"developerMailTo"
:
"mailto:sulzkons@hu-berlin.de"
,
"developerMailTo"
:
"mailto:sulzkons@hu-berlin.de"
,
"localStorageKeyCorpora"
:
"mc/corpora"
,
"localStorageKeyCorpora"
:
"mc/corpora"
,
...
...
src/providers/helper/helper.ts
View file @
b74bbd53
...
@@ -20,7 +20,7 @@ export class HelperProvider {
...
@@ -20,7 +20,7 @@ export class HelperProvider {
this
.
http
.
get
(
"
assets/config.json
"
).
subscribe
((
config
:
object
)
=>
{
this
.
http
.
get
(
"
assets/config.json
"
).
subscribe
((
config
:
object
)
=>
{
HelperProvider
.
config
=
config
;
HelperProvider
.
config
=
config
;
if
(
!
HelperProvider
.
config
[
"
backendBaseUrl
"
])
{
if
(
!
HelperProvider
.
config
[
"
backendBaseUrl
"
])
{
HelperProvider
.
config
[
"
backendBaseUrl
"
]
=
location
.
protocol
.
concat
(
"
//
"
).
concat
(
window
.
location
.
hostname
).
concat
(
location
.
port
?
`:
${
location
.
port
}
`
:
""
).
concat
(
"
/
"
).
concat
(
HelperProvider
.
config
[
"
backendProxy
URl
"
]).
concat
(
"
/
"
);
HelperProvider
.
config
[
"
backendBaseUrl
"
]
=
location
.
protocol
.
concat
(
"
//
"
).
concat
(
window
.
location
.
hostname
).
concat
(
location
.
port
?
`:
${
location
.
port
}
`
:
""
).
concat
(
"
/
"
).
concat
(
HelperProvider
.
config
[
"
backendProxy
Path
"
]).
concat
(
"
/
"
);
}
}
});
});
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment