From b0242788e90194d711f5acb140faa8599332c06f Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Thu, 11 Nov 2021 17:42:06 +0800 Subject: [PATCH 1/8] [PROD Release] Gigs Detail and Apply Integration (#208) * output from gigs-listing UI challenge * ci:deploying list * ci:redeploying * expend by default * restore redirection * clean up * Hot fix disable gigs (#193) * remove path * restore url * directo to gigs * Hot fix disable gigs (#194) * remove path * restore url * directo to gigs * hot-fix * Code clean up (#195) * remove path * restore url * directo to gigs * hot-fix * clean up * Earn App - Enable Gigs Listing Link (#199) * restore gigs-listing * restore ci * fix: gigs-link (#201) * [Dev merge] Gigs apply integration (#207) * output from challenge:30215305 * final issue resolve * ci:base branch * output from challenge:30217172 * reset ci --- src/App.jsx | 10 ++++++++++ src/components/Menu/index.jsx | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index c42341d..0925931 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -45,6 +45,16 @@ const App = () => { System.import("@topcoder/micro-frontends-challenges-app") } /> + System.import("@topcoder/micro-frontends-gigs-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); } From c74f758002eff2bee7485c9ad25a2e736e959831 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Thu, 2 Dec 2021 22:01:43 +0800 Subject: [PATCH 2/8] ci:deploying bash --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cb6119..2bc7716 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,6 +77,7 @@ workflows: branches: only: - dev + - challenges-bug-bash # Production builds are exectuted only on tagged commits to the # master branch. From 5f7ca18f3afa4b0d3f05a616a96c0aca64d23761 Mon Sep 17 00:00:00 2001 From: Nguyen Viet <36178659+nqviet@users.noreply.github.com> Date: Thu, 2 Dec 2021 21:01:59 +0700 Subject: [PATCH 3/8] fixed for banner on small screen (#213) --- src/components/Banner/index.jsx | 2 +- src/components/Banner/styles.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Banner/index.jsx b/src/components/Banner/index.jsx index 49ed0a8..8990d12 100644 --- a/src/components/Banner/index.jsx +++ b/src/components/Banner/index.jsx @@ -9,7 +9,7 @@ const Banner = () => { "Welcome to our BETA work listings site - Tell us what you think!"; return ( -
+

{header} diff --git a/src/components/Banner/styles.scss b/src/components/Banner/styles.scss index a208734..5c08105 100644 --- a/src/components/Banner/styles.scss +++ b/src/components/Banner/styles.scss @@ -20,7 +20,8 @@ flex-direction: row; align-items: center; @include roboto-bold; - height: 50px; + line-height: 25px; + min-height: 50px; font-size: 20px; text-transform: uppercase; } From 0fb33e7ff87e55f55a8955adfc91471a8cde6046 Mon Sep 17 00:00:00 2001 From: Gaurav Seta Date: Fri, 3 Dec 2021 20:08:46 +0530 Subject: [PATCH 4/8] issue 264 fix (#212) * Update styles.scss * feedback fix --- src/components/Menu/styles.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/Menu/styles.scss b/src/components/Menu/styles.scss index fcbdc0e..6ebfcae 100644 --- a/src/components/Menu/styles.scss +++ b/src/components/Menu/styles.scss @@ -85,6 +85,15 @@ $menu-padding-y: 20px; .sub-menu { padding-left: 24px + 16px; + + .menu-item { + cursor: default; + .link { + cursor: pointer; + display: inline-block; + } + } + } .sub-submenu { From 7938121543033cb6ff2d3d21c8fa066e29755a5e Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Fri, 3 Dec 2021 22:42:37 +0800 Subject: [PATCH 5/8] optimize --- config/dev.js | 12 +++++++++++- src/components/Menu/styles.scss | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config/dev.js b/config/dev.js index 7be35b6..4fdd169 100644 --- a/config/dev.js +++ b/config/dev.js @@ -1,2 +1,12 @@ module.exports = { -}; + MFE_CONFIG: { + "@topcoder/micro-frontends-challenges-app": + "http://localhost:8009/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: "http://localhost:3000", + }, + }; + \ No newline at end of file diff --git a/src/components/Menu/styles.scss b/src/components/Menu/styles.scss index 6ebfcae..74772ed 100644 --- a/src/components/Menu/styles.scss +++ b/src/components/Menu/styles.scss @@ -77,6 +77,7 @@ $menu-padding-y: 20px; .menu-item-main.expanded > .link + ul, .menu-item-secondary.expanded > .link + ul { display: block; + cursor: default; } .menu-item-secondary.active.collapsed { From e3c0f4b6687cc5b9342d30539b6bd278cb209510 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Fri, 3 Dec 2021 22:43:31 +0800 Subject: [PATCH 6/8] refine --- config/dev.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/config/dev.js b/config/dev.js index 4fdd169..b4afc13 100644 --- a/config/dev.js +++ b/config/dev.js @@ -1,12 +1,3 @@ module.exports = { - MFE_CONFIG: { - "@topcoder/micro-frontends-challenges-app": - "http://localhost:8009/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: "http://localhost:3000", - }, - }; +}; \ No newline at end of file From bdf9637852ffcf9e109655d7dbdcb058c7a6ca6c Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Mon, 6 Dec 2021 00:30:50 +0800 Subject: [PATCH 7/8] revert ci --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2bc7716..0cb6119 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,7 +77,6 @@ workflows: branches: only: - dev - - challenges-bug-bash # Production builds are exectuted only on tagged commits to the # master branch. From ca596aa152c6d13c88d32a580c9ab6e2bb454231 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Mon, 6 Dec 2021 00:32:16 +0800 Subject: [PATCH 8/8] update lint --- config/dev.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/dev.js b/config/dev.js index b4afc13..e180b24 100644 --- a/config/dev.js +++ b/config/dev.js @@ -1,3 +1,2 @@ module.exports = { -}; - \ No newline at end of file +}; \ No newline at end of file