joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update root folder by enviroment

This commit is contained in:
Joseph 2024-10-16 16:09:56 +07:00
parent 79b3cbe916
commit d53b786daf
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BACKEND/Modules/Admin/app/Http/Controllers/ProfileController.php
View File

@ -125,7 +125,7 @@ class ProfileController extends Controller
$rootFolder = rtrim($rootFolder, '/') . '/'; $rootFolder = rtrim($rootFolder, '/') . '/';
// Get all files and directories in the specified root folder // Get all files and directories in the specified root folder
$fileList = $this->getDirectoryTree(public_path($rootFolder), $rootFolder); $fileList = $this->getDirectoryTree(public_path($rootFolder), env('APP_ENV') === 'local' ? $rootFolder: 'image'.$rootFolder);
return response()->json(['data' => $fileList, 'status' => true]); return response()->json(['data' => $fileList, 'status' => true]);
} }
@ -219,7 +219,7 @@ class ProfileController extends Controller
// Parse the file path from the URL (remove the base URL part) // Parse the file path from the URL (remove the base URL part)
$storagePath = parse_url($fileUrl, PHP_URL_PATH); // Extract the path part of the URL $storagePath = parse_url($fileUrl, PHP_URL_PATH); // Extract the path part of the URL
$filePath = str_replace('/storage/', '', $storagePath); // Remove "/storage/" to get the actual file path $filePath = str_replace(env('APP_ENV') === 'local' ? '/storage/' : '/image/storage/', '', $storagePath); // Remove "/storage/" to get the actual file path
// Check if the file exists before attempting to delete it // Check if the file exists before attempting to delete it
if (Storage::disk('public')->exists($filePath)) { if (Storage::disk('public')->exists($filePath)) {

5
FRONTEND/src/pages/AllProfiles/AllProfiles.tsx
View File

@ -55,7 +55,6 @@ const AllProfiles = () => {
const [data, setData] = useState<TFileProfile[]>([]) const [data, setData] = useState<TFileProfile[]>([])
const [currentName, setCurrentName] = useState<string>('') const [currentName, setCurrentName] = useState<string>('')
const [openedProfile, setOpenedProfile] = useState(false) const [openedProfile, setOpenedProfile] = useState(false)
const root_folder = import.meta.env.VITE_BACKEND_URL.includes('localhost') ? '/storage/profiles/' : '/image/storage/profiles/'
function FileIcon({ name, isFolder, expanded }: FileIconProps) { function FileIcon({ name, isFolder, expanded }: FileIconProps) {
if (name.endsWith('.pdf')) { if (name.endsWith('.pdf')) {
return <IconFileTypePdf size={14} /> return <IconFileTypePdf size={14} />
@ -210,7 +209,7 @@ const AllProfiles = () => {
const getAllFile = async () => { const getAllFile = async () => {
try { try {
const res = await get(getAllFilesInProfiles, { const res = await get(getAllFilesInProfiles, {
root_folder: root_folder + currentName, root_folder: '/storage/profiles/' + currentName,
}) })
if (res.status === true) { if (res.status === true) {
setData(res.data) setData(res.data)
@ -231,7 +230,7 @@ const AllProfiles = () => {
const getTree = async () => { const getTree = async () => {
try { try {
const res = await get(getAllFilesInProfiles, { const res = await get(getAllFilesInProfiles, {
root_folder: root_folder, root_folder: '/storage/profiles',
}) })
if (res.status === true) { if (res.status === true) {
setTreeData(res.data) setTreeData(res.data)

3
FRONTEND/src/pages/Profile/Profile.tsx
View File

@ -144,7 +144,6 @@ const Profile = () => {
const [otherFiles, setOtherFiles] = useState([{ file: null, type: '' }]) const [otherFiles, setOtherFiles] = useState([{ file: null, type: '' }])
const [data, setData] = useState<TFileProfile[]>([]) const [data, setData] = useState<TFileProfile[]>([])
const [openedProfile, setOpenedProfile] = useState(false) const [openedProfile, setOpenedProfile] = useState(false)
const root_folder = import.meta.env.VITE_BACKEND_URL.includes('localhost') ? '/storage/profiles/' : '/image/storage/profiles/'
const handleOtherFileChange = ( const handleOtherFileChange = (
index: number, index: number,
field: string, field: string,
@ -210,7 +209,7 @@ const Profile = () => {
const getAllFile = async () => { const getAllFile = async () => {
try { try {
const res = await get(getAllFilesInProfiles, { const res = await get(getAllFilesInProfiles, {
root_folder: root_folder + JSON.parse(getUser())?.user?.name, root_folder: '/storage/profiles/' + JSON.parse(getUser())?.user?.name,
}) })
if (res.status === true) { if (res.status === true) {
setData(res.data) setData(res.data)