From 71ca6d661207285ffe3ae1bf5e10a05c0956eaba Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 5 Feb 2024 18:10:20 +0200 Subject: [PATCH 1/3] CORE-287 remove routes and menu items --- src/App.jsx | 32 ++------------------------------ src/constants/index.js | 15 --------------- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index e322b6f..bdce163 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,9 +1,8 @@ /** * Main App component */ -import React, { useLayoutEffect, useEffect, useRef } from "react"; -import { Router, useLocation, Redirect } from "@reach/router"; -import { disableSidebarForRoute } from "@topcoder/mfe-header"; +import React, { useEffect, useRef } from "react"; +import { Router, useLocation } from "@reach/router"; import _ from "lodash"; import { usePreviousLocation } from "./utils/hooks"; import Parcel from "single-spa-react/parcel"; @@ -17,11 +16,6 @@ import Menu from "./containers/Menu"; const App = () => { const menuVisible = useSelector((state) => state.menu.show); - useLayoutEffect(() => { - disableSidebarForRoute("/earn/*"); - document.title = "Listings-EARN-Topcoder"; - }, []); - const location = useLocation(); const previousLocation = usePreviousLocation(); @@ -39,33 +33,11 @@ const App = () => { {menuVisible && ReactDOM.createPortal(, document.querySelector("#menu-id"))} - - System.import("@topcoder/micro-frontends-challenges-app") - } - /> - System.import("@topcoder/micro-frontends-gigs-app")} - /> - System.import("@topcoder/micro-frontends-gigs-app")} - /> - System.import("@topcoder/micro-frontends-gigs-app")} - /> System.import("@topcoder/micro-frontends-gigs-app")} /> - ); diff --git a/src/constants/index.js b/src/constants/index.js index 72c8acf..144a28d 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -13,20 +13,5 @@ export const NAV_MENU = { }, ], }, - { - name: "Find Work", - icon: "find-work.svg", - iconActive: "find-work-green.svg", - children: [ - { - name: "Gigs", - path: "/earn/gigs", - }, - { - name: "Challenges", - path: "/earn/find/challenges", - }, - ], - }, ], }; From 3f068cade089e132584d23153c6948a8df911252 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 5 Feb 2024 18:11:15 +0200 Subject: [PATCH 2/3] ci: on dev --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 938426d..b9c3c87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,6 +78,7 @@ workflows: branches: only: - dev + - CORE-287 # Production builds are exectuted only on tagged commits to the # master branch. From f91cfb233e44cd179139d72ea3638831f1c1e07a Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 5 Feb 2024 18:31:40 +0200 Subject: [PATCH 3/3] CORE-287 off sidebar toggler --- src/App.jsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/App.jsx b/src/App.jsx index bdce163..18daa04 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,8 +1,9 @@ /** * Main App component */ -import React, { useEffect, useRef } from "react"; +import React, { useLayoutEffect, useEffect, useRef } from "react"; import { Router, useLocation } from "@reach/router"; +import { disableSidebarForRoute } from "@topcoder/mfe-header"; import _ from "lodash"; import { usePreviousLocation } from "./utils/hooks"; import Parcel from "single-spa-react/parcel"; @@ -16,6 +17,11 @@ import Menu from "./containers/Menu"; const App = () => { const menuVisible = useSelector((state) => state.menu.show); + useLayoutEffect(() => { + disableSidebarForRoute("/earn/*"); + document.title = "Listings-EARN-Topcoder"; + }, []); + const location = useLocation(); const previousLocation = usePreviousLocation();