refactor(app-router): fix layout, types

divyenduz · Apr 19, 2024 · e2e7ed5 · e2e7ed5
1 parent 3d29f96
commit e2e7ed5
Show file tree

Hide file tree

Showing 29 changed files with 375 additions and 659 deletions.
diff --git a/packages/next-js-app/app/BaseLayout.tsx b/packages/next-js-app/app/BaseLayout.tsx
diff --git a/packages/next-js-app/app/actions/getFeed.ts b/packages/next-js-app/app/actions/getFeed.ts
@@ -1,7 +1,15 @@
 'use server'
 
-import { sql } from '@trackfootball/database'
-import { FeedItemType } from 'app/dashboard/page'
+import { Field, Post, User, sql } from '@trackfootball/database'
+import { FeatureCollection, LineString } from '@turf/helpers'
+
+export type FeedItemType = Post & {
+  geoJson: FeatureCollection<LineString>
+  sprints: Array<FeatureCollection<LineString>>
+  runs: Array<FeatureCollection<LineString>>
+  Field: Field
+  User: User
+}
 
 export async function getFeed(cursor: number = 0, limit: number = 3) {
   const maxPostId = (

diff --git a/packages/next-js-app/app/activity/layout.tsx b/packages/next-js-app/app/activity/layout.tsx
diff --git a/packages/next-js-app/app/admin/add-field/AddField.tsx b/packages/next-js-app/app/admin/add-field/AddField.tsx
@@ -171,18 +171,16 @@ export default function AddField({ posts }: Props) {
               width: 140,
               renderCell: (params) => {
                 return (
-                  <Link legacyBehavior href={``}>
-                    <a
-                      onClick={() => {
-                        const post = posts.find(
-                          (post) => params.row.id === post.id
-                        )
-                        setPost(post!)
-                      }}
-                    >
-                      {params.row.id}
-                    </a>
-                  </Link>
+                  <Button
+                    onClick={() => {
+                      const post = posts.find(
+                        (post) => params.row.id === post.id
+                      )
+                      setPost(post!)
+                    }}
+                  >
+                    {params.row.id}
+                  </Button>
                 )
               },
             },
@@ -192,18 +190,16 @@ export default function AddField({ posts }: Props) {
               width: 140,
               renderCell: (params) => {
                 return (
-                  <Link legacyBehavior href={``}>
-                    <a
-                      onClick={() => {
-                        const post = posts.find(
-                          (post) => params.row.id === post.id
-                        )
-                        setPost(post!)
-                      }}
-                    >
-                      {params.row.text}
-                    </a>
-                  </Link>
+                  <Button
+                    onClick={() => {
+                      const post = posts.find(
+                        (post) => params.row.id === post.id
+                      )
+                      setPost(post!)
+                    }}
+                  >
+                    {params.row.text}
+                  </Button>
                 )
               },
             },
@@ -228,10 +224,10 @@ export default function AddField({ posts }: Props) {
       <div style={{ marginBottom: 30 }}></div>
 
       <Link
-        legacyBehavior
         href={`http://maps.google.com?q=${latitude},${longitude}&ll=${latitude},${longitude}&z=15`}
+        target="_blank"
       >
-        <a target="_blank">Open in Google maps</a>
+        Open in Google maps
       </Link>
 
       <span

diff --git a/packages/next-js-app/app/admin/add-field/page.tsx b/packages/next-js-app/app/admin/add-field/page.tsx
@@ -1,5 +1,5 @@
 import { UserType, sql } from '@trackfootball/database'
-import { Metadata, ResolvingMetadata } from 'next'
+import { Metadata } from 'next'
 import { MESSAGE_UNAUTHORIZED } from 'packages/auth/utils'
 import { auth } from 'utils/auth'
 
@@ -34,8 +34,8 @@ export default async function Activity() {
   const posts = await getPostsWithoutFields()
 
   return (
-    <>
+    <div className="w-full max-w-4xl">
       <AddField posts={posts}></AddField>
-    </>
+    </div>
   )
 }
diff --git a/packages/next-js-app/app/admin/edit-field/EditField.tsx b/packages/next-js-app/app/admin/edit-field/EditField.tsx
@@ -129,18 +129,17 @@ export default async function EditField({ fields }: Props) {
               width: 140,
               renderCell: (params) => {
                 return (
-                  <Link legacyBehavior href={``}>
-                    <a
-                      onClick={() => {
-                        const field = fields.find(
-                          (field) => params.row.id === field.id
-                        )
-                        setField(field!)
-                        setImmutableField(field!)
-                      }}
-                    >
-                      {params.row.id}
-                    </a>
+                  <Link
+                    href=""
+                    onClick={() => {
+                      const field = fields.find(
+                        (field) => params.row.id === field.id
+                      )
+                      setField(field!)
+                      setImmutableField(field!)
+                    }}
+                  >
+                    {params.row.id}
                   </Link>
                 )
               },
@@ -151,18 +150,17 @@ export default async function EditField({ fields }: Props) {
               width: 140,
               renderCell: (params) => {
                 return (
-                  <Link legacyBehavior href={``}>
-                    <a
-                      onClick={() => {
-                        const field = fields.find(
-                          (field) => params.row.id === field.id
-                        )
-                        setField(field!)
-                        setImmutableField(field!)
-                      }}
-                    >
-                      {params.row.name}
-                    </a>
+                  <Link
+                    href=""
+                    onClick={() => {
+                      const field = fields.find(
+                        (field) => params.row.id === field.id
+                      )
+                      setField(field!)
+                      setImmutableField(field!)
+                    }}
+                  >
+                    {params.row.name}
                   </Link>
                 )
               },
@@ -240,10 +238,10 @@ export default async function EditField({ fields }: Props) {
       <div style={{ marginBottom: 30 }}></div>
 
       <Link
-        legacyBehavior
         href={`http://maps.google.com?q=${latitude},${longitude}&ll=${latitude},${longitude}&z=15`}
+        target="_blank"
       >
-        <a target="_blank">Open in Google maps</a>
+        Open in Google maps
       </Link>
 
       <span

diff --git a/packages/next-js-app/app/admin/edit-field/page.tsx b/packages/next-js-app/app/admin/edit-field/page.tsx
@@ -1,5 +1,3 @@
-'use client'
-
 import { UserType, sql } from '@trackfootball/database'
 import { MESSAGE_UNAUTHORIZED } from 'packages/auth/utils'
 import { auth } from 'utils/auth'
@@ -33,8 +31,8 @@ export default async function Activity() {
   const fields = await getFields()
 
   return (
-    <>
+    <div className="w-full max-w-4xl">
       <EditField fields={fields}></EditField>
-    </>
+    </div>
   )
 }
diff --git a/packages/next-js-app/app/admin/layout.tsx b/packages/next-js-app/app/admin/layout.tsx