Resolved merge conflicts

Author: efrenmarin45

.github/ISSUE_TEMPLATE/blank-design-issue.md

@@ -2,7 +2,8 @@
 name: Blank Design Issue
 about: Template for designers to create issues and prepare for engineering hand off.
 title: ''
-labels: 'Milestone: Missing, role: UI/UX Design, Size: Missing'
+labels: 'Complexity: Missing, draft, Feature: Missing, Milestone: Missing, role: UI/UX
+  Design, size: Missing'
 assignees: ''
 
 ---
@@ -12,9 +13,13 @@ We need to do X for Y reason.
 
 ### Action Items
 
-- [ ] Address the problem overview with possible design solution(s) in a comment
 - [ ] Complete Design Iterations section below
+  - [ ] design requirement 1
+  - [ ] design requirement 2
+  - [ ] design requirement 99
 - [ ] Document user interaction in Figma
+- [ ] Update the Hand Off section of this ticket with the final iteration of this design
+
 
 ---
 

.github/ISSUE_TEMPLATE/blank-dev-issue.md

@@ -2,13 +2,12 @@
 name: Blank Dev Issue
 about: Template for developers to create issues and prepare for engineering tickets.
 title: ''
-labels: 'draft, Feature: Missing, Milestone: Missing, Role: Frontend, Size: Missing'
+labels: 'Complexity: Missing, draft, Feature: Missing, Milestone: Missing, Role: Frontend,
+  size: Missing'
 assignees: ''
 
 ---
 
-<!-- @format -->
-
 ### Overview
 
 We need to do X for Y reason.
@@ -26,18 +25,22 @@ Explain here if the issue requires additional info
 
 ### Resources/Instructions
 
-[Replace this text - Provide these resources here if exist. Provide screenshot only if the issue has visual
-changes on the site, do not post screenshots of codebase]
+- Figma Section:
+- Related Design Ticket:
 
-- Figma design file link
-- Related previous ticket
 <details><summary>Screenshot before proposed changes</summary>
 <p>
 [insert screenshot here]
 </p>
 </details>
 
-<details><summary>Screenshot after proposed changes</summary>
+<details><summary>Screenshot of Figma</summary>
+<p>
+[insert screenshot here]
+</p>
+</details>
+
+<details><summary>Screenshot of new feature from localhost</summary>
 <p>
 [insert screenshot here]
 </p>

.github/ISSUE_TEMPLATE/blank-issue.md

@@ -2,7 +2,8 @@
 name: Blank Issue
 about: Describe this issue's purpose here
 title: ''
-labels: 'Milestone: Missing, Role: Missing, Size: Missing'
+labels: 'Complexity: Missing, draft, Feature: Missing, Milestone: Missing, Role: Missing,
+  size: Missing'
 assignees: ''
 
 ---
@@ -12,5 +13,9 @@ We need to do X for Y reason.
 
 ### Action Items
 
+- [ ] Action Item 1
+- [ ] Action Item 2
+- [ ] Action Item 99
+
 ### Resources/Instructions
 REPLACE THIS TEXT -If there is a website which has documentation that helps with this issue provide the link(s) here.

.github/ISSUE_TEMPLATE/blank-research-plan.md

@@ -2,7 +2,8 @@
 name: Blank Research Plan
 about: Template for UX researcher to create research plan.
 title: ''
-labels: 'Feature: Research, Milestone: Missing, role: UI/UX Research, Size: Missing'
+labels: 'Complexity: Missing, Feature: Research, Milestone: Missing, role: UI/UX Research,
+  size: Missing'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/blank_epic.md

@@ -2,8 +2,8 @@
 name: New Blank Epic
 about: Template for PMs to create Epics to track batches of features in a milestone
 title: ''
-labels: 'draft, Epic, Feature: Missing, Milestone: Missing, Role: Product Management,
-  size: epic'
+labels: 'Complexity: Small, draft, Epic, Feature: Missing, Milestone: Missing, Role:
+  Missing, size: 0.25pt'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,13 +3,13 @@ name: Emergent Request
 about: When you discover something in your issue that is out of scope and it needs
   a new issue or discussion.
 title: 'ER: (title, required)'
