Merge pull request #78 from RaenonX-DL/dev

v1.7.6 Release
RaenonX-DL · Feb 9, 2021 · d6bf1ae · d6bf1ae
2 parents cd29102 + be25923
commit d6bf1ae
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 10 deletions.
diff --git a/public/locales/cht/translation.json b/public/locales/cht/translation.json
@@ -185,6 +185,9 @@
     "warning": {
       "page_nav": "確定要離開本頁面嗎？",
       "truncated": "因條目過多，故只顯示部分條目 (顯示 {{displayed}} 條 / 共有 {{returned}} 條)。如果要顯示第 {{displayed}} 條後的結果，請縮小搜尋範圍。"
+    },
+    "info": {
+      "donation": "為了提供更好的使用者體驗，網站將暫時撤除廣告。懇請各位使用者至 https://patreon.com/RaenonX 、 https://ko-fi.com/RaenonX 或 https://rnnx.cc/Paypal 捐款，感謝！"
     }
   },
   "misc": {

diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -185,6 +185,9 @@
     "warning": {
       "page_nav": "Are you sure you want to leave this page?",
       "truncated": "Due to excessive number of results, results are truncated ({{displayed}} Displayed / {{returned} Available). To display the truncated results, please narrow the search condition."
+    },
+    "info": {
+      "donation": "To provide better UX, the ads are disabled temporarily. Please donate via either https://patreon.com/RaenonX, https://ko-fi.com/RaenonX or https://rnnx.cc/Paypal, thanks!"
     }
   },
   "misc": {

diff --git a/public/locales/jp/translation.json b/public/locales/jp/translation.json
@@ -185,6 +185,9 @@
     "warning": {
       "page_nav": "このページ閉じますか？",
       "truncated": "項目が多過ぎるため、一部だけ展示されてます。({{displayed}} 表示中 / 全 {{returned}})。第{{displayed}}個項目の以後の結果も欲しいという方は検索範囲を指定してください。"
+    },
+    "info": {
+      "donation": "To provide better UX, the ads are disabled temporarily. Please donate via either https://patreon.com/RaenonX, https://ko-fi.com/RaenonX or https://rnnx.cc/Paypal, thanks!"
     }
   },
   "misc": {

diff --git a/src/components/elements/posts/analysis/form.tsx b/src/components/elements/posts/analysis/form.tsx
@@ -151,14 +151,14 @@ const AnalysisPostFormBase = (props: React.PropsWithChildren<AnalysisPostFormBas
       <Row>
         <Col>
           <h5>{t('posts.analysis.summon_result')}</h5>
-          <MarkdownInput onChanged={onSummonResultChanged} rows={5} value={states.summonResult}/>
+          <MarkdownInput onChanged={onSummonResultChanged} rows={4} value={states.summonResult}/>
         </Col>
       </Row>
       <hr/>
       <Row className="mb-3">
         <Col>
           <h5>{t('posts.analysis.passive')}</h5>
-          <MarkdownInput onChanged={onPassivesChanged} rows={5} value={states.passives}/>
+          <MarkdownInput onChanged={onPassivesChanged} rows={7} value={states.passives}/>
         </Col>
       </Row>
       <Row className="mb-3">
@@ -197,7 +197,7 @@ const AnalysisPostFormBase = (props: React.PropsWithChildren<AnalysisPostFormBas
     <>
       <h5>{t('posts.manage.modify_note')}</h5>
       <Row>
-        <Col><MarkdownInput onChanged={onModifyNoteChanged} rows={5}/></Col>
+        <Col><MarkdownInput onChanged={onModifyNoteChanged} rows={3}/></Col>
       </Row>
     </>
   );
@@ -362,7 +362,7 @@ const AnalysisPostPartialFormChara = (props: AnalysisPostPartialFormCharaProps)
       <Row>
         <Col>
           <h5>{t('posts.analysis.tips_builds')}</h5>
-          <MarkdownInput onChanged={onTipsBuildsChanged} rows={5} value={states.tipsBuilds}/>
+          <MarkdownInput onChanged={onTipsBuildsChanged} rows={10} value={states.tipsBuilds}/>
         </Col>
       </Row>
     </>
@@ -412,7 +412,7 @@ const AnalysisPostPartialFormDragon = (props: AnalysisPostPartialFormDragonProps
       <Row>
         <Col>
           <h5>{t('posts.analysis.notes_dragon')}</h5>
-          <MarkdownInput onChanged={onNotesChanged} rows={5} value={states.notes}/>
+          <MarkdownInput onChanged={onNotesChanged} rows={10} value={states.notes}/>
         </Col>
       </Row>
 
@@ -421,7 +421,7 @@ const AnalysisPostPartialFormDragon = (props: AnalysisPostPartialFormDragonProps
       <Row>
         <Col>
           <h5>{t('posts.analysis.suitable')}</h5>
-          <MarkdownInput onChanged={onSuitableCharactersChanged} rows={5} value={states.suitableCharacters}/>
+          <MarkdownInput onChanged={onSuitableCharactersChanged} rows={7} value={states.suitableCharacters}/>
         </Col>
       </Row>
     </>

diff --git a/src/components/elements/posts/analysis/skill.tsx b/src/components/elements/posts/analysis/skill.tsx
@@ -52,21 +52,21 @@ export const AnalysisSkillInput = (props: AnalysisSkillInputProps) => {
         <Col lg={4} className="pr-lg-2 mb-2">
           <Form.Label>{t('posts.analysis.skill.info')}</Form.Label>
           <MarkdownInput
-            rows={5} onChanged={onAnyInputChanged(onInfoChanged)} value={info}
+            rows={7} onChanged={onAnyInputChanged(onInfoChanged)} value={info}
             required={required.some((val) => val === 'all' || val === 'info')}
           />
         </Col>
         <Col lg={4} className="px-lg-2 mb-2">
           <Form.Label>{t('posts.analysis.skill.rotations')}</Form.Label>
           <MarkdownInput
-            rows={5} onChanged={onAnyInputChanged(onRotationsChanged)} value={rotations}
+            rows={7} onChanged={onAnyInputChanged(onRotationsChanged)} value={rotations}
             required={required.some((val) => val === 'all' || val === 'rotations')}
           />
         </Col>
         <Col lg={4} className="pl-lg-2 mb-2">
           <Form.Label>{t('posts.analysis.skill.tips')}</Form.Label>
           <MarkdownInput
-            rows={5} onChanged={onAnyInputChanged(onTipsChanged)} value={tips}
+            rows={7} onChanged={onAnyInputChanged(onTipsChanged)} value={tips}
             required={required.some((val) => val === 'all' || val === 'tips')}
           />
         </Col>

diff --git a/src/components/elements/posts/quest/form.tsx b/src/components/elements/posts/quest/form.tsx
@@ -197,7 +197,7 @@ export const QuestPostForm = ({post, fnSendRequest}: QuestPostFormProps) => {
     <>
       <h5>{t('posts.manage.modify_note')}</h5>
       <Row>
-        <Col><MarkdownInput onChanged={onModifyNoteChanged} rows={5}/></Col>
+        <Col><MarkdownInput onChanged={onModifyNoteChanged} rows={3}/></Col>
       </Row>
     </>
   );

diff --git a/src/main.tsx b/src/main.tsx
@@ -21,6 +21,7 @@ import {
   QuestPage,
 } from './components/pages';
 import Path from './constants/path';
+import {SiteAlert} from './siteAlert';
 import {GoogleAnalytics} from './utils/services/ga';
 
 
@@ -152,6 +153,8 @@ const PageMain = () => {
     <>
       <Navigation ref={ref}/>
 
+      <SiteAlert/>
+
       <Container className="p-3">
         <PageContent updatePageTitle={updatePageTitle}/>
       </Container>

diff --git a/src/siteAlert.tsx b/src/siteAlert.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import {Alert} from 'react-bootstrap';
+import {useTranslation} from 'react-i18next';
+import {Markdown} from './components/elements/markdown/main';
+
+export const SiteAlert = () => {
+  const {t} = useTranslation();
+
+  return (
+    <Alert variant="info"> <Markdown>{t('message.info.donation')}</Markdown></Alert>
+  );
+};