Upgrade staging (#191)

* moderation handle platform_user_id and near account id

* standardize activity

* fmt

* delete tests

* fix shared types

* activity leaderboard

* throw not error

* fix services

* feat: use tanstack table for leaderboard (#183)

* fix: mobile layout improvement feed page (#185)

* Refactors create feed flow, steps use router (#188)

* wip

* feed types

* better feed form

* Update packages/shared-db/tsconfig.json

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update apps/app/src/routes/_layout/create/feed/settings.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update apps/app/src/routes/_layout/create/feed/index.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* set lock

* nitpicks

* fmt

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Implements JWT auth flow with 7 day tokens (#187)

* better auth services

* nit picks

* nonce validation

* nitpicks

* clean up

* fix error types

* import error

* fix auth requests

* fix: toast colors not correct (#189)

* fix: toast colors not corrent

* fmt

* fix feed

* fix zod type

* fix @ and config

* fmt

* feat: add settings page UI

* feat: add route based tab navigation

* feat: welcome route for new feed (#192)

* feat: welcome route for new feed

* fix: feed overflow in top feeds column of leaderboard

* fix: coderabbit comments

* moderate submissions

* fmt

* fmt

---------

Co-authored-by: Zeeshan Ahmad <itexpert120@outlook.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Author: 3 people

apps/app/src/components/FeedItem.tsx

@@ -30,7 +30,7 @@ const NotesSection = ({
 }: {
   title: string;
   username: string;
-  note: string | null;
+  note?: string | null;
   className?: string;
 }) => {
   // Change title based on whether there are notes or not
@@ -63,8 +63,8 @@ const ModerationActions = ({
   submission: FeedContextSubmission;
   feedId: string;
 }) => {
-  const approveMutation = useApproveSubmission();
-  const rejectMutation = useRejectSubmission();
+  const approveMutation = useApproveSubmission(submission.tweetId);
+  const rejectMutation = useRejectSubmission(submission.tweetId);
 
   const handleApprove = () => {
     if (!submission.tweetId || !feedId) {
@@ -97,14 +97,19 @@ const ModerationActions = ({
     });
   };
 
-  const isPending = approveMutation.isPending || rejectMutation.isPending;
-
   return (
     <div className="flex justify-center flex-col gap-2">
-      <Button onClick={handleApprove} disabled={isPending}>
+      <Button
+        onClick={handleApprove}
+        disabled={approveMutation.isPending || rejectMutation.isPending}
+      >
         {approveMutation.isPending ? "Approving..." : "Approve"}
       </Button>
-      <Button onClick={handleReject} variant="destructive" disabled={isPending}>
+      <Button
+        onClick={handleReject}
+        variant="destructive"
+        disabled={approveMutation.isPending || rejectMutation.isPending}
+      >
         {rejectMutation.isPending ? "Rejecting..." : "Reject"}
       </Button>
     </div>
@@ -203,7 +208,7 @@ export const FeedItem = ({
               <div className="flex-col flex-grow">
                 <NotesSection
                   title="Moderation Notes"
-                  username={lastModeration.adminId}
+                  username={lastModeration.moderatorAccountId}
                   note={lastModeration.note}
                   // className="mb-4"
                 />

apps/app/src/components/UserMenu.tsx

@@ -9,7 +9,7 @@ import {
 } from "./ui/dropdown-menu";
 
 import { useNavigate } from "@tanstack/react-router";
-import { ChevronDown, CircleUserRound, LogOut } from "lucide-react";
+import { ChevronDown, CircleUserRound, LogOut, Settings } from "lucide-react";
 import { useAuth } from "../contexts/auth-context";
 import { useNearSocialProfile } from "../hooks/near-social";
 import { AvatarProfile } from "./AvatarProfile";
@@ -89,7 +89,7 @@ export default function UserMenu({ className }: UserMenuProps) {
       </DropdownMenuTrigger>
       <DropdownMenuContent className="w-56 mt-4">
         <DropdownMenuItem>
-          <div className="flex gap-2 w-full items-start">
+          <div className="flex gap-2 w-full items-center">
             {currentAccountId ? (
               <AvatarProfile accountId={currentAccountId} size="medium" />
             ) : (
@@ -112,6 +112,15 @@ export default function UserMenu({ className }: UserMenuProps) {
           <CircleUserRound />
           <span>Profile</span>
         </DropdownMenuItem>
+        <DropdownMenuItem
+          className="cursor-pointer hover:bg-gray-100"
+          onClick={() => {
+            navigate({ to: "/profile/settings" });
+          }}
+        >
+          <Settings />
+          <span>Settings</span>
+        </DropdownMenuItem>
         <DropdownMenuItem
           onClick={handleSignOut}
           className="cursor-pointer hover:bg-gray-100"

apps/app/src/components/leaderboard/LeaderboardColumns.tsx

@@ -88,9 +88,11 @@ export function createLeaderboardColumns(
           <div className="flex flex-col min-h-[32px] justify-center">
             <div className="flex items-center gap-2">
               {feedSubmissions && feedSubmissions.length > 0 && (
-                <div className="flex items-center justify-between gap-1 border border-neutral-400 px-2 py-1 rounded-md w-[150px]">
-                  <span className="text-sm">#{feedSubmissions[0].feedId}</span>
-                  <span className="text-sm">
+                <div className="flex items-center justify-between gap-1 border border-neutral-400 px-2 py-1 rounded-md w-[150px] min-w-0">
+                  <span className="text-sm truncate flex-shrink">
+                    #{feedSubmissions[0].feedId}
+                  </span>
+                  <span className="text-sm whitespace-nowrap flex-shrink-0">
                     {feedSubmissions[0].count}/{feedSubmissions[0].totalInFeed}
                   </span>
                 </div>
@@ -116,9 +118,11 @@ export function createLeaderboardColumns(
               <div className="flex flex-col gap-2 mt-2 pl-0">
                 {feedSubmissions.slice(1).map((feed, feedIndex) => (
                   <div key={feedIndex} className="flex items-center">
-                    <div className="flex items-center gap-1 border border-neutral-400 px-2 py-1 rounded-md justify-between w-[150px]">
-                      <span className="text-sm">#{feed.feedId}</span>
-                      <span className="text-sm">
+                    <div className="flex items-center gap-1 border border-neutral-400 px-2 py-1 rounded-md justify-between w-[150px] min-w-0">
+                      <span className="text-sm truncate flex-shrink">
+                        #{feed.feedId}
+                      </span>
+                      <span className="text-sm whitespace-nowrap flex-shrink-0">
                         {feed.count}/{feed.totalInFeed}
                       </span>
                     </div>

apps/app/src/components/ui/tabs.tsx

@@ -12,7 +12,7 @@ const TabsList = React.forwardRef<
   <TabsPrimitive.List
     ref={ref}
     className={cn(
-      "inline-flex h-9 items-center justify-center rounded-lg bg-neutral-100 p-1 text-neutral-500 dark:bg-neutral-800 dark:text-neutral-400",
+      "inline-flex h-9 items-center justify-center rounded-lg bg-slate-100 p-1 text-neutral-500 dark:bg-neutral-800 dark:text-neutral-400",
       className,
     )}
     {...props}

apps/app/src/config/index.ts

@@ -1,4 +1,4 @@
-import { isProduction } from './../../../api/src/services/config.service';
+import { isProduction } from "./../../../api/src/services/config.service";
 interface EVMChain {
   chainId: number;
   name: string;
@@ -25,7 +25,10 @@ const evmWalletChains: EVMWalletChains = {
   },
 };
 
-export const NETWORK_ID = isProduction ? "mainnet" : (process.env.PUBLIC_NETWORK || "testnet");
+export const NETWORK_ID =
+  process.env.NODE_ENV === "production" // TODO: strange
+    ? "mainnet"
+    : process.env.PUBLIC_NETWORK || "testnet";
 export const EVMWalletChain = evmWalletChains[NETWORK_ID];
 
 // API Configuration

apps/app/src/lib/api/moderation.ts

@@ -1,14 +1,17 @@
-import { useApiMutation } from "../../hooks/api-client";
-import { useQueryClient } from "@tanstack/react-query";
-import { useAuth } from "../../contexts/auth-context";
-import { toast } from "../../hooks/use-toast";
 import type {
   CreateModerationRequest,
   ModerationActionCreatedWrappedResponse,
   ModerationActionType,
 } from "@curatedotfun/types";
+import { useQueryClient } from "@tanstack/react-query";
+import { useAuth } from "../../contexts/auth-context";
+import { useApiMutation } from "../../hooks/api-client";
+import { toast } from "../../hooks/use-toast";
 
-const useModerateSubmission = (moderationAction: ModerationActionType) => {
+const useModerateSubmission = (
+  moderationAction: ModerationActionType,
+  submissionId: string,
+) => {
   const queryClient = useQueryClient();
   const auth = useAuth();
 
@@ -23,6 +26,7 @@ const useModerateSubmission = (moderationAction: ModerationActionType) => {
       message: "moderateSubmission",
     },
     {
+      mutationKey: ["moderate", moderationAction, submissionId],
       onSuccess: (_data, variables) => {
         queryClient.invalidateQueries({ queryKey: ["submissions"] });
         queryClient.invalidateQueries({
@@ -54,7 +58,7 @@ const useModerateSubmission = (moderationAction: ModerationActionType) => {
   );
 
   const mutate = (
-    payload: Omit<CreateModerationRequest, "action" | "adminId">,
+    payload: Omit<CreateModerationRequest, "action" | "moderatorAccountId">,
   ) => {
     if (!auth.isSignedIn || !auth.currentAccountId) {
       console.error(
@@ -70,13 +74,15 @@ const useModerateSubmission = (moderationAction: ModerationActionType) => {
     const internalPayload: CreateModerationRequest = {
       ...payload,
       action: moderationAction,
-      adminId: auth.currentAccountId,
+      moderatorAccountId: auth.currentAccountId,
     };
     actualMutate(internalPayload);
   };
 
   return { mutate, ...rest };
 };
 
-export const useApproveSubmission = () => useModerateSubmission("approve");
-export const useRejectSubmission = () => useModerateSubmission("reject");
+export const useApproveSubmission = (submissionId: string) =>
+  useModerateSubmission("approve", submissionId);
+export const useRejectSubmission = (submissionId: string) =>
+  useModerateSubmission("reject", submissionId);