Upgrade Next.js patch, migrate PWA integration to Serwist, and adopt shared ESLint config #119
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,116 +1,20 @@ | ||
| import nextJS from 'eslint-idea2app-next-js'; | ||
|
|
||
| export default [ | ||
| ...nextJS, | ||
| { | ||
| ignores: ['**/node_modules/**', '**/public/**', '**/.next/**', '.github/scripts/**'], | ||
| }, | ||
| { | ||
| rules: { | ||
| '@cspell/spellchecker': [ | ||
| 'warn', | ||
| { | ||
| cspell: { | ||
| words: ['aliyun', 'datav', 'Giscus', 'hackathon', 'Serwist'], | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| ]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,78 @@ | ||
| import { GetStaticProps } from 'next'; | ||
| import { FC, useContext } from 'react'; | ||
| import { Card, Col, Container, Row } from 'react-bootstrap'; | ||
| import { Minute, Second } from 'web-utility'; | ||
|
|
||
| import { PageHead } from '../../components/Layout/PageHead'; | ||
| import { Award, AwardModel } from '../../models/Award'; | ||
| import { hasLarkServerAccess } from '../../models/configuration'; | ||
| import { I18nContext } from '../../models/Translation'; | ||
| import { lark } from '../api/Lark/core'; | ||
|
|
||
| const formatAwardField = (value?: Award[keyof Award]) => | ||
| typeof value === 'string' || typeof value === 'number' | ||
| ? `${value}` | ||
| : Array.isArray(value) | ||
| ? value.filter((item): item is string => typeof item === 'string').join(' ') | ||
| : ''; | ||
|
|
||
| interface AwardPageProps { | ||
| awards: Award[]; | ||
| awardsUnavailable: boolean; | ||
| } | ||
|
|
||
| export const getStaticProps: GetStaticProps<AwardPageProps> = async () => { | ||
| if (!hasLarkServerAccess) | ||
| return { | ||
| props: { awards: [], awardsUnavailable: true }, | ||
| revalidate: Minute / Second, | ||
| }; | ||
|
Comment on lines
+12
to
+29
Member
There was a problem hiding this comment. 修改时如遇以下情况导致的构建失败，要先把代码提交上来：
你改的这一类代码，在运行时测试都是完全通过的，不需要你这样画蛇添足，全部回退！ |
||
|
|
||
| await lark.getAccessToken(); | ||
|
|
||
| const store = new AwardModel(); | ||
| store.client = lark.client; | ||
|
|
||
| const awards = await store.getAll(); | ||
|
|
||
| return { props: { awards, awardsUnavailable: false }, revalidate: Minute / Second }; | ||
| }; | ||
|
|
||
|
Comment on lines
-18
to
-19
Member
There was a problem hiding this comment. 此处是留给别的 PR 的占位符，不要画蛇添足给我加东西！我布置的任务里没有“把这个页面写完”！ |
||
| const AwardPage: FC<AwardPageProps> = ({ awards, awardsUnavailable }) => { | ||
| const { t } = useContext(I18nContext); | ||
|
|
||
| return ( | ||
| <Container className="py-4"> | ||
| <PageHead title={t('open_collaborator_award')} /> | ||
| <h1 className="mb-4 text-center text-md-start">{t('open_collaborator_award')}</h1> | ||
|
|
||
| {awards.length ? ( | ||
| <Row as="ul" className="list-unstyled g-4" xs={1} md={2}> | ||
| {awards.map(({ awardName, nomineeName, nomineeDesc, reason }, index) => ( | ||
| <Col | ||
| key={`${formatAwardField(awardName) || formatAwardField(nomineeName) || 'award'}-${index}`} | ||
| as="li" | ||
| > | ||
| <Card body className="h-100 shadow-sm"> | ||
| <h2 className="h5"> | ||
| {formatAwardField(awardName) || | ||
| formatAwardField(nomineeName) || | ||
| t('open_collaborator_award')} | ||
| </h2> | ||
| {nomineeName && <p className="mb-2 fw-bold">{formatAwardField(nomineeName)}</p>} | ||
| {nomineeDesc && <p>{formatAwardField(nomineeDesc)}</p>} | ||
| {reason && <p className="mb-0">{formatAwardField(reason)}</p>} | ||
| </Card> | ||
| </Col> | ||
| ))} | ||
| </Row> | ||
| ) : awardsUnavailable ? ( | ||
| <p className="py-4 text-center text-muted">{t('remote_content_unavailable')}</p> | ||
| ) : ( | ||
| <p className="py-4 text-center text-muted">{t('no_awards_yet')}</p> | ||
| )} | ||
| </Container> | ||
| ); | ||
| }; | ||
|
|
||
| export default AwardPage; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<pwa-install />