From b9533ea7ec91fc8bc29738b7caea74b2444b130a Mon Sep 17 00:00:00 2001
From: G-nizam-A <nizamcs10@gmail.com>
Date: Sun, 24 Mar 2024 17:44:49 +0530
Subject: [PATCH 1/2] Feat: Embed video trailer youtube #12

Fixes #12
---
 package.json              |   4 +-
 src/components/Dailog.tsx | 122 ++++++++++++++++++++++++++++++++++++++
 src/pages/Show/Movie.tsx  |  28 +++++----
 src/pages/Show/Tv.tsx     |  28 +++++----
 4 files changed, 161 insertions(+), 21 deletions(-)
 create mode 100644 src/components/Dailog.tsx

diff --git a/package.json b/package.json
index 4f60f2e..30e3bec 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-slot": "^1.0.2",
     "class-variance-authority": "^0.7.0",
@@ -41,4 +43,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.1.6"
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/Dailog.tsx b/src/components/Dailog.tsx
new file mode 100644
index 0000000..95b0d38
--- /dev/null
+++ b/src/components/Dailog.tsx
@@ -0,0 +1,122 @@
+"use client"
+
+import * as React from "react"
+import * as DialogPrimitive from "@radix-ui/react-dialog"
+import { Cross2Icon } from "@radix-ui/react-icons"
+
+import { cn } from "@/lib/utils"
+
+const Dialog = DialogPrimitive.Root
+
+const DialogTrigger = DialogPrimitive.Trigger
+
+const DialogPortal = DialogPrimitive.Portal
+
+const DialogClose = DialogPrimitive.Close
+
+const DialogOverlay = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Overlay
+    ref={ref}
+    className={cn(
+      "fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      className
+    )}
+    {...props}
+  />
+))
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
+
+const DialogContent = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <DialogPortal>
+    <DialogOverlay />
+    <DialogPrimitive.Content
+      ref={ref}
+      className={cn(
+        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+        <Cross2Icon className="h-4 w-4" />
+        <span className="sr-only">Close</span>
+      </DialogPrimitive.Close>
+    </DialogPrimitive.Content>
+  </DialogPortal>
+))
+DialogContent.displayName = DialogPrimitive.Content.displayName
+
+const DialogHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-1.5 text-center sm:text-left",
+      className
+    )}
+    {...props}
+  />
+)
+DialogHeader.displayName = "DialogHeader"
+
+const DialogFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className
+    )}
+    {...props}
+  />
+)
+DialogFooter.displayName = "DialogFooter"
+
+const DialogTitle = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Title
+    ref={ref}
+    className={cn(
+      "text-lg font-semibold leading-none tracking-tight",
+      className
+    )}
+    {...props}
+  />
+))
+DialogTitle.displayName = DialogPrimitive.Title.displayName
+
+const DialogDescription = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+DialogDescription.displayName = DialogPrimitive.Description.displayName
+
+export {
+  Dialog,
+  DialogPortal,
+  DialogOverlay,
+  DialogTrigger,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogFooter,
+  DialogTitle,
+  DialogDescription,
+}
diff --git a/src/pages/Show/Movie.tsx b/src/pages/Show/Movie.tsx
index 849cfe7..3eb67b0 100644
--- a/src/pages/Show/Movie.tsx
+++ b/src/pages/Show/Movie.tsx
@@ -1,4 +1,4 @@
-import { Link, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import useFetch from "@/hooks/useFetch";
 import type { Movie as MovieType } from "@/types/movie";
 import type { Images, Media, Video } from "@/types/media";
@@ -18,6 +18,7 @@ import {
 } from "@/components/ui/carousel";
 import SimilarCardItem from "@/components/SimilarCardItem";
 import WatchProviderContainer from "@/components/WatchProviderContainer";
+import { Dialog, DialogContent, DialogTrigger, } from "@/components/Dailog";
 
 export default function Movie() {
 	const params = useParams();
@@ -106,15 +107,22 @@ export default function Movie() {
 							</Carousel>
 						)}
 						{!!videos?.results.length && (
-							<Link
-								className="px-2 py-2 w-auto col-span-2 lg:col-span-1 text-center rounded-md bg-red-700"
-								to={`https://www.youtube.com/watch?v=${
-									getVideo(videos?.results)?.key
-								}`}
-								target="_blank"
-							>
-								Watch Trailer
-							</Link>
+						<Dialog>
+							<DialogTrigger asChild>
+								<div className="px-2 py-2 w-auto col-span-2 lg:col-span-1 text-center rounded-md bg-red-700 cursor-pointer">Watch Trailer</div>
+							</DialogTrigger>
+							<DialogContent className="bg-transparent p-0 border-none">
+								<iframe width={610}
+								height={365}
+								src={`https://www.youtube.com/embed/${getVideo(videos?.results)?.key}`} 
+								title="YouTube video player"
+								frameBorder={0}
+								allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+								referrerPolicy="strict-origin-when-cross-origin"
+								allowFullScreen={true}
+								/>
+							</DialogContent>
+						</Dialog>
 						)}
 					</div>
 
diff --git a/src/pages/Show/Tv.tsx b/src/pages/Show/Tv.tsx
index 7774dba..fbf753d 100644
--- a/src/pages/Show/Tv.tsx
+++ b/src/pages/Show/Tv.tsx
@@ -1,4 +1,4 @@
-import { Link, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import useFetch from "@/hooks/useFetch";
 import type { Response, SimilarMixed, SimilarTv } from "@/types/response";
 import type { Season, Tv as TvType } from "@/types/tv";
@@ -17,6 +17,7 @@ import imageUrl from "@/utils/image-url";
 import pickRandomImages from "@/utils/pick-random-images";
 import SeasonCardItem from "@/components/SeasonCardItem";
 import WatchProviderContainer from "@/components/WatchProviderContainer";
+import { Dialog, DialogContent, DialogTrigger, } from "@/components/Dailog";
 
 export default function Tv() {
 	const params = useParams();
@@ -98,15 +99,22 @@ export default function Tv() {
 							</Carousel>
 						)}
 						{!!videos?.results.length && (
-							<Link
-								className="px-2 py-2 w-auto col-span-2 lg:col-span-1 text-center rounded-md bg-red-700"
-								to={`https://www.youtube.com/watch?v=${
-									getVideo(videos?.results)?.key
-								}`}
-								target="_blank"
-							>
-								Watch Trailer
-							</Link>
+							<Dialog>
+							<DialogTrigger asChild>
+								<div className="px-2 py-2 w-auto col-span-2 lg:col-span-1 text-center rounded-md bg-red-700 cursor-pointer">Watch Trailer</div>
+							</DialogTrigger>
+							<DialogContent className="bg-transparent p-0 border-none">
+								<iframe width={610}
+								height={365}
+								src={`https://www.youtube.com/embed/${getVideo(videos?.results)?.key}`}
+								title="YouTube video player"
+								frameBorder={0}
+								allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+								referrerPolicy="strict-origin-when-cross-origin"
+								allowFullScreen={true}
+								/>
+							</DialogContent>
+						</Dialog>
 						)}
 					</div>
 

From 23910848bd896366138a6f8aedcb3cb8d2047358 Mon Sep 17 00:00:00 2001
From: nnivxix <adhe.hanasa@gmail.com>
Date: Mon, 25 Mar 2024 07:14:37 +0700
Subject: [PATCH 2/2] refactor: ui dialog for youtube trailer

---
 pnpm-lock.yaml                               | 70 ++++++++++++++++++++
 src/components/PopupYoutubeTrailer.tsx       | 25 +++++++
 src/components/{Dailog.tsx => ui/dialog.tsx} |  8 +--
 src/pages/Show/Movie.tsx                     | 21 ++----
 src/pages/Show/Tv.tsx                        | 21 ++----
 5 files changed, 106 insertions(+), 39 deletions(-)
 create mode 100644 src/components/PopupYoutubeTrailer.tsx
 rename src/components/{Dailog.tsx => ui/dialog.tsx} (97%)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f1fe217..f8ff46f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,12 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
+  '@radix-ui/react-dialog':
+    specifier: ^1.0.5
+    version: 1.0.5(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0)
+  '@radix-ui/react-icons':
+    specifier: ^1.3.0
+    version: 1.3.0(react@18.2.0)
   '@radix-ui/react-select':
     specifier: ^2.0.0
     version: 2.0.0(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0)
@@ -771,6 +777,40 @@ packages:
       react: 18.2.0
     dev: false
 
+  /@radix-ui/react-dialog@1.0.5(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.24.0
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.66)(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.2.66)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.66)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-id': 1.0.1(@types/react@18.2.66)(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.66)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.66)(react@18.2.0)
+      '@types/react': 18.2.66
+      '@types/react-dom': 18.2.22
+      aria-hidden: 1.2.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-remove-scroll: 2.5.5(@types/react@18.2.66)(react@18.2.0)
+    dev: false
+
   /@radix-ui/react-direction@1.0.1(@types/react@18.2.66)(react@18.2.0):
     resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
     peerDependencies:
@@ -847,6 +887,14 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
+  /@radix-ui/react-icons@1.3.0(react@18.2.0):
+    resolution: {integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==}
+    peerDependencies:
+      react: ^16.x || ^17.x || ^18.x
+    dependencies:
+      react: 18.2.0
+    dev: false
+
   /@radix-ui/react-id@1.0.1(@types/react@18.2.66)(react@18.2.0):
     resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
     peerDependencies:
@@ -913,6 +961,28 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
+  /@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.24.0
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.66)(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.66)(react@18.2.0)
+      '@types/react': 18.2.66
+      '@types/react-dom': 18.2.22
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: false
+
   /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.22)(@types/react@18.2.66)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
     peerDependencies:
