diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2eb27e340d..322f93b478 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,6 +17,7 @@ Right now, we are in the process of building the prototype. We warmly welcome yo Create pull requests (PRs) for changes that you think are needed. We would really appreciate your help! Skills with the following would be beneficial: + - Python - FastAPI - Javascript diff --git a/src/frontend/src/api/Project.js b/src/frontend/src/api/Project.js index e0e5288e90..66a21d6c87 100755 --- a/src/frontend/src/api/Project.js +++ b/src/frontend/src/api/Project.js @@ -44,6 +44,7 @@ export const ProjectById = (url, existingProjectList, projectId) => { title: resp.project_info?.[0]?.name, location_str: resp.location_str, description: resp.project_info[0]?.description, + short_description: resp.project_info[0]?.short_description, num_contributors: resp.num_contributors, total_tasks: resp.total_tasks, tasks_mapped: resp.tasks_mapped, diff --git a/src/frontend/src/components/ActivitiesPanel.jsx b/src/frontend/src/components/ActivitiesPanel.jsx index f85cdfd6d7..f2ab3d369a 100755 --- a/src/frontend/src/components/ActivitiesPanel.jsx +++ b/src/frontend/src/components/ActivitiesPanel.jsx @@ -114,7 +114,7 @@ const ActivitiesPanel = ({ defaultTheme, state, params, map, view, mapDivPostion }, [taskDisplay, state, searchText]); return ( - + state.project.taskModalStatus); + const { windowSize } = WindowDimension(); + function elastic(t) { return Math.pow(2, -10 * t) * Math.sin(((t - 0.075) * (2 * Math.PI)) / 0.3) + 1; } @@ -177,7 +181,9 @@ const OpenLayersMap = ({ btnDiv.className = 'ol-unselectable ol-control'; index == 0 ? (btnDiv.style.top = `${(btnsPosition = btnsPosition + 2)}%`) - : (btnDiv.style.top = `${(btnsPosition = btnsPosition + 9)}%`); + : windowSize.width >= 640 + ? (btnDiv.style.top = `${(btnsPosition = btnsPosition + 9)}%`) + : (btnDiv.style.top = `${(btnsPosition = btnsPosition + 6)}%`); btnDiv.appendChild(btn); var control = new Control({ element: btnDiv, @@ -322,13 +328,17 @@ const OpenLayersMap = ({ }, [map, currentLocLayer]); return ( - +
{/*