jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Give base url to image assets in filemanager

Browse Source
This commit is contained in:
Johannes Zellner
2023-04-16 18:39:18 +02:00
parent d8e9807d6d
commit 05065fca0e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
filemanager/src/views/Home.vue
View File

@@ -89,7 +89,8 @@ import { sanitize, buildFilePath } from 'pankow/utils';
import PreviewPanel from '../components/PreviewPanel.vue';
import { createDirectoryModel } from '../models/DirectoryModel.js';
const BASE_URL = import.meta.env.VITE_API_ORIGIN ? 'https://' + import.meta.env.VITE_API_ORIGIN : '';
const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? 'https://' + import.meta.env.VITE_API_ORIGIN : '';
const BASE_URL = import.meta.env.BASE_URL || '';
export default {
name: 'Home',
@@ -115,7 +116,7 @@ export default {
selectedItems: [],
clipboard: {},
accessToken: localStorage.token,
baseUrl: BASE_URL || '',
apiOrigin: API_ORIGIN || '',
apps: [],
volumes: [],
resources: [],
@@ -264,7 +265,7 @@ export default {
type: i.isDirectory ? 'directory' : 'file',
mimeType: i.mimeType,
previewUrl: i.previewUrl || null,
icon: `/mime-types/${i.mimeType === 'inode/symlink' ? 'none' : i.mimeType.split('/').join('-')}.svg`
icon: `${BASE_URL}/mime-types/${i.mimeType === 'inode/symlink' ? 'none' : i.mimeType.split('/').join('-')}.svg`
};
});
@@ -277,12 +278,12 @@ export default {
name: name,
type: 'directory',
mimeType: 'inode/directory',
icon: '/mime-types/inode-directory.svg'
icon: `${BASE_URL}/mime-types/inode-directory.svg`
};
},
async loadResource(resource) {
this.activeResource = resource;
this.directoryModel = createDirectoryModel(BASE_URL, this.accessToken, resource.type === 'volume' ? `volumes/${resource.id}` : `apps/${resource.id}`);
this.directoryModel = createDirectoryModel(this.apiOrigin, this.accessToken, resource.type === 'volume' ? `volumes/${resource.id}` : `apps/${resource.id}`);
this.loadCwd();
}
},
@@ -290,7 +291,7 @@ export default {
useConfirm();
// load all apps
let [error, result] = await safe(superagent.get(`${BASE_URL}/api/v1/apps`).query({ access_token: this.accessToken }));
let [error, result] = await safe(superagent.get(`${this.apiOrigin}/api/v1/apps`).query({ access_token: this.accessToken }));
if (error) {
console.error('Failed to list apps', error);
this.apps = [];
@@ -300,7 +301,7 @@ export default {
this.apps.forEach(function (a) { a.type = 'app'; a.label = a.fqdn; });
// load all volumes
[error, result] = await safe(superagent.get(`${BASE_URL}/api/v1/volumes`).query({ access_token: this.accessToken }));
[error, result] = await safe(superagent.get(`${this.apiOrigin}/api/v1/volumes`).query({ access_token: this.accessToken }));
if (error) {
console.error('Failed to list volumes', error);
this.volumes = [];

4
filemanager/src/views/Viewer.vue
View File

@@ -15,7 +15,7 @@ import { TextEditor, ImageViewer } from 'pankow';
import { createDirectoryModel } from '../models/DirectoryModel.js';
import { sanitize } from 'pankow/utils';
const BASE_URL = import.meta.env.VITE_API_ORIGIN ? 'https://' + import.meta.env.VITE_API_ORIGIN : '';
const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? 'https://' + import.meta.env.VITE_API_ORIGIN : '';
export default {
name: 'Viewer',
@@ -47,7 +47,7 @@ export default {
const fileName = this.$route.params.filePath[this.$route.params.filePath.length-1];
const parentDirectoryPath = sanitize(this.filePath.split('/').slice(0, -1).join('/'));
this.directoryModel = createDirectoryModel(BASE_URL, localStorage.accessToken, (this.resourceType === 'volume' ? 'volumes/' : 'apps/') + this.resourceId);
this.directoryModel = createDirectoryModel(API_ORIGIN, localStorage.token, (this.resourceType === 'volume' ? 'volumes/' : 'apps/') + this.resourceId);
const files = await this.directoryModel.listFiles(parentDirectoryPath);
this.item = files.find(i => i.fileName === fileName);