From 20d5d377393232cde1e177af5690dfebbb0fdf56 Mon Sep 17 00:00:00 2001 From: "Felipe Torres (fforres)" Date: Sun, 19 Nov 2023 18:16:53 -0800 Subject: [PATCH] Agregando soporte para graphql, (apollo + code-gen) en Edge/RSC (#11) --- .env | 1 + .gitignore | 4 + .prettierignore | 3 +- .../(transition)/(root)/layout.tsx | 4 +- app/(transition)/(root)/page.tsx | 32 + .../(transition)/graphiql/page.tsx | 4 +- {src/app => app}/(transition)/layout.tsx | 2 +- {src/app => app}/globals.css | 0 {src/app => app}/layout.tsx | 28 +- codegen.ts | 38 +- graphql.config.ts | 4 +- next.config.js | 1 - package-lock.json | 1101 ++++++++++------- package.json | 11 +- {src/app => public}/favicon.ico | Bin src/api/ApolloClient.tsx | 17 + src/api/ApolloWrapper.tsx | 47 + src/api/gql/fragment-masking.ts | 66 + src/api/gql/gql.ts | 42 + src/api/{types.ts => gql/graphql.ts} | 92 +- src/api/gql/index.ts | 2 + src/api/gql/schema.gql | 468 +++++++ src/api/index.ts | 9 - src/app/(transition)/(root)/page.tsx | 14 - .../sign-in/[[...sign-in]]/page.tsx | 11 - .../sign-up/[[...sign-up]]/page.tsx | 9 - src/components/Auth/clerk.tsx | 27 + .../graphql/FetchExampleEvents.generated.tsx | 68 + .../graphql/FetchExampleEvents.gql | 18 + .../features/LandingPageEvents/index.tsx | 14 + src/components/nav.tsx | 6 +- src/middleware.ts | 9 - tsconfig.json | 3 +- 33 files changed, 1596 insertions(+), 559 deletions(-) rename {src/app => app}/(transition)/(root)/layout.tsx (69%) create mode 100644 app/(transition)/(root)/page.tsx rename {src/app => app}/(transition)/graphiql/page.tsx (97%) rename {src/app => app}/(transition)/layout.tsx (95%) rename {src/app => app}/globals.css (100%) rename {src/app => app}/layout.tsx (66%) rename {src/app => public}/favicon.ico (100%) create mode 100644 src/api/ApolloClient.tsx create mode 100644 src/api/ApolloWrapper.tsx create mode 100644 src/api/gql/fragment-masking.ts create mode 100644 src/api/gql/gql.ts rename src/api/{types.ts => gql/graphql.ts} (81%) create mode 100644 src/api/gql/index.ts create mode 100644 src/api/gql/schema.gql delete mode 100644 src/api/index.ts delete mode 100644 src/app/(transition)/(root)/page.tsx delete mode 100644 src/app/(transition)/sign-in/[[...sign-in]]/page.tsx delete mode 100644 src/app/(transition)/sign-up/[[...sign-up]]/page.tsx create mode 100644 src/components/Auth/clerk.tsx create mode 100644 src/components/features/LandingPageEvents/graphql/FetchExampleEvents.generated.tsx create mode 100644 src/components/features/LandingPageEvents/graphql/FetchExampleEvents.gql create mode 100644 src/components/features/LandingPageEvents/index.tsx delete mode 100644 src/middleware.ts diff --git a/.env b/.env index 923411a..2fc88aa 100644 --- a/.env +++ b/.env @@ -4,3 +4,4 @@ NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL=/ NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL=/ NEXT_PUBLIC_GRAPHQL_ENDPOINT='https://api.jsconf.dev/graphql' NEXT_PUBLIC_TOKEN_STORAGE_KEY='HS:token_storage_key' +NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY='pk_test_ZnVua3ktZ3JpZmZvbi04NC5jbGVyay5hY2NvdW50cy5kZXYk' diff --git a/.gitignore b/.gitignore index 8f322f0..0d57ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,7 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts + +# # GQL / code-generation +# src/api/gql/**/* +# src/**/*.generated.* diff --git a/.prettierignore b/.prettierignore index 0fe97b3..2bb4e93 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ -src/api/types.ts +src/api/gql/**/* +src/**/*.generated.* diff --git a/src/app/(transition)/(root)/layout.tsx b/app/(transition)/(root)/layout.tsx similarity index 69% rename from src/app/(transition)/(root)/layout.tsx rename to app/(transition)/(root)/layout.tsx index 06bec15..adf60e3 100644 --- a/src/app/(transition)/(root)/layout.tsx +++ b/app/(transition)/(root)/layout.tsx @@ -1,15 +1,13 @@ import PageTransition from "@/components/PageTransition"; -import { currentUser } from "@clerk/nextjs"; import { Nav } from "@/components/nav"; export default async function Template({ children, }: { children: React.ReactNode; }) { - const user = await currentUser(); return ( <> -