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.

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

Ecosystem cards #5466

Merged
merged 34 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6636d3e
Add primary product cards
hasparus Aug 19, 2024
e371423
Avoid artificialy long cards on large screens
hasparus Aug 19, 2024
e6ca99c
Make all pricing links scroll to the #pricing section
hasparus Aug 19, 2024
35da597
Animate cards
hasparus Aug 19, 2024
aef92a1
Scroll to Ecosystem Management section as /ecosystem page doesn't exi…
hasparus Aug 19, 2024
354911a
Replace fill-available with stretch per autoprefixer warning
hasparus Aug 19, 2024
a2c3112
Make ecosystem links go to The Guild GitHub
hasparus Aug 19, 2024
8259b9c
Make the Migrate from Apollo link go to docs
hasparus Aug 19, 2024
12c267d
Refactor leading-[20px] to leading-5
hasparus Aug 19, 2024
9f94429
Add secondary products cards
hasparus Aug 19, 2024
07ba62c
Use path.join for Tailwind configs
hasparus Aug 19, 2024
7e45826
Try adding the failing class without prefix
hasparus Aug 19, 2024
cdb6535
Add a console.log
hasparus Aug 19, 2024
c34c653
Add more console logs
hasparus Aug 19, 2024
5562775
Remove console logs
hasparus Aug 19, 2024
5a2059c
Try cache-strategy
hasparus Aug 19, 2024
1dc7599
Move cache-strategy=content to lint.yml, keep metadata locally
hasparus Aug 19, 2024
d9fede8
Add a console log again
hasparus Aug 19, 2024
f2615d1
Add a console log to ESLint config
hasparus Aug 19, 2024
64f6ac6
Add another console log
hasparus Aug 19, 2024
a042bbd
Patch eslint-plugin-tailwindcss temporarily
hasparus Aug 19, 2024
ddf8bfd
Patch again
hasparus Aug 19, 2024
72102d0
Patch yet again
hasparus Aug 19, 2024
8d2cc3c
Paaatch
hasparus Aug 19, 2024
66bc0f2
Patch with a possible fix
hasparus Aug 19, 2024
53df200
Remove the patch, use my fork
hasparus Aug 19, 2024
811d938
Format
hasparus Aug 19, 2024
7c22c1f
Justify content of stats cards
hasparus Aug 20, 2024
30b4e97
Remove the masked beam of death on mobile
hasparus Aug 20, 2024
193a68c
Add min width to fix animation on mobiles
hasparus Aug 20, 2024
e6adf25
Align text to right
hasparus Aug 20, 2024
016f082
Do not show the mask image if both sides are scrolled
hasparus Aug 20, 2024
96a78a0
Add negative x margin to tools cards
hasparus Aug 20, 2024
8a382c6
Remove merge conflict marker
hasparus Aug 20, 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
10 changes: 8 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
const guildConfig = require('@theguild/eslint-config/base');
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { REACT_RESTRICTED_SYNTAX, RESTRICTED_SYNTAX } = require('@theguild/eslint-config/constants');
const path = require('path');

console.log('loaded eslint config', __filename);