diff --git a/src/components/PopupYoutubeTrailer.tsx b/src/components/PopupYoutubeTrailer.tsx
new file mode 100644
index 0000000..a944204
--- /dev/null
+++ b/src/components/PopupYoutubeTrailer.tsx
@@ -0,0 +1,25 @@
+import { Dialog, DialogTrigger, DialogContent } from "@/components/ui/dialog";
+
+export default function PopupYoutubeTrailer({ video }: { video: string }) {
+	return (
+		<Dialog>
+			<DialogTrigger>
+				<div className="px-2 py-2 w-auto col-span-2 lg:col-span-1 text-center rounded-md bg-red-700 cursor-pointer">
+					Watch Trailer
+				</div>
+			</DialogTrigger>
+			<DialogContent className="bg-transparent p-0 border-none">
+				<iframe
+					width={610}
+					height={365}
+					className="w-full"
+					src={`https://www.youtube.com/embed/${video}`}
+					title="YouTube video player"
+					allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+					referrerPolicy="strict-origin-when-cross-origin"
+					allowFullScreen={true}
+				/>
+			</DialogContent>
+		</Dialog>
+	);
+}
diff --git a/src/components/Dailog.tsx b/src/components/ui/dialog.tsx
similarity index 97%
rename from src/components/Dailog.tsx
rename to src/components/ui/dialog.tsx
index 95b0d38..c23630e 100644
--- a/src/components/Dailog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -1,8 +1,6 @@
-"use client"
-
 import * as React from "react"
 import * as DialogPrimitive from "@radix-ui/react-dialog"
