From 8341a62bf624b0c1aaf53762d1dce92a1936fb8f Mon Sep 17 00:00:00 2001 From: Kavi Gupta Date: Tue, 13 Aug 2024 02:12:41 -0400 Subject: [PATCH] pass template info in --- react/src/about.js | 2 +- react/src/components/article-panel.js | 2 +- react/src/components/comparison-panel.js | 4 ++-- react/src/components/mapper-panel.js | 2 +- react/src/components/quiz-panel.js | 2 +- react/src/components/statistic-panel.js | 2 +- react/src/data-credit.js | 2 +- react/src/index.js | 2 +- react/src/page_template/template.js | 8 ++++++-- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/react/src/about.js b/react/src/about.js index 5e60c3ca2..6f1526e35 100644 --- a/react/src/about.js +++ b/react/src/about.js @@ -12,7 +12,7 @@ class AboutPanel extends PageTemplate { super(props); } - main_content() { + main_content(template_info) { return (
About
diff --git a/react/src/components/article-panel.js b/react/src/components/article-panel.js index 201b6d79f..3ef6a2f92 100644 --- a/react/src/components/article-panel.js +++ b/react/src/components/article-panel.js @@ -24,7 +24,7 @@ class ArticlePanel extends PageTemplate { this.map_ref = React.createRef(); } - main_content() { + main_content(template_info) { if (this.props.articleType == undefined) { throw new Error("articleType is undefined"); } diff --git a/react/src/components/comparison-panel.js b/react/src/components/comparison-panel.js index 246f676bb..e112523d2 100644 --- a/react/src/components/comparison-panel.js +++ b/react/src/components/comparison-panel.js @@ -55,7 +55,7 @@ class ComparisonPanel extends PageTemplate { return true; } - main_content() { + main_content(template_info) { const self = this; if (this.props.names == undefined) { throw new Error("ComparisonPanel: names not set"); @@ -96,7 +96,7 @@ class ComparisonPanel extends PageTemplate { include_delete={this.props.datas.length > 1} on_click={() => on_delete(self.props.names, i)} on_change={(x) => on_change(self.props.names, i, x)} - screenshot_mode={this.state.screenshot_mode} + screenshot_mode={template_info.screenshot_mode} />
) )} diff --git a/react/src/components/mapper-panel.js b/react/src/components/mapper-panel.js index 11cebe889..3d60d41fe 100644 --- a/react/src/components/mapper-panel.js +++ b/react/src/components/mapper-panel.js @@ -321,7 +321,7 @@ class MapperPanel extends PageTemplate { return super.render(); } - main_content() { + main_content(template_info) { if (this.state.map_settings === undefined) { throw new Error("MapperPanel.main_content: map settings not set"); } diff --git a/react/src/components/quiz-panel.js b/react/src/components/quiz-panel.js index 17aaf119d..69e9ba82e 100644 --- a/react/src/components/quiz-panel.js +++ b/react/src/components/quiz-panel.js @@ -24,7 +24,7 @@ class QuizPanel extends PageTemplate { this.todays_quiz = this.props.todays_quiz; } - main_content() { + main_content(template_info) { const quiz = this.todays_quiz; const history = this.get_todays_quiz_history(); diff --git a/react/src/components/statistic-panel.js b/react/src/components/statistic-panel.js index 28c17067a..a1e70846e 100644 --- a/react/src/components/statistic-panel.js +++ b/react/src/components/statistic-panel.js @@ -108,7 +108,7 @@ class StatisticPanel extends PageTemplate { return style; } - main_content() { + main_content(template_info) { return
{this.props.rendered_statname}
diff --git a/react/src/data-credit.js b/react/src/data-credit.js index a04c73b67..071b76644 100644 --- a/react/src/data-credit.js +++ b/react/src/data-credit.js @@ -54,7 +54,7 @@ class DataCreditPanel extends PageTemplate { return this._refs[name]; } - main_content() { + main_content(template_info) { return (
Credits
diff --git a/react/src/index.js b/react/src/index.js index 708512053..2c9758756 100644 --- a/react/src/index.js +++ b/react/src/index.js @@ -12,7 +12,7 @@ class IndexPanel extends PageTemplate { super(props); } - main_content() { + main_content(template_info) { return (
diff --git a/react/src/page_template/template.js b/react/src/page_template/template.js index 1027d8f48..7290b67ec 100644 --- a/react/src/page_template/template.js +++ b/react/src/page_template/template.js @@ -41,6 +41,10 @@ class PageTemplate extends React.Component { }) } + const template_info = { + screenshot_mode: this.state.screenshot_mode + } + return ( @@ -57,7 +61,7 @@ class PageTemplate extends React.Component {
@@ -92,7 +96,7 @@ class PageTemplate extends React.Component { } } - main_content() { + main_content(template_info) { // not implemented, should be overridden return (
); }