louiscklaw/lettersoup-online
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update,

Browse Source
This commit is contained in:
louiscklaw
2025-05-08 17:19:43 +08:00
parent 7105bc85e3
commit 5640d4d4f6
46 changed files with 520 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
002_source/cms/src/app/dashboard/students/create/_PROMPT.md Normal file
View File

@@ -0,0 +1,3 @@
this `tsx` file is clone from elsewhere, please understand, modify and update the content of `/home/logic/_wsl_workspace/001_github_ws/lettersoup-online-ws/lettersoup-online/project/002_source/cms/src/app/dashboard/students/create/page.tsx.draft` to handle `Student` record thanks, modify comments/variables/paths/functions name please
e.g. why `lessonCategories` still exist ?

1
002_source/cms/src/app/dashboard/students/edit/[customerId]/_PROMPT.md Normal file
View File

@@ -0,0 +1 @@
this `tsx` file is clone from elsewhere, please understand, modify and update the content of `/home/logic/_wsl_workspace/001_github_ws/lettersoup-online-ws/lettersoup-online/project/002_source/cms/src/app/dashboard/students/edit/[customerId]/page.tsx.draft` to handle `Student` record thanks, modify comments/variables/paths/functions name please

3
002_source/cms/src/app/dashboard/students/list/_PROMPT.md Normal file
View File

@@ -0,0 +1,3 @@
this `tsx` file is clone from elsewhere, please understand, modify and update the content of `/home/logic/_wsl_workspace/001_github_ws/lettersoup-online-ws/lettersoup-online/project/002_source/cms/src/app/dashboard/students/list/page.tsx.draft` to handle `Student` record thanks, modify comments/variables/paths/functions name please
e.g. why `lessonCategories` still exist ?

36
002_source/cms/src/app/dashboard/students/list/page.tsx
View File

