update,

2025-04-19 02:11:44 +08:00
parent 50b69d3ce8
commit 60a0cdc11d
30 changed files with 391 additions and 184 deletions
--- a/002_source/cms/src/app/dashboard/lesson_categories/.vscode/settings.json
+++ b/002_source/cms/src/app/dashboard/lesson_categories/.vscode/settings.json
@@ -1,3 +0,0 @@
-{
-  "git.ignoreLimitWarning": true
-}
--- a/002_source/cms/src/app/dashboard/lesson_categories/page.tsx
+++ b/002_source/cms/src/app/dashboard/lesson_categories/page.tsx
@@ -19,7 +19,6 @@ import { pb } from '@/lib/pb';
 import { toast } from '@/components/core/toaster';
 import ErrorDisplay from '@/components/dashboard/error';
 import { defaultLessonCategory } from '@/components/dashboard/lesson_category/_constants';
-// import { defaultLessonCategory, type LessonCategory } from '@/components/dashboard/lesson_category/interfaces';
 import { LessonCategoriesFilters } from '@/components/dashboard/lesson_category/lesson-categories-filters';
 import type { Filters } from '@/components/dashboard/lesson_category/lesson-categories-filters';
 import { LessonCategoriesPagination } from '@/components/dashboard/lesson_category/lesson-categories-pagination';
@@ -30,38 +29,27 @@ import FormLoading from '@/components/loading';

 // import { lessonCategoriesSampleData } from './lesson-categories-sample-data';

-interface PageProps {
-  searchParams: {
-    email?: string;
-    phone?: string;
-    sortDir?: 'asc' | 'desc';
-    spStatus?: string;
-    spName?: string;
-    spVisible?: string;
-    spType?: string;
-    //
-  };
-}
-
 export default function Page({ searchParams }: PageProps): React.JSX.Element {
-  const { t } = useTranslation(['common']);
-  const { email, phone, sortDir, spStatus } = searchParams;
+  const { t } = useTranslation(['lesson_category']);
+  const { email, phone, sortDir, status, name, visible, type } = searchParams;
  const router = useRouter();
+  const [lessonCategoriesData, setLessonCategoriesData] = React.useState<LessonCategory[]>([]);
+  //

-  const [recordCount, setRecordCount] = React.useState<number>(0);
+  const [isLoadingAddPage, setIsLoadingAddPage] = React.useState<boolean>(false);
+  const [showLoading, setShowLoading] = React.useState<boolean>(true);
+  const [showError, setShowError] = React.useState<boolean>(false);
  const [rowsPerPage, setRowsPerPage] = React.useState<number>(5);
+  //
+  const [f, setF] = React.useState<LessonCategory[]>([]);
  const [currentPage, setCurrentPage] = React.useState<number>(1);
  //
-  const [showError, setShowError] = React.useState<boolean>(false);
-  const [showLoading, setShowLoading] = React.useState<boolean>(true);
-
-  //
-  const [isLoadingAddPage, setIsLoadingAddPage] = React.useState<boolean>(false);
-  const [lessonCategoriesData, setLessonCategoriesData] = React.useState<LessonCategory[]>([]);
+  const [recordCount, setRecordCount] = React.useState<number>(0);

  const sortedLessonCategories = applySort(lessonCategoriesData, sortDir);
-  const filteredLessonCategories = applyFilters(sortedLessonCategories, { email, phone, status: spStatus });
+  const filteredLessonCategories = applyFilters(sortedLessonCategories, { email, phone, status: status });

+  //
  const reloadRows = () => {
    setShowLoading(true);

@@ -116,7 +104,7 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
      <Stack spacing={4}>
        <Stack direction={{ xs: 'column', sm: 'row' }} spacing={3} sx={{ alignItems: 'flex-start' }}>
          <Box sx={{ flex: '1 1 auto' }}>
-            <Typography variant="h4">{t('dashboard.lessonCategorys.list.title')}</Typography>
+            <Typography variant="h4">{t('list.title')}</Typography>
          </Box>
          <Box sx={{ display: 'flex', justifyContent: 'flex-end' }}>
            <LoadingButton
@@ -128,13 +116,17 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
              startIcon={<PlusIcon />}
              variant="contained"
            >
-              {t('dashboard.lessonCategories.add')}
+              {t('list.add')}
            </LoadingButton>
          </Box>
        </Stack>
-        <LessonCategoriesSelectionProvider lessonCategories={filteredLessonCategories}>
+        <LessonCategoriesSelectionProvider lessonCategories={f}>
          <Card>
-            <LessonCategoriesFilters filters={{ email, phone, status: spStatus }} sortDir={sortDir} />
+            <LessonCategoriesFilters
+              filters={{ email, phone, status, name, visible, type }}
+              fullData={lessonCategoriesData}
+              sortDir={sortDir}
+            />
            <Divider />
            <Box sx={{ overflowX: 'auto' }}>
              <LessonCategoriesTable reloadRows={reloadRows} rows={filteredLessonCategories} />
@@ -183,3 +175,16 @@ function applyFilters(row: LessonCategory[], { email, phone, status }: Filters):
    return true;
  });
 }
