k4rli/fauxjira
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added API_PORT to client env

Browse Source
This commit is contained in:
ireic
2020-01-11 17:22:08 +01:00
parent f1f79dafff
commit 544b1f7e30
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/package.json
View File

@@ -6,7 +6,7 @@
"scripts": { "scripts": {
"start": "nodemon --exec ts-node --files src/index.ts", "start": "nodemon --exec ts-node --files src/index.ts",
"start:test": "cross-env NODE_ENV='test' DB_DATABASE='jira_test' npm start", "start:test": "cross-env NODE_ENV='test' DB_DATABASE='jira_test' npm start",
"start:production": "cross-env NODE_ENV=production pm2 start node -- -r ./tsconfig-paths.js build/index.js", "start:production": "pm2 start node -- -r ./tsconfig-paths.js build/index.js",
"build": "cd src && tsc", "build": "cd src && tsc",
"pre-commit": "lint-staged" "pre-commit": "lint-staged"
}, },

2
client/src/shared/utils/api.js
View File

@@ -6,7 +6,7 @@ import { objectToQueryString } from 'shared/utils/url';
import { getStoredAuthToken, removeStoredAuthToken } from 'shared/utils/authToken'; import { getStoredAuthToken, removeStoredAuthToken } from 'shared/utils/authToken';
const defaults = { const defaults = {
baseURL: `http://localhost:${process.env.PORT || 3000}`, baseURL: `http://localhost:${process.env.API_PORT || 3000}`,
headers: () => ({ headers: () => ({
'Content-Type': 'application/json', 'Content-Type': 'application/json',
Authorization: getStoredAuthToken() ? `Bearer ${getStoredAuthToken()}` : undefined, Authorization: getStoredAuthToken() ? `Bearer ${getStoredAuthToken()}` : undefined,

6
client/webpack.config.production.js
View File

@@ -58,6 +58,12 @@ module.exports = {
template: path.join(__dirname, 'src/index.html'), template: path.join(__dirname, 'src/index.html'),
favicon: path.join(__dirname, 'src/favicon.png'), favicon: path.join(__dirname, 'src/favicon.png'),
}), }),
new webpack.DefinePlugin({
'process.env': {
NODE_ENV: JSON.stringify('production'),
API_PORT: JSON.stringify('3001'),
},
}),
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
], ],
}; };