diff --git a/app/Helpers/helper.php b/app/Helpers/helper.php index 5eade2d67..9f16f2272 100644 --- a/app/Helpers/helper.php +++ b/app/Helpers/helper.php @@ -1216,11 +1216,11 @@ if (!function_exists('getImageUrlPrefix')) { case 'wasabi': $url = $settings['wasabi_url']; - return $url ? rtrim($url, '/') . '/media/' : url('/storage/media/'); + return $url ? rtrim($url, '/') . '/media/' : url('/uploads/media/'); case 'local': default: - return url('/'); + return url('/uploads/'); } } } @@ -1255,7 +1255,7 @@ if (!function_exists('getStorageFilePath')) { // Remove any path separators to ensure only filename $filename = basename($filename); - return storage_path('app/public/media/' . $filename); + return public_path('uploads/media/' . $filename); } } diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index f4a92cce2..59288afa7 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -32,7 +32,7 @@ class MediaController extends Controller $media = $mediaQuery->latest()->get()->map(function ($media) { try { - $url = getImageUrlPrefix() . '/storage/media/' . $media->file_name; + $url = getImageUrlPrefix() . 'media/' . $media->file_name; return [ 'id' => $media->id, 'name' => $media->name, diff --git a/resources/js/hooks/use-favicon.ts b/resources/js/hooks/use-favicon.ts index 171cf22f5..62e225d2a 100755 --- a/resources/js/hooks/use-favicon.ts +++ b/resources/js/hooks/use-favicon.ts @@ -12,17 +12,17 @@ export function useFavicon() { let faviconUrl; if (favicon.startsWith('http')) { faviconUrl = favicon; - } else if (favicon.includes('Product/hrmgo-saas-react/storage/media/')) { + } else if (favicon.includes('Product/hrmgo-saas-react/uploads/media/')) { // Path already contains full project path, just prepend origin faviconUrl = `${window.location.origin}/${favicon}`; - } else if (favicon.includes('storage/media/')) { - // Path contains storage/media but not full project path + } else if (favicon.includes('uploads/media/')) { + // Path contains uploads/media but not full project path const baseUrl = (window as any).baseUrl || window.location.origin; faviconUrl = `${baseUrl}/${favicon}`; } else { // Simple path, add full storage path const baseUrl = (window as any).baseUrl || window.location.origin; - faviconUrl = `${baseUrl}/storage/media/${favicon.replace(/^\//, '')}`; + faviconUrl = `${baseUrl}/uploads/media/${favicon.replace(/^\//, '')}`; } // Update favicon in document head diff --git a/resources/js/utils/helpers.ts b/resources/js/utils/helpers.ts index 631b61707..3adad5803 100755 --- a/resources/js/utils/helpers.ts +++ b/resources/js/utils/helpers.ts @@ -103,18 +103,18 @@ declare global { const getImagePath = (path: string, pageProps?: any): string => { if (!path) return ''; if (path.startsWith('http')) return path; - // If path already contains storage/media, just prepend domain - if (path.includes('storage/media')) { + // If path already contains uploads/media, just prepend domain + if (path.includes('uploads/media')) { return path.startsWith('/') ? `${window.location.origin}${path}` : `${window.location.origin}/${path}`; } try { const props = pageProps || usePage().props; - const dynamicPath = `${(props as any).globalSettings?.base_url || window.location.origin}/storage/media/`; + const dynamicPath = `${(props as any).globalSettings?.base_url || window.location.origin}/uploads/media/`; let imageUrlPrefix = (props as any).imageUrlPrefix || dynamicPath; - if (!imageUrlPrefix.includes('storage/media')) { - imageUrlPrefix = imageUrlPrefix.endsWith('/') ? imageUrlPrefix + 'storage/media/' : imageUrlPrefix + '/storage/media/'; + if (!imageUrlPrefix.includes('uploads/media')) { + imageUrlPrefix = imageUrlPrefix.endsWith('/') ? imageUrlPrefix + 'uploads/media/' : imageUrlPrefix + '/uploads/media/'; } // Handle slash concatenation @@ -130,7 +130,7 @@ const getImagePath = (path: string, pageProps?: any): string => { } } catch { - const fallbackPrefix = `${window.location.origin}/${window.location.pathname.split('/')[1]}/storage/media/`; + const fallbackPrefix = `${window.location.origin}/${window.location.pathname.split('/')[1]}/uploads/media/`; return path.startsWith('/') ? fallbackPrefix + path.substring(1) : fallbackPrefix + path; } }