From 6220e4f63faed0ff40696c5d80beaabfe1fcded4 Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Sat, 13 Apr 2024 10:30:04 -0500 Subject: [PATCH 1/4] Remove unused defaultProps The defaultProps are not used, and may be a relic of previous error page function. --- client/homebrew/pages/errorPage/errorPage.jsx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/client/homebrew/pages/errorPage/errorPage.jsx b/client/homebrew/pages/errorPage/errorPage.jsx index 33da05017..113c152d0 100644 --- a/client/homebrew/pages/errorPage/errorPage.jsx +++ b/client/homebrew/pages/errorPage/errorPage.jsx @@ -13,15 +13,6 @@ const ErrorIndex = require('./errors/errorIndex.js'); const ErrorPage = createClass({ displayName : 'ErrorPage', - getDefaultProps : function() { - return { - ver : '0.0.0', - errorId : '', - text : '# Oops \n We could not find a brew with that id. **Sorry!**', - error : {} - }; - }, - render : function(){ const errorText = ErrorIndex(this.props)[this.props.brew.HBErrorCode.toString()] || ''; From ff84ded5472d4e949615d237e6e3fc8c10b4fef5 Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Sat, 13 Apr 2024 11:10:43 -0500 Subject: [PATCH 2/4] Convert page to functional component --- client/homebrew/pages/errorPage/errorPage.jsx | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/client/homebrew/pages/errorPage/errorPage.jsx b/client/homebrew/pages/errorPage/errorPage.jsx index 113c152d0..f57a63fa2 100644 --- a/client/homebrew/pages/errorPage/errorPage.jsx +++ b/client/homebrew/pages/errorPage/errorPage.jsx @@ -1,32 +1,24 @@ -require('./errorPage.less'); -const React = require('react'); -const createClass = require('create-react-class'); -const _ = require('lodash'); -const cx = require('classnames'); +import './errorPage.less'; +import React from 'react'; +import UIPage from '../basePages/uiPage/uiPage.jsx'; +import Markdown from '../../../../shared/naturalcrit/markdown.js'; +import ErrorIndex from './errors/errorIndex.js'; -const UIPage = require('../basePages/uiPage/uiPage.jsx'); +const ErrorPage = ({ brew })=>{ + const errorText = ErrorIndex({ brew })[brew.HBErrorCode.toString()] || ''; -const Markdown = require('../../../../shared/naturalcrit/markdown.js'); - -const ErrorIndex = require('./errors/errorIndex.js'); - -const ErrorPage = createClass({ - displayName : 'ErrorPage', - - render : function(){ - const errorText = ErrorIndex(this.props)[this.props.brew.HBErrorCode.toString()] || ''; - - return + return ( +
-

{`Error ${this.props.brew.status || '000'}`}

-

{this.props.brew.text || 'No error text'}

+

{`Error ${brew?.status || '000'}`}

+

{brew?.text || 'No error text'}


- ; - } -}); + + ); +}; module.exports = ErrorPage; From 52904eea09daeb2f0f718ec23195f5500531a26e Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Sat, 13 Apr 2024 20:47:38 -0500 Subject: [PATCH 3/4] add a comment --- client/homebrew/pages/errorPage/errorPage.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/homebrew/pages/errorPage/errorPage.jsx b/client/homebrew/pages/errorPage/errorPage.jsx index f57a63fa2..899de0d6c 100644 --- a/client/homebrew/pages/errorPage/errorPage.jsx +++ b/client/homebrew/pages/errorPage/errorPage.jsx @@ -5,6 +5,7 @@ import Markdown from '../../../../shared/naturalcrit/markdown.js'; import ErrorIndex from './errors/errorIndex.js'; const ErrorPage = ({ brew })=>{ + // Retrieving the error text based on the brew's error code from ErrorIndex const errorText = ErrorIndex({ brew })[brew.HBErrorCode.toString()] || ''; return ( From c0a8b79acc09e45d07a2c23c799095623af31995 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 30 Apr 2024 13:40:39 -0400 Subject: [PATCH 4/4] Small tweak --- client/homebrew/pages/errorPage/errorPage.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/homebrew/pages/errorPage/errorPage.jsx b/client/homebrew/pages/errorPage/errorPage.jsx index 899de0d6c..387a99b02 100644 --- a/client/homebrew/pages/errorPage/errorPage.jsx +++ b/client/homebrew/pages/errorPage/errorPage.jsx @@ -1,8 +1,8 @@ -import './errorPage.less'; -import React from 'react'; -import UIPage from '../basePages/uiPage/uiPage.jsx'; -import Markdown from '../../../../shared/naturalcrit/markdown.js'; -import ErrorIndex from './errors/errorIndex.js'; +require('./errorPage.less'); +const React = require('react'); +const UIPage = require('../basePages/uiPage/uiPage.jsx'); +const Markdown = require('../../../../shared/naturalcrit/markdown.js'); +const ErrorIndex = require('./errors/errorIndex.js'); const ErrorPage = ({ brew })=>{ // Retrieving the error text based on the brew's error code from ErrorIndex