const SCHEMA_PATH = './packages/services/api/src/modules/*/module.graphql.ts';
const OPERATIONS_PATHS = [
Expand Down Expand Up @@ -38,6 +41,9 @@ const HIVE_RESTRICTED_SYNTAX = [

const tailwindCallees = ['clsx', 'cn', 'cva', 'cx'];

/**
* @type {import('eslint').Linter.Config}
*/
module.exports = {
ignorePatterns: [
'scripts',
Expand Down Expand Up @@ -198,7 +204,7 @@ module.exports = {
settings: {
tailwindcss: {
callees: tailwindCallees,
config: 'packages/web/app/tailwind.config.cjs',
config: path.join(__dirname, './packages/web/app/tailwind.config.cjs'),
whitelist: ['drag-none'],
cssFiles: ['packages/web/app/src/index.css', 'node_modules/graphiql/dist/style.css'],
},
Expand All @@ -219,7 +225,7 @@ module.exports = {
},
tailwindcss: {
callees: tailwindCallees,
config: 'packages/web/docs/tailwind.config.cjs',
config: path.join(__dirname, './packages/web/docs/tailwind.config.cjs'),
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: eslint
id: eslint
run: |
pnpm lint || \
pnpm lint --cache-strategy content || \
( \
echo "" && \
echo "To fix it, run" && \
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"eslint": "8.57.0",
"eslint-plugin-cypress": "3.5.0",
"eslint-plugin-hive": "file:rules",
"eslint-plugin-tailwindcss": "3.17.4",
"eslint-plugin-tailwindcss": "npm:@hasparus/eslint-plugin-tailwindcss@3.17.5",
"fs-extra": "11.2.0",
"graphql": "16.9.0",
"jest-snapshot-serializer-raw": "2.0.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/web/app/tailwind.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ const { fontFamily } = require('tailwindcss/defaultTheme');
const svgToDataUri = require('mini-svg-data-uri');
const { default: flattenColorPalette } = require('tailwindcss/lib/util/flattenColorPalette');

console.log('loaded tailwind config', __filename);

module.exports = {
darkMode: 'class',
content: ['./index.html', './src/**/*.ts{,x}'],
Expand Down
15 changes: 5 additions & 10 deletions packages/web/docs/src/components/community-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,18 @@ export function CommunitySection({ className }: { className?: string }) {
title="Available for free"
description="Free Hobby plan that fits perfectly for most side projects."
>
<CallToAction
variant="secondary-inverted"
href="/#pricing"
target="_blank"
rel="noreferrer"
>
<CallToAction variant="secondary-inverted" href="/#pricing">
Check Pricing
</CallToAction>
</CommunityCard>
</div>
<MaskingScrollview
outerClassName="max-sm:-mx-4 max-sm:px-4"
className="max-sm:!mask-image-none relative -m-4 flex flex-row gap-6 p-4 max-sm:overflow-x-auto sm:grid sm:h-[600px] sm:grid-cols-2 sm:overflow-y-auto lg:grid-cols-4"
outerClassName="max-sm:-mx-4 max-sm:px-4 "
className="relative -m-4 flex flex-row gap-6 p-4 max-sm:overflow-x-auto sm:grid sm:h-[600px] sm:grid-cols-2 sm:overflow-y-auto lg:grid-cols-4"
fade="y"
>
{Array.from({ length: 4 }).map((_, i) => (
<div className="contents flex-col gap-6 sm:flex [&>:last-child]:flex-1" key={i}>
<div className="contents flex-col gap-6 sm:flex max-lg:[&>:last-child]:flex-1" key={i}>
saihaj marked this conversation as resolved.
Show resolved Hide resolved
{tempSocialPosts.map((post, j) =>
j % 4 === i ? <SocialPostCard post={post} key={j} /> : null,
)}
Expand Down Expand Up @@ -143,7 +138,7 @@ function SocialPostCard({ post }: { post: SocialPost }) {
const isTwitterLink = post.href.startsWith('https://twitter.com/');

return (
<div className="rounded-2xl bg-green-900 p-6 text-green-200 max-sm:h-[fill-available]">
<div className="rounded-2xl bg-green-900 p-6 text-green-200 max-sm:h-[stretch]">
<div className="flex flex-row items-center gap-2">
<div className="relative">
<a
Expand Down
7 changes: 2 additions & 5 deletions packages/web/docs/src/components/decorations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,9 @@ export function ArchDecorationGradientDefs() {

export function HighlightDecoration(props: React.SVGAttributes<SVGSVGElement>) {
return (
<svg width="895" height="674" viewBox="0 0 895 674" {...props}>
<svg width="895" height="674" viewBox="0 0 895 674" fill="#86B6C1" {...props}>
<g filter="url(#filter0_f_711_1774)">
<path
d="M350 280.534C350 296.208 356.24 311.261 367.33 322.351L453.447 408.468L463.532 418.553L549.649 504.67C560.739 515.76 575.792 522 591.466 522L894 522L894 408.468L552.251 408.468C503.249 408.468 463.532 368.751 463.532 319.749L463.532 -22L350 -22L350 280.534Z"
fill="#86B6C1"
/>
<path d="M350 280.534C350 296.208 356.24 311.261 367.33 322.351L453.447 408.468L463.532 418.553L549.649 504.67C560.739 515.76 575.792 522 591.466 522L894 522L894 408.468L552.251 408.468C503.249 408.468 463.532 368.751 463.532 319.749L463.532 -22L350 -22L350 280.534Z" />
</g>
<defs>
<filter
Expand Down
11 changes: 7 additions & 4 deletions packages/web/docs/src/components/ecosystem-management.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,13 @@ export function EcosystemManagementSection({ className }: { className?: string }
))}
</ul>
<div className="flex flex-col gap-x-4 gap-y-2 md:flex-row">
<CallToAction href="/" variant="primary-inverted">
<CallToAction
href="https://the-guild.dev/graphql/hive/docs/use-cases/apollo-studio"
variant="primary-inverted"
>
Migrate from Apollo
</CallToAction>
<CallToAction href="/" variant="secondary">
<CallToAction href="https://github.com/the-guild-org" variant="secondary">
<BookIcon />
Explore the full Ecosystem
</CallToAction>
Expand Down Expand Up @@ -264,7 +267,7 @@ function EdgeLabel(props: EdgeLabelProps) {
<div
className={
'flex size-8 h-[var(--label-h)] items-center justify-center' +
' cursor-default rounded bg-green-700 text-sm font-medium leading-[20px]'
' cursor-default rounded bg-green-700 text-sm font-medium leading-5'
}
{...props}
/>
Expand Down Expand Up @@ -294,7 +297,7 @@ function Node({ title, description, children, highlighted, className, ...rest }:
<div>
<div className="font-medium text-green-100">{title}</div>
{description && (
<div className="mt-0.5 text-sm leading-[20px] text-green-200">{description}</div>
<div className="mt-0.5 text-sm leading-5 text-green-200">{description}</div>
)}
</div>
</div>
Expand Down
4 changes: 1 addition & 3 deletions packages/web/docs/src/components/feature-tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,7 @@ function Feature(props: {
return (
<div key={highlight.title} onPointerOver={() => setActiveHighlight(i)}>
<dt className="text-green-1000 font-medium">{highlight.title}</dt>
<dd className="mt-2 text-sm leading-[20px] text-green-800">
{highlight.description}
</dd>
<dd className="mt-2 text-sm leading-5 text-green-800">{highlight.description}</dd>
</div>
);
})}
Expand Down
4 changes: 3 additions & 1 deletion packages/web/docs/src/components/landing-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Page } from './page';
import { Pricing } from './pricing';
import { StatsItem, StatsList } from './stats';
import { TeamSection } from './team-section';
import { ToolsAndLibrariesCards } from './tools-and-libraries-cards';

export function IndexPage(): ReactElement {
return (
Expand Down Expand Up @@ -61,7 +62,7 @@ export function IndexPage(): ReactElement {
<CallToAction variant="primary-inverted" href="https://app.graphql-hive.com">
Get started for free
</CallToAction>
<CallToAction variant="secondary" href="/docs">
<CallToAction variant="secondary" href="/#pricing">
View Pricing
</CallToAction>
</HeroLinks>
Expand All @@ -88,6 +89,7 @@ export function IndexPage(): ReactElement {
<Pricing />
<TeamSection className="mx-4 md:mx-6" />
<CommunitySection className="mx-4 mt-6 md:mx-6" />
<ToolsAndLibrariesCards className="mx-4 mt-6 md:mx-6" />
</Page>
</Tooltip.Provider>
);
Expand Down
8 changes: 6 additions & 2 deletions packages/web/docs/src/components/masking-scrollview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ export function MaskingScrollview({
// replace "mask" with "background" to debug it
maskImage:
fade === 'x'
? `linear-gradient(to left, transparent, black 128px 25%, black 50%, transparent 50%),
? scrolledSides.left && scrolledSides.right
? 'none'
: `linear-gradient(to left, transparent, black 128px 25%, black 50%, transparent 50%),
linear-gradient(to right, transparent, black 128px 25%, black 50%, transparent 50%)`
: `linear-gradient(to bottom, transparent, black 128px 25%, black 50%, transparent 50%),
: scrolledSides.top && scrolledSides.bottom
? 'none'
: `linear-gradient(to bottom, transparent, black 128px 25%, black 50%, transparent 50%),
linear-gradient(to top, transparent, black 128px 25%, black 50%, transparent 50%)`,
maskSize:
fade === 'x'
Expand Down
8 changes: 5 additions & 3 deletions packages/web/docs/src/components/stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export function StatsItem(props: {
decimal?: boolean;
}) {
return (
<div className="flex items-end gap-4 rounded-3xl border border-green-400 p-8 lg:flex-col lg:items-start lg:p-12">
<Heading as="div" size="xl" className="text-green-1000 text-[48px] lg:text-6xl">
<div className="flex items-end justify-between gap-4 rounded-3xl border border-green-400 p-8 lg:flex-col lg:items-start lg:p-12">
<Heading as="div" size="xl" className="text-green-1000 min-w-[120px] text-[48px] lg:text-6xl">
<CountUp
start={0}
end={props.value}
Expand All @@ -24,7 +24,9 @@ export function StatsItem(props: {
/>
{props.suffix}
</Heading>
<div className="mb-3 font-medium sm:mb-3 md:mb-2 lg:mb-0">{props.label}</div>
<div className="mb-3 font-medium max-md:text-right sm:mb-3 md:mb-2 lg:mb-0">
{props.label}
</div>
</div>
);
}
Expand Down
Loading
Loading