From fa24307cd28791c54b118056d095ca77af7c17ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Qing=20Wang=20=E2=9A=9B?= Date: Sat, 19 Aug 2023 17:03:19 +0800 Subject: [PATCH] fix: onboarding on signin page --- apps/bootstrapper/package.json | 2 +- apps/e2e/package.json | 2 +- apps/main/package.json | 10 +- apps/service-worker/package.json | 2 +- package.json | 2 +- packages/analytics/package.json | 4 +- packages/eslint-config/package.json | 8 +- packages/trpc/package.json | 6 +- packages/types/package.json | 8 +- packages/ui/package.json | 26 +- packages/ui/src/blocks/layout/site-layout.tsx | 25 +- packages/ui/src/blocks/pricing/pricing.tsx | 2 +- .../src/blocks/sign-in-form/sign-in-form.tsx | 8 +- packages/ui/src/hooks/use-sign-in-window.ts | 2 +- packages/ui/src/pages/auth/sign-in.tsx | 20 +- .../ui/src/pages/dashboard/project/new.tsx | 1 + packages/ui/src/pages/home.tsx | 2 +- packages/ui/src/pages/new.tsx | 10 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 1083 ++++++++--------- 20 files changed, 599 insertions(+), 630 deletions(-) diff --git a/apps/bootstrapper/package.json b/apps/bootstrapper/package.json index ebff16e70..c78605a3c 100644 --- a/apps/bootstrapper/package.json +++ b/apps/bootstrapper/package.json @@ -21,7 +21,7 @@ "@types/react": "18.2.20", "@types/react-dom": "18.2.7", "dotenv": "16.3.1", - "dotenv-cli": "7.2.1", + "dotenv-cli": "7.3.0", "dotenv-expand": "10.0.0", "eslint": "8.47.0", "jest": "29.6.2", diff --git a/apps/e2e/package.json b/apps/e2e/package.json index 5c5071528..c53606cbb 100644 --- a/apps/e2e/package.json +++ b/apps/e2e/package.json @@ -13,7 +13,7 @@ "@types/node": "18.16.18", "cypress": "10.11.0", "dotenv": "16.3.1", - "dotenv-cli": "7.2.1", + "dotenv-cli": "7.3.0", "dotenv-expand": "10.0.0", "eslint": "8.47.0", "typescript": "5.1.6" diff --git a/apps/main/package.json b/apps/main/package.json index e96ae49a9..b3c895e31 100644 --- a/apps/main/package.json +++ b/apps/main/package.json @@ -22,7 +22,7 @@ "@chirpy-dev/ui": "workspace:*", "@chirpy-dev/utils": "workspace:*", "@radix-ui/colors": "1.0.1", - "@t3-oss/env-nextjs": "0.6.0", + "@t3-oss/env-nextjs": "0.6.1", "@tensorflow-models/toxicity": "1.2.2", "@tensorflow/tfjs": "3.18.0", "@tensorflow/tfjs-converter": "3.18.0", @@ -34,7 +34,7 @@ "html-loader": "4.2.0", "lodash": "4.17.21", "micro": "10.0.1", - "next": "13.4.16", + "next": "13.4.19", "next-axiom": "0.17.0", "next-connect": "0.12.2", "next-mdx-remote": "3.0.8", @@ -52,7 +52,7 @@ "superjson": "1.13.1", "type-fest": "4.2.0", "web-push": "3.6.4", - "zod": "3.22.0" + "zod": "3.22.2" }, "devDependencies": { "@chirpy-dev/bootstrapper": "workspace:*", @@ -61,7 +61,7 @@ "@chirpy-dev/eslint-config": "workspace:*", "@chirpy-dev/service-worker": "workspace:*", "@chirpy-dev/tsconfigs": "workspace:*", - "@next/bundle-analyzer": "13.4.16", + "@next/bundle-analyzer": "13.4.19", "@relative-ci/agent": "4.1.6", "@types/cors": "2.8.13", "@types/jest": "29.5.3", @@ -72,7 +72,7 @@ "@types/requestidlecallback": "0.3.5", "@types/web-push": "3.3.2", "dotenv": "16.3.1", - "dotenv-cli": "7.2.1", + "dotenv-cli": "7.3.0", "dotenv-expand": "10.0.0", "eslint": "8.47.0", "jest": "29.6.2", diff --git a/apps/service-worker/package.json b/apps/service-worker/package.json index 5630e34f2..a358c642c 100644 --- a/apps/service-worker/package.json +++ b/apps/service-worker/package.json @@ -11,7 +11,7 @@ "@chirpy-dev/eslint-config": "workspace:*", "@chirpy-dev/tsconfigs": "workspace:*", "dotenv": "16.3.1", - "dotenv-cli": "7.2.1", + "dotenv-cli": "7.3.0", "dotenv-expand": "10.0.0", "eslint": "8.47.0", "typescript": "5.1.6", diff --git a/package.json b/package.json index 501540939..5f26dbd08 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "eslint": "8.47.0", "husky": "8.0.3", "lint-staged": "13.2.3", - "next": "13.4.16", + "next": "13.4.19", "prettier": "2.8.8", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 0724b6c13..f04b8e692 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -17,8 +17,8 @@ "@headlessui/react": "1.7.16", "@tremor/react": "3.6.1", "clsx": "2.0.0", - "framer-motion": "10.15.2", - "next": "13.4.16", + "framer-motion": "10.16.0", + "next": "13.4.19", "prop-types": "15.8.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index d2c4a5e3e..c17e561a0 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -5,15 +5,15 @@ "main": "./index.js", "dependencies": { "@chirpy-dev/prettier-config": "workspace:*", - "@typescript-eslint/eslint-plugin": "6.3.0", - "@typescript-eslint/parser": "6.3.0", - "eslint-config-next": "13.4.13", + "@typescript-eslint/eslint-plugin": "6.4.0", + "@typescript-eslint/parser": "6.4.0", + "eslint-config-next": "13.4.19", "eslint-config-prettier": "8.8.0", "eslint-plugin-jest": "27.2.3", "eslint-plugin-prettier": "4.2.1", "eslint-plugin-storybook": "0.6.7", "eslint-plugin-unicorn": "48.0.1", - "next": "13.4.16", + "next": "13.4.19", "prettier": "2.8.8", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/trpc/package.json b/packages/trpc/package.json index 460a248d5..752c23c80 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -26,15 +26,15 @@ "@trpc/server": "10.37.1", "@types/web-push": "3.3.2", "dayjs": "1.11.9", - "next": "13.4.16", + "next": "13.4.19", "next-auth": "4.23.0", "next-axiom": "0.17.0", "react": "18.2.0", "react-dom": "18.2.0", - "stripe": "12.18.0", + "stripe": "13.2.0", "superjson": "1.13.1", "web-push": "3.6.4", - "zod": "3.22.0" + "zod": "3.22.2" }, "devDependencies": { "@types/jest": "29.5.3", diff --git a/packages/types/package.json b/packages/types/package.json index 0d07a1f1c..a834a33b3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -7,14 +7,14 @@ "types": "./src/index.ts", "devDependencies": { "@chirpy-dev/tsconfigs": "workspace:*", - "@tiptap/core": "2.0.4", - "@tiptap/pm": "2.0.4", - "@tiptap/react": "2.0.4", + "@tiptap/core": "2.1.6", + "@tiptap/pm": "2.1.6", + "@tiptap/react": "2.1.6", "@types/node": "18.16.18", "@types/react": "18.2.20", "@types/react-dom": "18.2.7", "csstype": "3.1.2", - "next": "13.4.16", + "next": "13.4.19", "next-auth": "4.23.0", "next-mdx-remote": "3.0.8", "react": "18.2.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index 6c22e8810..2cba572ca 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,14 +27,14 @@ "@radix-ui/react-tooltip": "1.0.6", "@stripe/stripe-js": "2.1.0", "@tanstack/react-query": "4.32.6", - "@tiptap/core": "2.0.4", - "@tiptap/extension-image": "2.0.4", - "@tiptap/extension-link": "2.0.4", - "@tiptap/extension-placeholder": "2.0.4", - "@tiptap/extension-underline": "2.0.4", - "@tiptap/pm": "2.0.4", - "@tiptap/react": "2.0.4", - "@tiptap/starter-kit": "2.0.4", + "@tiptap/core": "2.1.6", + "@tiptap/extension-image": "2.1.6", + "@tiptap/extension-link": "2.1.6", + "@tiptap/extension-placeholder": "2.1.6", + "@tiptap/extension-underline": "2.1.6", + "@tiptap/pm": "2.1.6", + "@tiptap/react": "2.1.6", + "@tiptap/starter-kit": "2.1.6", "avvvatars-react": "0.4.2", "canvas-confetti": "1.6.0", "class-variance-authority": "0.6.1", @@ -42,9 +42,9 @@ "crisp-sdk-web": "1.0.21", "dayjs": "1.11.9", "debounce-promise": "3.1.2", - "framer-motion": "10.15.2", - "lucide-react": "0.265.0", - "next": "13.4.16", + "framer-motion": "10.16.0", + "lucide-react": "0.268.0", + "next": "13.4.19", "next-auth": "4.23.0", "next-axiom": "0.17.0", "next-mdx-remote": "3.0.8", @@ -80,7 +80,7 @@ "@types/node": "18.16.18", "@types/react": "18.2.20", "@types/react-dom": "18.2.7", - "@types/testing-library__jest-dom": "5.14.9", + "@types/testing-library__jest-dom": "6.0.0", "autoprefixer": "10.4.14", "babel-loader": "8.2.5", "chromatic": "6.11.4", @@ -99,7 +99,7 @@ "postcss-loader": "7.3.3", "require-from-string": "2.0.2", "resolve-url-loader": "5.0.0", - "sass": "1.65.1", + "sass": "1.66.1", "sass-loader": "13.3.2", "storybook-addon-next": "1.7.1", "style-loader": "3.3.3", diff --git a/packages/ui/src/blocks/layout/site-layout.tsx b/packages/ui/src/blocks/layout/site-layout.tsx index 12b1ff4bc..f6d4a8588 100644 --- a/packages/ui/src/blocks/layout/site-layout.tsx +++ b/packages/ui/src/blocks/layout/site-layout.tsx @@ -38,18 +38,19 @@ export function SiteLayout({ )} > {!hideHeader &&
} -
- {/* This div is necessary to make fill viewport work */} -
{children}
-
+ {/* Make main content to fill viewport even the content isn't tall enough */} +
+
+ {children} +
+
{!hideFooter &&