renamed files/function to undo-upvote and moved button on the front end

colorstackorg · Jul 26, 2024 · c69a0fa · c69a0fa
1 parent c732cf8
commit c69a0fa
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 29 deletions.
diff --git a/...routes/api.company-review.$id.downvote.ts → ...tes/api.company-review.$id.undo-upvote.ts b/...routes/api.company-review.$id.downvote.ts → ...tes/api.company-review.$id.undo-upvote.ts
@@ -1,13 +1,13 @@
 import { type ActionFunctionArgs, json } from '@remix-run/node';
 
-import { downvoteCompanyReview } from '@oyster/core/employment.server';
+import { undoUpvoteCompanyReview } from '@oyster/core/employment.server';
 
 import { ensureUserAuthenticated, user } from '@/shared/session.server';
 
 export async function action({ params, request }: ActionFunctionArgs) {
   const session = await ensureUserAuthenticated(request);
 
-  await downvoteCompanyReview(params.id as string, {
+  await undoUpvoteCompanyReview(params.id as string, {
     memberId: user(session),
   });
 

diff --git a/apps/member-profile/app/routes/api.company-review.$id.upvote.ts b/apps/member-profile/app/routes/api.company-review.$id.upvote.ts
@@ -1,7 +1,6 @@
 import { type ActionFunctionArgs, json } from '@remix-run/node';
 
 import { upvoteCompanyReview } from '@oyster/core/employment.server';
-import { track } from '@oyster/infrastructure/mixpanel';
 
 import { ensureUserAuthenticated, user } from '@/shared/session.server';
 
@@ -12,12 +11,5 @@ export async function action({ params, request }: ActionFunctionArgs) {
     memberId: user(session),
   });
 
-  track({
-    event: 'Review Upvoted',
-    properties: undefined,
-    request,
-    user: user(session),
-  });
-
   return json({});
 }
diff --git a/apps/member-profile/app/shared/components/company-review.tsx b/apps/member-profile/app/shared/components/company-review.tsx
@@ -28,7 +28,6 @@ import { Route } from '@/shared/constants';
 
 type CompanyReviewProps = {
   id?: string;
-  date: string;
   company?: {
     id: string;
     image: string;
@@ -91,11 +90,6 @@ export const CompanyReview = ({
         <Text color="gray-500" variant="sm">
           {reviewedAt}
         </Text>
-        <UpvoteCompanyReviewButton
-          id={id}
-          upvoted={upvoted}
-          upvotes={upvotes}
-        />
 
         {editable && workExperienceId && (
           <div className="ml-auto">
@@ -169,6 +163,7 @@ export const CompanyReview = ({
       </div>
 
       <CompanyReviewText text={text} />
+      <UpvoteCompanyReviewButton id={id} upvoted={upvoted} upvotes={upvotes} />
     </Card>
   );
 };
@@ -284,11 +279,11 @@ function UpvoteCompanyReviewButton({
   const fetcher = useFetcher();
 
   const action = upvoted
-    ? `/api/company-review/${id}/downvote`
+    ? `/api/company-review/${id}/undo-upvote`
     : `/api/company-review/${id}/upvote`;
 
   return (
-    <fetcher.Form action={action} method="post" className="ml-auto">
+    <fetcher.Form action={action} method="post" className="mr-auto">
       <button
         className={cx(
           getTextCn({ color: 'gray-500', variant: 'sm' }),

diff --git a/packages/core/src/modules/employment/company.types.ts b/packages/core/src/modules/employment/company.types.ts
@@ -1,14 +1,7 @@
 import { z } from 'zod';
 
-export const DownvoteCompanyReviewInput = z.object({
-  memberId: z.string().min(1),
-});
-
 export const UpvoteCompanyReviewInput = z.object({
   memberId: z.string().min(1),
 });
 
-export type DownvoteCompanyReviewInput = z.infer<
-  typeof DownvoteCompanyReviewInput
->;
 export type UpvoteCompanyReviewInput = z.infer<typeof UpvoteCompanyReviewInput>;
diff --git a/packages/core/src/modules/employment/index.server.ts b/packages/core/src/modules/employment/index.server.ts
@@ -5,5 +5,5 @@ export { listCompanyEmployees } from './queries/list-company-employees';
 export { listCompanyReviews } from './queries/list-company-reviews';
 export { addCompanyReview } from './use-cases/add-company-review';
 export { editCompanyReview } from './use-cases/edit-company-review';
-export { downvoteCompanyReview } from './use-cases/downvote-company-review';
+export { undoUpvoteCompanyReview } from './use-cases/undo-upvote-company-review';
 export { upvoteCompanyReview } from './use-cases/upvote-company-review';
diff --git a/...ment/use-cases/downvote-company-review.ts → ...t/use-cases/undo-upvote-company-review.ts b/...ment/use-cases/downvote-company-review.ts → ...t/use-cases/undo-upvote-company-review.ts
@@ -1,10 +1,10 @@
 import { db } from '@oyster/db';
 
-import { type DownvoteCompanyReviewInput } from '@/modules/employment/company.types';
+import { type UpvoteCompanyReviewInput } from '@/modules/employment/company.types';
 
-export async function downvoteCompanyReview(
+export async function undoUpvoteCompanyReview(
   id: string,
-  input: DownvoteCompanyReviewInput
+  input: UpvoteCompanyReviewInput
 ) {
   const result = await db.transaction().execute(async (trx) => {
     await trx