diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js index 7b3ac82d..5fcb3258 100644 --- a/frontend/src/app/App.js +++ b/frontend/src/app/App.js @@ -139,8 +139,7 @@ function App() { {role && } - - {role && } + @@ -228,458 +227,466 @@ function App() { -
- - {role == ACCOUNT_TYPE.SUPPORT ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.SUPPORT ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.SUPPORT ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.SUPPORT ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.MENTOR ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.MENTOR ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.MENTOR ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - + + {role && ( + + {role && } +
+ + {role == ACCOUNT_TYPE.SUPPORT ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.SUPPORT ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.SUPPORT ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.SUPPORT ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.MENTOR ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.MENTOR ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.MENTOR ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + - - {role == ACCOUNT_TYPE.MENTEE ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.MENTEE ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.MENTOR || - role == ACCOUNT_TYPE.MENTEE || - role == ACCOUNT_TYPE.PARTNER ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - + + {role == ACCOUNT_TYPE.MENTEE ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.MENTEE ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.MENTOR || + role == ACCOUNT_TYPE.MENTEE || + role == ACCOUNT_TYPE.PARTNER ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + - - {role == ACCOUNT_TYPE.MENTEE || - role == ACCOUNT_TYPE.GUEST || - role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - {Object.keys(allHubData).map((hub_url) => { - return ( - <> - - - - - - - - - - - - - - - - - - - - - - - - - - ); - })} - - {role == ACCOUNT_TYPE.PARTNER || - role == ACCOUNT_TYPE.GUEST || - role == ACCOUNT_TYPE.HUB || - role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.MENTOR || - role == ACCOUNT_TYPE.MENTEE || - role == ACCOUNT_TYPE.GUEST || - role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - + + {role == ACCOUNT_TYPE.MENTEE || + role == ACCOUNT_TYPE.GUEST || + role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + {Object.keys(allHubData).map((hub_url) => { + return ( + <> + + + + + + + + + + + + + + + + + + + + + + + + + + ); + })} + + {role == ACCOUNT_TYPE.PARTNER || + role == ACCOUNT_TYPE.GUEST || + role == ACCOUNT_TYPE.HUB || + role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.MENTOR || + role == ACCOUNT_TYPE.MENTEE || + role == ACCOUNT_TYPE.GUEST || + role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + - - - - - - + + + + + + - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN || role == ACCOUNT_TYPE.HUB ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - - - {role == ACCOUNT_TYPE.ADMIN ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN || role == ACCOUNT_TYPE.HUB ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + + + {role == ACCOUNT_TYPE.ADMIN ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + - - {role == ACCOUNT_TYPE.PARTNER || role == ACCOUNT_TYPE.HUB ? ( - - ) : ( - <> - {cur_time - startPathTime > 100 && ( - - )} - - )} - + + {role == ACCOUNT_TYPE.PARTNER || + role == ACCOUNT_TYPE.HUB ? ( + + ) : ( + <> + {cur_time - startPathTime > 100 && ( + + )} + + )} + - - - - - - - - - - - - - - - - - - - {role == ACCOUNT_TYPE.HUB && } - {n50Flag && } -
-
+ + + + + + + + + + + + + + + + + + + {role == ACCOUNT_TYPE.HUB && } + {n50Flag && } +
+
+ )}
diff --git a/frontend/src/components/pages/AdminTraining.js b/frontend/src/components/pages/AdminTraining.js index 518dfad4..e3673120 100644 --- a/frontend/src/components/pages/AdminTraining.js +++ b/frontend/src/components/pages/AdminTraining.js @@ -83,7 +83,7 @@ const Row = (props) => { ...(isDragging ? { position: "relative", - zIndex: 9999, + zIndex: 999, } : {}), }; diff --git a/frontend/src/components/pages/HomeLayout.js b/frontend/src/components/pages/HomeLayout.js index 45429f8e..858b49e0 100644 --- a/frontend/src/components/pages/HomeLayout.js +++ b/frontend/src/components/pages/HomeLayout.js @@ -81,6 +81,7 @@ function HomeLayout({ children, ignoreHomeLayout, allHubData, location }) {