Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document
This commit is contained in:
commit
5cd7071459
|
|
@ -169,7 +169,7 @@ class ProfileController extends Controller
|
||||||
$name = $request->input('name') ?? auth('admins')->user()->name;
|
$name = $request->input('name') ?? auth('admins')->user()->name;
|
||||||
// Validate the incoming files
|
// Validate the incoming files
|
||||||
$request->validate([
|
$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 = [];
|
$uploadedFiles = [];
|
||||||
|
|
|
||||||
|
|
@ -103,8 +103,12 @@ const Document = () => {
|
||||||
if (['doc'].includes(extension!)) {
|
if (['doc'].includes(extension!)) {
|
||||||
return (
|
return (
|
||||||
<a
|
<a
|
||||||
href={`${import.meta.env.VITE_BACKEND_URL}${uri}`}
|
href={`${import.meta.env.VITE_BACKEND_URL}${
|
||||||
download="Document Download"
|
import.meta.env.VITE_BACKEND_URL?.includes('localhost')
|
||||||
|
? ''
|
||||||
|
: 'image/'
|
||||||
|
}${uri}`}
|
||||||
|
download={row.title}
|
||||||
target="_self"
|
target="_self"
|
||||||
>
|
>
|
||||||
<IconFileTypeDoc style={{ color: '#1e62c1' }} />
|
<IconFileTypeDoc style={{ color: '#1e62c1' }} />
|
||||||
|
|
@ -115,8 +119,12 @@ const Document = () => {
|
||||||
if (['xls', 'xlsx'].includes(extension!)) {
|
if (['xls', 'xlsx'].includes(extension!)) {
|
||||||
return (
|
return (
|
||||||
<a
|
<a
|
||||||
href={`${import.meta.env.VITE_BACKEND_URL}${uri}`}
|
href={`${import.meta.env.VITE_BACKEND_URL}${
|
||||||
download="Document Download"
|
import.meta.env.VITE_BACKEND_URL?.includes('localhost')
|
||||||
|
? ''
|
||||||
|
: 'image/'
|
||||||
|
}${uri}`}
|
||||||
|
download={row.title}
|
||||||
target="_self"
|
target="_self"
|
||||||
>
|
>
|
||||||
<IconFileTypeXls style={{ color: '#0e864b' }} />
|
<IconFileTypeXls style={{ color: '#0e864b' }} />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue