diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2019-08-27 17:56:04 -0700 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2019-08-28 15:59:05 +0200 |
| commit | 1e86592650fc695615e0fa34c947b32693d03466 (patch) | |
| tree | e970e02d2cb56c94276971a271f028db9471f0ac /ui-react | |
| parent | 56f5c144cfff229235817feda9baf4036b22156a (diff) | |
Fix frontend docker
Fix the frontend docker in Nginx with https for backend in https as well
Issue-ID: CLAMP-486
Change-Id: I33fd89289618affa5e734c80991aaefece31309e
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'ui-react')
| -rw-r--r-- | ui-react/nginx/nginx.conf | 17 | ||||
| -rw-r--r-- | ui-react/package.json | 3 | ||||
| -rw-r--r-- | ui-react/public/index.html | 10 |
3 files changed, 6 insertions, 24 deletions
diff --git a/ui-react/nginx/nginx.conf b/ui-react/nginx/nginx.conf deleted file mode 100644 index 758a646e5..000000000 --- a/ui-react/nginx/nginx.conf +++ /dev/null @@ -1,17 +0,0 @@ -server { - - listen 80; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ /index.html; - } - - error_page 500 502 503 504 /50x.html; - - location = /50x.html { - root /usr/share/nginx/html; - } - -}
\ No newline at end of file diff --git a/ui-react/package.json b/ui-react/package.json index 65608bed4..3d2f68124 100644 --- a/ui-react/package.json +++ b/ui-react/package.json @@ -4,14 +4,13 @@ "description": "ONAP Clamp Loop Designer UI", "author": "ONAP Clamp Team", "license": "Apache-2.0", - "homepage": "wiki.onap.org", "publishConfig": { "registry": "https://nexus3.onap.org/repository/npm.snapshot/" }, "main": "index.js", "proxy": "https://localhost:8443", "scripts": { - "start": "react-scripts start", + "start": "HTTPS=true react-scripts start", "build": "react-scripts build", "test": "react-scripts test --env=jsdom --watchAll=false", "eject": "react-scripts eject", diff --git a/ui-react/public/index.html b/ui-react/public/index.html index 2b740fea8..bab3e7ab6 100644 --- a/ui-react/public/index.html +++ b/ui-react/public/index.html @@ -26,15 +26,15 @@ <head> <meta charset="utf-8"> <meta name="viewport" - content="width=device-width, initial-scale=1, shrink-to-fit=no"> + content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="theme-color" content="#000000"> -<link rel="manifest" href="%PUBLIC_URL%/manifest.json"> -<link rel="shortcut icon" href="%PUBLIC_URL%/onap.ico"> +<link rel="manifest" href="manifest.json"> +<link rel="shortcut icon" href="onap.ico"> <title>Clamp Designer UI</title> </head> <body> - <noscript>You need to enable JavaScript to run this app.</noscript> - <div id="root"></div> + <noscript>You need to enable JavaScript to run this app.</noscript> + <div id="root"></div> </body> </html> |