Skip to content

Commit

Permalink
feat: Migrate Newsletter section to app folder
Browse files Browse the repository at this point in the history
  • Loading branch information
pedromtec committed Aug 20, 2024
1 parent cca7f35 commit 210e13e
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
NewsletterHeader as UINewsletterHeader,
} from '@faststore/ui'

import { NewsletterAddendum as UINewsletterAddendum } from 'src/components/ui/Newsletter'
import { NewsletterAddendum as UINewsletterAddendum } from 'app/components/ui/Newsletter'

export const NewsletterDefaultComponents = {
Button: UIButton,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import {
NewsletterHeaderProps as UINewsletterHeaderProps,
} from '@faststore/ui'

import UINewsletter from '../../ui/Newsletter'
import UINewsletter from 'app/components/ui/Newsletter'

import Section from '../Section'
import Section from 'src/components/sections/Section'
import styles from './section.module.scss'
import { getOverridableSection } from '../../../../app/sdk/overrides/getOverriddenSection'
import { getOverridableSection } from 'app/sdk/overrides/getOverriddenSection'
import { NewsletterDefaultComponents } from './DefaultComponents'

type SubscribeMessage = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use client'

import { getOverriddenSection } from 'app/sdk/overrides/getOverriddenSection'
import type { SectionOverrideDefinitionV1 } from 'app/typings/overridesDefinition'
import { override } from 'src/customizations/src/components/overrides/Newsletter'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { InputFieldProps } from '@faststore/ui'
import { useNewsletter } from 'src/sdk/newsletter/useNewsletter'
import { useOverrideComponents } from 'app/sdk/overrides/OverrideContext'

import type { NewsletterProps as SectionNewsletterProps } from 'src/components/sections/Newsletter'
import type { NewsletterProps as SectionNewsletterProps } from 'app/components/sections/Newsletter'

export type NewsletterProps = SectionNewsletterProps

Expand Down
2 changes: 2 additions & 0 deletions packages/core/app/fs-next-update/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import RenderSections from 'app/components/cms/RenderSections'
import { OverriddenDefaultBannerText as BannerText } from 'app/components/sections/BannerText/OverriddenDefaultBannerText'
import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/OverriddenDefaultHero'
import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'

import Incentives from 'app/components/sections/Incentives'
import PageProvider from 'app/sdk/overrides/PageProvider'
Expand All @@ -19,6 +20,7 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
Incentives,
ProductShelf,
BannerText,
Newsletter,
...CUSTOM_COMPONENTS,
}

Expand Down
2 changes: 1 addition & 1 deletion packages/core/app/typings/overrides.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import type { PropsWithChildren } from 'react'
import Breadcrumb from '../../src/components/sections/Breadcrumb'
import CrossSellingShelf from '../../src/components/sections/CrossSellingShelf'
import EmptyState from '../../src/components/sections/EmptyState'
import Newsletter from '../../src/components/sections/Newsletter'
import Newsletter from '../components/sections/Newsletter'
import ProductDetails from '../../src/components/sections/ProductDetails'
import ProductGallery from '../../src/components/sections/ProductGallery'
import ProductShelf from '../components/sections/ProductShelf'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import type { BannerTextProps } from 'app/components/sections/BannerText'
import { OverriddenDefaultBannerText as BannerText } from 'app/components/sections/BannerText/OverriddenDefaultBannerText'

import type { NewsletterProps } from 'src/components/sections/Newsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
import type { NewsletterProps } from 'app/components/sections/Newsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'

import Section from '../Section'
import styles from './section.module.scss'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type { PageContentType } from 'app/server/cms'
import { getPage } from 'app/server/cms'
import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
import { OverriddenDefaultCrossSellingShelf as CrossSellingShelf } from 'src/components/sections/CrossSellingShelf/OverriddenDefaultCrossSellingShelf'
import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
import ProductTiles from 'src/components/sections/ProductTiles'
import CUSTOM_COMPONENTS from 'src/customizations/src/components'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/Over
import deepmerge from 'deepmerge'
import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
import { OverriddenDefaultBreadcrumb as Breadcrumb } from 'src/components/sections/Breadcrumb/OverriddenDefaultBreadcrumb'
import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultProductGallery as ProductGallery } from 'src/components/sections/ProductGallery/OverriddenDefaultProductGallery'
import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
import ProductTiles from 'src/components/sections/ProductTiles'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import PageProvider, { SearchPageContext } from 'app/sdk/overrides/PageProvider'
import { SearchContentType } from 'app/server/cms'
import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
import { OverriddenDefaultBreadcrumb as Breadcrumb } from 'src/components/sections/Breadcrumb/OverriddenDefaultBreadcrumb'
import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultProductGallery as ProductGallery } from 'src/components/sections/ProductGallery/OverriddenDefaultProductGallery'
import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
import ProductTiles from 'src/components/sections/ProductTiles'
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/pages/[slug]/p.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/Over
import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
import { OverriddenDefaultBreadcrumb as Breadcrumb } from 'src/components/sections/Breadcrumb/OverriddenDefaultBreadcrumb'
import { OverriddenDefaultCrossSellingShelf as CrossSellingShelf } from 'src/components/sections/CrossSellingShelf/OverriddenDefaultCrossSellingShelf'
import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultProductDetails as ProductDetails } from 'src/components/sections/ProductDetails/OverriddenDefaultProductDetails'
import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
import ProductTiles from 'src/components/sections/ProductTiles'
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Incentives from 'app/components/sections/Incentives'
import type { PageContentType } from 'app/server/cms'
import { getPage } from 'app/server/cms'
import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
import ProductTiles from 'src/components/sections/ProductTiles'
import CUSTOM_COMPONENTS from 'src/customizations/src/components'
Expand All @@ -20,7 +20,7 @@ import PageProvider from 'app/sdk/overrides/PageProvider'
import { getDynamicContent } from 'app/utils/dynamicContent'
import GlobalSections, {
getGlobalSectionsData,
GlobalSectionsData
GlobalSectionsData,
} from 'src/components/cms/GlobalSections'
import storeConfig from '../../faststore.config'

Expand Down

0 comments on commit 210e13e

Please sign in to comment.