[fix] 3 legacy bugs

IdeaMall · Nov 28, 2023 · befe45e · befe45e · github-actions · Nov 28, 2023
1 parent 0e1d228
commit befe45e
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 ## Technology stack
 
 - Language: [TypeScript v5][2]
-- Component engine: [Nextjs v13][3]
+- Component engine: [Nextjs v14][3]
 - Component suite: [Bootstrap v5][4]
 - PWA framework: [Workbox v6][5]
 - State management: [MobX v6][10]

diff --git a/components/AdminFrame.tsx b/components/AdminFrame.tsx
@@ -10,8 +10,7 @@ import userStore from '../models/User';
 import { MainNavigator } from './MainNavigator';
 import { PageHead } from './PageHead';
 
-const SessionBox = dynamic(() => import('./SessionBox'), { ssr: false }),
-  { location } = globalThis,
+const { location } = globalThis,
   { t } = i18n;
 
 @observer
@@ -47,7 +46,7 @@ export class AdminFrame extends PureComponent<PropsWithChildren> {
       routes.find(({ path }) => this.routeOf(path).active) || {};
 
     return (
-      <SessionBox autoCover roles={[Role.Administrator, Role.Manager]}>
+      <>
         <PageHead title={`${title} - ${t('administrator')}`} />
 
         <MainNavigator fluid />
@@ -86,7 +85,7 @@ export class AdminFrame extends PureComponent<PropsWithChildren> {
             {children}
           </Container>
         </div>
-      </SessionBox>
+      </>
     );
   }
 }
