From 59781bb47c69762aee0057e9b936e45686e6e436 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 25 Mar 2021 04:27:02 -0300 Subject: [PATCH 1/7] Fix navbar-app and earn-app local config file --- config/micro-frontends-config-local.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/micro-frontends-config-local.json b/config/micro-frontends-config-local.json index 0137f5d..9e8842c 100644 --- a/config/micro-frontends-config-local.json +++ b/config/micro-frontends-config-local.json @@ -1,11 +1,11 @@ { "imports": { - "@topcoder/micro-frontends-navbar-app": "http://localhost:3001/navbar/topcoder-micro-frontends-navbar-app.js", + "@topcoder/micro-frontends-navbar-app": "http://localhost:8081/topcoder-micro-frontends-navbar-app.js", "@topcoder/micro-frontends-react-app": "http://localhost:8500/react/topcoder-micro-frontends-react-app.js", "@topcoder/micro-frontends-angular-app": "http://localhost:4200/angular/main.js", "@topcoder/micro-frontends-teams": "http://localhost:8501/taas-app/topcoder-micro-frontends-teams.js", "@topcoder/micro-frontends-task-marketplace-app": "http://localhost:8502/tasks/topcoder-micro-frontends-task-marketplace-app.js", - "@topcoder/micro-frontends-earn-app": "http://localhost:8008/earn/topcoder-micro-frontends-earn-app.js", + "@topcoder/micro-frontends-earn-app": "http://localhost:8008/topcoder-micro-frontends-earn-app.js", "@topcoder/micro-frontends-submission-review-app": "http://localhost:8503/submissionreview/topcoder-micro-frontends-submission-review-app.js", "@topcoder/micro-frontends-model-app": "http://localhost:8504/model-app/topcoder-micro-frontends-model-app.js" } From da15f1ab04f4d8deb430b9dc1bdd0cc51d3f154e Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 25 Mar 2021 09:49:57 -0300 Subject: [PATCH 2/7] Added hosted app to local config file --- config/micro-frontends-config-local.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/config/micro-frontends-config-local.json b/config/micro-frontends-config-local.json index 9e8842c..c479cff 100644 --- a/config/micro-frontends-config-local.json +++ b/config/micro-frontends-config-local.json @@ -1,12 +1,13 @@ { "imports": { - "@topcoder/micro-frontends-navbar-app": "http://localhost:8081/topcoder-micro-frontends-navbar-app.js", - "@topcoder/micro-frontends-react-app": "http://localhost:8500/react/topcoder-micro-frontends-react-app.js", - "@topcoder/micro-frontends-angular-app": "http://localhost:4200/angular/main.js", - "@topcoder/micro-frontends-teams": "http://localhost:8501/taas-app/topcoder-micro-frontends-teams.js", - "@topcoder/micro-frontends-task-marketplace-app": "http://localhost:8502/tasks/topcoder-micro-frontends-task-marketplace-app.js", + "@topcoder/micro-frontends-navbar-app": "http://localhost:3001/navbar/topcoder-micro-frontends-navbar-app.js", + "@topcoder/micro-frontends-react-app": "https://platform.topcoder-dev.com/react/topcoder-micro-frontends-react-app.js", + "@topcoder/micro-frontends-angular-app": "https://platform.topcoder-dev.com/angular/main.js", + "@topcoder/micro-frontends-teams": "https://platform.topcoder-dev.com/taas-app/topcoder-micro-frontends-teams.js", + "@topcoder/micro-frontends-task-marketplace-app": "https://platform.topcoder-dev.com/tasks/topcoder-micro-frontends-task-marketplace-app.js", "@topcoder/micro-frontends-earn-app": "http://localhost:8008/topcoder-micro-frontends-earn-app.js", - "@topcoder/micro-frontends-submission-review-app": "http://localhost:8503/submissionreview/topcoder-micro-frontends-submission-review-app.js", - "@topcoder/micro-frontends-model-app": "http://localhost:8504/model-app/topcoder-micro-frontends-model-app.js" + "@topcoder/micro-frontends-submission-review-app": "https://platform.topcoder-dev.com/submissionreview/topcoder-micro-frontends-submission-review-app.js", + "@topcoder/micro-frontends-model-app": "https://platform.topcoder-dev.com/model-app/topcoder-micro-frontends-model-app.js", + "@topcoder/micro-frontends-community-admin-app": "https://tc-micro-community-admin.herokuapp.com/community-admin-app/topcoder-micro-frontends-community-admin-app.js" } } \ No newline at end of file From bd2a3e30fcf6c1b7044c7cc0040f62288d454faa Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 2 Apr 2021 07:06:56 -0300 Subject: [PATCH 3/7] ci: Deploy challenge-listing-part-1 to Dev env --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 830835a..8bc8e64 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,6 +75,7 @@ workflows: branches: only: - dev + - challenge-listing-part-1 # Production builds are exectuted only on tagged commits to the # master branch. From fc368b28ba4e768abe85f7c7a4d9c89484893a5d Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Tue, 13 Apr 2021 02:33:38 -0300 Subject: [PATCH 4/7] Challenge 30177722 - Submission 457950 --- src/reuse/global.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/reuse/global.css b/src/reuse/global.css index 38e1de1..a56fba2 100644 --- a/src/reuse/global.css +++ b/src/reuse/global.css @@ -1,5 +1,6 @@ @import url("https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Barlow+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"); +@import url('https://fonts.googleapis.com/css2?family=Barlow:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); body { background-color: #f4f5f6; From eb630fd08ec5d7cf0f6f075fc500545e7fbe1b10 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 13 Apr 2021 02:55:11 -0300 Subject: [PATCH 5/7] ci: Deploy challenge-listing-part-2 in Dev env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bc8e64..63c9bdf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,7 @@ workflows: branches: only: - dev - - challenge-listing-part-1 + - challenge-listing-part-2 # Production builds are exectuted only on tagged commits to the # master branch. From 48bd0b6126990e8f1ed6dc88eaa7491d05b48678 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 14 Apr 2021 01:12:59 -0300 Subject: [PATCH 6/7] ci: Deploy challenge-listing-part-2 to Prod env Just for testing purpose. --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63c9bdf..0fd7a14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,6 @@ workflows: branches: only: - dev - - challenge-listing-part-2 # Production builds are exectuted only on tagged commits to the # master branch. @@ -83,4 +82,6 @@ workflows: context: org-global filters: branches: - only: master + only: + - master + - challenge-listing-part-2 From 8be0f7ee31abfd811ad4d108400079312b11a7f2 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 14 Apr 2021 21:17:33 -0300 Subject: [PATCH 7/7] Revert "ci: Deploy challenge-listing-part-2 to Prod env" This reverts commit 48bd0b6126990e8f1ed6dc88eaa7491d05b48678. --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0fd7a14..63c9bdf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,6 +75,7 @@ workflows: branches: only: - dev + - challenge-listing-part-2 # Production builds are exectuted only on tagged commits to the # master branch. @@ -82,6 +83,4 @@ workflows: context: org-global filters: branches: - only: - - master - - challenge-listing-part-2 + only: master