From f07519ca5e151a20e396910ca316b1aaf6a1a037 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 12 Oct 2021 00:45:00 +0800 Subject: [PATCH 1/5] remove path --- src/constants/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants/index.js b/src/constants/index.js index 72c8acf..6af6add 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -20,7 +20,7 @@ export const NAV_MENU = { children: [ { name: "Gigs", - path: "/earn/gigs", + path: "", }, { name: "Challenges", From 7178eeb555ea8bc069cde995e59b526b5be87525 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 12 Oct 2021 00:46:57 +0800 Subject: [PATCH 2/5] restore url --- config/default.js | 3 +++ config/prod.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config/default.js b/config/default.js index b11adb6..fd5040d 100644 --- a/config/default.js +++ b/config/default.js @@ -6,5 +6,8 @@ module.exports = { "https://platform.topcoder-dev.com/challenges-app/topcoder-micro-frontends-challenges-app.js", "@topcoder/micro-frontends-gigs-app": "https://platform.topcoder-dev.com/gigs-app/topcoder-micro-frontends-gigs-app.js", + }, + URL: { + BASE: "https://www.topcoder-dev.com", } }; diff --git a/config/prod.js b/config/prod.js index 9cd7cfa..31de6ac 100644 --- a/config/prod.js +++ b/config/prod.js @@ -2,5 +2,8 @@ module.exports = { MFE_CONFIG: { '@topcoder/micro-frontends-challenges-app': 'https://platform.topcoder.com/challenges-app/topcoder-micro-frontends-challenges-app.js', '@topcoder/micro-frontends-gigs-app': 'https://platform.topcoder.com/gigs-app/topcoder-micro-frontends-gigs-app.js', + }, + URL: { + BASE: "https://www.topcoder.com", } }; From 7cba64ce80ee3daf9d784b525dc84528a6791332 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 12 Oct 2021 00:51:57 +0800 Subject: [PATCH 3/5] directo to gigs --- src/containers/Menu/index.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/containers/Menu/index.jsx b/src/containers/Menu/index.jsx index aca7887..5f0239a 100644 --- a/src/containers/Menu/index.jsx +++ b/src/containers/Menu/index.jsx @@ -26,6 +26,9 @@ const MenuContainer = () => { ); if (name) { setSelectedMenuItemName(name); + if (name == "Gigs") { + window.location.href = `${process.env.URL.BASE}/gigs`; + } } else { setSelectedMenuItemName(null); } From 3d7675c58bcfbdf69af728fbceceee92317c1011 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 12 Oct 2021 01:02:57 +0800 Subject: [PATCH 4/5] hot-fix --- src/components/Menu/index.jsx | 3 +++ src/containers/Menu/index.jsx | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Menu/index.jsx b/src/components/Menu/index.jsx index 7e37f2e..b631099 100644 --- a/src/components/Menu/index.jsx +++ b/src/components/Menu/index.jsx @@ -34,6 +34,9 @@ const Menu = ({ menu, selected, onSelect, isLoggedIn, onUpdateMenu }) => { 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/containers/Menu/index.jsx b/src/containers/Menu/index.jsx index 5f0239a..aca7887 100644 --- a/src/containers/Menu/index.jsx +++ b/src/containers/Menu/index.jsx @@ -26,9 +26,6 @@ const MenuContainer = () => { ); if (name) { setSelectedMenuItemName(name); - if (name == "Gigs") { - window.location.href = `${process.env.URL.BASE}/gigs`; - } } else { setSelectedMenuItemName(null); } From 28715db8312ce12049b62996142bf9b1c64d44ca Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 12 Oct 2021 01:13:10 +0800 Subject: [PATCH 5/5] clean up --- src/containers/Menu/index.jsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/containers/Menu/index.jsx b/src/containers/Menu/index.jsx index 5f0239a..aca7887 100644 --- a/src/containers/Menu/index.jsx +++ b/src/containers/Menu/index.jsx @@ -26,9 +26,6 @@ const MenuContainer = () => { ); if (name) { setSelectedMenuItemName(name); - if (name == "Gigs") { - window.location.href = `${process.env.URL.BASE}/gigs`; - } } else { setSelectedMenuItemName(null); }