diff --git a/package.json b/package.json
@@ -28,10 +28,10 @@
     "web-utility": "^4.1.3"
   },
   "devDependencies": {
-    "@octokit/openapi-types": "^19.0.2",
+    "@octokit/openapi-types": "^19.1.0",
     "@types/lodash": "^4.14.202",
     "@types/node": "^18.18.13",
-    "@types/react": "^18.2.38",
+    "@types/react": "^18.2.39",
     "eslint": "^8.54.0",
     "eslint-config-next": "^14.0.3",
     "eslint-config-prettier": "^9.0.0",

diff --git a/pages/admin/category.tsx b/pages/admin/category.tsx
@@ -1,9 +1,10 @@
-import { Category, UserInputData } from '@ideamall/data-service';
+import { Category, Role, UserInputData } from '@ideamall/data-service';
 import { ClickBoundary, Loading, SpinnerButton } from 'idea-react';
 import { computed, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import { FileUploader } from 'mobx-restful-table';
-import { createRef, FormEvent, MouseEvent, PureComponent } from 'react';
+import dynamic from 'next/dynamic';
+import { createRef,FormEvent, MouseEvent, PureComponent } from 'react';
 import { Col, FloatingLabel, Form } from 'react-bootstrap';
 import { formToJSON } from 'web-utility';
 
@@ -13,11 +14,17 @@ import fileStore from '../../models/File';
 import { i18n } from '../../models/Translation';
 import userStore from '../../models/User';
 
+const SessionBox = dynamic(() => import('../../components/SessionBox'), {
+  ssr: false,
+});
+
 export default function CategoryAdminPage() {
   return (
-    <AdminFrame>
-      <CategoryAdmin />
-    </AdminFrame>
+    <SessionBox autoCover roles={[Role.Administrator, Role.Manager]}>
+      <AdminFrame>
+        <CategoryAdmin />
+      </AdminFrame>
+    </SessionBox>
   );
 }
 

diff --git a/pages/admin/goods/[id].tsx b/pages/admin/goods/[id].tsx
@@ -1,4 +1,4 @@
-import { Goods } from '@ideamall/data-service';
+import { Goods, Role } from '@ideamall/data-service';
 import { Loading, SpinnerButton } from 'idea-react';
 import { observer } from 'mobx-react';
 import { FormField } from 'mobx-restful-table';
@@ -19,6 +19,9 @@ import fileStore from '../../../models/File';
 import { GoodsModel } from '../../../models/Goods';
 import { i18n } from '../../../models/Translation';
 
+const SessionBox = dynamic(() => import('../../../components/SessionBox'), {
+  ssr: false,
+});
 const HTMLEditor = dynamic(() => import('../../../components/HTMLEditor'), {
   ssr: false,
 });
@@ -33,9 +36,11 @@ export default function GoodsEditorPage({
   route: { params },
 }: InferGetServerSidePropsType<typeof getServerSideProps>) {
   return (
-    <AdminFrame>
-      <GoodsEditor id={params!.id} />
-    </AdminFrame>
+    <SessionBox autoCover roles={[Role.Administrator, Role.Manager]}>
+      <AdminFrame>
+        <GoodsEditor id={params!.id} />
+      </AdminFrame>
+    </SessionBox>
   );
 }
 

diff --git a/pages/admin/goods/index.tsx b/pages/admin/goods/index.tsx
@@ -1,7 +1,8 @@
-import { Goods } from '@ideamall/data-service';
+import { Goods, Role } from '@ideamall/data-service';
 import { Loading, text2color } from 'idea-react';
 import { observer } from 'mobx-react';
 import { Pager } from 'mobx-restful-table';
+import dynamic from 'next/dynamic';
 import { PureComponent } from 'react';
 import { Badge, Button, Table } from 'react-bootstrap';
 import { parseURLData } from 'web-utility';
@@ -12,11 +13,17 @@ import { isServer } from '../../../models/Base';
 import { GoodsModel } from '../../../models/Goods';
 import { i18n } from '../../../models/Translation';
 
+const SessionBox = dynamic(() => import('../../../components/SessionBox'), {
+  ssr: false,
+});
+
 export default function GoodsAdminPage() {
   return (
-    <AdminFrame>
-      <GoodsAdmin />
-    </AdminFrame>
+    <SessionBox autoCover roles={[Role.Administrator, Role.Manager]}>
+      <AdminFrame>
+        <GoodsAdmin />
+      </AdminFrame>
+    </SessionBox>
   );
 }
 

diff --git a/pages/admin/index.tsx b/pages/admin/index.tsx
@@ -1,17 +1,24 @@
-import { StatisticSummary } from '@ideamall/data-service';
+import { Role, StatisticSummary } from '@ideamall/data-service';
 import { observer } from 'mobx-react';
+import dynamic from 'next/dynamic';
 import { PureComponent } from 'react';
 import { Card, Col, Row } from 'react-bootstrap';
 
 import { AdminFrame } from '../../components/AdminFrame';
 import { StatisticModel } from '../../models/Statistic';
 import { i18n } from '../../models/Translation';
 
+const SessionBox = dynamic(() => import('../../components/SessionBox'), {
+  ssr: false,
+});
+
 export default function AdminHomePage() {
   return (
-    <AdminFrame>
-      <AdminHome />
-    </AdminFrame>
+    <SessionBox autoCover roles={[Role.Administrator, Role.Manager]}>
+      <AdminFrame>
+        <AdminHome />
+      </AdminFrame>
+    </SessionBox>
   );
 }
 

diff --git a/pages/admin/user.tsx b/pages/admin/user.tsx
@@ -1,8 +1,9 @@
-import { Gender, User } from '@ideamall/data-service';
+import { Gender, Role, User } from '@ideamall/data-service';
 import { Avatar } from 'idea-react';
 import { computed } from 'mobx';
 import { observer } from 'mobx-react';
 import { Column, RestTable } from 'mobx-restful-table';
+import dynamic from 'next/dynamic';
 import { PureComponent } from 'react';
 import { Container, Form } from 'react-bootstrap';
 
@@ -11,11 +12,17 @@ import { GenderSymbol, RoleName } from '../../components/data';
 import { i18n } from '../../models/Translation';
 import userStore from '../../models/User';
 
+const SessionBox = dynamic(() => import('../../components/SessionBox'), {
+  ssr: false,
+});
+
 export default function UserAdminPage() {
   return (
-    <AdminFrame>
-      <UserAdmin />
-    </AdminFrame>
+    <SessionBox autoCover roles={[Role.Administrator, Role.Manager]}>
+      <AdminFrame>
+        <UserAdmin />
+      </AdminFrame>
+    </SessionBox>
   );
 }
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/start.sh b/start.sh
@@ -3,7 +3,7 @@
 docker load < $1
 docker image ls -a
 
-docker compose down
-docker compose up -d
+docker-compose down
+docker-compose up -d
 
 docker image prune -a -f