From b6e91d7348b37cabd00cd9d198869d7a7944be48 Mon Sep 17 00:00:00 2001 From: MarconLP <13001502+MarconLP@users.noreply.github.com> Date: Fri, 14 Apr 2023 19:46:09 +0200 Subject: [PATCH] cleanup code --- package-lock.json | 11 +++++++++++ package.json | 1 + src/components/VideoMoreMenu.tsx | 7 ++----- src/pages/share/[videoId].tsx | 2 +- src/server/api/routers/video.ts | 5 +---- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index f8e6209..66d3f61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,7 @@ "@trpc/server": "^10.18.0", "axios": "^1.3.5", "dayjs": "^1.11.7", + "file-saver": "^2.0.5", "next": "^13.2.4", "next-auth": "^4.21.0", "react": "18.2.0", @@ -3572,6 +3573,11 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -9012,6 +9018,11 @@ "flat-cache": "^3.0.4" } }, + "file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", diff --git a/package.json b/package.json index f4c9c9d..73b070d 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@trpc/server": "^10.18.0", "axios": "^1.3.5", "dayjs": "^1.11.7", + "file-saver": "^2.0.5", "next": "^13.2.4", "next-auth": "^4.21.0", "react": "18.2.0", diff --git a/src/components/VideoMoreMenu.tsx b/src/components/VideoMoreMenu.tsx index bc2250c..67e84c7 100644 --- a/src/components/VideoMoreMenu.tsx +++ b/src/components/VideoMoreMenu.tsx @@ -1,6 +1,6 @@ import { type RouterOutputs } from "~/utils/api"; -import { Menu, Popover, Transition } from "@headlessui/react"; -import { Fragment, useState } from "react"; +import { Menu, Transition } from "@headlessui/react"; +import { Fragment } from "react"; import { DotsHorizontalIcon, DownloadIcon, @@ -13,8 +13,6 @@ interface Props { } export default function VideoMoreMenu({ video }: Props) { - const [open, setOpen] = useState(null); - const items = [ { name: "Rename", @@ -27,7 +25,6 @@ export default function VideoMoreMenu({ video }: Props) { { name: "Delete", icon: , - props: { onClick: () => console.log("test") }, }, ]; diff --git a/src/pages/share/[videoId].tsx b/src/pages/share/[videoId].tsx index 2c44c87..9bdf686 100644 --- a/src/pages/share/[videoId].tsx +++ b/src/pages/share/[videoId].tsx @@ -68,7 +68,7 @@ const VideoList: NextPage = () => { width="100%" height="100%" controls={true} - url={video?.video_url} + url={video.video_url} /> )} diff --git a/src/server/api/routers/video.ts b/src/server/api/routers/video.ts index cdf0a8d..6b94f26 100644 --- a/src/server/api/routers/video.ts +++ b/src/server/api/routers/video.ts @@ -47,9 +47,7 @@ export const videoRouter = createTRPCRouter({ const signedUrl = await getSignedUrl(s3, getObjectCommand); - video.video_url = signedUrl; - - return video; + return { ...video, video_url: signedUrl }; }), getUploadUrl: protectedProcedure .input(z.object({ key: z.string() })) @@ -61,7 +59,6 @@ export const videoRouter = createTRPCRouter({ data: { userId: ctx.session.user.id, title: key, - video_url: "bla", }, });