Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Mizu
Commits
1408bf81
Unverified
Commit
1408bf81
authored
3 years ago
by
Andrey Pokhilko
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge branch 'develop' into feat/oas-counters
parents
2a1477a0
0abd7c06
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ui/.env.basic
+1
-2
ui/.env.basic
ui/.env.enterprise
+0
-2
ui/.env.enterprise
ui/src/helpers/api.js
+2
-5
ui/src/helpers/api.js
with
3 additions
and
9 deletions
+3
-9
ui/.env.basic
+
1
-
2
View file @
1408bf81
REACT_APP_OVERRIDE_WS_URL="ws://localhost:8899/ws"
REACT_APP_OVERRIDE_API_URL="http://localhost:8899/"
REACT_APP_OVERRIDE_IS_ENTERPRISE="false"
This diff is collapsed.
Click to expand it.
ui/.env.enterprise
+
0
-
2
View file @
1408bf81
REACT_APP_OVERRIDE_WS_URL="ws://localhost:8899/ws"
REACT_APP_OVERRIDE_API_URL="http://localhost:8899/"
REACT_APP_OVERRIDE_IS_ENTERPRISE="true"
This diff is collapsed.
Click to expand it.
ui/src/helpers/api.js
+
2
-
5
View file @
1408bf81
import
*
as
axios
from
"
axios
"
;
// When working locally cp `cp .env.example .env`
export
const
MizuWebsocketURL
=
process
.
env
.
REACT_APP_OVERRIDE_WS_URL
?
process
.
env
.
REACT_APP_OVERRIDE_WS_URL
:
window
.
location
.
protocol
===
'
https:
'
?
`wss://
${
window
.
location
.
host
}
/ws`
:
`ws://
${
window
.
location
.
host
}
/ws`
;
export
const
MizuWebsocketURL
=
window
.
location
.
protocol
===
'
https:
'
?
`wss://
${
window
.
location
.
host
}
/ws`
:
`ws://
${
window
.
location
.
host
}
/ws`
;
export
const
FormValidationErrorType
=
"
formError
"
;
const
CancelToken
=
axios
.
CancelToken
;
// When working locally cp `cp .env.example .env`
const
apiURL
=
process
.
env
.
REACT_APP_OVERRIDE_API_URL
?
process
.
env
.
REACT_APP_OVERRIDE_API_URL
:
`
${
window
.
location
.
origin
}
/`
;
const
apiURL
=
`
${
window
.
location
.
origin
}
/`
;
export
default
class
Api
{
static
instance
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help