diff --git a/package-lock.json b/package-lock.json index 4f2a4ae..f4868aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "VoD-System", + "name": "vodSystem", "lockfileVersion": 3, "requires": true, "packages": { @@ -32,7 +32,8 @@ "react-player": "^2.16.0", "react-range-slider-input": "^3.2.1", "react-router": "7.5.2", - "react-router-dom": "^7.6.0" + "react-router-dom": "^7.6.0", + "react-slider": "^2.0.6" }, "devDependencies": { "@babel/preset-react": "7.26.3", @@ -41,6 +42,7 @@ "@rollup/pluginutils": "5.1.4", "@types/react": "18.3.20", "@types/react-dom": "18.3.6", + "@types/react-slider": "^1.3.6", "@vaadin/hilla-generator-cli": "24.7.3", "@vaadin/hilla-generator-core": "24.7.3", "@vaadin/hilla-generator-plugin-backbone": "24.7.3", @@ -3143,6 +3145,16 @@ "@types/react": "^18.0.0" } }, + "node_modules/@types/react-slider": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/@types/react-slider/-/react-slider-1.3.6.tgz", + "integrity": "sha512-RS8XN5O159YQ6tu3tGZIQz1/9StMLTg/FCIPxwqh2gwVixJnlfIodtVx+fpXVMZHe7A58lAX1Q4XTgAGOQaCQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/react": "*" + } + }, "node_modules/@types/resolve": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", @@ -8521,6 +8533,18 @@ "react-dom": ">=18" } }, + "node_modules/react-slider": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/react-slider/-/react-slider-2.0.6.tgz", + "integrity": "sha512-gJxG1HwmuMTJ+oWIRCmVWvgwotNCbByTwRkFZC6U4MBsHqJBmxwbYRJUmxy4Tke1ef8r9jfXjgkmY/uHOCEvbA==", + "license": "MIT", + "dependencies": { + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "react": "^16 || ^17 || ^18" + } + }, "node_modules/readable-stream": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", diff --git a/package.json b/package.json index d23fc2a..a3a9bf0 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "@rollup/pluginutils": "5.1.4", "@types/react": "18.3.20", "@types/react-dom": "18.3.6", + "@types/react-slider": "^1.3.6", "@vaadin/hilla-generator-cli": "24.7.3", "@vaadin/hilla-generator-core": "24.7.3", "@vaadin/hilla-generator-plugin-backbone": "24.7.3", @@ -61,7 +62,8 @@ "react-player": "^2.16.0", "react-range-slider-input": "^3.2.1", "react-router": "7.5.2", - "react-router-dom": "^7.6.0" + "react-router-dom": "^7.6.0", + "react-slider": "^2.0.6" }, "vaadin": { "dependencies": { @@ -155,4 +157,4 @@ "react-player": "$react-player", "react-range-slider-input": "$react-range-slider-input" } -} \ No newline at end of file +} diff --git a/src/main/frontend/views/video/{id}.tsx b/src/main/frontend/views/video/{id}.tsx index a4f7d54..5ae41bc 100644 --- a/src/main/frontend/views/video/{id}.tsx +++ b/src/main/frontend/views/video/{id}.tsx @@ -3,6 +3,7 @@ import { useEffect, useRef, useState } from "react"; import RangeSlider from 'react-range-slider-input'; import 'react-range-slider-input/dist/style.css'; + export type VideoMetadata = { startPoint: number, endPoint: number, @@ -24,20 +25,32 @@ export default function video() { const videoUrl = "api/v1/download/input/" + id; const [metadata, setMetadata] = useState(null); + const [sliderValue, setSliderValue] = useState(0); - let previousInput = [0, 0]; - const handleInput = (val: [number, number]) => { + let previousRangeSliderInput = [0, 0]; + const handleRangeSliderInput = (val: [number, number]) => { if (!videoRef.current) { return; } - if (previousInput[0] != val[0]) { + if (previousRangeSliderInput[0] != val[0]) { videoRef.current.currentTime = val[0]; - } else if (previousInput[1] != val[1]) { + setSliderValue(val[0]); + } else if (previousRangeSliderInput[1] != val[1]) { videoRef.current.currentTime = val[1]; + setSliderValue(val[1]); } - previousInput = val; + previousRangeSliderInput = val; + }; + + const updateVideoTag = (e: React.ChangeEvent) => { + if (!videoRef.current) { + return; + } + + setSliderValue(parseFloat(e.target.value)); + //videoRef.current.currentTime = parseFloat(e.target.value); }; useEffect(() => { @@ -60,16 +73,28 @@ export default function video() { - Your browser does not support the video tag. + Your browser does not support the video tag. Bzzzz. {metadata && - +
+ + + +
} );