@@ -3,11 +3,10 @@
// RULES:
// contains list page for students (Students)
// contain definition to collection only
//
import * as React from 'react';
import { useRouter } from 'next/navigation';
import { COL_STUDENTS } from '@/constants';
import { COL_USER_METAS } from '@/constants';
import { LoadingButton } from '@mui/lab';
import Box from '@mui/material/Box';
import Card from '@mui/material/Card';
@@ -38,8 +37,7 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
const { email, phone, sortDir, status } = searchParams;
const [lessonCategoriesData, setLessonCategoriesData] = React.useState<Student[]>([]);
//
const [studentsData, setStudentsData] = React.useState<Student[]>([]);
const [isLoadingAddPage, setIsLoadingAddPage] = React.useState<boolean>(false);
const [showLoading, setShowLoading] = React.useState<boolean>(true);
@@ -51,24 +49,31 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
const [currentPage, setCurrentPage] = React.useState<number>(0);
//
const [recordCount, setRecordCount] = React.useState<number>(0);
const [listOption, setListOption] = React.useState({});
const [listOption, setListOption] = React.useState({ filter: '' });
const [listSort, setListSort] = React.useState({});
function isListOptionChanged(): boolean {
return JSON.stringify(listOption) === JSON.stringify({ filter: '' });
}
//
const reloadRows = async (): Promise<void> => {
try {
const listOptionTeacherOnly = isListOptionChanged()
? { filter: `role = "student"` }
: { filter: [listOption.filter, `role = "student"`].join(' && ') };
const models: ListResult<RecordModel> = await pb
.collection(COL_STUDENTS)
.getList(currentPage + 1, rowsPerPage, listOption);
.collection(COL_USER_METAS)
.getList(currentPage + 1, rowsPerPage, listOptionTeacherOnly);
const { items, totalItems } = models;
const tempLessonTypes: Student[] = items.map((lt) => {
const tempStudents: Student[] = items.map((lt) => {
return { ...defaultStudent, ...lt };
});
setLessonCategoriesData(tempLessonTypes);
setStudentsData(tempStudents);
setRecordCount(totalItems);
setF(tempLessonTypes);
setF(tempStudents);
} catch (error) {
//
logger.error(error);
setShowError({
//
@@ -110,11 +115,12 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
if (email) {
tempFilter.push(`email ~ "%${email}%"`);
}
if (phone) {
tempFilter.push(`phone ~ "%${phone}%"`);
}
let preFinalListOption = {};
let preFinalListOption = { filter: '' };
if (tempFilter.length > 0) {
preFinalListOption = { filter: tempFilter.join(' && ') };
}
@@ -158,7 +164,7 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
loading={isLoadingAddPage}
onClick={(): void => {
setIsLoadingAddPage(true);
router.push(paths.dashboard.customers.create);
router.push(paths.dashboard.students.create);
}}
startIcon={<PlusIcon />}
variant="contained"
@@ -167,11 +173,11 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
</LoadingButton>
</Box>
</Stack>
<StudentsSelectionProvider customers={f}>
<StudentsSelectionProvider students={f}>
<Card>
<StudentsFilters
filters={{ email, phone, status }}
fullData={lessonCategoriesData}
fullData={studentsData}
sortDir={sortDir}
/>
<Divider />

4
002_source/cms/src/app/dashboard/students/view/[customerId]/BasicDetailCard.tsx → 002_source/cms/src/app/dashboard/students/view/[id]/BasicDetailCard.tsx
View File

@@ -17,10 +17,10 @@ import { PropertyList } from '@/components/core/property-list';
import type { Student } from '@/components/dashboard/student/type.d';
export default function BasicDetailCard({
lpModel: model,
studentRecord: model,
handleEditClick,
}: {
lpModel: Student;
studentRecord: Student;
handleEditClick: () => void;
}): React.JSX.Element {
const { t } = useTranslation();

20
002_source/cms/src/app/dashboard/students/view/[customerId]/TitleCard.tsx → 002_source/cms/src/app/dashboard/students/view/[id]/TitleCard.tsx
View File

@@ -13,13 +13,11 @@ import type { Student } from '@/components/dashboard/student/type.d';
// import type { CrCategory } from '@/components/dashboard/cr/categories/type';
function getImageUrlFrRecord(record: Student): string {
// TODO: fix this
// `http://127.0.0.1:8090/api/files/${'record.collectionId'}/${'record.id'}/${'record.cat_image'}`;
return 'getImageUrlFrRecord(helloworld)';
function getImageUrlForStudent(student: Student): string {
return `http://127.0.0.1:8090/api/files/${student.collectionId}/${student.id}/${student.avatar}`;
}
export default function SampleTitleCard({ lpModel }: { lpModel: Student }): React.JSX.Element {
export default function SampleTitleCard({ studentRecord }: { studentRecord: Student }): React.JSX.Element {
const { t } = useTranslation();
return (
@@ -31,7 +29,7 @@ export default function SampleTitleCard({ lpModel }: { lpModel: Student }): Reac
>
<Avatar
variant="rounded"
src={getImageUrlFrRecord(lpModel)}
src={getImageUrlForStudent(studentRecord)}
sx={{ '--Avatar-size': '64px' }}
>
{t('empty')}
@@ -42,7 +40,7 @@ export default function SampleTitleCard({ lpModel }: { lpModel: Student }): Reac
spacing={2}
sx={{ alignItems: 'center', flexWrap: 'wrap' }}
>
<Typography variant="h4">{lpModel.email}</Typography>
<Typography variant="h4">{studentRecord.name || studentRecord.email}</Typography>
<Chip
icon={
<CheckCircleIcon
@@ -50,17 +48,11 @@ export default function SampleTitleCard({ lpModel }: { lpModel: Student }): Reac
weight="fill"
/>
}
label={lpModel.quota}
label={studentRecord.status}
size="small"
variant="outlined"
/>
</Stack>
<Typography
color="text.secondary"
variant="body1"
>
{lpModel.status}
</Typography>
</div>
</Stack>
<div>

3
002_source/cms/src/app/dashboard/students/view/[id]/_PROMPT.md Normal file
View File

@@ -0,0 +1,3 @@
this `tsx` file is clone from elsewhere, please understand, modify and update the content of `/home/logic/_wsl_workspace/001_github_ws/lettersoup-online-ws/lettersoup-online/project/002_source/cms/src/app/dashboard/students/view/[customerId]/page.tsx.draft` to handle `Student` record thanks, modify comments/variables/paths/functions name please
e.g. update `lpModel` names

24
002_source/cms/src/app/dashboard/students/view/[customerId]/page.tsx → 002_source/cms/src/app/dashboard/students/view/[id]/page.tsx
View File

@@ -30,29 +30,29 @@ import BasicDetailCard from './BasicDetailCard';
import TitleCard from './TitleCard';
import { defaultStudent } from '@/components/dashboard/student/_constants';
import type { Student } from '@/components/dashboard/student/type.d';
import { COL_STUDENTS } from '@/constants';
import { COL_USER_METAS } from '@/constants';
export default function Page(): React.JSX.Element {
const { t } = useTranslation();
const router = useRouter();
//
const { customerId } = useParams<{ customerId: string }>();
const { id: studentId } = useParams<{ id: string }>();
//
const [showLoading, setShowLoading] = React.useState<boolean>(true);
const [showError, setShowError] = React.useState({ show: false, detail: '' });
//
const [showLessonCategory, setShowLessonCategory] = React.useState<Student>(defaultStudent);
const [studentRecord, setStudentRecord] = React.useState<Student>(defaultStudent);
function handleEditClick(): void {
router.push(paths.dashboard.students.edit(showLessonCategory.id));
router.push(paths.dashboard.students.edit(studentRecord.id));
}
React.useEffect(() => {
if (customerId) {
pb.collection(COL_STUDENTS)
.getOne(customerId)
if (studentId) {
pb.collection(COL_USER_METAS)
.getOne(studentId)
.then((model: RecordModel) => {
setShowLessonCategory({ ...defaultStudent, ...model });
setStudentRecord({ ...defaultStudent, ...model });
})
.catch((err) => {
logger.error(err);
@@ -64,9 +64,9 @@ export default function Page(): React.JSX.Element {
setShowLoading(false);
});
}
}, [customerId]);
}, [studentId]);
// return <>{JSON.stringify({ showError, showLessonCategory }, null, 2)}</>;
// return <>{JSON.stringify({ showError, studentRecord }, null, 2)}</>;
if (showLoading) return <FormLoading />;
if (showError.show)
@@ -106,7 +106,7 @@ export default function Page(): React.JSX.Element {
spacing={3}
sx={{ alignItems: 'flex-start' }}
>
<TitleCard lpModel={showLessonCategory} />
<TitleCard studentRecord={studentRecord} />
</Stack>
</Stack>
<Grid
@@ -119,7 +119,7 @@ export default function Page(): React.JSX.Element {
>
<Stack spacing={4}>
<BasicDetailCard
lpModel={showLessonCategory}
studentRecord={studentRecord}
handleEditClick={handleEditClick}
/>
<SampleSecurityCard />