Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document

This commit is contained in:
dbdbd9 2025-03-27 07:50:25 +07:00
commit 5cd7071459
2 changed files with 13 additions and 5 deletions

View File

@ -169,7 +169,7 @@ class ProfileController extends Controller
$name = $request->input('name') ?? auth('admins')->user()->name;
// Validate the incoming files
$request->validate([
'files.*' => 'required|file|mimes:jpg,png,jpeg,pdf,doc,docx|max:5120', // Adjust file types and size limit as needed
'files.*' => 'required|file|mimes:jpg,png,jpeg,pdf,doc,docx,xlsx,xls,csv|max:5120', // Adjust file types and size limit as needed
]);
$uploadedFiles = [];

View File

@ -103,8 +103,12 @@ const Document = () => {
if (['doc'].includes(extension!)) {
return (
<a
href={`${import.meta.env.VITE_BACKEND_URL}${uri}`}
download="Document Download"
href={`${import.meta.env.VITE_BACKEND_URL}${
import.meta.env.VITE_BACKEND_URL?.includes('localhost')
? ''
: 'image/'
}${uri}`}
download={row.title}
target="_self"
>
<IconFileTypeDoc style={{ color: '#1e62c1' }} />
@ -115,8 +119,12 @@ const Document = () => {
if (['xls', 'xlsx'].includes(extension!)) {
return (
<a
href={`${import.meta.env.VITE_BACKEND_URL}${uri}`}
download="Document Download"
href={`${import.meta.env.VITE_BACKEND_URL}${
import.meta.env.VITE_BACKEND_URL?.includes('localhost')
? ''
: 'image/'
}${uri}`}
download={row.title}
target="_self"
>
<IconFileTypeXls style={{ color: '#0e864b' }} />