Merge branch 'fix-button' of https://github.com/emredevsalot/monorepo …

…into fix-button
kamp-us · Aug 22, 2023 · d150efc · d150efc
2 parents de8e801 + 238e79b
commit d150efc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/apps/kampus/app/pano/PanoFeed.tsx b/apps/kampus/app/pano/PanoFeed.tsx
@@ -3,6 +3,7 @@ import Link from "next/link";
 import { graphql, useFragment, usePaginationFragment } from "react-relay";
 
 import { Button } from "@kampus/ui";
+import { Session } from "@kampus/next-auth";
 
 import { PostItem } from "~/app/pano/features/post-list/PostItem";
 import { type PanoFeed_viewer$key } from "./__generated__/PanoFeed_viewer.graphql";
@@ -42,6 +43,7 @@ const viewerFragment = graphql`
 `;
 
 interface Props {
+  session: Session | null;
   panoFeed: PanoFeedFragment$key;
   panoViewer: PanoFeed_viewer$key;
 }
@@ -59,17 +61,19 @@ export function PanoFeed(props: Props) {
 
   return (
     <>
-      <Button variant="outline" asChild>
-        <Link
-          href={{
-            pathname: `/post/create`,
-            search: `foo=bar`,
-          }}
-          as="post/create"
-        >
-          New post
-        </Link>
-      </Button>
+      {props.session && (
+        <Button variant="outline" asChild>
+          <Link
+            href={{
+              pathname: `/post/create`,
+              search: `foo=bar`,
+            }}
+            as="post/create"
+          >
+            New post
+          </Link>
+        </Button>
+      )}
       <Suspense fallback="loading">
         <section className="flex flex-col gap-4">
           {feed?.edges?.map((edge) => {

diff --git a/apps/kampus/app/pano/PostListContainer.tsx b/apps/kampus/app/pano/PostListContainer.tsx
@@ -2,13 +2,15 @@
 
 import { graphql, usePreloadedQuery } from "react-relay";
 
+import { Session } from "@kampus/next-auth";
 import { type SerializablePreloadedQuery } from "@kampus/relay";
 import useSerializablePreloadedQuery from "@kampus/relay/use-serializable-preloaded-query";
 
 import { type PostListContainerQuery } from "./__generated__/PostListContainerQuery.graphql";
 import { PanoFeed } from "./PanoFeed";
 
 interface Props {
+  session: Session | null;
   preloadedQuery: SerializablePreloadedQuery<PostListContainerQuery>;
 }
 
@@ -29,5 +31,5 @@ export const PostListContainer = (props: Props) => {
     return null;
   }
 
-  return <PanoFeed panoFeed={data.viewer} panoViewer={data.viewer} />;
+  return <PanoFeed session={props.session} panoFeed={data.viewer} panoViewer={data.viewer} />;
 };
diff --git a/apps/kampus/app/pano/page.tsx b/apps/kampus/app/pano/page.tsx
@@ -1,3 +1,4 @@
+import { getServerSession } from "@kampus/next-auth";
 import loadSerializableQuery from "@kampus/relay/load-serializable-query";
 
 import { PostSortFilters } from "~/app/pano/features/post-filter/PostSortFilters";
@@ -19,6 +20,7 @@ const normalizeFilter = (query?: string): PanoPostFilterType | null => {
 };
 
 export default async function PostsPage({ searchParams }: { searchParams: { filter?: string } }) {
+  const session = await getServerSession();
   const normalized = normalizeFilter(searchParams.filter);
 
   const preloadedQuery = await loadSerializableQuery<PostListContainerQuery>(query, {
@@ -28,7 +30,7 @@ export default async function PostsPage({ searchParams }: { searchParams: { filt
   return (
     <div className="flex flex-col gap-4">
       <PostSortFilters selected={normalized ?? "ALL"} />
-      <PostListContainer preloadedQuery={preloadedQuery} />
+      <PostListContainer session={session} preloadedQuery={preloadedQuery} />
     </div>
   );
 }