feat: add edit chapters

celluloid-camp · Nov 4, 2024 · 19723d0 · 19723d0
1 parent 715eb7d
commit 19723d0
Show file tree

Hide file tree

Showing 27 changed files with 1,177 additions and 2,418 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Build
         uses: docker/build-push-action@v3
         with:
-          file: ./apps/frontend/Dockerfile
+          file: ./Dockerfile
           context: .
           push: true
           tags: ghcr.io/${{ github.repository }}/celluloid:staging

diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/apps/frontend/Dockerfile → Dockerfile b/apps/frontend/Dockerfile → Dockerfile
diff --git a/apps/backend/package.json b/apps/backend/package.json
diff --git a/apps/backend/src/index.ts b/apps/backend/src/index.ts
diff --git a/apps/backend/src/openapi.ts b/apps/backend/src/openapi.ts
diff --git a/apps/backend/tsconfig.json b/apps/backend/tsconfig.json
diff --git a/apps/backend/tsup.config.ts b/apps/backend/tsup.config.ts
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -39,10 +39,12 @@
     "@mui/styles": "^6.1.2",
     "@tanstack/react-query": "^4.36.1",
     "@tanstack/react-query-devtools": "^5.4.2",
+    "@tiptap/extension-text-style": "^2.9.1",
     "@trpc/client": "^10.45.2",
     "@trpc/react-query": "^10.45.2",
     "@trpc/server": "^10.45.2",
     "@types/linkify-urls": "^3.1.1",
+    "@uidotdev/usehooks": "^2.4.1",
     "adminjs": "^7.8.13",
     "change-case": "^4.1.2",
     "cookie-parser": "^1.4.7",
@@ -51,6 +53,7 @@
     "dayjs": "^1.11.10",
     "enzyme": "^3.3.0",
     "express": "^4.21.1",
+    "express-formidable": "^1.2.0",
     "express-session": "^1.18.1",
     "file-saver": "^2.0.5",
     "formik": "^2.2.9",
@@ -108,6 +111,7 @@
     "@types/cookie-parser": "^1",
     "@types/cors": "^2.8.13",
     "@types/express": "^4",
+    "@types/express-formidable": "^1",
     "@types/express-session": "^1",
     "@types/file-saver": "^2.0.5",
     "@types/get-urls": "^9.1.3",

diff --git a/apps/frontend/src/components/Dialog.tsx b/apps/frontend/src/components/Dialog.tsx
@@ -1,15 +1,13 @@
 import CloseIcon from "@mui/icons-material/Close";
 import {
   Alert,
-  Box,
   DialogTitle,
-  DialogTitleProps,
+  type DialogTitleProps,
   IconButton,
   LinearProgress,
   styled,
-  Typography,
 } from "@mui/material";
-import Dialog, { DialogProps } from "@mui/material/Dialog";
+import Dialog, { type DialogProps } from "@mui/material/Dialog";
 import DialogContent from "@mui/material/DialogContent";
 
 export const BootstrapDialog = styled(Dialog)(({ theme }) => ({

diff --git a/apps/frontend/src/components/annotation/AnnotationForm.tsx b/apps/frontend/src/components/annotation/AnnotationForm.tsx
@@ -19,7 +19,7 @@ import { Trans, useTranslation } from "react-i18next";
 import * as Yup from "yup";
 
 import { useVideoPlayerProgressValue } from "~components/project/useVideoPlayer";
-import { ProjectById, trpc, UserMe } from "~utils/trpc";
+import { type ProjectById, trpc, type UserMe } from "~utils/trpc";
 
 import { DurationSlider } from "./DurationSlider";
 import {
@@ -60,9 +60,8 @@ export const AnnotationForm: React.FC<AnnotationFormProps> = (props) => {
         {t("annotation.form.add-annotation")}
       </Button>
     );
-  } else {
-    return <AnnotationFormContent onClose={handleClose} {...props} />;
   }
+  return <AnnotationFormContent onClose={handleClose} {...props} />;
 };
 
 export const AnnotationFormContent: React.FC<

diff --git a/apps/frontend/src/components/annotation/AnnotationPanel.tsx b/apps/frontend/src/components/annotation/AnnotationPanel.tsx
@@ -165,6 +165,7 @@ const AnnotationList: React.FC<
 export const AnnotationPanel: React.FC<AnnotationPanelProps> = ({
   annotationCount,
   playerIsReady,
+  videoPlayerRef,
   ...props
 }) => {
   const [value, setValue] = useState("1");
@@ -269,9 +270,18 @@ export const AnnotationPanel: React.FC<AnnotationPanelProps> = ({
         </TabPanel>
         <TabPanel
           value="2"
-          sx={{ height: "90%", padding: 0, position: "relative" }}
+          sx={{
+            height: "100%",
+            padding: 0,
+            paddingBottom: "100px",
+            position: "relative",
+          }}
         >
-          <ChaptersPanel project={props.project} user={props.user} />
+          <ChaptersPanel
+            project={props.project}
+            user={props.user}
+            videoPlayerRef={videoPlayerRef}
+          />
         </TabPanel>
       </TabContext>
     </Paper>