-labels: 'Complexity: Missing, Discussion, Emergent Request, Feature: Missing, Question,
+labels: 'Complexity: Small, Discussion, Emergent Request, Feature: Missing, Question,
   Role: Missing, size: 0.25pt'
 assignees: ''
 
 ---
 
-### Emergent Requirement - Problem Description
+### Emergent Request - Problem Description
 - (short-answer, required)
 
 ### Relevant Issue(s)

.github/ISSUE_TEMPLATE/emergent-request.md

@@ -30,6 +30,7 @@ docker/
 venv/
 .vscode
 .editorconfig
+.prettierignore
 
 # socrata experimental files
 *-socrata*
@@ -40,4 +41,5 @@ venv/
 # archive
 /archive/aws/API\ Responses/*
 
-.DS_Store
+.DS_Store
+

.gitignore

@@ -65,12 +65,21 @@ Our mission is to create a user-friendly platform for anyone interested in explo
 - Run `npm start`
 - Visit http://localhost:5173
 
+### Run tests
+
+- Run `npm test`
+
+See [contributing.md](contributing.md#testing) for info on writing tests.
+
 ### Information About Technologies
 
 - Frontend
   - Mapbox
   - React
   - MUI
+  - Vite
+  - Vitest
+  - React Testing Library
 - Backend
   - DuckDb
   - HuggingFace

README.md

@@ -81,6 +81,7 @@ const styles = (theme) => ({
       marginRight: 5,
     },
     '& .mapboxgl-popup': {
+      maxWidth: '474px!important',
       '&-anchor-bottom .mapboxgl-popup-tip': {
         borderTopColor: theme.palette.primary.main,
       },
@@ -95,6 +96,11 @@ const styles = (theme) => ({
       },
     },
   },
+  loadedModal: {
+   '& .mapboxgl-popup-content': {
+      borderRadius: 30,
+    },
+  },
   menuWrapper: {
     position: 'absolute',
     left: '20px',
@@ -415,7 +421,7 @@ class Map extends React.Component {
 
   addPopup = (coordinates, requestId) => {
     this.setState({ selectedRequestId: requestId });
-    this.popup = new mapboxgl.Popup()
+    this.popup = new mapboxgl.Popup({closeButton: false, anchor: 'left'})
       .setLngLat(coordinates)
       .setDOMContent(this.requestDetail)
       .addTo(this.map);
@@ -430,7 +436,7 @@ class Map extends React.Component {
   };
 
   reset = () => {
-    const { dispatchUpdateNcId } = this.props;
+    const { dispatchUpdateNcId, dispatchUpdateSelectedCouncils } = this.props;
 
     this.zoomOut();
     this.addressLayer.clearMarker();
@@ -456,23 +462,18 @@ class Map extends React.Component {
     });
 
     // Reset MinZoom to original value after deselecting NC
+    this.resetBoundaries();
+    dispatchUpdateSelectedCouncils([])
     this.map.setMinZoom(DEFAULT_MIN_ZOOM);
   };
 
   resetBoundaries = () => {
     const {
       dispatchUpdateNcId,
-      dispatchUpdateSelectedCouncils,
-      dispatchUpdateUnselectedCouncils,
-      councils,
     } = this.props;
 
     // Reset the selected NcId back to null.
     dispatchUpdateNcId(null);
-
-    // Reset councilSelector.
-    dispatchUpdateSelectedCouncils([]);
-    dispatchUpdateUnselectedCouncils(councils);
   };
 
   addressSearchIsEmpty = () => {
@@ -765,6 +766,13 @@ class Map extends React.Component {
       }
     }
   }
+  setRequestDetailLoading = (isLoading) => {
+    if (!isLoading && this.popup) {
+      this.popup.addClassName(this.props.classes.loadedModal);
+    }
+  };
+
+  //// RENDER ////
 
   render() {
     const {
@@ -815,7 +823,10 @@ class Map extends React.Component {
           boundaryStyle={mapStyle === 'dark' ? 'light' : 'dark'}
         />
         <div ref={(el) => (this.requestDetail = el)}>
-          <RequestDetail requestId={selectedRequestId} />
+          <RequestDetail 
+            requestId={selectedRequestId} 
+            loadingCallback={this.setRequestDetailLoading}
+          />
         </div>
         {this.state.mapReady && requestTypes && (
           <>