merge

AI4Bharat · Aug 19, 2024 · 9d3a65f · 9d3a65f
2 parents ca37b05 + 34d6d28
commit 9d3a65f
Show file tree

Hide file tree

Showing 19 changed files with 289 additions and 135 deletions.
diff --git a/src/common/AddProjectMembers.jsx b/src/common/AddProjectMembers.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-
+import { useSelector } from "react-redux";
 //Components
 import {
   Button,
@@ -30,8 +30,13 @@ const AddProjectMembers = ({
   handleSelectField,
   managerNames,
 }) => {
-  const acceptedManagers = managerNames.filter((manager) => manager.has_accepted_invite==true);
-
+  const alreadyExistingUsers = useSelector((state)=>state.
+  getProjectMembers.data);
+  console.log(alreadyExistingUsers);
+  const acceptedManagers = managerNames.filter((manager) =>manager.has_accepted_invite === true &&
+      !alreadyExistingUsers.some((user) => user.id === manager.id)
+  );
+  console.log(acceptedManagers)
   const filterOptions = (options, state) => {
     const newOptions = options.filter((user) => {
       const { first_name, last_name, email } = user;

diff --git a/src/common/CreateVideoDialog.jsx b/src/common/CreateVideoDialog.jsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useEffect } from "react";
+import React, { Fragment, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { MenuProps } from "utils";
 
@@ -78,6 +78,14 @@ const CreateVideoDialog = ({
     (state) => state.getSupportedLanguages.transcriptionLanguage
   );
 
+  const videosInProject = useSelector((state)=>state.getProjectVideoList.data)
+  const [showPopup, setShowPopup] = useState(false);
+  useEffect(() => {
+    if (videosInProject.some((video) => video.url === videoLink)) {
+      setShowPopup(true);
+    }
+  }, [videoLink, videosInProject]);
+
   const handleClear = () => {
     setLang("");
     setVideoLink("");
@@ -241,6 +249,55 @@ const CreateVideoDialog = ({
           onChange={(event) => setVideoLink(event.target.value)}
           sx={{ mt: 3 }}
         />
+        {showPopup && (
+  <div
+    style={{
+      position: 'fixed',
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0,
+      backgroundColor: 'rgba(0,0,0,0.5)',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+      zIndex: 9999,
+    }}
+  >
+    <div
+      style={{
+        backgroundColor: 'white',
+        padding: '20px',
+        borderRadius: '8px',
+        textAlign: 'center',
+        position: 'relative',
+        minWidth: '300px',
+      }}
+    >
+      <p>This video already exists in the project. Do you want to upload it again?</p>
+      <Button
+                  style={{ marginRight: "10px" }}
+                  // className={classes.projectButton}
+                  onClick={()=>setShowPopup(false)}
+                  variant="contained"
+                >
+                  Yes
+                </Button>
+
+                <Button
+                  style={{ marginRight: "10px" }}
+                  // className={classes.projectButton}
+                  onClick={()=>{setShowPopup(false)
+                    setVideoLink("")
+                  }}
+                  variant="contained"
+                >
+                  No
+                </Button>
+    </div>
+  </div>
+)}
+
 
         <FormControl fullWidth sx={{ mt: 3 }}>
           <InputLabel id="select-voice">Voice Selection</InputLabel>

diff --git a/src/common/CustomMenuComponent.jsx b/src/common/CustomMenuComponent.jsx
@@ -21,6 +21,8 @@ const CustomMenuComponent = ({
   setShowSubtitles,
   showTimeline,
   setShowTimeline,
+  useYtdlp,
+  setUseYtdlp,
 }) => {
   const player = useSelector((state) => state.commonReducer.player);
 
@@ -109,6 +111,19 @@ const CustomMenuComponent = ({
               <input type="checkbox" checked={showTimeline} onChange={() => {setShowTimeline(!showTimeline)}}/>
             </div>
           </MenuItem>
+          <MenuItem key="Youtube Player">
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "space-between",
+                width: "100%",
+              }}
+            >
+              <span>Youtube Player</span>
+              <input type="checkbox" checked={!useYtdlp} onChange={() => {setUseYtdlp(!useYtdlp)}}/>
+            </div>
+          </MenuItem>
       </Menu>
 
       <Menu

diff --git a/src/common/ExportDialog.jsx b/src/common/ExportDialog.jsx
@@ -69,7 +69,7 @@ const ExportDialog = ({
       PaperProps={{ style: { borderRadius: "10px" } }}
     >
       <DialogTitle variant="h4" display="flex" alignItems={"center"}>
-        <Typography variant="h4">Export Subtitles</Typography>{" "}
+        <Typography variant="h4">Export Voiceover</Typography>{" "}
         <IconButton
           aria-label="close"
           onClick={handleClose}
@@ -172,7 +172,7 @@ const ExportDialog = ({
         ) : (
           <></>
         )}
-
+{/* 
         {currentTaskType?.includes("VOICEOVER") && !isBulkTaskDownload && (
           <>
             <DialogContentText id="select-speaker-info" sx={{ mt: 2 }}>
@@ -196,7 +196,7 @@ const ExportDialog = ({
               </FormControl>
             </DialogActions>
           </>
-        )}
+        )} */}
 
         <DialogActions>
           <Button

diff --git a/src/common/TimeBoxes.jsx b/src/common/TimeBoxes.jsx
@@ -2,15 +2,15 @@ import React, { memo } from "react";
 import { ProjectStyle } from "styles";
 import { TextField } from "@mui/material";
 
-const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
+const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly, player }) => {
   const classes = ProjectStyle();
 
   return (
     <div style={{display: "flex", margin:"0"}}>
       <TextField
         variant="standard"
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "hours")
+          handleTimeChange(event.target.value, index, type, "hours", player)
         }
         value={time.split(":")[0]}
         onFocus={(event) => event.target.select()}
@@ -36,7 +36,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         onFocus={(event) => event.target.select()}
         InputProps={{ inputProps: { min: 0, max: 100 }, readOnly:readOnly }}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "minutes")
+          handleTimeChange(event.target.value, index, type, "minutes", player)
         }
       />
 
@@ -55,7 +55,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         InputProps={{ inputProps: { min: 0, max: 100 }, readOnly:readOnly }}
         className={classes.timeInputBox}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "seconds")
+          handleTimeChange(event.target.value, index, type, "seconds", player)
         }
         // style={{
 
@@ -78,7 +78,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         InputProps={{ inputProps: { min: 0, max: 999 }, readOnly:readOnly }}
         className={classes.timeInputBox}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "miliseconds")
+          handleTimeChange(event.target.value, index, type, "miliseconds", player)
         }
       />
     </div>