Skip to content
This repository was archived by the owner on Mar 23, 2022. It is now read-only.

Commit 8844bbe

Browse files
RaenonXRaenonX
authored
Merge pull request #34 from RaenonX-DL/dev
v1.3.0 release
2 parents b625664 + 4e9d6a0 commit 8844bbe

26 files changed

+467
-321
lines changed

‎public/index.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,11 @@
5050

5151
gtag('js', new Date());
5252

53-
gtag('config', 'G-796E69CFJG', {'send_page_view': false});
53+
gtag('config', 'G-796E69CFJG');
5454
</script>
55+
56+
<!-- Google AdSense -->
57+
<script async data-ad-client="ca-pub-1535004092052078" src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
5558
</head>
5659
<body>
5760
<noscript>請啟用 JavaScript 以瀏覽本網站。</noscript>

‎public/locales/cht/translation.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"request_failed": "無法傳送登入請求"
3131
},
3232
"lang": {
33-
"in-use": "目前使用中"
33+
"in_use": "目前使用中"
34+
},
35+
"message": {
36+
"page_nav": "確定要離開本頁面嗎？"
3437
},
3538
"misc": {
3639
"add": "新增",

‎public/locales/en/translation.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"data": {
44
"title_self": "Game Data",
55
"active": "Active",
6-
"cex": "Chain EX",
6+
"cex": "Chained Co-ability",
77
"others": "Others",
88
"passive": "Passive",
99
"print": "Wyrmprints",
@@ -30,7 +30,10 @@
3030
"request_failed": "Failed to send login request"
3131
},
3232
"lang": {
33-
"in-use": "Currently in-use"
33+
"in_use": "Currently in-use"
34+
},
35+
"message": {
36+
"page_nav": "Are you sure to leave this page?"
3437
},
3538
"misc": {
3639
"add": "Add",

‎src/components/elements.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import {QuestPostForm} from './elements/questPostForm';
88
import {QuestPostList} from './elements/questPostList';
99
import {QuestPositionOutput} from './elements/questPositionOutput';
1010
import {QuestPostFetchStatus} from './elements/questFetch';
11-
import {AnalysisPostList} from './elements/analysisPostList';
11+
import {QuestPostOutput} from './elements/questPostOutput';
1212

13+
import {AnalysisPostList} from './elements/analysisPostList';
1314
import {AnalysisPostOutput} from './elements/analysisPostOutput';
1415
import {
1516
AnalysisPostFetchStatus,
@@ -26,6 +27,7 @@ import {getGoogleUid} from './elements/googleSignin';
2627
// Components
2728
import {Navigation} from './elements/navigation';
2829
import {Footer} from './elements/footer';
30+
import {PageAnchor, scrollToAnchor} from './elements/pageAnchor';
2931
import {Paginator} from './elements/paginator';
3032
import {ExpressModal} from './elements/modalExpress';
3133
import {Markdown} from './elements/markdown';
@@ -38,9 +40,9 @@ export type {
3840
};
3941

4042
export {
41-
QuestPostForm, QuestPostList, QuestPositionOutput,
43+
QuestPostForm, QuestPostList, QuestPositionOutput, QuestPostOutput,
4244
AnalysisPostOutput, AnalysisPostFormChara, AnalysisPostFormDragon, AnalysisPostList, AnalysisSkillOutput,
4345
PostManageBar, PostListPage, FetchPost, PostInfo, PostModificationNotes,
4446
getGoogleUid,
45-
Navigation, Footer, Paginator, ExpressModal, Markdown, InfoCard,
47+
Navigation, Footer, PageAnchor, scrollToAnchor, Paginator, ExpressModal, Markdown, InfoCard,
4648
};

‎src/components/elements/analysisPostForm.tsx‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {useTranslation} from 'react-i18next';
66
import {getGoogleUid} from './googleSignin';
77
import {MarkdownInput} from './markdownInput';
88
import {ExpressModal} from './modalExpress';
9+
import {Prompt} from './prompt';
910
import {AnalysisSkillInput} from './analysisSkill';
1011
import {
1112
ApiRequestSender,
@@ -250,12 +251,11 @@ const AnalysisPostFormBase = (props: React.PropsWithChildren<AnalysisPostFormBas
250251
{children}
251252
{sectionGeneralBottom}
252253
{
253-
hasPost ?
254-
<>
255-
<hr/>
256-
{sectionModifyNote}
257-
</> :
258-
<></>
254+
hasPost &&
255+
<>
256+
<hr/>
257+
{sectionModifyNote}
258+
</>
259259
}
260260
<hr/>
261261
{sectionControl}
@@ -558,11 +558,14 @@ export const AnalysisPostFormChara = ({post, fnSendRequest}: AnalysisPostFormCha
558558
};
559559

560560
return (
561-
<AnalysisPostFormBase
562-
states={statesBase} hasPost={post !== undefined && post !== null} handleFormSubmit={handleFormSubmit}>
563-
<AnalysisPostPartialFormChara states={statesChara}/>
564-
<div className="mb-3"/>
565-
</AnalysisPostFormBase>
561+
<>
562+
<Prompt/>
563+
<AnalysisPostFormBase
564+
states={statesBase} hasPost={post !== undefined && post !== null} handleFormSubmit={handleFormSubmit}>
565+
<AnalysisPostPartialFormChara states={statesChara}/>
566+
<div className="mb-3"/>
567+
</AnalysisPostFormBase>
568+
</>
566569
);
567570
};
568571

@@ -687,11 +690,14 @@ export const AnalysisPostFormDragon = ({post, fnSendRequest}: AnalysisPostFormDr
687690
};
688691

689692
return (
690-
<AnalysisPostFormBase
691-
states={statesBase} hasPost={post !== undefined && post !== null} handleFormSubmit={handleFormSubmit}>
692-
<AnalysisPostPartialFormDragon states={statesDragon}/>
693-
<div className="mb-3"/>
694-
</AnalysisPostFormBase>
693+
<>
694+
<Prompt/>
695+
<AnalysisPostFormBase
696+
states={statesBase} hasPost={post !== undefined && post !== null} handleFormSubmit={handleFormSubmit}>
697+
<AnalysisPostPartialFormDragon states={statesDragon}/>
698+
<div className="mb-3"/>
699+
</AnalysisPostFormBase>
700+
</>
695701
);
696702
};
697703

0 commit comments

Comments
 (0)