From 3c611ec9c51a1d016807808d87711a40ad447a5b Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 15 Aug 2020 16:26:54 +0000 Subject: [PATCH 01/23] File Modified --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 6366ef6..847d301 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ function App() {
logo

- Edit src/App.js and save to reload by Abhinav. + Edit src/App.js and save to reload by Subhashree 1234

Date: Sat, 15 Aug 2020 16:45:27 +0000 Subject: [PATCH 02/23] My chnage --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 847d301..90edfa6 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ function App() {
logo

- Edit src/App.js and save to reload by Subhashree 1234 + Edit src/App.js and save to reload by Subhashree 101

Date: Sat, 15 Aug 2020 16:50:11 +0000 Subject: [PATCH 03/23] My chnage --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73d9c0d..d6d0928 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,14 @@ before_install: script: - docker run -e CI=true singhabhinav/react-project npm run test -deploy: - provider: elasticbeanstalk - region: us-west-1 # Specify your region - app: "docker-react-project" # Copy it from Elastic Beanstalk dashboard - env: "DockerReactProject-env-2" # Copy it from Elastic Beanstalk dashboard - bucket_name: "elasticbeanstalk-us-west-1-034275272121" - bucket_path: "docker" - access_key_id: $AWS_ACCESS_KEY - secret_access_key: $AWS_SECRET_KEY - on: - branch: master +#deploy: +# provider: elasticbeanstalk +# region: us-west-1 # Specify your region +# app: "docker-react-project" # Copy it from Elastic Beanstalk dashboard +# env: "DockerReactProject-env-2" # Copy it from Elastic Beanstalk dashboard +# bucket_name: "elasticbeanstalk-us-west-1-034275272121" +# bucket_path: "docker" +# access_key_id: $AWS_ACCESS_KEY +# secret_access_key: $AWS_SECRET_KEY +# on: +# branch: master From 8686ac729f9d0fe901c614c0f6748bf40b9ea23f Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 15 Aug 2020 16:57:02 +0000 Subject: [PATCH 04/23] My chnage --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6d0928..44b021b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ services: - docker before_install: - - docker build -t singhabhinav/react-project -f Dockerfile_dev . + - docker build -t li[idocker1/react-project -f Dockerfile_dev . script: - - docker run -e CI=true singhabhinav/react-project npm run test + - docker run -e CI=true lipidocker1/react-project npm run test #deploy: # provider: elasticbeanstalk From a3ab8694be1301fd6bfd475d6f7986a4cb055d74 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 15 Aug 2020 16:58:37 +0000 Subject: [PATCH 05/23] My chnage --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 44b021b..f8ba86a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ services: - docker before_install: - - docker build -t li[idocker1/react-project -f Dockerfile_dev . + - docker build -t lipdocker1/react-project -f Dockerfile_dev . script: - docker run -e CI=true lipidocker1/react-project npm run test From 6319bb695fc7ab42560c3510757ed5586bb53faa Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 15 Aug 2020 17:04:33 +0000 Subject: [PATCH 06/23] My chnage --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8ba86a..e1bc3fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ services: - docker before_install: - - docker build -t lipdocker1/react-project -f Dockerfile_dev . + - docker build -t lipdocker1/react-project:prod -f Dockerfile_dev . script: - - docker run -e CI=true lipidocker1/react-project npm run test + - docker run -e CI=true lipidocker1/react-project:prod npm run test #deploy: # provider: elasticbeanstalk From 9bcc0689040a62d9f3264983dab665579c5d8a81 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 15 Aug 2020 17:27:01 +0000 Subject: [PATCH 07/23] travis file change --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1bc3fc..a269333 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ services: - docker before_install: - - docker build -t lipdocker1/react-project:prod -f Dockerfile_dev . + - docker build -t singhabhinav/react-project -f Dockerfile_dev . script: - - docker run -e CI=true lipidocker1/react-project:prod npm run test + - docker run -e CI=true singhabhinav/react-project:prod npm run test #deploy: # provider: elasticbeanstalk From 36394d33a0e69ff4bbba691e67523202a26f17b3 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 15 Aug 2020 17:29:42 +0000 Subject: [PATCH 08/23] travis file change --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a269333..d6d0928 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_install: - docker build -t singhabhinav/react-project -f Dockerfile_dev . script: - - docker run -e CI=true singhabhinav/react-project:prod npm run test + - docker run -e CI=true singhabhinav/react-project npm run test #deploy: # provider: elasticbeanstalk From 2e492e09a4863484cee33a8e01b2903a745076d7 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 15 Aug 2020 17:37:41 +0000 Subject: [PATCH 09/23] My APP.js change --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 90edfa6..b2edcc0 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ function App() {
logo

- Edit src/App.js and save to reload by Subhashree 101 + Edit src/App.js and save to reload by Subhashree 102

Date: Sat, 15 Aug 2020 17:56:41 +0000 Subject: [PATCH 10/23] travis file change --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6d0928..ecfa7c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ services: - docker before_install: - - docker build -t singhabhinav/react-project -f Dockerfile_dev . + - docker build -t lipidocker1/react-project:prod -f Dockerfile_dev . script: - - docker run -e CI=true singhabhinav/react-project npm run test + - docker run -e CI=true lipidocker1/react-project:prod npm run test #deploy: # provider: elasticbeanstalk From bf649289408f42eb9e33d22cb59e0ac13941a627 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sun, 16 Aug 2020 15:42:35 +0000 Subject: [PATCH 11/23] Added config for Travis file --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index ecfa7c0..1815d21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,13 @@ script: - docker run -e CI=true lipidocker1/react-project:prod npm run test #deploy: -# provider: elasticbeanstalk -# region: us-west-1 # Specify your region -# app: "docker-react-project" # Copy it from Elastic Beanstalk dashboard -# env: "DockerReactProject-env-2" # Copy it from Elastic Beanstalk dashboard -# bucket_name: "elasticbeanstalk-us-west-1-034275272121" -# bucket_path: "docker" -# access_key_id: $AWS_ACCESS_KEY -# secret_access_key: $AWS_SECRET_KEY -# on: -# branch: master + provider: elasticbeanstalk + region: us-west-1 # Specify your region + app: "react-project-docker" # Copy it from Elastic Beanstalk dashboard + env: "ReactProjectDocker-env" # Copy it from Elastic Beanstalk dashboard + bucket_name: "elasticbeanstalk-us-west-1-391998522123" + bucket_path: "docker" + access_key_id: $AWS_ACCESS_KEY + secret_access_key: $AWS_SECRET_KEY + on: + branch: master From 075a43229a6afb038293d76c9dc50de48a495eb2 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sun, 16 Aug 2020 15:46:44 +0000 Subject: [PATCH 12/23] Added config for Travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1815d21..9ccd344 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: script: - docker run -e CI=true lipidocker1/react-project:prod npm run test - +# #deploy: provider: elasticbeanstalk region: us-west-1 # Specify your region From 4b978ca3df490e259a4cc122c4fd67bada26e5f5 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sun, 16 Aug 2020 16:02:24 +0000 Subject: [PATCH 13/23] New Addition Aug 16th --- .travis.yml | 2 +- src/App.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ccd344..1815d21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: script: - docker run -e CI=true lipidocker1/react-project:prod npm run test -# + #deploy: provider: elasticbeanstalk region: us-west-1 # Specify your region diff --git a/src/App.js b/src/App.js index b2edcc0..43afb63 100644 --- a/src/App.js +++ b/src/App.js @@ -8,10 +8,7 @@ function App() {
logo

- Edit src/App.js and save to reload by Subhashree 102 -

- src/App.js and save to reload by Subhashree 111111111111111111111111111111111111111111111111111111111111111 className="App-link" href="https://reactjs.org" target="_blank" rel="noopener noreferrer" From 432a48ed4c3cf06f8e3e06c39d030aadb04c5456 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sun, 16 Aug 2020 16:09:23 +0000 Subject: [PATCH 14/23] todays change --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1815d21..ac5a10e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: script: - docker run -e CI=true lipidocker1/react-project:prod npm run test -#deploy: +deploy: provider: elasticbeanstalk region: us-west-1 # Specify your region app: "react-project-docker" # Copy it from Elastic Beanstalk dashboard From 94f4bd0dc7c34cf7530d0b83ea696c5c19202afa Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sun, 16 Aug 2020 16:19:35 +0000 Subject: [PATCH 15/23] APP.js file changed --- src/App.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index 43afb63..75930d2 100644 --- a/src/App.js +++ b/src/App.js @@ -8,12 +8,15 @@ function App() {
logo

- Edit src/App.js and save to reload by Subhashree 111111111111111111111111111111111111111111111111111111111111111 className="App-link" + Edit src/App.js and save to reload by Subhashree 111 +

+ - Learn React + Learn React
From 00db2e57d8639c4fa754837b9874a7556e5574d3 Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sun, 16 Aug 2020 16:27:01 +0000 Subject: [PATCH 16/23] APP.js file changed --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 75930d2..988dd80 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ function App() {
logo

- Edit src/App.js and save to reload by Subhashree 111 + Edit src/App.js and save to reload by Aarush Pattnaik Web Site

Date: Sat, 22 Aug 2020 15:22:38 +0000 Subject: [PATCH 17/23] App Chnage --- src/App.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/App.js b/src/App.js index 988dd80..b965fd3 100644 --- a/src/App.js +++ b/src/App.js @@ -10,6 +10,9 @@ function App() {

Edit src/App.js and save to reload by Aarush Pattnaik Web Site

+

+ Added one more line +

Date: Sat, 22 Aug 2020 16:12:25 +0000 Subject: [PATCH 18/23] travis file updated with stage and prod deployment --- .travis.yml | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac5a10e..9d5fe88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,25 @@ script: - docker run -e CI=true lipidocker1/react-project:prod npm run test deploy: - provider: elasticbeanstalk - region: us-west-1 # Specify your region - app: "react-project-docker" # Copy it from Elastic Beanstalk dashboard - env: "ReactProjectDocker-env" # Copy it from Elastic Beanstalk dashboard - bucket_name: "elasticbeanstalk-us-west-1-391998522123" - bucket_path: "docker" - access_key_id: $AWS_ACCESS_KEY - secret_access_key: $AWS_SECRET_KEY - on: - branch: master + + - provider: elasticbeanstalk + region: us-west-1 # Specify your region + app: "react-project-dockerstaging" # Copy it from Elastic Beanstalk dashboard + env: "ReactProjectDockersraging-env" # Copy it from Elastic Beanstalk dashboard + bucket_name: "elasticbeanstalk-us-west-1-391998522123" + bucket_path: "docker" + access_key_id: $AWS_ACCESS_KEY + secret_access_key: $AWS_SECRET_KEY + on: + branch: staging + + - provider: elasticbeanstalk + region: us-west-1 # Specify your region + app: "react-project-docker" # Copy it from Elastic Beanstalk dashboard + env: "ReactProjectDocker-env" # Copy it from Elastic Beanstalk dashboard + bucket_name: "elasticbeanstalk-us-west-1-391998522123" + bucket_path: "docker" + access_key_id: $AWS_ACCESS_KEY + secret_access_key: $AWS_SECRET_KEY + on: + branch: master From 89a93e7b84583dd5cf633c18b49eac7d1ee8132e Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 22 Aug 2020 16:21:14 +0000 Subject: [PATCH 19/23] travis file updated with stage and prod deployment --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d5fe88..dee6c0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ before_install: script: - docker run -e CI=true lipidocker1/react-project:prod npm run test -deploy: - +deploy: - provider: elasticbeanstalk region: us-west-1 # Specify your region app: "react-project-dockerstaging" # Copy it from Elastic Beanstalk dashboard @@ -19,8 +18,7 @@ deploy: access_key_id: $AWS_ACCESS_KEY secret_access_key: $AWS_SECRET_KEY on: - branch: staging - + branch: staging - provider: elasticbeanstalk region: us-west-1 # Specify your region app: "react-project-docker" # Copy it from Elastic Beanstalk dashboard @@ -30,4 +28,4 @@ deploy: access_key_id: $AWS_ACCESS_KEY secret_access_key: $AWS_SECRET_KEY on: - branch: master + branch: master From 3f864bf0eff3a9e3c1510edcb0c7c937cf73870a Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 22 Aug 2020 16:32:42 +0000 Subject: [PATCH 20/23] travis file updated with stage and prod deployment --- .travis.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index dee6c0f..efd5cd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,23 +9,23 @@ script: - docker run -e CI=true lipidocker1/react-project:prod npm run test deploy: - - provider: elasticbeanstalk - region: us-west-1 # Specify your region - app: "react-project-dockerstaging" # Copy it from Elastic Beanstalk dashboard - env: "ReactProjectDockersraging-env" # Copy it from Elastic Beanstalk dashboard - bucket_name: "elasticbeanstalk-us-west-1-391998522123" - bucket_path: "docker" - access_key_id: $AWS_ACCESS_KEY - secret_access_key: $AWS_SECRET_KEY - on: - branch: staging - - provider: elasticbeanstalk - region: us-west-1 # Specify your region - app: "react-project-docker" # Copy it from Elastic Beanstalk dashboard - env: "ReactProjectDocker-env" # Copy it from Elastic Beanstalk dashboard - bucket_name: "elasticbeanstalk-us-west-1-391998522123" - bucket_path: "docker" - access_key_id: $AWS_ACCESS_KEY - secret_access_key: $AWS_SECRET_KEY - on: - branch: master + - provider: elasticbeanstalk + region: us-west-1 # Specify your region + app: "react-project-dockerstaging" # Copy it from Elastic Beanstalk dashboard + env: "ReactProjectDockersraging-env" # Copy it from Elastic Beanstalk dashboard + bucket_name: "elasticbeanstalk-us-west-1-391998522123" + bucket_path: "docker" + access_key_id: $AWS_ACCESS_KEY + secret_access_key: $AWS_SECRET_KEY + on: + branch: staging + - provider: elasticbeanstalk + region: us-west-1 # Specify your region + app: "react-project-docker" # Copy it from Elastic Beanstalk dashboard + env: "ReactProjectDocker-env" # Copy it from Elastic Beanstalk dashboard + bucket_name: "elasticbeanstalk-us-west-1-391998522123" + bucket_path: "docker" + access_key_id: $AWS_ACCESS_KEY + secret_access_key: $AWS_SECRET_KEY + on: + branch: master From 698b75e0804fb645ee49f4a084abee8d90adcaaf Mon Sep 17 00:00:00 2001 From: Subhashree Mohapatra Date: Sat, 22 Aug 2020 16:42:24 +0000 Subject: [PATCH 21/23] App file chnaged --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index b965fd3..ec2a521 100644 --- a/src/App.js +++ b/src/App.js @@ -11,7 +11,7 @@ function App() { Edit src/App.js and save to reload by Aarush Pattnaik Web Site

- Added one more line + Added one more line in master brach

Date: Sat, 22 Aug 2020 17:12:11 +0000 Subject: [PATCH 22/23] application file mdified in feature branch --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index ec2a521..65cf20c 100644 --- a/src/App.js +++ b/src/App.js @@ -11,7 +11,7 @@ function App() { Edit src/App.js and save to reload by Aarush Pattnaik Web Site

- Added one more line in master brach + Modified one more line in master brach

Date: Sat, 22 Aug 2020 17:25:46 +0000 Subject: [PATCH 23/23] App file modified with feature deatils --- src/App.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index 65cf20c..088d8f0 100644 --- a/src/App.js +++ b/src/App.js @@ -8,10 +8,10 @@ function App() {
logo

- Edit src/App.js and save to reload by Aarush Pattnaik Web Site + Edit src/App.js and save to reload by Subhashree Web Site

- Modified one more line in master brach + Modified one more line in feature brach