Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deploy to prod #908

Merged
merged 29 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
60a4474
use current time for all types of events in editor
fzhao21 Nov 30, 2023
a358582
Merge branch 'develop' into 754-add-use-current-time-icon-to-all-editors
fzhao21 Dec 8, 2023
c95b7a7
unrenamed
fzhao21 Dec 14, 2023
3cbc7af
got rid of some errors from merge
fzhao21 Dec 14, 2023
af83e03
tiny commit
fzhao21 Jan 18, 2024
bb66bca
variable name fixes to pass tests
fzhao21 Feb 22, 2024
f78d6bb
eslint formatting fixes and pull request fixes
fzhao21 Feb 29, 2024
8f446e3
censor-menu variable name fix
fzhao21 Mar 1, 2024
59c9ca2
Merge pull request #891 from BYU-ODH/754-add-use-current-time-icon-to…
reynoldsnlp Mar 4, 2024
62b9ca4
iOS/Chrome messages
reynoldsnlp Mar 7, 2024
bb44011
blur logic for start value
fzhao21 Mar 18, 2024
2bb95f0
Merge pull request #897 from BYU-ODH/716
reynoldsnlp Mar 18, 2024
c9520c7
Bump @babel/traverse from 7.18.2 to 7.24.0
dependabot[bot] Mar 18, 2024
2a5ead7
Bump axios from 0.27.2 to 0.28.0
dependabot[bot] Mar 18, 2024
b2c0f14
Merge pull request #898 from BYU-ODH/dependabot/npm_and_yarn/babel/tr…
reynoldsnlp Mar 18, 2024
be80038
Merge pull request #899 from BYU-ODH/dependabot/npm_and_yarn/axios-0.…
reynoldsnlp Mar 18, 2024
35ed8c4
Bump es5-ext from 0.10.61 to 0.10.64
dependabot[bot] Mar 18, 2024
1849123
Bump follow-redirects from 1.15.1 to 1.15.6
dependabot[bot] Mar 18, 2024
7e168b1
Merge pull request #900 from BYU-ODH/dependabot/npm_and_yarn/follow-r…
reynoldsnlp Mar 18, 2024
08ac925
Merge pull request #901 from BYU-ODH/dependabot/npm_and_yarn/es5-ext-…
reynoldsnlp Mar 18, 2024
3cc1352
Bump webpack-dev-middleware from 5.3.3 to 5.3.4
dependabot[bot] Mar 23, 2024
88df453
changed importfile modal words and added tooltips
fzhao21 Mar 25, 2024
5d70e6d
Bump express from 4.18.1 to 4.19.2
dependabot[bot] Mar 28, 2024
6e9242b
add raw seconds value to input tooltips
fzhao21 Mar 28, 2024
7e1ce7c
Merge pull request #905 from BYU-ODH/895-add-raw-seconds-value-to-inp…
reynoldsnlp Mar 28, 2024
d0c3b47
Merge pull request #902 from BYU-ODH/dependabot/npm_and_yarn/webpack-…
reynoldsnlp Mar 28, 2024
21071a7
Merge pull request #904 from BYU-ODH/dependabot/npm_and_yarn/express-…
reynoldsnlp Mar 28, 2024
66cca84
warning swal
fzhao21 Apr 8, 2024
a1e59f3
Merge pull request #907 from BYU-ODH/654-player-safariios-warning-is-…
reynoldsnlp Apr 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
372 changes: 259 additions & 113 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"axios": "^0.27.2",
"axios": "^0.28.0",
"bootstrap": "^5.1.3",
"buffer": "^6.0.3",
"deep-object-diff": "^1.1.9",
Expand Down
6 changes: 3 additions & 3 deletions src/components/bits/SubtitleEditorSideMenu/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import closeIcon from 'assets/close_icon.svg'
import plus from 'assets/plus-circle.svg'
import Style, { Icon } from './styles.js'

import { convertSecondsToMinute } from '../../common/timeConversion'
import { convertSecondsToHMS } from '../../common/timeConversion'

const SubtitleEditorSideMenu = props => {

Expand Down Expand Up @@ -120,7 +120,7 @@ const SubtitleEditorSideMenu = props => {
id={`sub-start${ind}`}
className='sub-start side-tab-input'
type='text'
value={`${sub.start === `` ? `` : convertSecondsToMinute(sub.start, videoLength)}`}
value={`${sub.start === `` ? `` : convertSecondsToHMS(sub.start, videoLength)}`}
onKeyUp={e => e.stopPropagation()}
onClick={ () => changeSubIndex(ind) }
onChange={e => editSub(`beg`, e.target.value, null, subLayer, ind, null, subs[subLayer].id)}
Expand All @@ -139,7 +139,7 @@ const SubtitleEditorSideMenu = props => {
id={`sub-end${ind}`}
className='sub-end'
type='text'
value={`${sub.end === `` ? `` : convertSecondsToMinute(sub.end, videoLength)}`}
value={`${sub.end === `` ? `` : convertSecondsToHMS(sub.end, videoLength)}`}
onKeyUp={e => e.stopPropagation()}
onClick={ () => changeSubIndex(ind) }
onChange={e => editSub(`end`, e.target.value, null, subLayer, ind, null, subs[subLayer].id)}
Expand Down
19 changes: 14 additions & 5 deletions src/components/bits/Tooltips/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ export const ToolTip = (props) => {

const {
tip,
secValue,
} = props

const [name, setName] = useState(``)
const [position, setPosition] = useState(null)
const [timeValue, setTimeValue] = useState()

useEffect(() => {
if(window.innerWidth < 600){
Expand All @@ -65,9 +67,10 @@ export const ToolTip = (props) => {
setName(tip.props.name)
if(tip.props.position)
setPosition(tip.props.position)

if(tip.props.secValue || tip.props.secValue === 0.0)
setTimeValue(Number(tip.props.secValue).toFixed(2))
}
}, [tip, name, position])
}, [tip, name, position, secValue])

const tips = {
"actions": `Actions`,
Expand Down Expand Up @@ -97,14 +100,20 @@ export const ToolTip = (props) => {
"translation-off": `Translations off`,
"transcript-seek": `Click to seek`,
"definitions-disabled": `Definitions are not supported for this language`,
"startclock":`set start time`,
"endclock":`set end time`,
"changetime":`change time`,
"clips-tab": `Clips`,
"captions-tab": `Captions`,
"import-disable": `Save changes to import`,
"export-disable": `Save changes to export`,
"only-sec":`only sec`,
}

// console.log("POSITION", position)

return(
<Style id='tip-box' position={position}><h3>{tips[`${name}`]}</h3></Style>
<Style id='tip-box' position={position}>
<h3>{tips[name] === `only sec` ? `${timeValue} secs` : `${tips[name]}`}</h3>
</Style>
)
}

Expand Down
Loading
Loading