[optimize] Model folder structure

[optimize] update Upstream packages
kaiyuanshe · Sep 3, 2023 · ea23083 · ea23083 · github-actions · Sep 3, 2023
1 parent d8aa0d7
commit ea23083
Show file tree

Hide file tree

Showing 100 changed files with 232 additions and 223 deletions.
diff --git a/components/Activity/ActivityCard.tsx b/components/Activity/ActivityCard.tsx
@@ -9,7 +9,7 @@ import Link from 'next/link';
 import { Card, Col, Row } from 'react-bootstrap';
 
 import { Activity } from '../../models/Activity';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
 import { convertDatetime } from '../../utils/time';
 import { ActivityControl, ActivityControlProps } from './ActivityControl';
 import { ActivityEntry } from './ActivityEntry';

diff --git a/components/Activity/ActivityControl.tsx b/components/Activity/ActivityControl.tsx
@@ -3,8 +3,8 @@ import { FC } from 'react';
 import { Button } from 'react-bootstrap';
 
 import { Activity } from '../../models/Activity';
-import platformAdmin from '../../models/PlatformAdmin';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
+import platformAdmin from '../../models/User/PlatformAdmin';
 
 const { t } = i18n;
 

diff --git a/components/Activity/ActivityEditor.tsx b/components/Activity/ActivityEditor.tsx
@@ -9,8 +9,8 @@ import { Button, Col, Form, Row } from 'react-bootstrap';
 import { formToJSON } from 'web-utility';
 
 import activityStore, { Activity } from '../../models/Activity';
-import fileStore from '../../models/File';
-import { i18n } from '../../models/Translation';
+import fileStore from '../../models/Base/File';
+import { i18n } from '../../models/Base/Translation';
 import { DateTimeInput } from '../DateTimeInput';
 
 const { t } = i18n,

diff --git a/components/Activity/ActivityEntry.tsx b/components/Activity/ActivityEntry.tsx
@@ -3,7 +3,7 @@ import { Button } from 'react-bootstrap';
 import { diffTime } from 'web-utility';
 
 import { Activity } from '../../models/Activity';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
 import { TimeUnit } from '../../utils/time';
 
 const { t } = i18n;

diff --git a/components/Activity/ActivityList.tsx b/components/Activity/ActivityList.tsx
@@ -7,9 +7,9 @@ import {
   ActivityListType,
   ActivityModel,
 } from '../../models/Activity';
-import platformAdmin from '../../models/PlatformAdmin';
-import sessionStore from '../../models/Session';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
+import platformAdmin from '../../models/User/PlatformAdmin';
+import sessionStore from '../../models/User/Session';
 import { XScrollListProps } from '../layout/ScrollList';
 import { ActivityCard, ActivityCardProps } from './ActivityCard';
 

diff --git a/components/Activity/ActivityLogList.tsx b/components/Activity/ActivityLogList.tsx
@@ -1,7 +1,7 @@
 import { ScrollListProps } from 'mobx-restful-table';
 import { Badge, ListGroup } from 'react-bootstrap';
 
