[feat] profile context integration with view plants and add details #63
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,65 +2,28 @@ | |
|
|
||
| import { useState } from 'react'; | ||
| import { useRouter } from 'next/navigation'; | ||
| import { insertUserPlants } from '@/api/supabase/queries/userPlants'; | ||
| import PlantDetails from '@/components/PlantDetails'; | ||
| import COLORS from '@/styles/colors'; | ||
| import { Flex } from '@/styles/containers'; | ||
| import { H1, P1 } from '@/styles/text'; | ||
| import { UserPlant } from '@/types/schema'; | ||
| import { useAuth } from '@/utils/AuthProvider'; | ||
| import { useProfile } from '@/utils/ProfileProvider'; | ||
| import { ButtonDiv, FooterButton, MoveButton } from './styles'; | ||
|
|
||
| export default function Home() { | ||
| const { profileData, profileReady, plantsToAdd } = useProfile(); | ||
| const { userId } = useAuth(); | ||
| const router = useRouter(); | ||
|
|
||
| if (profileReady && !profileData) { | ||
| router.push('/view-plants'); | ||
| } | ||
| const [currentIndex, setCurrentIndex] = useState<number>(1); | ||
| const [details, setDetails] = useState<Partial<UserPlant>[]>( | ||
| plantsToAdd.map(plant => ({ plant_id: plant.id, user_id: userId! })), | ||
| ); | ||
|
|
||
| const getDefaultDate = () => new Date().toISOString().substring(0, 10); | ||
|
There was a problem hiding this comment. note: this date is a little funky. it's 1:48am 12/13, but the plant i just added says 12/12. Perhaps we should look into other date formatting options e.g. |
||
|
|
||
|
|
@@ -71,28 +34,24 @@ export default function Home() { | |
| // Set curr date in details to default date if not on submission page | ||
| if ( | ||
| (!currentDetail || !currentDetail.date_added) && | ||
| currentIndex <= plantsToAdd.length | ||
| ) { | ||
| updateInput('date_added', getDefaultDate()); | ||
| } | ||
| // For valid moves, move to next page | ||
| if ( | ||
| steps !== 0 && | ||
| currentIndex + steps > 0 && | ||
| currentIndex + steps <= plantsToAdd.length + 1 | ||
| ) { | ||
| setCurrentIndex(prevIndex => prevIndex + steps); | ||
| } | ||
| } | ||
|
|
||
| // disable next if planting type not selected (undefined) | ||
| const disableNext = | ||
| currentIndex <= plantsToAdd.length && | ||
| !details[currentIndex - 1].planting_type; | ||
|
|
||
| function updateInput(field: string, value: string) { | ||
| const updatedDetails = [...details]; | ||
|
|
@@ -102,38 +61,74 @@ export default function Home() { | |
| }; | ||
| setDetails(updatedDetails); | ||
| } | ||
| // const handleSubmit = async () => { | ||
| // try { | ||
| // await insertUserPlants(userId!, details); | ||
| // router.push('/view-plants'); | ||
| // } catch (error) { | ||
| // console.error('Error inserting user plants:', error); | ||
| // // Optionally, add user-facing error handling | ||
| // } | ||
| // }; | ||
| async function updateDB() { | ||
| await insertUserPlants(userId!, details); | ||
| router.push('/view-plants'); | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| {currentIndex !== plantsToAdd.length + 1 && ( | ||
| <Flex $direction="column" $justify="between"> | ||
| <Flex $direction="column" $justify="start"> | ||
| <Flex $gap="16px" $direction="column" $textAlign="center"> | ||
| <H1 $color={COLORS.shrub}>Add Plant Details</H1> | ||
| <P1 $color={COLORS.midgray}> | ||
| {currentIndex} / {plantsToAdd.length} | ||
| </P1> | ||
| </Flex> | ||
| <PlantDetails | ||
| plant={plantsToAdd[currentIndex - 1]} | ||
| date={details[currentIndex - 1].date_added || getDefaultDate()} | ||
| plantingType={details[currentIndex - 1].planting_type || 'SELECT'} | ||
| onDateChange={date => updateInput('date_added', date)} | ||
| onPlantingTypeChange={type => updateInput('planting_type', type)} | ||
| /> | ||
| </Flex> | ||
| <FooterButton> | ||
| <ButtonDiv> | ||
| {currentIndex > 1 && ( | ||
| <MoveButton | ||
| type="button" | ||
| onClick={() => move(-1)} | ||
| $secondaryColor={COLORS.shrub} | ||
| > | ||
| Back | ||
| </MoveButton> | ||
| )} | ||
|
|
||
| <MoveButton | ||
| type="button" | ||
| disabled={disableNext} | ||
| onClick={() => move(1)} | ||
| $primaryColor={disableNext ? COLORS.midgray : COLORS.shrub} | ||
| $secondaryColor="white" | ||
| > | ||
| Next | ||
| </MoveButton> | ||
| </ButtonDiv> | ||
| </FooterButton> | ||
| </Flex> | ||
| )} | ||
| {currentIndex === plantsToAdd.length + 1 && ( | ||
| <div> | ||
| <button type="button" onClick={() => move(-1)}> | ||
| Back | ||
| </button> | ||
| <button type="button" onClick={updateDB}> | ||
| Submit | ||
| </button> | ||
| </div> | ||
| )} | ||
| </> | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import styled from 'styled-components'; | ||
| import { SmallRoundedButton } from '@/components/Button'; | ||
|
|
||
| export const MoveButton = styled(SmallRoundedButton)` | ||
| border: 1px solid; | ||
| font-family: inherit; | ||
| margin-bottom: 10px; | ||
| width: 170px; | ||
| height: 50px; | ||
| font-size: 15px; | ||
| font-style: normal; | ||
| font-weight: 400; | ||
| line-height: normal; | ||
| `; | ||
| export const FooterButton = styled.div` | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: end; | ||
| width: 100%; | ||
| position: absolute; | ||
| bottom: 0; | ||
| left: 50%; | ||
| transform: translateX(-50%); | ||
| padding: 24px; | ||
| `; | ||
|
|
||
| export const ButtonDiv = styled.div` | ||
| display: flex; | ||
| width: 100%; | ||
| justify-content: space-between; | ||
| &:has(:only-child) { | ||
| justify-content: flex-end; | ||
| } | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note: we should replace all routes with CONFIG
e.g.