From 60df47fb8dddef47a3514b099de4b2b224e0ea11 Mon Sep 17 00:00:00 2001 From: louiscklaw Date: Fri, 16 May 2025 15:55:47 +0800 Subject: [PATCH] ```update Extract PocketBase URL to constant and refactor related functions to use it for dynamic file URL generation``` --- .../ionic_mobile/src/lib/get-image-url-from-file.ts.ts | 10 ++++++++++ 002_source/ionic_mobile/src/lib/getStudentAvatar.tsx | 6 ++++-- 002_source/ionic_mobile/src/lib/pb.ts | 4 +++- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 002_source/ionic_mobile/src/lib/get-image-url-from-file.ts.ts diff --git a/002_source/ionic_mobile/src/lib/get-image-url-from-file.ts.ts b/002_source/ionic_mobile/src/lib/get-image-url-from-file.ts.ts new file mode 100644 index 0000000..b7d0aa2 --- /dev/null +++ b/002_source/ionic_mobile/src/lib/get-image-url-from-file.ts.ts @@ -0,0 +1,10 @@ +// +// PURPOSE: +// get file url from pocketbase record +// + +import { POCKETBASE_URL } from '../constants'; + +export default function getImageUrlFromFile(collectionId: string, id: string, imgFile: string | undefined): string { + return `${POCKETBASE_URL}/api/files/${collectionId}/${id}/${imgFile}`; +} diff --git a/002_source/ionic_mobile/src/lib/getStudentAvatar.tsx b/002_source/ionic_mobile/src/lib/getStudentAvatar.tsx index 3a9c012..5f8f7f1 100644 --- a/002_source/ionic_mobile/src/lib/getStudentAvatar.tsx +++ b/002_source/ionic_mobile/src/lib/getStudentAvatar.tsx @@ -1,5 +1,7 @@ +import { POCKETBASE_URL } from '../constants'; import { DBUserMeta } from '../db/UserMetas/type'; -export function getStudentAvatar(studentMeta: DBUserMeta) { - return `url(http://localhost:8090/api/files/${studentMeta.collectionId}/${studentMeta.id}/${studentMeta.avatar})`; +export function getStudentAvatarUrl(studentMeta: DBUserMeta) { + const { collectionId, id, avatar } = studentMeta; + return `url(${POCKETBASE_URL}/api/files/${collectionId}/${id}/${avatar})`; } diff --git a/002_source/ionic_mobile/src/lib/pb.ts b/002_source/ionic_mobile/src/lib/pb.ts index 729e137..d6f25aa 100644 --- a/002_source/ionic_mobile/src/lib/pb.ts +++ b/002_source/ionic_mobile/src/lib/pb.ts @@ -1,5 +1,7 @@ import PocketBase from 'pocketbase'; +import { ERR_POCKETBASE_URL_IS_EMPTY } from '../ERRORS'; +import { POCKETBASE_URL } from '../constants'; -const pb = new PocketBase('http://127.0.0.1:8090'); +const pb = new PocketBase(POCKETBASE_URL); export { pb };