From 7caeb5560e1c486673207fd933e82cbc9b6d1005 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 26 Oct 2021 22:29:41 +0800 Subject: [PATCH 1/5] output from challenge:30215305 --- src/App.jsx | 5 +++++ src/components/Menu/index.jsx | 3 --- src/constants/index.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index c42341d..5f43e3a 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -45,6 +45,11 @@ const App = () => { System.import("@topcoder/micro-frontends-challenges-app") } /> + System.import("@topcoder/micro-frontends-gigs-app")} + /> { const onSelectMenuItem = (name, path) => { selectionRef.current.select(name); - if (name == "Gigs") { - window.location.href = `${process.env.URL.BASE}/gigs`; - } if (path) { navigate(path); } diff --git a/src/constants/index.js b/src/constants/index.js index 6af6add..72c8acf 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -20,7 +20,7 @@ export const NAV_MENU = { children: [ { name: "Gigs", - path: "", + path: "/earn/gigs", }, { name: "Challenges", From 2715cdfff64ca087f690f94718ee96a62d8bd671 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Thu, 28 Oct 2021 14:55:46 +0800 Subject: [PATCH 2/5] final issue resolve --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cb6119..c366c3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,6 +77,7 @@ workflows: branches: only: - dev + - gigs-detail-integration # Production builds are exectuted only on tagged commits to the # master branch. From db0a7bc1ad479af6eda38ed3ca6e3fbebba0d17b Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Thu, 28 Oct 2021 22:56:20 +0800 Subject: [PATCH 3/5] ci:base branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c366c3c..9980ed3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,7 +77,7 @@ workflows: branches: only: - dev - - gigs-detail-integration + - gigs-apply-integration # Production builds are exectuted only on tagged commits to the # master branch. From 8ad0195e4aad9d28b0dee1ebf8ab7a4727ecd789 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Sun, 31 Oct 2021 19:35:14 +0800 Subject: [PATCH 4/5] output from challenge:30217172 --- src/App.jsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/App.jsx b/src/App.jsx index 5f43e3a..0925931 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -45,6 +45,11 @@ const App = () => { System.import("@topcoder/micro-frontends-challenges-app") } /> + System.import("@topcoder/micro-frontends-gigs-app")} + /> Date: Wed, 10 Nov 2021 13:36:39 +0800 Subject: [PATCH 5/5] reset ci --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9980ed3..0cb6119 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,7 +77,6 @@ workflows: branches: only: - dev - - gigs-apply-integration # Production builds are exectuted only on tagged commits to the # master branch.