-import { Cross2Icon } from "@radix-ui/react-icons"
+import { X } from "lucide-react"
 
 import { cn } from "@/lib/utils"
 
@@ -45,7 +43,7 @@ const DialogContent = React.forwardRef<
     >
       {children}
       <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
-        <Cross2Icon className="h-4 w-4" />
+        <X className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>
     </DialogPrimitive.Content>
@@ -112,8 +110,8 @@ export {
   Dialog,
   DialogPortal,
   DialogOverlay,
-  DialogTrigger,
   DialogClose,
+  DialogTrigger,
   DialogContent,
   DialogHeader,
   DialogFooter,
diff --git a/src/pages/Show/Movie.tsx b/src/pages/Show/Movie.tsx
index 3eb67b0..8900b63 100644
--- a/src/pages/Show/Movie.tsx
+++ b/src/pages/Show/Movie.tsx
@@ -18,7 +18,7 @@ import {
 } from "@/components/ui/carousel";
 import SimilarCardItem from "@/components/SimilarCardItem";
 import WatchProviderContainer from "@/components/WatchProviderContainer";
-import { Dialog, DialogContent, DialogTrigger, } from "@/components/Dailog";
+import PopupYoutubeTrailer from "@/components/PopupYoutubeTrailer";
 
 export default function Movie() {
 	const params = useParams();
@@ -107,22 +107,9 @@ export default function Movie() {
 							</Carousel>
 						)}
 						{!!videos?.results.length && (
-						<Dialog>
-							<DialogTrigger asChild>
-								<div className="px-2 py-2 w-auto col-span-2 lg:col-span-1 text-center rounded-md bg-red-700 cursor-pointer">Watch Trailer</div>
-							</DialogTrigger>
-							<DialogContent className="bg-transparent p-0 border-none">
-								<iframe width={610}
-								height={365}
-								src={`https://www.youtube.com/embed/${getVideo(videos?.results)?.key}`} 
-								title="YouTube video player"
-								frameBorder={0}
-								allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-								referrerPolicy="strict-origin-when-cross-origin"
-								allowFullScreen={true}
-								/>
-							</DialogContent>
-						</Dialog>
+							<PopupYoutubeTrailer
+								video={getVideo(videos.results)?.key as string}
+							/>
 						)}
 					</div>
 
diff --git a/src/pages/Show/Tv.tsx b/src/pages/Show/Tv.tsx
index fbf753d..eb4c406 100644
--- a/src/pages/Show/Tv.tsx
+++ b/src/pages/Show/Tv.tsx
@@ -17,7 +17,7 @@ import imageUrl from "@/utils/image-url";
 import pickRandomImages from "@/utils/pick-random-images";
 import SeasonCardItem from "@/components/SeasonCardItem";
 import WatchProviderContainer from "@/components/WatchProviderContainer";
-import { Dialog, DialogContent, DialogTrigger, } from "@/components/Dailog";
+import PopupYoutubeTrailer from "@/components/PopupYoutubeTrailer";
 
 export default function Tv() {
 	const params = useParams();
@@ -99,22 +99,9 @@ export default function Tv() {
 							</Carousel>
 						)}
 						{!!videos?.results.length && (
-							<Dialog>
-							<DialogTrigger asChild>
-								<div className="px-2 py-2 w-auto col-span-2 lg:col-span-1 text-center rounded-md bg-red-700 cursor-pointer">Watch Trailer</div>
-							</DialogTrigger>
-							<DialogContent className="bg-transparent p-0 border-none">
-								<iframe width={610}
-								height={365}
-								src={`https://www.youtube.com/embed/${getVideo(videos?.results)?.key}`}
-								title="YouTube video player"
-								frameBorder={0}
-								allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-								referrerPolicy="strict-origin-when-cross-origin"
-								allowFullScreen={true}
-								/>
-							</DialogContent>
-						</Dialog>
+							<PopupYoutubeTrailer
+								video={getVideo(videos.results)?.key as string}
+							/>
 						)}
 					</div>