diff --git a/.gitignore b/.gitignore index 4d29575de80483b005c29bfcac5061cd2f45313e..f21726c760680e64debfd1abbf4924a22e1fb12c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ .env.development.local .env.test.local .env.production.local +.env npm-debug.log* yarn-debug.log* diff --git a/gitlab-ci.yml b/gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..ccabf64d19d2a3c4520adae3021919f8fd08ca6b --- /dev/null +++ b/gitlab-ci.yml @@ -0,0 +1,18 @@ +stages: + - push-image + +docker-push: + image: docker + services: + - docker:dind + stage: push-image + tags: ['docker'] + only: + - testing + before_script: + - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin + script: + - docker build --build-arg REACT_APP_URL=${REACT_APP_URL} -t overflow2019/frontend:test . + - docker push overflow2019/frontend + after_script: + - docker logout diff --git a/src/components/Header.js b/src/components/Header.js index 70799067bb53691f50038a5c987469665f162b8b..69ca46428b49cad55b679a5e89bbd311878897c7 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -35,7 +35,7 @@ class Header extends React.Component { componentDidMount() { let token = sessionStorage.getItem('token'); if (token) { - fetch('http://localhost:5000/user/verify', { + fetch(`${process.env.REACT_APP_URL}/user/verify`, { headers: { Authorization: 'Bearer ' + token } diff --git a/src/components/LoginForm.js b/src/components/LoginForm.js index 7893bb8c967509d8589d31665e1f1a57c4b34fcb..fe34df7518a5ee8c99399e287f72eec3b1391164 100644 --- a/src/components/LoginForm.js +++ b/src/components/LoginForm.js @@ -38,7 +38,7 @@ export class LoginForm extends React.Component { e.preventDefault(); // Send login info to the server - fetch('http://localhost:5000/user/login', { + fetch(`${process.env.REACT_APP_URL}/user/login`, { method: 'POST', headers: { Accept: 'application/json', diff --git a/src/components/RegisterForm.js b/src/components/RegisterForm.js index f0ead02cce19af21937d132a54443f593d8ad9d4..b50187de0afbae9d0703800c70489f978d3943a6 100644 --- a/src/components/RegisterForm.js +++ b/src/components/RegisterForm.js @@ -44,7 +44,7 @@ export class RegisterForm extends React.Component { this.handleError('Passwords do not match'); } else { // Send register info to the server - fetch('http://localhost:5000/user/register', { + fetch(`${process.env.REACT_APP_URL}/user/register`, { method: 'POST', headers: { Accept: 'application/json',