Merge pull request #30 from HideyoshiNakazone/devel
Devel - Fixes Env Variables
This commit is contained in:
10
angular.json
10
angular.json
@@ -79,16 +79,6 @@
|
|||||||
"options": {
|
"options": {
|
||||||
"browserTarget": "frontend-hideyoshi.com:build:build"
|
"browserTarget": "frontend-hideyoshi.com:build:build"
|
||||||
},
|
},
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"browserTarget": "frontend-hideyoshi.com:build:production",
|
|
||||||
"proxyConfig": "src/proxy.conf.json"
|
|
||||||
},
|
|
||||||
"development": {
|
|
||||||
"browserTarget": "frontend-hideyoshi.com:build:development",
|
|
||||||
"proxyConfig": "src/proxy.conf.json"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultConfiguration": "development"
|
"defaultConfiguration": "development"
|
||||||
},
|
},
|
||||||
"extract-i18n": {
|
"extract-i18n": {
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
window['env'] = window['env'] || {};
|
window['env'] = window['env'] || {};
|
||||||
|
|
||||||
// Environment variables
|
// Environment variables
|
||||||
window['env']['backendPath'] = '${BACKEND_URL}';
|
window['env']['BACKEND_URL'] = '${BACKEND_URL}';
|
||||||
window['env']['backendOAuthPath'] = '${BACKEND_OAUTH_URL}';
|
window['env']['BACKEND_OAUTH_URL'] = '${BACKEND_OAUTH_URL}';
|
||||||
})(this);
|
})(this);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
backendPath: (<any>window).env['BACKEND_URL'],
|
backendPath: (<any>window)['env']['BACKEND_URL'],
|
||||||
backendOAuthPath: (<any>window).env['BACKEND_OAUTH_URL']
|
backendOAuthPath: (<any>window)['env']['BACKEND_OAUTH_URL']
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<link rel="preconnect" href="https://hideyoshi-portfolio-dev.s3.amazonaws.com">
|
<link rel="preconnect" href="https://hideyoshi-portfolio-dev.s3.amazonaws.com">
|
||||||
|
|
||||||
<!-- Loading environment variables -->
|
<!-- Loading environment variables -->
|
||||||
<script src="assets/env.js"></script>
|
<script src="./assets/env.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"/api": {
|
|
||||||
"target": "http://localhost:8070",
|
|
||||||
"secure": false,
|
|
||||||
"pathRewrite": {"^/api" : ""}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user