Added tests for GetGoalsForUser routeSupport icons

package.json

@@ -10,7 +10,6 @@
     "@material-ui/core": "^4.12.4",
     "@material-ui/pickers": "^3.3.10",
     "@reduxjs/toolkit": "^1.5.1",
-    "@types/emoji-mart": "^3.0.5",
     "@types/node": "^17.0.41",
     "@types/react": "^16.9.0",
     "@types/react-redux": "^7.1.7",
@@ -55,8 +54,8 @@
     ]
   },
   "devDependencies": {
-    "@types/emoji-mart": "^3.0.9",
+    "@types/emoji-mart": "^3.0.14",
     "@types/react-dom": "^18.0.5",
     "@types/styled-components": "^5.1.25"
   }
-}
+}

src/api/types.ts

@@ -20,6 +20,7 @@ export interface Application {
 export interface Goal {
   id: string
   name: string
+  icon?: string
   targetAmount: number
   balance: number
   targetDate: Date

src/ui/features/goalmanager/GoalManager.tsx

@@ -2,6 +2,8 @@ import { faCalendarAlt } from '@fortawesome/free-regular-svg-icons'
 import { faDollarSign, IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { MaterialUiPickersDate } from '@material-ui/pickers/typings/date'
+import 'emoji-mart/css/emoji-mart.css'
+import { Picker, EmojiData } from 'emoji-mart'
 import 'date-fns'
 import React, { useEffect, useState } from 'react'
 import styled from 'styled-components'
@@ -11,6 +13,8 @@ import { selectGoalsMap, updateGoal as updateGoalRedux } from '../../../store/go
 import { useAppDispatch, useAppSelector } from '../../../store/hooks'
 import DatePicker from '../../components/DatePicker'
 import { Theme } from '../../components/Theme'
+import AddIconButton from './AddIconButton'
+import GoalIcon from './GoalIcon'
 
 type Props = { goal: Goal }
 export function GoalManager(props: Props) {
@@ -21,16 +25,20 @@ export function GoalManager(props: Props) {
   const [name, setName] = useState<string | null>(null)
   const [targetDate, setTargetDate] = useState<Date | null>(null)
   const [targetAmount, setTargetAmount] = useState<number | null>(null)
+  const [icon, setIcon] = useState<string | null>(null)
+  const [isPickerOpen, setIsPickerOpen] = useState<boolean>(false)
 
   useEffect(() => {
     setName(props.goal.name)
     setTargetDate(props.goal.targetDate)
     setTargetAmount(props.goal.targetAmount)
+    setIcon(props.goal.icon ?? null)
   }, [
     props.goal.id,
     props.goal.name,
     props.goal.targetDate,
     props.goal.targetAmount,
+    props.goal.icon,
   ])
 
   useEffect(() => {
@@ -40,10 +48,7 @@ export function GoalManager(props: Props) {
   const updateNameOnChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const nextName = event.target.value
     setName(nextName)
-    const updatedGoal: Goal = {
-      ...props.goal,
-      name: nextName,
-    }
+    const updatedGoal: Goal = { ...props.goal, name: nextName }
     dispatch(updateGoalRedux(updatedGoal))
     updateGoalApi(props.goal.id, updatedGoal)
   }
@@ -75,10 +80,37 @@ export function GoalManager(props: Props) {
     }
   }
 
+  const onEmojiSelect = (emojiData: EmojiData) => {
+    if ('native' in emojiData) {
+      const selectedIcon = emojiData.native
+      setIcon(selectedIcon)
+      setIsPickerOpen(false)
+      const updatedGoal: Goal = { ...props.goal, icon: selectedIcon }
+      dispatch(updateGoalRedux(updatedGoal))
+      updateGoalApi(props.goal.id, updatedGoal)
+    }
+  }
+
+  const togglePicker = (event: React.MouseEvent) => {
+    event.stopPropagation()
+    setIsPickerOpen(!isPickerOpen)
+  }
+
   return (
     <GoalManagerContainer>
       <NameInput value={name ?? ''} onChange={updateNameOnChange} />
 
+      {icon
+        ? <GoalIcon icon={icon} onClick={togglePicker} />
+        : <AddIconButton hasIcon={!!icon} onClick={togglePicker} />
+      }
+
+      {isPickerOpen && (
+        <EmojiPickerContainer>
+          <Picker onSelect={onEmojiSelect} set="apple" />
+        </EmojiPickerContainer>
+      )}
+
       <Group>
         <Field name="Target Date" icon={faCalendarAlt} />
         <Value>
@@ -111,9 +143,6 @@ export function GoalManager(props: Props) {
 }
 
 type FieldProps = { name: string; icon: IconDefinition }
-type AddIconButtonContainerProps = { shouldShow: boolean }
-type GoalIconContainerProps = { shouldShow: boolean }
-type EmojiPickerContainerProps = { isOpen: boolean; hasIcon: boolean }
 
 const Field = (props: FieldProps) => (
   <FieldContainer>
@@ -131,7 +160,6 @@ const GoalManagerContainer = styled.div`
   width: 100%;
   position: relative;
 `
-
 const Group = styled.div`
   display: flex;
   flex-direction: row;
@@ -148,7 +176,6 @@ const NameInput = styled.input`
   font-weight: bold;
   color: ${({ theme }: { theme: Theme }) => theme.text};
 `
-
 const FieldName = styled.h1`
   font-size: 1.8rem;
   margin-left: 1rem;
@@ -160,7 +187,6 @@ const FieldContainer = styled.div`
   flex-direction: row;
   align-items: center;
   width: 20rem;
-
   svg {
     color: rgba(174, 174, 174, 1);
   }
@@ -178,7 +204,12 @@ const StringInput = styled.input`
   font-weight: bold;
   color: ${({ theme }: { theme: Theme }) => theme.text};
 `
-
 const Value = styled.div`
   margin-left: 2rem;
 `
+const EmojiPickerContainer = styled.div`
+  position: absolute;
+  top: 12rem;
+  left: 0;
+  z-index: 100;
+`

src/ui/pages/Main/goals/GoalCard.tsx

@@ -27,6 +27,8 @@ export default function GoalCard(props: Props) {
 
   return (
     <Container key={goal.id} onClick={onClick}>
+      {goal.icon && <Icon>{goal.icon}</Icon>}
+      <Name>{goal.name}</Name>
       <TargetAmount>${goal.targetAmount}</TargetAmount>
       <TargetDate>{asLocaleDateString(goal.targetDate)}</TargetDate>
     </Container>
@@ -43,14 +45,18 @@ const Container = styled(Card)`
   margin-left: 2rem;
   margin-right: 2rem;
   border-radius: 2rem;
-
   align-items: center;
 `
+const Icon = styled.span`
+  font-size: 2rem;
+`
+const Name = styled.h3`
+  font-size: 1rem;
+`
 const TargetAmount = styled.h2`
   font-size: 2rem;
 `
-
 const TargetDate = styled.h4`
   color: rgba(174, 174, 174, 1);
   font-size: 1rem;
-`
+`