Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dogmar
dogmar committed Jul 28, 2023
2 parents 71a785e + 0f4ac54 commit d0ce2ad
Show file tree
Hide file tree
Showing 56 changed files with 1,205 additions and 498 deletions.
8 changes: 6 additions & 2 deletions next.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const withMarkdoc = require('@markdoc/next.js')(
module.exports = () => {
const plugins = [withMarkdoc]

return plugins.reduce((acc, next) => next(acc), {
return plugins.reduce((acc, next) => next(acc), {
transpilePackages: [
'@pluralsh/design-system',
'honorable',
Expand All @@ -19,7 +19,11 @@ return plugins.reduce((acc, next) => next(acc), {
reactStrictMode: false,
compiler: {
// https://nextjs.org/docs/advanced-features/compiler#styled-components
styledComponents: true,
styledComponents: {
ssr: true,
displayName: true,
// minify: false,
},
emotion: true,
},
i18n: {
Expand Down
13 changes: 7 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"chroma-js": "2.4.2",
"classnames": "2.3.2",
"deep-freeze": "0.0.1",
"framer-motion": "10.14.0",
"fuse.js": "6.6.2",
"graphql": "16.7.1",
"highlight.js": "11.8.0",
Expand All @@ -56,11 +57,11 @@
"lodash-es": "4.17.21",
"memoize-one": "6.0.0",
"moment-timezone": "^0.5.43",
"next": "13.4.10",
"next": "13.4.12",
"next-compose-plugins": "2.2.1",
"next-transpile-modules": "10.0.0",
"octokit": "^3.0.0",
"posthog-js": "1.71.0",
"octokit": "^3.1.0",
"posthog-js": "1.75.2",
"raw-loader": "4.0.2",
"react": "18.2.0",
"react-add-to-calendar": "^0.1.5",
Expand All @@ -80,14 +81,14 @@
"swiper": "9.4.1",
"swr": "2.2.0",
"tslib": "2.6.0",
"type-fest": "3.13.0",
"type-fest": "3.13.1",
"url-join": "5.0.0",
"usehooks-ts": "2.9.1"
},
"devDependencies": {
"@graphql-codegen/cli": "4.0.1",
"@graphql-codegen/client-preset": "4.0.1",
"@next/bundle-analyzer": "13.4.10",
"@next/bundle-analyzer": "13.4.12",
"@pluralsh/eslint-config-typescript": "2.5.56",
"@pluralsh/stylelint-config": "2.0.5",
"@types/node": "20.4.2",
Expand All @@ -109,7 +110,7 @@
"husky": "8.0.3",
"lint-staged": "13.2.3",
"npm-run-all": "4.1.5",
"postcss": "8.4.26",
"postcss": "8.4.27",
"prettier": "2.8.8",
"react-hooks": "1.0.1",
"stylelint": "15.10.1",
Expand Down
7 changes: 3 additions & 4 deletions pages/applications/[repo].tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ import {
} from '@src/components/layout/LayoutHelpers'
import { TextLimiter } from '@src/components/layout/TextLimiter'
import { BackButton } from '@src/components/Nav'
import BuildStack, {
getStackTabData,
} from '@src/components/page-sections/BuildStackSection'
import BuildStackSection from '@src/components/page-sections/BuildStackSection'
import {
CaseStudySection,
getCaseStudyApps,
Expand All @@ -56,6 +54,7 @@ import {
getTinyRepos,
} from '@src/data/getRepos'
import { getStacks } from '@src/data/getStacks'
import { getStackTabData } from '@src/data/getStackTabData'
import {
type AppDefaultsFragment,
AppExtrasDocument,
Expand Down Expand Up @@ -289,7 +288,7 @@ export default function App({
</div>
</StandardPageWidth>
<HPWMiniSectionAppStacks />
{buildStackTabs && <BuildStack tabs={buildStackTabs} />}
{buildStackTabs && <BuildStackSection tabs={buildStackTabs} />}
<CompanyLogosSection
className="mt-xxxxlarge"
logos={globalProps.siteSettings?.partner_logos?.items}
Expand Down
150 changes: 22 additions & 128 deletions pages/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ import { ArticleCardNoBorder } from '@src/components/ArticleCard'
import { CompanyLogosSection } from '@src/components/CompanyLogos'
import { FooterVariant } from '@src/components/FooterFull'
import PersonCheck from '@src/components/icons/PersonCheck'
import { Columns, EqualColumn } from '@src/components/layout/Columns'
import { GradientBG } from '@src/components/layout/GradientBG'
import { HeaderPad } from '@src/components/layout/HeaderPad'
import { HomePageHero } from '@src/components/PageHeros'
import { TestimonialsSection } from '@src/components/QuoteCards'
import { CenteredSectionHead } from '@src/components/SectionHeads'
import { ShadowedCard } from '@src/components/ShadowedCard'
import { Body2, ResponsiveText } from '@src/components/Typography'
import {
PageHomepageDocument,
type PageHomepageQuery,
Expand All @@ -45,6 +43,7 @@ import {
StandardPageSection,
StandardPageWidth,
} from '../src/components/layout/LayoutHelpers'
import { HomepageFeaturesSection } from '../src/components/page-sections/HomepageFeaturesSection'

const HeroImagesSC = styled.div(({ theme: _theme }) => {
const baseWidth = 1432
Expand Down Expand Up @@ -136,52 +135,6 @@ function HeroImages({ ...props }: ComponentProps<typeof HeroImagesSC>) {
)
}

const FeatureSC = styled(Columns)(({ theme }) => ({
display: 'flex',
alignItems: 'center',
// flexDirection: 'column',
rowGap: theme.spacing.xxxlarge,
[mqs.columns]: {
'&:nth-child(2n+1)': {
flexDirection: 'row-reverse',
},
},
}))

export function Feature({
heading,
children,
imageUrl,
}: {
heading: ReactNode
children: ReactNode
imageUrl?: string
}) {
return (
<FeatureSC>
<EqualColumn className="flex flex-col gap-y-xlarge">
<ResponsiveText
className="[text-wrap:balance]"
textStyles={{ '': 'mTitle1' }}
>
{heading}
</ResponsiveText>
<Body2 as="div">{children}</Body2>
</EqualColumn>
<EqualColumn className="w-full">
<div
className={classNames('w-full', {
'min-h-[250px]': !imageUrl,
'bg-fill-one': !imageUrl,
})}
>
{imageUrl && <img src={imageUrl} />}
</div>
</EqualColumn>
</FeatureSC>
)
}

const BuildSecurelyCardSC = styled(ShadowedCard)(({ theme }) => ({
display: 'flex',
flexDirection: 'column',
Expand Down Expand Up @@ -302,77 +255,6 @@ function BuildSecurely() {
)
}

function FeaturesSection() {
return (
<ColorModeProvider mode="light">
<StandardPageSection className="bg-fill-zero">
<StandardPageWidth>
<div className="flex flex-col gap-y-xxxxlarge md:gap-y-xxxxxlarge xxl:gap-y-xxxxxxlarge">
<CenteredSectionHead
preHeading="Features"
heading="Get all the control, flexibility, and security that comes from self-hosting, with none of the hassle."
/>
<Feature heading="Easy setup, effortless deployments">
<p>
Install Plural using our CLI or our cloud shell in minutes and
then choose from 90+ production-grade, open-source applications
to deploy in your environment.
</p>
</Feature>
<Feature
heading="For the security and privacy conscious"
imageUrl=""
>
<p>
Plural is built for secure deployments, featuring
security-scanned and hardened images, seamless integration with
your SAML gateway, turnkey user authentication, centralized user
management, and granular RBAC.
</p>
</Feature>
<Feature
heading="Fully customizable deployments"
imageUrl=""
>
<p>
We know that everyone’s requirements are a little different.
That’s why everything is customizable in Plural. Want to change
the network setup? How about using a different storage layer? No
sweat. Better yet, all configuration is stored in Git, providing
a natural development workflow to rework and customize
applications.
</p>
</Feature>
<Feature
heading="Take the hassle out of upgrades and scaling"
imageUrl=""
>
<p>
Never have the headache of manually upgrading applications
again. Plural’s built in dependency tree ensures all
dependencies are upgraded in the correct order, with no
downtime. Need to scale? That’s 1-click with our operational
runbooks.
</p>
</Feature>
<Feature
heading="Built for production"
imageUrl=""
>
<p>
Harness Complete Performance Insights: Plural's Native
Integrations with Prometheus, Datadog, and More. Streamline
Testing and Rollouts with Effortless Multi-Cluster Deploys from
Dev to Prod.
</p>
</Feature>
</div>
</StandardPageWidth>
</StandardPageSection>
</ColorModeProvider>
)
}

export default function Index({
quotes,
globalProps,
Expand Down Expand Up @@ -416,7 +298,7 @@ export default function Index({
</div>
}
/>
<div className="pt-xxxlarge sm:pt-xxxxlarge md:pt-xxxxlarge lg:pt-xxxxxlarge lg:pb-xxlarge">
<div className="pt-xxxlarge sm:pt-xxxxlarge md:pt-xxxxlarge lg:pt-0 lg:pb-xxlarge">
<StandardPageWidth>
<HeroImages />
</StandardPageWidth>
Expand All @@ -427,7 +309,7 @@ export default function Index({
</StandardPageWidth>
</StandardPageSection>
</HeaderPad>
<FeaturesSection />
<HomepageFeaturesSection />
<GradientBG
size="cover"
position="bottom middle"
Expand All @@ -452,16 +334,28 @@ export default function Index({
const medium = first || last

return (
<ArticleCardNoBorder
className={classNames({ 'columns:col-span-3': medium })}
size={medium ? 'medium' : 'small'}
reverse={first}
{...c}
/>
c && (
<ArticleCardNoBorder
key={c.id}
className={classNames({ 'columns:col-span-3': medium })}
size={medium ? 'medium' : 'small'}
reverse={first}
{...{
author: c.author,
ctas: c.ctas,
date: c.date,
description: c.description,
heading: c.heading,
thumbnail: c.thumbnail,
url: c.url,
videoUrl: c.videoUrl,
}}
/>
)
)
})}
</div>
</StandardPageWidth>{' '}
</StandardPageWidth>
</StandardPageSection>
</div>
</ColorModeProvider>
Expand Down
6 changes: 0 additions & 6 deletions pages/marketplace.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,12 +603,6 @@ export const getStaticProps: GetStaticProps<PageProps> = async () => {

const { categories, tags } = await getSearchMetadata()

console.log('errors', [
...(reposError ? [reposError] : []),
...(stacksError ? [reposError] : []),
...(faqError ? [faqError] : []),
])

return propsWithGlobalSettings({
metaTitle: 'Explore the open-source marketplace',
metaDescription:
Expand Down
15 changes: 7 additions & 8 deletions pages/plural-deployments-early-access.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ import {
StandardPageSection,
StandardPageWidth,
} from '@src/components/layout/LayoutHelpers'
import { Feature } from '@src/components/page-sections/HomepageFeaturesSection'
import {
CenteredSectionHead,
SubsectionHead,
} from '@src/components/SectionHeads'
import { BasicUl, Body1, Body2 } from '@src/components/Typography'
import { BasicUl, Body1, Body2, InlineLink } from '@src/components/Typography'
import { propsWithGlobalSettings } from '@src/utils/getGlobalProps'

import { HeaderPad } from '../src/components/layout/HeaderPad'

import { Feature } from '.'

function SignUpSection({ containerId }: { containerId: string }) {
return (
<ColorModeProvider
Expand Down Expand Up @@ -149,7 +148,7 @@ export default function Legal(

<Feature
heading="Point and click cluster creation with cluster API"
imageUrl="/images/cont-deploy/create-cluster-m.png"
graphic={<img src="/images/cont-deploy/create-cluster-m.png" />}
>
<BasicUl>
<li>
Expand All @@ -169,7 +168,7 @@ export default function Legal(
</Feature>
<Feature
heading="Deploy from git in one click"
imageUrl="/images/cont-deploy/deploy-service.png"
graphic={<img src="/images/cont-deploy/deploy-service.png" />}
>
<BasicUl>
<li>
Expand All @@ -178,12 +177,12 @@ export default function Legal(
</li>
<li>
First class support for{' '}
<a
<InlineLink
href="https://cdk8s.io"
className="inline-link"
>
https://cdk8s.io
</a>
cdk8s.io
</InlineLink>{' '}
to provide a robust Kubernetes authoring experience with unit
testability and package management
</li>
Expand Down
5 changes: 2 additions & 3 deletions pages/plural-stacks/[stack].tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ import { FooterVariant } from '@src/components/FooterFull'
import { GradientBG } from '@src/components/layout/GradientBG'
import { StandardPageWidth } from '@src/components/layout/LayoutHelpers'
import { BackButton } from '@src/components/Nav'
import BuildStackSection, {
getStackTabData,
} from '@src/components/page-sections/BuildStackSection'
import BuildStackSection from '@src/components/page-sections/BuildStackSection'
import { getCaseStudyApps } from '@src/components/page-sections/CaseStudySection'
import { HPWMiniSectionAppStacks } from '@src/components/page-sections/HowPluralWorksMiniSection'
import { ProviderIcon } from '@src/components/ProviderIcon'
Expand All @@ -42,6 +40,7 @@ import { getProviderIcon, getStackMeta } from '@src/consts'
import { appUrl } from '@src/consts/routes'
import { type TinyRepo, getTinyRepos, normalizeRepo } from '@src/data/getRepos'
import { type FullStack, getFullStack, getStacks } from '@src/data/getStacks'
import { getStackTabData } from '@src/data/getStackTabData'
import {
type FaqItemFragment,
FaqListDocument,
Expand Down
Loading

0 comments on commit d0ce2ad

Please sign in to comment.