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.

Sign up for GitHub

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

fix(app): change image/video path to relative path #16533

Merged
merged 4 commits into from
Oct 22, 2024
Merged

fix(app): change image/video path to relative path #16533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a354759
change path to relative path
TamarZanzouri Oct 18, 2024
aaef16b
fixed path
TamarZanzouri Oct 18, 2024
98ce3a7
formatting
TamarZanzouri Oct 18, 2024
d078a38
fixed bug with video
TamarZanzouri Oct 22, 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
4 changes: 2 additions & 2 deletions app/src/organisms/Desktop/Devices/ChangePipette/InstructionStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ export function InstructionStep(props: Props): JSX.Element {
const display =
displayCategory === 'GEN2'
? new URL(
`/app/assets/images/change-pip/${direction}-${String(
`../../../../assets/images/change-pip/${direction}-${String(
mount
)}-${channelsKey}-GEN2-${diagram}@3x.png`,
import.meta.url
).href
: new URL(
`/app/assets/images/change-pip/${direction}-${String(
`../../../../assets/images/change-pip/${direction}-${String(
mount
)}-${channelsKey}-${diagram}@3x.png`,
import.meta.url
Expand Down
14 changes: 6 additions & 8 deletions app/src/organisms/Desktop/Devices/ChangePipette/LevelPipette.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ export function LevelingVideo(props: {
mount: Mount
}): JSX.Element {
const { pipetteName, mount } = props
const video = new URL(
`../../../../assets/videos/pip-leveling/${pipetteName}-${mount}.webm`,
import.meta.url
).href

return (
<video
css={css`
Expand All @@ -38,14 +43,7 @@ export function LevelingVideo(props: {
loop={true}
controls={true}
>
<source
src={
new URL(
`/app/assets/videos/pip-leveling/${pipetteName}-${mount}.webm`,
import.meta.url
).href
}
/>
<source src={video} />
</video>
)
}
Expand Down
Loading