diff --git a/src/api/lib.js b/src/api/lib.js new file mode 100644 index 0000000..3c593ca --- /dev/null +++ b/src/api/lib.js @@ -0,0 +1,53 @@ +import axios from 'axios' +import { user } from '../data/user' +import { Goal, Transaction, User } from './types' + +export const API_ROOT = 'https://fencer-commbank.azurewebsites.net' + +export async function getUser(): Promise { + try { + const response = await axios.get(`${API_ROOT}/api/User/${user.id}`) + return response.data + } catch (error: any) { + return null + } +} + +export async function getTransactions(): Promise { + try { + const response = await axios.get(`${API_ROOT}/api/Transaction/User/${user.id}`) + return response.data + } catch (error: any) { + return null + } +} + +export async function getGoals(): Promise { + try { + const response = await axios.get(`${API_ROOT}/api/Goal/User/${user.id}`) + return response.data + } catch (error: any) { + return null + } +} + +export async function createGoal(): Promise { + try { + const response = await axios.post(`${API_ROOT}/api/Goal`, { + userId: user.id, + targetDate: new Date(), + }) + return response.data + } catch (error: any) { + return null + } +} + +export async function updateGoal(goalId: string, updatedGoal: Goal): Promise { + try { + await axios.put(`${API_ROOT}/api/Goal/${goalId}`, updatedGoal) + return true + } catch (error: any) { + return false + } +} diff --git a/src/ui/features/goalmanager/GoalManager.js b/src/ui/features/goalmanager/GoalManager.js new file mode 100644 index 0000000..56007bf --- /dev/null +++ b/src/ui/features/goalmanager/GoalManager.js @@ -0,0 +1,247 @@ +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 { BaseEmoji } from 'emoji-mart' +import 'date-fns' +import React, { useEffect, useState } from 'react' +import styled from 'styled-components' +import { updateGoal as updateGoalApi } from '../../../api/lib' +import { Goal } from '../../../api/types' +import { selectGoalsMap, updateGoal as updateGoalRedux } from '../../../store/goalsSlice' +import { useAppDispatch, useAppSelector } from '../../../store/hooks' +import DatePicker from '../../components/DatePicker' +import EmojiPicker from '../../components/EmojiPicker' +import { Theme } from '../../components/Theme' +import AddIconButton from './AddIconButton' +import GoalIcon from './GoalIcon' + +type GoalWithIcon = Goal & { icon?: string | null } +type Props = { goal: GoalWithIcon } +export function GoalManager(props: Props) { + const dispatch = useAppDispatch() + + const goal = useAppSelector(selectGoalsMap)[props.goal.id] as GoalWithIcon + + const [name, setName] = useState(null) + const [targetDate, setTargetDate] = useState(null) + const [targetAmount, setTargetAmount] = useState(null) + const [icon, setIcon] = useState(null) + const [isEmojiPickerOpen, setIsEmojiPickerOpen] = useState(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(() => { + setName(goal.name) + }, [goal.name]) + + useEffect(() => { + setIcon(goal.icon ?? null) + }, [goal.icon]) + + const persistGoal = (updatedGoal: GoalWithIcon) => { + dispatch(updateGoalRedux(updatedGoal)) + updateGoalApi(props.goal.id, updatedGoal) + } + + const buildUpdatedGoal = (overrides: Partial): GoalWithIcon => { + const currentGoal = goal ?? props.goal + + return { + ...currentGoal, + name: name ?? currentGoal.name, + targetDate: targetDate ?? currentGoal.targetDate, + targetAmount: targetAmount ?? currentGoal.targetAmount, + icon: icon ?? currentGoal.icon ?? null, + ...overrides, + } + } + + const updateNameOnChange = (event: React.ChangeEvent) => { + const nextName = event.target.value + setName(nextName) + persistGoal(buildUpdatedGoal({ name: nextName })) + } + + const updateTargetAmountOnChange = (event: React.ChangeEvent) => { + const nextTargetAmount = parseFloat(event.target.value) + setTargetAmount(nextTargetAmount) + persistGoal(buildUpdatedGoal({ targetAmount: nextTargetAmount })) + } + + const pickDateOnChange = (date: MaterialUiPickersDate) => { + if (date != null) { + setTargetDate(date) + persistGoal(buildUpdatedGoal({ targetDate: date })) + } + } + + const toggleEmojiPicker = (event: React.MouseEvent) => { + event.stopPropagation() + setIsEmojiPickerOpen(prevState => !prevState) + } + + const pickEmojiOnClick = (emoji: BaseEmoji, event: React.MouseEvent) => { + event.stopPropagation() + const nextIcon = emoji.native + setIcon(nextIcon) + setIsEmojiPickerOpen(false) + persistGoal(buildUpdatedGoal({ icon: nextIcon })) + } + + return ( + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + {props.goal.balance} + + + + + + + {new Date(props.goal.created).toLocaleDateString()} + + +
+ ) +} + +type FieldProps = { name: string; icon: IconDefinition } +type AddIconButtonContainerProps = { shouldShow: boolean } +type GoalIconContainerProps = { shouldShow: boolean } +type EmojiPickerContainerProps = { isOpen: boolean; hasIcon: boolean } + +const Field = (props: FieldProps) => ( + + + {props.name} + +) + +const GoalManagerContainer = styled.div` + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + height: 100%; + width: 100%; + position: relative; +` + +const Header = styled.div` + display: flex; + flex-direction: column; + align-items: flex-start; +` + +const Group = styled.div` + display: flex; + flex-direction: row; + width: 100%; + margin-top: 1.25rem; + margin-bottom: 1.25rem; +` +const NameInput = styled.input` + display: flex; + background-color: transparent; + outline: none; + border: none; + font-size: 4rem; + font-weight: bold; + color: ${({ theme }: { theme: Theme }) => theme.text}; +` + +const FieldName = styled.h1` + font-size: 1.8rem; + margin-left: 1rem; + color: rgba(174, 174, 174, 1); + font-weight: normal; +` +const FieldContainer = styled.div` + display: flex; + flex-direction: row; + align-items: center; + width: 20rem; + + svg { + color: rgba(174, 174, 174, 1); + } +` +const StringValue = styled.h1` + font-size: 1.8rem; + font-weight: bold; +` +const StringInput = styled.input` + display: flex; + background-color: transparent; + outline: none; + border: none; + font-size: 1.8rem; + font-weight: bold; + color: ${({ theme }: { theme: Theme }) => theme.text}; +` + +const Value = styled.div` + margin-left: 2rem; +` + +const AddIconButtonContainer = styled.div` + display: ${({ shouldShow }) => (shouldShow ? 'flex' : 'none')}; + margin-bottom: 1.5rem; +` + +const GoalIconContainer = styled.div` + display: ${({ shouldShow }) => (shouldShow ? 'flex' : 'none')}; + margin-bottom: 1rem; +` + +const EmojiPickerContainer = styled.div` + display: ${({ isOpen }) => (isOpen ? 'block' : 'none')}; + position: absolute; + top: ${({ hasIcon }) => (hasIcon ? '5.5rem' : '3rem')}; + left: 0; + z-index: 2; +` diff --git a/src/ui/features/goalmanager/GoalManager.tsx b/src/ui/features/goalmanager/GoalManager.tsx index 0779dda..56007bf 100644 --- a/src/ui/features/goalmanager/GoalManager.tsx +++ b/src/ui/features/goalmanager/GoalManager.tsx @@ -2,6 +2,7 @@ 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 { BaseEmoji } from 'emoji-mart' import 'date-fns' import React, { useEffect, useState } from 'react' import styled from 'styled-components' @@ -10,73 +11,111 @@ import { Goal } from '../../../api/types' import { selectGoalsMap, updateGoal as updateGoalRedux } from '../../../store/goalsSlice' import { useAppDispatch, useAppSelector } from '../../../store/hooks' import DatePicker from '../../components/DatePicker' +import EmojiPicker from '../../components/EmojiPicker' import { Theme } from '../../components/Theme' +import AddIconButton from './AddIconButton' +import GoalIcon from './GoalIcon' -type Props = { goal: Goal } +type GoalWithIcon = Goal & { icon?: string | null } +type Props = { goal: GoalWithIcon } export function GoalManager(props: Props) { const dispatch = useAppDispatch() - const goal = useAppSelector(selectGoalsMap)[props.goal.id] + const goal = useAppSelector(selectGoalsMap)[props.goal.id] as GoalWithIcon const [name, setName] = useState(null) const [targetDate, setTargetDate] = useState(null) const [targetAmount, setTargetAmount] = useState(null) + const [icon, setIcon] = useState(null) + const [isEmojiPickerOpen, setIsEmojiPickerOpen] = useState(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(() => { setName(goal.name) }, [goal.name]) + useEffect(() => { + setIcon(goal.icon ?? null) + }, [goal.icon]) + + const persistGoal = (updatedGoal: GoalWithIcon) => { + dispatch(updateGoalRedux(updatedGoal)) + updateGoalApi(props.goal.id, updatedGoal) + } + + const buildUpdatedGoal = (overrides: Partial): GoalWithIcon => { + const currentGoal = goal ?? props.goal + + return { + ...currentGoal, + name: name ?? currentGoal.name, + targetDate: targetDate ?? currentGoal.targetDate, + targetAmount: targetAmount ?? currentGoal.targetAmount, + icon: icon ?? currentGoal.icon ?? null, + ...overrides, + } + } + const updateNameOnChange = (event: React.ChangeEvent) => { const nextName = event.target.value setName(nextName) - const updatedGoal: Goal = { - ...props.goal, - name: nextName, - } - dispatch(updateGoalRedux(updatedGoal)) - updateGoalApi(props.goal.id, updatedGoal) + persistGoal(buildUpdatedGoal({ name: nextName })) } const updateTargetAmountOnChange = (event: React.ChangeEvent) => { const nextTargetAmount = parseFloat(event.target.value) setTargetAmount(nextTargetAmount) - const updatedGoal: Goal = { - ...props.goal, - name: name ?? props.goal.name, - targetDate: targetDate ?? props.goal.targetDate, - targetAmount: nextTargetAmount, - } - dispatch(updateGoalRedux(updatedGoal)) - updateGoalApi(props.goal.id, updatedGoal) + persistGoal(buildUpdatedGoal({ targetAmount: nextTargetAmount })) } const pickDateOnChange = (date: MaterialUiPickersDate) => { if (date != null) { setTargetDate(date) - const updatedGoal: Goal = { - ...props.goal, - name: name ?? props.goal.name, - targetDate: date ?? props.goal.targetDate, - targetAmount: targetAmount ?? props.goal.targetAmount, - } - dispatch(updateGoalRedux(updatedGoal)) - updateGoalApi(props.goal.id, updatedGoal) + persistGoal(buildUpdatedGoal({ targetDate: date })) } } + const toggleEmojiPicker = (event: React.MouseEvent) => { + event.stopPropagation() + setIsEmojiPickerOpen(prevState => !prevState) + } + + const pickEmojiOnClick = (emoji: BaseEmoji, event: React.MouseEvent) => { + event.stopPropagation() + const nextIcon = emoji.native + setIcon(nextIcon) + setIsEmojiPickerOpen(false) + persistGoal(buildUpdatedGoal({ icon: nextIcon })) + } + return ( +
+ + + + + + + +
+ + + + + @@ -132,6 +171,12 @@ const GoalManagerContainer = styled.div` position: relative; ` +const Header = styled.div` + display: flex; + flex-direction: column; + align-items: flex-start; +` + const Group = styled.div` display: flex; flex-direction: row; @@ -182,3 +227,21 @@ const StringInput = styled.input` const Value = styled.div` margin-left: 2rem; ` + +const AddIconButtonContainer = styled.div` + display: ${({ shouldShow }) => (shouldShow ? 'flex' : 'none')}; + margin-bottom: 1.5rem; +` + +const GoalIconContainer = styled.div` + display: ${({ shouldShow }) => (shouldShow ? 'flex' : 'none')}; + margin-bottom: 1rem; +` + +const EmojiPickerContainer = styled.div` + display: ${({ isOpen }) => (isOpen ? 'block' : 'none')}; + position: absolute; + top: ${({ hasIcon }) => (hasIcon ? '5.5rem' : '3rem')}; + left: 0; + z-index: 2; +`