-import { Log, LogModel } from '../../models/Log';
+import { Log, LogModel } from '../../models/Activity/Log';
 
 export interface ActivityLogListProps extends ScrollListProps<Log> {
   store: LogModel;

diff --git a/components/Activity/ActivityManageFrame.tsx b/components/Activity/ActivityManageFrame.tsx
@@ -22,8 +22,8 @@ import { Container, Nav } from 'react-bootstrap';
 
 import { menus } from '../../configuration/menu';
 import activityStore from '../../models/Activity';
-import sessionStore from '../../models/Session';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
+import sessionStore from '../../models/User/Session';
 import { findDeep } from '../../utils/data';
 import { MainBreadcrumb } from '../layout/MainBreadcrumb';
 import PageHead from '../layout/PageHead';

diff --git a/components/Activity/AwardList.tsx b/components/Activity/AwardList.tsx
@@ -4,8 +4,8 @@ import { ScrollList, ScrollListProps } from 'mobx-restful-table';
 import { FC, PureComponent } from 'react';
 import { Button, Image, Table } from 'react-bootstrap';
 
-import { Award } from '../../models/Award';
-import { i18n } from '../../models/Translation';
+import { Award } from '../../models/Activity/Award';
+import { i18n } from '../../models/Base/Translation';
 import styles from '../../styles/Table.module.less';
 import { XScrollListProps } from '../layout/ScrollList';
 

diff --git a/components/Activity/EnrollmentList.tsx b/components/Activity/EnrollmentList.tsx
@@ -1,10 +1,10 @@
-import { ScrollList, ScrollListProps } from 'mobx-restful-table';
+import { ScrollList } from 'mobx-restful-table';
 import { FC, PureComponent } from 'react';
 import { Button, Form, Table } from 'react-bootstrap';
 
 import activityStore from '../../models/Activity';
-import { Enrollment, statusName } from '../../models/Enrollment';
-import { i18n } from '../../models/Translation';
+import { Enrollment, statusName } from '../../models/Activity/Enrollment';
+import { i18n } from '../../models/Base/Translation';
 import styles from '../../styles/participant.module.less';
 import { XScrollListProps } from '../layout/ScrollList';
 

diff --git a/components/Activity/EnrollmentStatistic.tsx b/components/Activity/EnrollmentStatistic.tsx
@@ -11,8 +11,8 @@ import { PureComponent } from 'react';
 import { Col, Container, Row } from 'react-bootstrap';
 import { isEmpty } from 'web-utility';
 
-import { EnrollmentModel } from '../../models/Enrollment';
-import { i18n } from '../../models/Translation';
+import { EnrollmentModel } from '../../models/Activity/Enrollment';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Activity/QuestionnaireCreate.tsx b/components/Activity/QuestionnaireCreate.tsx
@@ -4,8 +4,8 @@ import { FC, FormEvent } from 'react';
 import { Button, Col, Form, Row } from 'react-bootstrap';
 import { formToJSON } from 'web-utility';
 
-import { Question } from '../../models/Question';
-import { i18n } from '../../models/Translation';
+import { Question } from '../../models/Activity/Question';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Activity/QuestionnairePreview.tsx b/components/Activity/QuestionnairePreview.tsx
@@ -3,8 +3,8 @@ import Link from 'next/link';
 import { PureComponent } from 'react';
 import { Container, Form, Row } from 'react-bootstrap';
 
-import { Question } from '../../models/Question';
-import { i18n } from '../../models/Translation';
+import { Question } from '../../models/Activity/Question';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Activity/QuestionnaireTable.tsx b/components/Activity/QuestionnaireTable.tsx
@@ -2,8 +2,8 @@ import { observer } from 'mobx-react';
 import { FC } from 'react';
 import { Button, Container, Table } from 'react-bootstrap';
 
-import { Question } from '../../models/Question';
-import { i18n } from '../../models/Translation';
+import { Question } from '../../models/Activity/Question';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/DateTimeInput.tsx b/components/DateTimeInput.tsx
@@ -4,7 +4,7 @@ import { ChangeEvent, PureComponent } from 'react';
 import { Col, Form, InputGroup, Row } from 'react-bootstrap';
 import { formatDate } from 'web-utility';
 
-import { i18n } from '../models/Translation';
+import { i18n } from '../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Git/Card.tsx b/components/Git/Card.tsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react';
 import { FC, ReactNode } from 'react';
 import { Badge, Button, Card, Col, Form, Row } from 'react-bootstrap';
 
+import { i18n } from '../../models/Base/Translation';
 import { GitTemplate } from '../../models/TemplateRepo';
-import { i18n } from '../../models/Translation';
 import { GitLogo } from './Logo';
 
 const { t } = i18n;

diff --git a/components/Git/CardList.tsx b/components/Git/CardList.tsx
@@ -2,8 +2,8 @@ import { text2color } from 'idea-react';
 import { FC } from 'react';
 import { Badge, Button, Card, Col, Form, Row } from 'react-bootstrap';
 
+import { i18n } from '../../models/Base/Translation';
 import { GitTemplate } from '../../models/TemplateRepo';
-import { i18n } from '../../models/Translation';
 import { XScrollListProps } from '../layout/ScrollList';
 import { GitLogo } from './Logo';
 

diff --git a/components/Git/GitTeamCard.tsx b/components/Git/GitTeamCard.tsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react';
 import { FC, ReactNode } from 'react';
 import { Badge, Card, Col, Form, Row } from 'react-bootstrap';
 
+import { i18n } from '../../models/Base/Translation';
 import { GitRepository } from '../../models/Git';
-import { i18n } from '../../models/Translation';
 import { GitLogo } from './Logo';
 
 const { t } = i18n;

diff --git a/components/Git/Modal.tsx b/components/Git/Modal.tsx
@@ -12,8 +12,8 @@ import {
 } from 'react-bootstrap';
 import { formToJSON } from 'web-utility';
 
+import { i18n } from '../../models/Base/Translation';
 import { GitTemplateModal } from '../../models/TemplateRepo';
-import { i18n } from '../../models/Translation';
 
 export interface GitModalProps extends Pick<ModalProps, 'show' | 'onHide'> {
   name?: string;

diff --git a/components/HTMLEditor.tsx b/components/HTMLEditor.tsx
@@ -10,7 +10,7 @@ import {
 } from 'react-bootstrap-editor';
 import { Constructor, uniqueID } from 'web-utility';
 
-import fileStore from '../models/File';
+import fileStore from '../models/Base/File';
 
 ImageTool.prototype.save = blob =>
   fileStore.upload(new File([blob], uniqueID()));

diff --git a/components/Message/MessageList.tsx b/components/Message/MessageList.tsx
@@ -6,8 +6,12 @@ import { ScrollList, ScrollListProps } from 'mobx-restful-table';
 import { FC, PureComponent } from 'react';
 import { Button, Form, Table } from 'react-bootstrap';
 
-import { Message, MessageType, MessageTypeName } from '../../models/Message';
-import { i18n } from '../../models/Translation';
+import {
+  Message,
+  MessageType,
+  MessageTypeName,
+} from '../../models/Activity/Message';
+import { i18n } from '../../models/Base/Translation';
 import styles from '../../styles/participant.module.less';
 import { XScrollListProps } from '../layout/ScrollList';
 

diff --git a/components/Message/MessageModal.tsx b/components/Message/MessageModal.tsx
@@ -4,8 +4,12 @@ import { createRef, FormEvent, PureComponent } from 'react';
 import { Button, Form, Modal, ModalProps } from 'react-bootstrap';
 import { formToJSON } from 'web-utility';
 
-import { Message, MessageModel, MessageTypeName } from '../../models/Message';
-import { i18n } from '../../models/Translation';
+import {
+  Message,
+  MessageModel,
+  MessageTypeName,
+} from '../../models/Activity/Message';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Organization/ActivityOrganizationModal.tsx b/components/Organization/ActivityOrganizationModal.tsx
@@ -7,8 +7,8 @@ import {
   Organization,
   OrganizationModel,
   OrganizationTypeName,
-} from '../../models/Organization';
-import { i18n } from '../../models/Translation';
+} from '../../models/Activity/Organization';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Organization/OrganizationCard.tsx b/components/Organization/OrganizationCard.tsx
@@ -1,6 +1,9 @@
 import { Card } from 'react-bootstrap';
 
-import { Organization, OrganizationTypeName } from '../../models/Organization';
+import {
+  Organization,
+  OrganizationTypeName,
+} from '../../models/Activity/Organization';
 
 export const OrganizationCard = ({
   name,

diff --git a/components/Organization/OrganizationList.tsx b/components/Organization/OrganizationList.tsx
@@ -3,9 +3,9 @@ import { Form, Image, Table } from 'react-bootstrap';
 
 import {
   Organization,
-  OrganizationTypeName
-} from '../../models/Organization';
-import { i18n } from '../../models/Translation';
+  OrganizationTypeName,
+} from '../../models/Activity/Organization';
+import { i18n } from '../../models/Base/Translation';
 import styles from '../../styles/Table.module.less';
 import { XScrollListProps } from '../layout/ScrollList';
 import { OrganizationCard } from './OrganizationCard';

diff --git a/components/PlatformAdmin/PlatformAdminFrame.tsx b/components/PlatformAdmin/PlatformAdminFrame.tsx
@@ -20,9 +20,9 @@ import { Fragment, PureComponent } from 'react';
 import { Container, Nav } from 'react-bootstrap';
 
 import { adminMenus } from '../../configuration/menu';
-import platformAdminStore from '../../models/PlatformAdmin';
-import sessionStore from '../../models/Session';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
+import platformAdminStore from '../../models/User/PlatformAdmin';
+import sessionStore from '../../models/User/Session';
 import { findDeep } from '../../utils/data';
 import { MainBreadcrumb } from '../layout/MainBreadcrumb';
 import PageHead from '../layout/PageHead';

diff --git a/components/PlatformAdmin/PlatformAdminModal.tsx b/components/PlatformAdmin/PlatformAdminModal.tsx
@@ -3,9 +3,9 @@ import { observer } from 'mobx-react';
 import { FormEvent, PureComponent } from 'react';
 import { Button, Form, Modal, ModalProps } from 'react-bootstrap';
 
-import { PlatformAdminModel } from '../../models/PlatformAdmin';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
 import userStore from '../../models/User';
+import { PlatformAdminModel } from '../../models/User/PlatformAdmin';
 import { UserList } from '../User/UserList';
 
 const { t } = i18n;

diff --git a/components/Team/JoinTeamModal.tsx b/components/Team/JoinTeamModal.tsx
@@ -1,7 +1,7 @@
 import { FormEventHandler } from 'react';
 import { Button, Col, Form, Modal, ModalProps } from 'react-bootstrap';
 
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Team/TeamAdministratorTable.tsx b/components/Team/TeamAdministratorTable.tsx
@@ -2,9 +2,9 @@ import { observer } from 'mobx-react';
 import { FC } from 'react';
 import { Form, Table } from 'react-bootstrap';
 
-import sessionStore from '../../models/Session';
-import { TeamMember } from '../../models/Team';
-import { i18n } from '../../models/Translation';
+import { TeamMember } from '../../models/Activity/Team';
+import { i18n } from '../../models/Base/Translation';
+import sessionStore from '../../models/User/Session';
 import styles from '../../styles/Table.module.less';
 import { convertDatetime } from '../../utils/time';
 import { XScrollListProps } from '../layout/ScrollList';

diff --git a/components/Team/TeamAwardAssignment.tsx b/components/Team/TeamAwardAssignment.tsx
@@ -1,6 +1,6 @@
 import { FC } from 'react';
 
-import { AwardAssignment } from '../../models/Award';
+import { AwardAssignment } from '../../models/Activity/Award';
 import { XScrollListProps } from '../layout/ScrollList';
 
 export interface TeamAwardAssignmentLayoutProps

diff --git a/components/Team/TeamAwardCard.tsx b/components/Team/TeamAwardCard.tsx
@@ -7,8 +7,8 @@ import { PureComponent } from 'react';
 import { Accordion, Button } from 'react-bootstrap';
 
 import activityStore from '../../models/Activity';
-import { Team } from '../../models/Team';
-import { i18n } from '../../models/Translation';
+import { Team } from '../../models/Activity/Team';
+import { i18n } from '../../models/Base/Translation';
 import { TeamAwardAssignmentLayout } from './TeamAwardAssignment';
 import { TeamMemberListLayout } from './TeamMemberList';
 import { SimpleTeamWorkListLayout } from './TeamWork';

diff --git a/components/Team/TeamAwardList.tsx b/components/Team/TeamAwardList.tsx
@@ -2,8 +2,8 @@ import { ScrollList, ScrollListProps } from 'mobx-restful-table';
 import { FC, PureComponent } from 'react';
 import { Col, Row } from 'react-bootstrap';
 
-import { Team } from '../../models/Team';
-import { i18n } from '../../models/Translation';
+import { Team } from '../../models/Activity/Team';
+import { i18n } from '../../models/Base/Translation';
 import { XScrollListProps } from '../layout/ScrollList';
 import { TeamAwardCard } from './TeamAwardCard';
 

diff --git a/components/Team/TeamCard.tsx b/components/Team/TeamCard.tsx
@@ -2,8 +2,8 @@ import classNames from 'classnames';
 import { Avatar } from 'idea-react';
 import { HTMLAttributes } from 'react';
 
-import { Team } from '../../models/Team';
-import { i18n } from '../../models/Translation';
+import { Team } from '../../models/Activity/Team';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Team/TeamCreateModal.tsx b/components/Team/TeamCreateModal.tsx
@@ -4,8 +4,8 @@ import { Modal } from 'react-bootstrap';
 import { formToJSON } from 'web-utility';
 
 import activityStore from '../../models/Activity';
-import { Team } from '../../models/Team';
-import { i18n } from '../../models/Translation';
+import { Team } from '../../models/Activity/Team';
+import { i18n } from '../../models/Base/Translation';
 import { TeamEditor } from './TeamEditor';
 
 const { t } = i18n;

diff --git a/components/Team/TeamEditor.tsx b/components/Team/TeamEditor.tsx
@@ -1,8 +1,8 @@
 import { FC, FormEvent } from 'react';
 import { Button, Col, Form, Row } from 'react-bootstrap';
 
-import { Team } from '../../models/Team';
-import { i18n } from '../../models/Translation';
+import { Team } from '../../models/Activity/Team';
+import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 

diff --git a/components/Team/TeamList.tsx b/components/Team/TeamList.tsx
@@ -1,7 +1,7 @@
 import { ScrollListProps } from 'mobx-restful-table';
 import { Col, Row } from 'react-bootstrap';
 
-import { Team, TeamModel } from '../../models/Team';
+import { Team, TeamModel } from '../../models/Activity/Team';
 import { TeamCard } from './TeamCard';
 
 export interface TeamListProps extends ScrollListProps<Team> {

diff --git a/components/Team/TeamManageFrame.tsx b/components/Team/TeamManageFrame.tsx
@@ -15,10 +15,10 @@ import { Col, Nav } from 'react-bootstrap';
 
 import { activityTeamMenus } from '../../configuration/menu';
 import activityStore from '../../models/Activity';
+import { Staff } from '../../models/Activity/Staff';
 import { ErrorBaseData } from '../../models/Base';
-import sessionStore from '../../models/Session';
-import { Staff } from '../../models/Staff';
-import { i18n } from '../../models/Translation';
+import { i18n } from '../../models/Base/Translation';
+import sessionStore from '../../models/User/Session';
 import { findDeep } from '../../utils/data';
 import { ActivityManageFrameProps } from '../Activity/ActivityManageFrame';
 import { MainBreadcrumb } from '../layout/MainBreadcrumb';