+
+interface PageProps {
+  searchParams: {
+    email?: string;
+    phone?: string;
+    sortDir?: 'asc' | 'desc';
+    status?: string;
+    name?: string;
+    visible?: string;
+    type?: string;
+    //
+  };
+}
--- a/002_source/cms/src/app/dashboard/lesson_types/[type_id]/page.tsx
+++ b/002_source/cms/src/app/dashboard/lesson_types/[type_id]/page.tsx
@@ -37,14 +37,15 @@ import { PropertyItem } from '@/components/core/property-item';
 import { PropertyList } from '@/components/core/property-list';
 import { toast } from '@/components/core/toaster';
 import ErrorDisplay from '@/components/dashboard/error';
-import { defaultLessonType } from '@/components/dashboard/lesson_type/_constants';
+import { defaultLessonType, LessonTypeDefaultValue } from '@/components/dashboard/lesson_type/_constants';
 // import { getLessonTypeById } from '@/components/dashboard/lesson_type/http-actions';
-import { LessonTypeDefaultValue, type LessonType } from '@/components/dashboard/lesson_type/ILessonType';
+// import { LessonTypeDefaultValue, type LessonType } from '@/components/dashboard/lesson_type/ILessonType';
 // import { defaultLessonType } from '@/components/dashboard/lesson_type/interfaces';
 import { Notifications } from '@/components/dashboard/lesson_type/notifications';
 import { Payments } from '@/components/dashboard/lesson_type/payments';
 import type { Address } from '@/components/dashboard/lesson_type/shipping-address';
 import { ShippingAddress } from '@/components/dashboard/lesson_type/shipping-address';
