Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[migrate] replace Forum Timeline component with latest Idea React #349

Merged
merged 1 commit into from
Oct 26, 2024
Merged

[migrate] replace Forum Timeline component with latest Idea React #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions components/Activity/Forum/Timeline.module.less
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions components/Activity/Forum/Timeline.tsx
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions components/Base/TimeRange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Time } from 'idea-react';
import { TableCellValue } from 'mobx-lark';
import { FC } from 'react';
import { formatDate } from 'web-utility';

export const TimeRange: FC<Record<'startTime' | 'endTime', TableCellValue>> = ({
startTime,
Expand All @@ -9,7 +9,7 @@ export const TimeRange: FC<Record<'startTime' | 'endTime', TableCellValue>> = ({
startTime &&
endTime && (
<>
🕒 {formatDate(+startTime!, 'YYYY-MM-DD HH:mm')} ~{' '}
{formatDate(+endTime!, 'YYYY-MM-DD HH:mm')}
🕒 <Time dateTime={+startTime!} format="YYYY-MM-DD HH:mm" /> ~{' '}
<Time dateTime={+endTime!} format="YYYY-MM-DD HH:mm" />
</>
);
16 changes: 10 additions & 6 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// @ts-check
import { fixupPluginRules } from '@eslint/compat';
import { fixupConfigRules, fixupPluginRules } from '@eslint/compat';
import { FlatCompat } from '@eslint/eslintrc';
import eslint from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';
import reactPlugin from 'eslint-plugin-react';
Expand All @@ -8,7 +9,8 @@ import globals from 'globals';
import tsEslint from 'typescript-eslint';
import { fileURLToPath } from 'url';

const tsconfigRootDir = fileURLToPath(new URL('.', import.meta.url));
const tsconfigRootDir = fileURLToPath(new URL('.', import.meta.url)),
flatCompat = new FlatCompat();

export default tsEslint.config(
// register all of the plugins up-front
Expand All @@ -28,6 +30,7 @@ export default tsEslint.config(
// extends ...
eslint.configs.recommended,
...tsEslint.configs.recommended,
...fixupConfigRules(flatCompat.extends('plugin:@next/next/core-web-vitals')),

// base config
{
Expand All @@ -43,6 +46,10 @@ export default tsEslint.config(
'no-empty-pattern': 'warn',
'simple-import-sort/exports': 'error',
'simple-import-sort/imports': 'error',
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-unsafe-declaration-merging': 'warn',
'react/jsx-no-target-blank': 'warn',
'react/jsx-sort-props': [
'error',
Expand All @@ -53,10 +60,7 @@ export default tsEslint.config(
noSortAlphabetically: true,
},
],
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-unsafe-declaration-merging': 'warn',
'@next/next/no-sync-scripts': 'warn',
},
},
{
Expand Down
0 next.config.mjs → next.config.ts
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"copy-webpack-plugin": "^12.0.2",
"echarts-jsx": "^0.5.4",
"file-type": "^19.6.0",
"idea-react": "^2.0.0-rc.7",
"idea-react": "^2.0.0-rc.8",
"koajax": "^3.0.2",
"leaflet": "^1.9.4",
"leaflet.chinatmsproviders": "^3.0.6",
Expand Down Expand Up @@ -55,6 +55,7 @@
"@babel/plugin-transform-typescript": "^7.25.9",
"@babel/preset-react": "^7.25.9",
"@eslint/compat": "^1.2.1",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.13.0",
"@kaiyuanshe/kys-service": "^1.0.0-rc.0",
"@softonus/prettier-plugin-duplicate-remover": "^1.0.1",
Expand All @@ -65,7 +66,7 @@
"@types/lodash": "^4.17.12",
"@types/mdx": "^2.0.13",
"@types/next-pwa": "^5.6.9",
"@types/node": "^20.17.0",
"@types/node": "^20.17.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"eslint": "^9.13.0",
Expand Down
2 changes: 1 addition & 1 deletion pages/_document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function Document() {
/>
<link
rel="stylesheet"
href="https://npm.onmicrosoft.cn/idea-react/dist/index.css"
href="https://npm.onmicrosoft.cn/idea-react@2.0.0-rc.8/dist/index.css"
/>
<link
rel="stylesheet"
Expand Down
23 changes: 18 additions & 5 deletions pages/activity/[id]/forum/[forumId].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { ShareBox } from 'idea-react';
import { TableCellLocation } from 'mobx-lark';
import { ShareBox, Timeline, TimelineEvent } from 'idea-react';
import { TableCellLocation, TableCellValue } from 'mobx-lark';
import { observer } from 'mobx-react';
import { cache, compose, errorLogger, router } from 'next-ssr-middleware';
import { QRCodeSVG } from 'qrcode.react';
import { Component } from 'react';
import { Container } from 'react-bootstrap';

import ForumTimeline from '../../../../components/Activity/Forum/Timeline';
import { PageHead } from '../../../../components/Layout/PageHead';
import { Activity, ActivityModel } from '../../../../models/Activity';
import { Agenda } from '../../../../models/Activity/Agenda';
import { Forum } from '../../../../models/Activity/Forum';
import { API_Host } from '../../../../models/Base';
import { API_Host, blobURLOf } from '../../../../models/Base';
import { t } from '../../../../models/Base/Translation';
import { fileURLOf } from '../../../api/lark/file/[id]';

Expand Down Expand Up @@ -47,6 +46,20 @@ export default class ForumPage extends Component<ForumPageProps> {
{ sharedURL } = this;
const { id: activityId, name, city, location, image, cardImage } = activity,
{ name: forumName, location: room } = forum;
const events: TimelineEvent[] = agendas.map(
({ id, title, startTime, endTime, summary, mentors, mentorAvatars }) => ({
title: title as string,
summary: summary as string,
time: [startTime as number, endTime as number],
link: `/activity/${activityId}/agenda/${id}`,
people: (mentors as string[]).map((name, index) => ({
name,
avatar: blobURLOf([
(mentorAvatars as TableCellValue[])![index]!,
] as TableCellValue),
})),
}),
);

return (
<Container
Expand All @@ -67,7 +80,7 @@ export default class ForumPage extends Component<ForumPageProps> {
</ul>
</header>
<section className="p-3">
<ForumTimeline {...{ activityId, agendas }} />
<Timeline events={events} timeFormat="YYYY-MM-DD HH:mm" />
</section>
<footer className="d-flex flex-column align-items-center gap-4">
<QRCodeSVG value={sharedURL} />
Expand Down
Loading
Loading