Skip to content
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

Jump to bottom

Staging #74

Merged
merged 3 commits into from
Apr 26, 2024
Merged

Staging #74

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
633221b
added string validation in the parse method
ChinmayeeMestry Apr 26, 2024
a5cbea9
Merge pull request #72 from contentstack/shopify-add-oxygen-workflow-…
NamrataSane Apr 26, 2024
6ac0548
Merge pull request #73 from contentstack/development
NamrataSane Apr 26, 2024
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
2 changes: 1 addition & 1 deletion app/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export function Footer(fetchdata: any) {
</div>
</div>
<div className="footer-copyright-sec">
<p>{parse(footer?.copyright)}</p>
<p>{parse(footer?.copyright || '')}</p>
</div>
</div>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion app/components/Search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ function SearchResultItem({goToSearchResult, item}: SearchResultItemProps) {
)}
<div>
{item.styledTitle ? (
<div>{parse(item?.styledTitle)}</div>
<div>{parse(item?.styledTitle || '')}</div>
) : (
<span>{item.title}</span>
)}
Expand Down
4 changes: 2 additions & 2 deletions app/routes/($locale)._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function RecommendedProducts({
)}
{cmsData?.banner?.banner_description ? (
<div className="banner-description">
{parse(cmsData?.banner?.banner_description)}
{parse(cmsData?.banner?.banner_description || '')}
</div>
) : (
''
Expand Down Expand Up @@ -363,7 +363,7 @@ function RecommendedProducts({
</div>
</div>
<h2 className="new-arrival-heading">
{parse(cmsData?.new_arrival_description)}
{parse(cmsData?.new_arrival_description || '')}
</h2>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/($locale).about.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function RecommendedProducts({
<h1 className=" bodyCss about-heading">{cmsData?.heading}</h1>
</div>
<div className="container">
<p className="about-description">{parse(cmsData?.description)}</p>
<p className="about-description">{parse(cmsData?.description || '')}</p>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion app/routes/($locale).blogs.$blogHandle.$articleHandle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function Article() {
</h1>

{image && <Image data={image} sizes="90vw" loading="eager" />}
<div className="article">{parse(contentHtml)}</div>
<div className="article">{parse(contentHtml || '')}</div>
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion app/routes/($locale).policies.$handle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function Policy() {
</div>
<br />
<h1>{policy.title}</h1>
<div>{parse(policy.body)}</div>
<div>{parse(policy.body || '')}</div>
</div>
);
}
Expand Down
6 changes: 3 additions & 3 deletions app/routes/($locale).products.$handle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ function ProductMain({
<div className="product-main">
<h1>{title}</h1>
<br />
{descriptionHtml && <div>{parse(descriptionHtml)}</div>}
{descriptionHtml && <div>{parse(descriptionHtml || '')}</div>}
<ProductPrice selectedVariant={selectedVariant} />
<br />
<Suspense
Expand Down Expand Up @@ -360,7 +360,7 @@ function ProductMain({
<strong>Reviews</strong>
</p>
<br />
<div>{parse(valueMap.get('product_review'))}</div>
<div>{parse(valueMap.get('product_review') || '')}</div>
<br />
</>
)}
Expand All @@ -371,7 +371,7 @@ function ProductMain({
<strong>Shipping and Return</strong>
</p>
<br />
<div>{parse(valueMap.get('shipping_return_policy'))}</div>
<div>{parse(valueMap.get('shipping_return_policy') || '')}</div>
<br />
</>
)}
Expand Down
4 changes: 2 additions & 2 deletions app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function RecommendedProducts({
)}
{cmsData?.banner?.banner_description ? (
<div className="banner-description">
{parse(cmsData?.banner?.banner_description)}
{parse(cmsData?.banner?.banner_description || '')}
</div>
) : (
''
Expand Down Expand Up @@ -363,7 +363,7 @@ function RecommendedProducts({
</div>
</div>
<h2 className="new-arrival-heading">
{parse(cmsData?.new_arrival_description)}
{parse(cmsData?.new_arrival_description || '')}
</h2>
</div>
</div>
Expand Down
Loading