Skip to content

Core multitenants #63

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.

Sign up for GitHub

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

Merged
Stivenjs merged 3 commits into from
Jun 3, 2025
Merged

Core multitenants #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e970538
refactor(collection-form): move Amplify configuration to a shared mod…
Stivenjs Jun 3, 2025
1be6f9b
refactor(collections-page): implement dynamic loading for collections…
Stivenjs Jun 3, 2025
5d5cd68
refactor(collections-page): enhance collections page with improved lo…
Stivenjs Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions app/store/components/product-management/collection-form/config/amplifyConfig.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/store/components/product-management/collection-form/form-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { useCollections } from '@/app/store/hooks/useCollections'
import { getStoreId } from '@/utils/store-utils'
import { UnsavedChangesAlert } from '@/components/ui/unsaved-changes-alert'
import { useCollectionForm } from '@/app/store/components/product-management/utils/collection-form-utils'
import { configureAmplify } from '@/app/store/components/product-management/collection-form/config/amplifyConfig'

import { CollectionHeader } from '@/app/store/components/product-management/collection-form/components/CollectionHeader'
import { CollectionContent } from '@/app/store/components/product-management/collection-form/components/CollectionContent'
import { CollectionSidebar } from '@/app/store/components/product-management/collection-form/components/CollectionSidebar'
import { CollectionFooter } from '@/app/store/components/product-management/collection-form/components/CollectionFooter'
import { configureAmplify } from '@/lib/amplify-config'

// Configure Amplify
configureAmplify()

export function FormPage() {
Expand Down
13 changes: 2 additions & 11 deletions app/store/components/product-management/collections/collections-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import CollectionsHeader from '@/app/store/components/product-management/collect
import CollectionsTabs from '@/app/store/components/product-management/collections/collections-tabs'
import CollectionsTable from '@/app/store/components/product-management/collections/collections-table'
import CollectionsFooter from '@/app/store/components/product-management/collections/collections-footer'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'
import { configureAmplify } from '@/lib/amplify-config'
import { useCollections } from '@/app/store/hooks/useCollections'
import { Skeleton } from '@/components/ui/skeleton'
import {
Expand All @@ -18,15 +17,7 @@ import {
TableRow,
} from '@/components/ui/table'

Amplify.configure(outputs)
const existingConfig = Amplify.getConfig()
Amplify.configure({
...existingConfig,
API: {
...existingConfig.API,
REST: outputs.custom.APIs,
},
})
configureAmplify()

type FilterType = 'all' | 'active' | 'inactive'

Expand Down
Loading