Self-review

Yes-Theory-Fam · Aug 24, 2024 · 3c0ca05 · 3c0ca05
1 parent f8e6fc3
commit 3c0ca05
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 127 deletions.
diff --git a/.yarn/patches/@payloadcms-graphql-npm-3.0.0-beta.55-27e9ac4479.patch b/.yarn/patches/@payloadcms-graphql-npm-3.0.0-beta.55-27e9ac4479.patch
diff --git a/package.json b/package.json
@@ -13,8 +13,7 @@
   ],
   "resolutions": {
     "react-test-renderer": "18.2.0",
-    "ts-node": "10.9.1",
-    "@payloadcms/graphql@npm:3.0.0-beta.55": "patch:@payloadcms/graphql@npm%3A3.0.0-beta.55#~/.yarn/patches/@payloadcms-graphql-npm-3.0.0-beta.55-27e9ac4479.patch"
+    "ts-node": "10.9.1"
   },
   "packageManager": "[email protected]"
 }
diff --git a/packages/web/.gitignore b/packages/web/.gitignore
@@ -38,3 +38,4 @@ schema.graphql
 
 # Uploaded payload
 media/
+src/app/(payload)/media/
diff --git a/packages/web/Dockerfile b/packages/web/Dockerfile
@@ -21,7 +21,8 @@ RUN yarn workspaces focus
 FROM node:20.9-alpine AS builder
 WORKDIR /app
 
-ARG FRONTEND_URL
+ARG NEXT_PUBLIC_FRONTEND_URL
+ENV NEXT_PUBLIC_FRONTEND_URL=$NEXT_PUBLIC_FRONTEND_URL
 
 # Copy node_modules and other side products from deps
 COPY --from=deps /app/packages/web/ ./packages/web/

diff --git a/packages/web/src/app/(app)/layout.tsx b/packages/web/src/app/(app)/layout.tsx
@@ -1,7 +1,7 @@
 import {type Metadata} from 'next';
 import {Roboto} from 'next/font/google';
 import {type PropsWithChildren, Suspense} from 'react';
-import {Footer, type NavLinkDefinition} from 'ui';
+import {Footer} from 'ui';
 import {CookieConsent} from '../../components/cookie-consent/cookie-consent';
 import {getCurrentUser} from '../../context/user/user';
 import {getNavRoutes} from '../../lib/features/features';
@@ -18,8 +18,6 @@ const roboto = Roboto({
   variable: '--font-roboto',
 });
 
-export const dynamic = 'force-dynamic';
-
 export const metadata: Metadata = {
   metadataBase: new URL(
     process.env.NEXT_PUBLIC_FRONTEND_URL ?? 'http://localhost:3000',
@@ -50,7 +48,7 @@ export const metadata: Metadata = {
 
 const RootLayout = async ({children}: PropsWithChildren) => {
   const user = await getCurrentUser();
-  const routes: NavLinkDefinition[] = await getNavRoutes();
+  const routes = await getNavRoutes();
 
   return (
     <html lang='en' className={roboto.variable}>

diff --git a/packages/web/src/app/(payload)/collections/groupchats.ts b/packages/web/src/app/(payload)/collections/groupchats.ts
@@ -1,6 +1,5 @@
 import {
   type GeneratedTypes,
-  type Payload,
   type CollectionConfig,
   type ValidateOptions,
 } from 'payload';
@@ -54,7 +53,7 @@ export const Groupchats: CollectionConfig = {
         // We need to run local operations with certain auth, so we skip if payload is not available
         if (!req.payload) return true;
 
-        const matchingGroupchats = await (req.payload as Payload).find({
+        const matchingGroupchats = await req.payload.find({
           collection: 'groupchats',
           where: {
             name: {equals: nameValue},

diff --git a/packages/web/src/app/(payload)/collections/users.ts b/packages/web/src/app/(payload)/collections/users.ts
@@ -26,8 +26,6 @@ export const toRequestUser = (
 ) => ({
   collection: 'users',
   ...user,
-  // Not a fan of this but it's required to be a valid type for AuthStrategyFunction for now
-  email: '',
 });
 
 export const Users: CollectionConfig = {

diff --git a/packages/web/src/app/(payload)/media/groupchats-1.png b/packages/web/src/app/(payload)/media/groupchats-1.png
diff --git a/packages/web/src/app/(payload)/media/groupchats.png b/packages/web/src/app/(payload)/media/groupchats.png
diff --git a/packages/web/src/app/(payload)/media/yesbot-buddy-project-1.webp b/packages/web/src/app/(payload)/media/yesbot-buddy-project-1.webp
diff --git a/packages/web/src/app/(payload)/media/yesbot-buddy-project.webp b/packages/web/src/app/(payload)/media/yesbot-buddy-project.webp
diff --git a/packages/web/src/app/(payload)/plugins/externals.ts b/packages/web/src/app/(payload)/plugins/externals.ts
diff --git a/packages/web/src/app/(payload)/plugins/mocks/auth-strategy.ts b/packages/web/src/app/(payload)/plugins/mocks/auth-strategy.ts
diff --git a/packages/web/src/app/(payload)/plugins/mocks/empty.ts b/packages/web/src/app/(payload)/plugins/mocks/empty.ts
diff --git a/packages/web/src/app/(payload)/plugins/safe-async-endpoints.ts b/packages/web/src/app/(payload)/plugins/safe-async-endpoints.ts
diff --git a/packages/web/src/app/(payload)/plugins/tailwind.ts b/packages/web/src/app/(payload)/plugins/tailwind.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,4 @@ schema.graphql

		# Uploaded payload
		media/
		src/app/(payload)/media/