Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f2bbdf3
chore(amplify): update npm command in amplify.yml from ci to install …
Stivenjs Jun 5, 2025
ea1940c
chore(amplify): switch npm install to npm ci in amplify.yml for consi…
Stivenjs Jun 5, 2025
c4061b8
chore(amplify): add global installation of backend CLI in amplify.yml…
Stivenjs Jun 5, 2025
d558275
chore(amplify): set CI environment variable for ampx pipeline deploym…
Stivenjs Jun 5, 2025
dc25989
chore(amplify): remove CI environment variable from ampx pipeline dep…
Stivenjs Jun 5, 2025
f8cee59
chore(amplify): update pipeline deployment command in amplify.yml to …
Stivenjs Jun 5, 2025
e2fda63
chore(amplify): update ampx command in amplify.yml to use npx for pip…
Stivenjs Jun 5, 2025
fc0183d
chore(dependencies): add json-schema-to-ts and ts-algebra to package-…
Stivenjs Jun 5, 2025
bcf05fc
chore(amplify): modify pipeline deployment command in amplify.yml to …
Stivenjs Jun 5, 2025
8a760e2
chore(package): remove unnecessary newline in package.json scripts se…
Stivenjs Jun 5, 2025
a945eee
chore(dependencies): add @aws-amplify/backend-cli version 1.7.2 to pa…
Stivenjs Jun 5, 2025
7926dfb
chore(package): remove unused json-schema-to-ts and ts-algebra from p…
Stivenjs Jun 5, 2025
22e3c3e
chore(package): add json-schema-to-ts and ts-algebra to package-lock.…
Stivenjs Jun 5, 2025
84cd080
chore(amplify): remove unnecessary newline in amplify.yml
Stivenjs Jun 5, 2025
56d29d6
chore(amplify): update Amplify configuration to use outputs from ampl…
Stivenjs Jun 5, 2025
817596f
chore(package): add prepare script for husky in package.json
Stivenjs Jun 5, 2025
e06bb4d
refactor(middleware): update subdomain detection logic to only trigge…
Stivenjs Jun 5, 2025
f69ff66
refactor(middleware): enhance subdomain validation for production and…
Stivenjs Jun 5, 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
13 changes: 11 additions & 2 deletions app/(main-layout)/account-settings/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,18 @@ import { ActiveSessions } from '@/app/(main-layout)/account-settings/components/
import { useState, useEffect, Suspense } from 'react'
import { useSearchParams } from 'next/navigation'
import useUserStore from '@/context/core/userStore'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

function AccountSettingsContent() {
const searchParams = useSearchParams()
Expand Down
13 changes: 11 additions & 2 deletions app/(main-layout)/landing/components/DocsLanding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,18 @@ import { Feature } from '@/app/(main-layout)/landing/components/Feature'
import { Testimonials } from '@/app/(main-layout)/landing/components/Testimonials'
import { MarqueeLogos } from '@/app/(main-layout)/landing/components/MarqueeLogos'
import { LogoCarousell } from '@/app/(main-layout)/landing/components/LogoCarousell'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function LandingPage() {
return (
Expand Down
13 changes: 11 additions & 2 deletions app/(main-layout)/pricing/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,18 @@ import { FAQSection } from '@/app/(main-layout)/pricing/components/FAQSection'
import { faqItems } from '@/app/(main-layout)/pricing/components/FAQItem'
import { FeatureComparison } from '@/app/(main-layout)/pricing/components/FeatureComparison'
import { plans } from '@/app/(main-layout)/pricing/components/plans'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function PricingPage() {
return (
Expand Down
13 changes: 11 additions & 2 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@ import { inter } from '@/config/fonts'
import { ReactQueryProvider } from '@/utils/ReactQueryProvider'
import { Toaster } from '@/components/ui/sonner'
import ConfigureAmplifyClientSide from '@/utils/ConfigureAmplify'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

import './global.css'

Expand Down
3 changes: 0 additions & 3 deletions app/store/[slug]/dashboard/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
'use client'

import { EcommerceSetup } from '@/app/store/components/store-setup/components/EcommerceSetup'
import { configureAmplify } from '@/lib/amplify-config'

configureAmplify()

export default function DashboardPage() {
return <EcommerceSetup />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/orders/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { Orders } from '@/app/store/components/orders/components/Orders'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function OrdersPage() {
return <Orders />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/orders/processing/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { InProgress } from '@/app/store/components/orders/components/InProgress'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function ProcessingPage() {
return <InProgress />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/products/[productId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@
import { ProductForm } from '@/app/store/components/product-management/main-components/ProductForm'
import { useParams, usePathname } from 'next/navigation'
import { getStoreId } from '@/utils/store-utils'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function EditProductPage() {
const params = useParams()
Expand Down
12 changes: 12 additions & 0 deletions app/store/[slug]/products/collections/[collectionId]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
'use client'

import { FormPage } from '@/app/store/components/product-management/collection-form/form-page'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function CollectionEditPage() {
return <FormPage />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/products/collections/new/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
'use client'

import { FormPage } from '@/app/store/components/product-management/collection-form/form-page'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function CollectionPage() {
return <FormPage />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/products/collections/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
'use client'

import { CollectionsPage } from '@/app/store/components/product-management/collections/collections-page'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function CollectionsPages() {
return <CollectionsPage />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/products/inventory/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
'use client'

import { InventoryManager } from '@/app/store/components/product-management/main-components/InventoryManager'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'
import { getStoreId } from '@/utils/store-utils'
import { useParams, usePathname } from 'next/navigation'

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

export default function InventoryPage() {
const pathname = usePathname()
Expand Down
14 changes: 12 additions & 2 deletions app/store/[slug]/products/new/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
import { ProductForm } from '@/app/store/components/product-management/main-components/ProductForm'
import { useParams, usePathname } from 'next/navigation'
import { getStoreId } from '@/utils/store-utils'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

configureAmplify()
export default function AddProductPage() {
const params = useParams()
const pathname = usePathname()
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/products/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@
import { ProductManager } from '@/app/store/components/product-management/main-components/ProductManager'
import { getStoreId } from '@/utils/store-utils'
import { useParams, usePathname } from 'next/navigation'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function StoreProductsPage() {
const pathname = usePathname()
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/setup/apps/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
'use client'

import { AppIntegrationPage } from '@/app/store/components/app-integration/components/AppIntegrationPage'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function AppIntegration() {
return <AppIntegrationPage />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/setup/domain/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
'use client'

import { DomainManagement } from '@/app/store/components/domains/components/DomainManagement'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function DomainManagementPage() {
return <DomainManagement />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/setup/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
'use client'

import { ThemePreview } from '@/app/store/components/store-config/components/ThemePreview'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function SetupPage() {
return <ThemePreview />
Expand Down
13 changes: 11 additions & 2 deletions app/store/[slug]/setup/payments/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { PaymentSettings } from '@/app/store/components/payments/components/PaymentSettings'
import { configureAmplify } from '@/lib/amplify-config'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

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

export default function PaymentsPage() {
return <PaymentSettings />
Expand Down
3 changes: 0 additions & 3 deletions app/store/components/domains/components/DomainManagement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import { ChangeDomainDialog } from '@/app/store/components/domains/components/Ch
import { EditStoreProfileDialog } from '@/app/store/components/domains/components/EditStoreProfileDialog'
import { Skeleton } from '@/components/ui/skeleton'
import useStoreDataStore from '@/context/core/storeDataStore'
import { configureAmplify } from '@/lib/amplify-config'

configureAmplify()

export function DomainManagement() {
const { currentStore, isLoading } = useStoreDataStore()
Expand Down
Loading