+import { type LessonType } from '@/components/dashboard/lesson_type/types';
 import FormLoading from '@/components/loading';

 export default function Page(): React.JSX.Element {
@@ -58,7 +59,7 @@ export default function Page(): React.JSX.Element {
  //
  const [showLessonType, setShowLessonType] = React.useState<LessonType>(LessonTypeDefaultValue);

-  function handleEditClick() {
+  function handleEditClick(): void {
    router.push(paths.dashboard.lesson_types.edit(showLessonType.id));
  }

--- a/002_source/cms/src/app/dashboard/lesson_types/lesson-types-data.tsx
+++ b/002_source/cms/src/app/dashboard/lesson_types/lesson-types-data.tsx
@@ -1,5 +1,7 @@
 import { dayjs } from '@/lib/dayjs';
-import type { LessonType } from '@/components/dashboard/lesson_type/ILessonType';
+import { LessonType } from '@/components/dashboard/lesson_type/types';
+
+// import type { LessonType } from '@/components/dashboard/lesson_type/ILessonType';

 // import { helloworld } from '@/components/dashboard/lesson_type/helloworld';
 // export const metadata = { title: `List | Customers | Dashboard | ${config.site.name}` } satisfies Metadata;
--- a/002_source/cms/src/app/dashboard/lesson_types/lesson-types-sample-data.tsx
+++ b/002_source/cms/src/app/dashboard/lesson_types/lesson-types-sample-data.tsx
@@ -1,5 +1,7 @@
 import { dayjs } from '@/lib/dayjs';
-import type { LessonType } from '@/components/dashboard/lesson_type/ILessonType';
+import { LessonType } from '@/components/dashboard/lesson_type/types';
+
+// import type { LessonType } from '@/components/dashboard/lesson_type/ILessonType';

 // import { helloworld } from '@/components/dashboard/lesson_type/helloworld';
 // export const metadata = { title: `List | Customers | Dashboard | ${config.site.name}` } satisfies Metadata;
--- a/002_source/cms/src/app/dashboard/lesson_types/page.tsx
+++ b/002_source/cms/src/app/dashboard/lesson_types/page.tsx
@@ -19,28 +19,31 @@ import { pb } from '@/lib/pb';
 import { toast } from '@/components/core/toaster';
 import ErrorDisplay from '@/components/dashboard/error';
 import { defaultLessonType } from '@/components/dashboard/lesson_type/_constants';
-import type { LessonType } from '@/components/dashboard/lesson_type/ILessonType';
+// import type { LessonType } from '@/components/dashboard/lesson_type/ILessonType';
 // import { defaultLessonType, emptyLessonType, safeAssignment } from '@/components/dashboard/lesson_type/interfaces';
 import { LessonTypesFilters } from '@/components/dashboard/lesson_type/lesson-types-filters';
 import type { Filters } from '@/components/dashboard/lesson_type/lesson-types-filters';
 import { LessonTypesPagination } from '@/components/dashboard/lesson_type/lesson-types-pagination';
 import { LessonTypesSelectionProvider } from '@/components/dashboard/lesson_type/lesson-types-selection-context';
 import { LessonTypesTable } from '@/components/dashboard/lesson_type/lesson-types-table';
+import type { LessonType } from '@/components/dashboard/lesson_type/types';
 import FormLoading from '@/components/loading';

 export default function Page({ searchParams }: PageProps): React.JSX.Element {
-  const { t } = useTranslation();
+  const { t } = useTranslation(['lesson_type']);
  const { email, phone, sortDir, status, name, visible, type } = searchParams;
  const router = useRouter();
  const [lessonTypesData, setLessonTypesData] = React.useState<LessonType[]>([]);
+  //

  const [isLoadingAddPage, setIsLoadingAddPage] = React.useState<boolean>(false);
  const [showLoading, setShowLoading] = React.useState<boolean>(true);
  const [showError, setShowError] = React.useState<boolean>(false);
  const [rowsPerPage, setRowsPerPage] = React.useState<number>(5);
-
+  //
  const [f, setF] = React.useState<LessonType[]>([]);
  const [currentPage, setCurrentPage] = React.useState<number>(0);
+  //
  const [recordCount, setRecordCount] = React.useState<number>(0);

  const [listOption, setListOption] = React.useState({});
@@ -117,7 +120,7 @@ export default function Page({ searchParams }: PageProps): React.JSX.Element {
      <Stack spacing={4}>
        <Stack direction={{ xs: 'column', sm: 'row' }} spacing={3} sx={{ alignItems: 'flex-start' }}>
          <Box sx={{ flex: '1 1 auto' }}>
-            <Typography variant="h4">{t('Lesson Types')}</Typography>
+            <Typography variant="h4">{t('list.title')}</Typography>
          </Box>
          <Box sx={{ display: 'flex', justifyContent: 'flex-end' }}>
            <LoadingButton
--- a/002_source/cms/src/app/dashboard/page.tsx
+++ b/002_source/cms/src/app/dashboard/page.tsx
@@ -26,8 +26,8 @@ import { Events } from '@/components/dashboard/overview/events';
 import { HelperWidget } from '@/components/dashboard/overview/helper-widget';
 import { Subscriptions } from '@/components/dashboard/overview/subscriptions';
 import { Summary } from '@/components/dashboard/overview/summary';
+import ActiveUserCount from '@/components/dashboard/overview/summary/ActiveUserCount';

-import ActiveUserCount from '../../components/dashboard/overview/summary/ActiveUserCount';
 import { events as SampleEvents } from './SampleEvents';
 import { messages as SampleMessages } from './SampleMessages';
 import { SamplesubScriptions } from './SamplesubScriptions';