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

Remove marketing blocks from PRODUCT mode home page #2780

Merged
merged 6 commits into from
Apr 5, 2022
Merged

Remove marketing blocks from PRODUCT mode home page #2780

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a183a5d
wip
fiskus Apr 5, 2022
5f27acc
fix background heights
fiskus Apr 5, 2022
77c3bc1
remove Docs and Blog
fiskus Apr 5, 2022
09a4482
add changelog entry
fiskus Apr 5, 2022
96cf04a
Merge branch 'master' of github.com:quiltdata/quilt into product-no-m…
fiskus Apr 5, 2022
f885c1f
simplify condition
fiskus Apr 5, 2022
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
4 changes: 2 additions & 2 deletions catalog/app/containers/NavBar/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,13 @@ function useLinks(): LinkDescriptor[] {
label: 'URI',
path: paths.uriResolver,
},
{ href: URLS.docs, label: 'Docs' },
cfg.mode !== 'PRODUCT' && { href: URLS.docs, label: 'Docs' },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we should keep the documentation link

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aneesh asked to remove it. I thought we should keep it too.

But after removing all marketing blocks docs link in the footer become visible now, and probably redundant

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, we have docs links in-place where something goes wrong and user should want to check the docs :)

cfg.mode === 'MARKETING' && { to: `${urls.home()}#pricing`, label: 'Pricing' },
(cfg.mode === 'MARKETING' || cfg.mode === 'OPEN') && {
href: URLS.jobs,
label: 'Jobs',
},
{ href: URLS.blog, label: 'Blog' },
cfg.mode !== 'PRODUCT' && { href: URLS.blog, label: 'Blog' },
cfg.mode === 'MARKETING' && { to: urls.about(), label: 'About' },
].filter(Boolean) as LinkDescriptor[]
}
Expand Down
2 changes: 1 addition & 1 deletion catalog/app/website/pages/Landing/Buckets/Buckets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export default function Buckets({ query: filter } = { query: '' }) {

return (
<div className={classes.root}>
<Backlight style={{ opacity: 0.5 }} />
<Backlight style={{ height: '1200px', opacity: 0.5 }} />
<M.Container maxWidth="lg" className={classes.container}>
<div ref={scrollRef} style={{ position: 'relative', top: -72 }} />
<M.Typography variant="h1" color="textPrimary">
Expand Down
22 changes: 13 additions & 9 deletions catalog/app/website/pages/Landing/Landing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,27 @@ import UseQuilt from './UseQuilt'
export default function Landing({ location }) {
const cfg = Config.useConfig()
const { q: query = '' } = parseSearch(location.search)
const showMarketingBlocks = cfg.mode !== 'LOCAL' && cfg.mode !== 'PRODUCT'
return (
<Layout>
<MetaTitle />
<React.Suspense fallback={null}>
<LinkedData.CatalogData />
</React.Suspense>
{cfg.mode !== 'LOCAL' && <Dots />}
{cfg.mode !== 'LOCAL' && (
<Dots style={{ height: cfg.mode === 'PRODUCT' ? '1109px' : undefined }} />
)}
{cfg.mode === 'PRODUCT' && <Buckets query={query} />}
{cfg.mode === 'LOCAL' ? <LocalMode /> : <Showcase />}
{cfg.mode !== 'LOCAL' && <UseQuilt />}
{cfg.mode !== 'LOCAL' && <Logos />}
{cfg.mode !== 'LOCAL' && <CaseStudies />}
{cfg.mode !== 'LOCAL' && <Testimonials />}
{cfg.mode !== 'LOCAL' && <Platform />}
{cfg.mode !== 'LOCAL' && <Highlights />}
{cfg.mode === 'LOCAL' && <LocalMode />}
{showMarketingBlocks && <Showcase />}
{showMarketingBlocks && <UseQuilt />}
{showMarketingBlocks && <Logos />}
{showMarketingBlocks && <CaseStudies />}
{showMarketingBlocks && <Testimonials />}
{showMarketingBlocks && <Platform />}
{showMarketingBlocks && <Highlights />}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could wrap these into a fragment and keep only one check before it, e.g.:

{showMarketingBlocks && (
  <>
    <Showcase />
    <UseQuilt />
    ...
  </>
)}

no big deal tho, up to you

{cfg.mode === 'MARKETING' && <Pricing />}
{cfg.mode !== 'LOCAL' && <Contribute />}
{showMarketingBlocks && <Contribute />}
{cfg.mode === 'MARKETING' && <StickyFooter />}
</Layout>
)
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* [Added] Use `quilt_summarize.json` to control Perspective menu ([#2744](https://github.com/quiltdata/quilt/pull/2744))
* [Added] Show bucket collaborators ([#2756](https://github.com/quiltdata/quilt/pull/2756))
* [Fixed] Fix package creation in S3 buckets with SSE-KMS enabled ([#2754](https://github.com/quiltdata/quilt/pull/2754))
* [Changed] Clean up home page ([#2780](https://github.com/quiltdata/quilt/pull/2780)).

# 5.0.0 - 2022-03-14
## CLI
Expand Down