mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Fix download path on custom base path (#889) 

Co-authored-by: Konstantin Koval <kkb@ukr.net>
This commit is contained in:
David Valdez 2024-05-20 05:31:53 -05:00 committed by GitHub
parent 0193f7703d
commit 7c7089e320
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/src/components/sidebar/SidebarDownloadMedia.tsx
View File

@ -1,18 +1,18 @@
import React from 'react' import { gql, useLazyQuery } from '@apollo/client'
import { MessageState } from '../messages/Messages'
import { useLazyQuery, gql } from '@apollo/client'
import { authToken } from '../../helpers/authentication'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { NotificationType } from '../../__generated__/globalTypes'
import { authToken } from '../../helpers/authentication'
import { TranslationFn } from '../../localization' import { TranslationFn } from '../../localization'
import { MessageState } from '../messages/Messages'
import { MediaSidebarMedia } from './MediaSidebar/MediaSidebar' import { MediaSidebarMedia } from './MediaSidebar/MediaSidebar'
import React from 'react'
import { SidebarSection, SidebarSectionTitle } from './SidebarComponents'
import SidebarTable from './SidebarTable' import SidebarTable from './SidebarTable'
import { import {
sidebarDownloadQuery, sidebarDownloadQuery,
sidebarDownloadQueryVariables, sidebarDownloadQueryVariables,
sidebarDownloadQuery_media_downloads, sidebarDownloadQuery_media_downloads,
} from './__generated__/sidebarDownloadQuery' } from './__generated__/sidebarDownloadQuery'
import { SidebarSection, SidebarSectionTitle } from './SidebarComponents'
import { NotificationType } from '../../__generated__/globalTypes'
export const SIDEBAR_DOWNLOAD_QUERY = gql` export const SIDEBAR_DOWNLOAD_QUERY = gql`
query sidebarDownloadQuery($mediaId: ID!) { query sidebarDownloadQuery($mediaId: ID!) {
@ -56,7 +56,10 @@ const formatBytes = (t: TranslationFn) => (bytes: number) => {
} }
const downloadMedia = (t: TranslationFn) => async (url: string) => { const downloadMedia = (t: TranslationFn) => async (url: string) => {
const imgUrl = new URL(url, location.origin) const imgUrl = new URL(
`${import.meta.env.BASE_URL}${url}`.replace(/\/\//g, '/'),
location.origin
)
if (authToken() == null) { if (authToken() == null) {
// Get share token if not authorized // Get share token if not authorized