-
Notifications
You must be signed in to change notification settings - Fork 38
feat(web-ui): extract shared shadcn-style package for apps/landing and apps/guides #2075
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
andrew-bierman
wants to merge
4
commits into
copilot/replicate-ui-style-in-landing-page
from
feat/shared-web-ui-package
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5a47586
feat(web-ui): add @packrat/web-ui workspace package skeleton
andrew-bierman 4153474
refactor(landing): use @packrat/web-ui Button component
andrew-bierman 5c04b2a
chore: initial plan commit
Copilot ba33f6b
fix(biome): resolve formatting and lint errors from base branch files
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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,56 @@ | ||
| import { packItemsStore, packsStore } from 'expo-app/features/packs/store'; | ||
| import { recordPackWeight } from 'expo-app/features/packs/store/packWeightHistory'; | ||
| import type { Pack, PackInput, PackInStore } from 'expo-app/features/packs/types'; | ||
| import { nanoid } from 'nanoid/non-secure'; | ||
| import { useCallback } from 'react'; | ||
|
|
||
| export function useCreatePackFromPack() { | ||
| const createPackFromPack = useCallback((sourcePack: Pack, packData: Partial<PackInput>) => { | ||
| const newPackId = nanoid(); | ||
| const timestamp = new Date().toISOString(); | ||
|
|
||
| // Create the new pack with custom data, falling back to source pack data | ||
| const newPack: PackInStore = { | ||
| id: newPackId, | ||
| name: packData.name || `${sourcePack.name} (Copy)`, | ||
| description: packData.description || sourcePack.description, | ||
| category: packData.category || sourcePack.category, | ||
| isPublic: packData.isPublic !== undefined ? packData.isPublic : false, // Default to private | ||
| image: packData.image !== undefined ? packData.image : sourcePack.image, | ||
| tags: packData.tags || sourcePack.tags || [], | ||
| localCreatedAt: timestamp, | ||
| localUpdatedAt: timestamp, | ||
| deleted: false, | ||
| }; | ||
|
|
||
| // @ts-ignore: Safe because Legend-State uses Proxy | ||
| packsStore[newPackId].set(newPack); | ||
|
Comment on lines
+26
to
+27
|
||
|
|
||
| // Copy each item from the source pack | ||
| if (sourcePack.items) { | ||
| for (const item of sourcePack.items) { | ||
| if (!item.deleted) { | ||
| const newItemId = nanoid(); | ||
| const newItem = { | ||
| ...item, | ||
| id: newItemId, | ||
| packId: newPackId, | ||
| deleted: false, | ||
| createdAt: undefined, // Reset server timestamps | ||
| updatedAt: undefined, | ||
| }; | ||
|
|
||
| // @ts-ignore: Safe because Legend-State uses Proxy | ||
| packItemsStore[newItemId].set(newItem); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Recalculate pack weight | ||
| recordPackWeight(newPackId); | ||
|
|
||
| return newPackId; | ||
| }, []); | ||
|
|
||
| return createPackFromPack; | ||
| } | ||
This file contains hidden or 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,49 @@ | ||
| import { useMutation, useQueryClient } from '@tanstack/react-query'; | ||
| import axiosInstance from 'expo-app/lib/api/client'; | ||
| import { useCallback } from 'react'; | ||
| import type { Pack, PackInput } from '../types'; | ||
| import { useCreatePackFromPack } from './useCreatePackFromPack'; | ||
|
|
||
| export function useDuplicatePack() { | ||
| const createPackFromPack = useCreatePackFromPack(); | ||
| const queryClient = useQueryClient(); | ||
|
|
||
| const duplicatePackMutation = useMutation({ | ||
| mutationFn: async ({ | ||
| packId, | ||
| packData = {}, | ||
| }: { | ||
| packId: string; | ||
| packData?: Partial<PackInput>; | ||
| }) => { | ||
| // First, fetch the full pack details with items | ||
| const response = await queryClient.fetchQuery({ | ||
| queryKey: ['pack', packId], | ||
| queryFn: async () => { | ||
| const res = await axiosInstance.get(`/api/packs/${packId}`); | ||
| return res.data as Pack; | ||
| }, | ||
| }); | ||
|
|
||
| // Create the new pack from the fetched pack | ||
| const newPackId = createPackFromPack(response, packData); | ||
| return newPackId; | ||
| }, | ||
| onError: (error) => { | ||
| console.error('Error duplicating pack:', error); | ||
| }, | ||
| }); | ||
|
|
||
| const duplicatePack = useCallback( | ||
| (packId: string, packData?: Partial<PackInput>) => { | ||
| return duplicatePackMutation.mutateAsync({ packId, packData }); | ||
| }, | ||
| [duplicatePackMutation], | ||
| ); | ||
|
|
||
| return { | ||
| duplicatePack, | ||
| isLoading: duplicatePackMutation.isPending, | ||
| error: duplicatePackMutation.error, | ||
| }; | ||
| } |
This file contains hidden or 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
This file contains hidden or 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 | ||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -57,6 +57,22 @@ export const TripForm = ({ trip }: { trip?: Trip }) => { | |||||||||||||||||||||||||||||||||||
| const { location, setLocation } = useTripLocation(); | ||||||||||||||||||||||||||||||||||||
| const packs = usePacks(); | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| // Initialize location store with trip's location when component mounts or | ||||||||||||||||||||||||||||||||||||
| // trip ID changes. We intentionally depend only on trip?.id (not trip?.location) | ||||||||||||||||||||||||||||||||||||
| // so that after the user picks a new location via location-search, a | ||||||||||||||||||||||||||||||||||||
| // re-render of the same trip object does not overwrite their selection in | ||||||||||||||||||||||||||||||||||||
| // the store. | ||||||||||||||||||||||||||||||||||||
| // biome-ignore lint/correctness/useExhaustiveDependencies: intentional — see comment above; reseeding on trip?.location would stomp user-picked values | ||||||||||||||||||||||||||||||||||||
| useEffect(() => { | ||||||||||||||||||||||||||||||||||||
| // Set location from trip, or null if trip has no location | ||||||||||||||||||||||||||||||||||||
| setLocation(trip?.location ?? null); | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| // Cleanup: clear location when component unmounts | ||||||||||||||||||||||||||||||||||||
| return () => { | ||||||||||||||||||||||||||||||||||||
|
Comment on lines
+67
to
+71
|
||||||||||||||||||||||||||||||||||||
| // Set location from trip, or null if trip has no location | |
| setLocation(trip?.location ?? null); | |
| // Cleanup: clear location when component unmounts | |
| return () => { | |
| const nextLocation = trip?.location ?? null; | |
| // Defer the seed so the final mounted store state matches the current | |
| // trip, even if another mount-only effect in this component clears the | |
| // shared location store during the same commit. | |
| const timeoutId = setTimeout(() => { | |
| setLocation(nextLocation); | |
| }, 0); | |
| // Cleanup: cancel pending seed and clear location when component unmounts | |
| return () => { | |
| clearTimeout(timeoutId); |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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.
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.
packData.name/packData.descriptionare merged using||, which will treat empty strings as “not provided” and fall back to the source pack values. If callers ever intentionally pass an empty string (e.g., to clear description), this will be impossible.Use nullish coalescing (
??) for string fields so onlyundefined/nulltrigger the fallback.