Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 11 additions & 18 deletions .github/workflows-src/website.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,20 @@ export default createWorkflow(({setWorkflowName, addTrigger, addJob}) => {

run('yarn workspace @databases/website build');

run(`npm install netlify-cli@17.10.1 -g`);
const netlifyDeploy = [
`netlify deploy`,
`--cwd .`,
`--filter @databases/website`,
`--dir packages/website/out`,
`--site ${secrets.NETLIFY_SITE_ID}`,
`--auth ${secrets.NETLIFY_AUTH_TOKEN}`,
].join(' ');
when(eq(github.event_name, `push`), () => {
run(
`netlify deploy --cwd . --filter @databases/website --prod --dir=packages/website/out`,
{
env: {
NETLIFY_SITE_ID: secrets.NETLIFY_SITE_ID,
NETLIFY_AUTH_TOKEN: secrets.NETLIFY_AUTH_TOKEN,
},
},
);
run(netlifyDeploy + ` --prod`);
});
when(neq(github.event_name, `push`), () => {
run(
`netlify deploy --cwd . --filter @databases/website --dir=packages/website/out`,
{
env: {
NETLIFY_SITE_ID: secrets.NETLIFY_SITE_ID,
NETLIFY_AUTH_TOKEN: secrets.NETLIFY_AUTH_TOKEN,
},
},
);
run(netlifyDeploy);
});
});
});
17 changes: 7 additions & 10 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,12 @@ jobs:
key: next-${{ hashFiles('yarn.lock') }}
restore-keys: next-
- run: yarn workspace @databases/website build
- run: npm install netlify-cli@17.10.1 -g
- if: ${{ github.event_name == 'push' }}
run: netlify deploy --cwd . --filter @databases/website --prod
--dir=packages/website/out
env:
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
run: netlify deploy --cwd . --filter @databases/website --dir
packages/website/out --site ${{ secrets.NETLIFY_SITE_ID }} --auth ${{
secrets.NETLIFY_AUTH_TOKEN }} --prod
- if: ${{ github.event_name != 'push' }}
run: netlify deploy --cwd . --filter @databases/website
--dir=packages/website/out
env:
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
run: netlify deploy --cwd . --filter @databases/website --dir
packages/website/out --site ${{ secrets.NETLIFY_SITE_ID }} --auth ${{
secrets.NETLIFY_AUTH_TOKEN }}
12 changes: 5 additions & 7 deletions packages/website/components/HeroUnit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ export default function HeroUnit() {
</p>
<div tw="mt-5 max-w-md mx-auto sm:flex sm:justify-center md:mt-8">
<div tw="rounded-md shadow">
<Link href="/docs/sql">
<a
href="/docs/sql"
tw="w-full flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-red-800 hover:bg-red-700 md:py-4 md:text-lg md:px-10"
>
Get started
</a>
<Link
href="/docs/sql"
tw="w-full flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-red-800 hover:bg-red-700 md:py-4 md:text-lg md:px-10"
>
Get started
</Link>
</div>
</div>
Expand Down
122 changes: 55 additions & 67 deletions packages/website/components/NavBar.tsx

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions packages/website/components/Sidebar/SidebarLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@ const SidebarLink = memo<SidebarLinkProps>(
({children, id, activeDoc}) => {
return (
<li>
<Link href={`/docs/${id}`}>
<a
tw="py-1 mt-1 -mb-1 block rounded-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:ring-gray-300"
css={[
activeDoc === id && tw`text-red-800 font-semibold`,
activeDoc !== id && tw`text-gray-500 hover:text-gray-700`,
]}
href={`/docs/${id}`}
>
{children}
</a>
<Link
href={`/docs/${id}`}
tw="py-1 mt-1 -mb-1 block rounded-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:ring-gray-300"
css={[
activeDoc === id && tw`text-red-800 font-semibold`,
activeDoc !== id && tw`text-gray-500 hover:text-gray-700`,
]}
>
{children}
</Link>
</li>
);
Expand Down
5 changes: 4 additions & 1 deletion packages/website/next-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
/// <reference types="next" />
/// <reference types="next/types/global" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
6 changes: 3 additions & 3 deletions packages/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"mdast-util-from-markdown": "^0.8.5",
"mdast-util-gfm-table": "^0.1.6",
"micromark-extension-gfm-table": "^0.4.3",
"next": "10.0.9",
"react": "17.0.1",
"react-dom": "17.0.1"
"next": "13.5.2",
"react": "19.1.1",
"react-dom": "19.1.1"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.2.0",
Expand Down
12 changes: 5 additions & 7 deletions packages/website/pages/blog/[year]/[month]/[day]/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,11 @@ const BlogPost = ({post: doc}: Props) => {
<Document document={doc.body} />
</article>
<div tw="flex md:justify-center mt-12 mx-4 md:mx-0">
<Link href="/blog">
<a
tw="rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100"
href="/blog"
>
Recent posts
</a>
<Link
href="/blog"
tw="rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100"
>
Recent posts
</Link>
</div>
</div>
Expand Down
12 changes: 5 additions & 7 deletions packages/website/pages/blog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ const Blog = ({recentPosts}: Props) => {
<Document document={post.body} />

<div tw="flex md:justify-center mt-12 mx-4 md:mx-0">
<Link href={post.pathname}>
<a
tw="rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100"
href={post.pathname}
>
Read More
</a>
<Link
href={post.pathname}
tw="rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100"
>
Read More
</Link>
</div>
</article>
Expand Down
25 changes: 11 additions & 14 deletions packages/website/pages/docs/[slug].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,24 +165,21 @@ const Post = ({nav, doc}: Props) => {
</article>
<div tw="flex flex-col md:flex-row mt-12 mx-4 md:mx-0">
{doc.previous && (
<Link href={`/docs/${doc.previous.id}`} prefetch={false}>
<a
tw="rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-gray-400"
href={`/docs/${doc.previous.id}`}
>
← {doc.previous.label}
</a>
<Link
href={`/docs/${doc.previous.id}`}
prefetch={false}
tw="rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-gray-400"
>
← {doc.previous.label}
</Link>
)}
<div tw="flex-grow h-4" />
{doc.next && (
<Link href={`/docs/${doc.next.id}`}>
<a
tw="text-right rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-gray-400"
href={`/docs/${doc.next.id}`}
>
{doc.next.label} →
</a>
<Link
href={`/docs/${doc.next.id}`}
tw="text-right rounded-md px-6 py-4 border border-red-900 text-red-900 bg-white shadow-md hover:bg-red-900 hover:text-red-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-gray-400"
>
{doc.next.label} →
</Link>
)}
</div>
Expand Down
12 changes: 5 additions & 7 deletions packages/website/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -311,13 +311,11 @@ export default function Home() {

<div tw="mt-12 mb-12 max-w-md mx-auto sm:flex sm:justify-center md:mt-16">
<div tw="rounded-md shadow">
<Link href="/docs/sql">
<a
href="/docs/sql"
tw="w-full flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-red-900 hover:bg-red-700 md:py-4 md:text-lg md:px-10"
>
Get started
</a>
<Link
href="/docs/sql"
tw="w-full flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-red-900 hover:bg-red-700 md:py-4 md:text-lg md:px-10"
>
Get started
</Link>
</div>
</div>
Expand Down
12 changes: 5 additions & 7 deletions packages/website/pages/users.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ export default function Users() {

<div tw="pb-12 max-w-md mx-auto sm:flex sm:justify-center md:mt-16">
<div tw="rounded-md shadow">
<Link href="/docs/sql">
<a
href="/docs/sql"
tw="w-full flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-red-900 hover:bg-red-700 md:py-4 md:text-lg md:px-10"
>
Get started
</a>
<Link
href="/docs/sql"
tw="w-full flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-red-900 hover:bg-red-700 md:py-4 md:text-lg md:px-10"
>
Get started
</Link>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion packages/website/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"incremental": true
},
"include": [
"next-env.d.ts",
"twin.d.ts",
"**/*.ts",
"**/*.tsx",
"**/*.tsx"
],
"exclude": [
"node_modules"
Expand Down
Loading
Loading