From d46de52aa2cce329f2ca96db331c210ca99ec638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?= Date: Sat, 16 Jul 2022 00:15:17 +0200 Subject: [PATCH] GH-230 Move feedback messages to their own component --- modules/overview/_includes.php | 2 + .../FeedbackMessagesDisplay.component.php | 39 +++++++++++++++++++ .../FeedbackMessagesDisplay.utils.php | 29 ++++++++++++++ .../FeedbackMessagesDisplay/index.php | 5 +++ .../FeedbackMessagesDisplay/messageRow.tpl | 5 +++ overview.php | 22 ++--------- 6 files changed, 83 insertions(+), 19 deletions(-) create mode 100644 modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.component.php create mode 100644 modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.utils.php create mode 100644 modules/overview/screens/Overview/components/FeedbackMessagesDisplay/index.php create mode 100644 modules/overview/screens/Overview/components/FeedbackMessagesDisplay/messageRow.tpl diff --git a/modules/overview/_includes.php b/modules/overview/_includes.php index 388fd86cc..91a1dd803 100644 --- a/modules/overview/_includes.php +++ b/modules/overview/_includes.php @@ -27,6 +27,8 @@ include($includePath . './screens/Overview/components/AccountActivationInfoBox/AccountActivationInfoBox.component.php'); include($includePath . './screens/Overview/components/AdminAlerts/AdminAlerts.component.php'); include($includePath . './screens/Overview/components/EmailChangeInfo/EmailChangeInfo.component.php'); + include($includePath . './screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.component.php'); + include($includePath . './screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.utils.php'); include($includePath . './screens/Overview/components/GiftItemsInfoBox/GiftItemsInfoBox.component.php'); include($includePath . './screens/Overview/components/Morale/Morale.component.php'); include($includePath . './screens/Overview/components/Morale/Morale.utils.php'); diff --git a/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.component.php b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.component.php new file mode 100644 index 000000000..833408b1d --- /dev/null +++ b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.component.php @@ -0,0 +1,39 @@ + '', + ]; + } + + $localTemplateLoader = createLocalTemplateLoader(__DIR__); + $tplBodyCache = [ + 'messageRow' => $localTemplateLoader('messageRow'), + ]; + + $parsedMessages = array_map_withkeys($messages, function ($message) use (&$tplBodyCache) { + return parsetemplate( + $tplBodyCache['messageRow'], + $message + ); + }); + + $componentHTML = implode('', $parsedMessages); + + return [ + 'componentHTML' => $componentHTML, + ]; +} + +?> diff --git a/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.utils.php b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.utils.php new file mode 100644 index 000000000..a264a31af --- /dev/null +++ b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/FeedbackMessagesDisplay.utils.php @@ -0,0 +1,29 @@ + $_Lang['Abandon_ColonyAbandoned'], + 'colorClass' => 'lime', + ]; + } + + return $messages; +} + +?> diff --git a/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/index.php b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/index.php new file mode 100644 index 000000000..bc99142d1 --- /dev/null +++ b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/index.php @@ -0,0 +1,5 @@ + diff --git a/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/messageRow.tpl b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/messageRow.tpl new file mode 100644 index 000000000..374b38298 --- /dev/null +++ b/modules/overview/screens/Overview/components/FeedbackMessagesDisplay/messageRow.tpl @@ -0,0 +1,5 @@ + + + {messageContent} + + diff --git a/overview.php b/overview.php index a44a21eed..0d188cc46 100644 --- a/overview.php +++ b/overview.php @@ -98,25 +98,9 @@ ])['componentHTML']; // --- System Messages Box ------------------------------------------------------------------------------- - if(!empty($_GET['showmsg'])) - { - $SysMsgLoop = 0; - if($_GET['showmsg'] == 'abandon') - { - $ShowSystemMsg[$SysMsgLoop]['txt'] = $_Lang['Abandon_ColonyAbandoned']; - $ShowSystemMsg[$SysMsgLoop]['col'] = 'lime'; - $SysMsgLoop += 1; - } - } - - if(!empty($ShowSystemMsg)) - { - $parse['SystemMsgBox'] = ''; - foreach($ShowSystemMsg as $SystemMsg) - { - $parse['SystemMsgBox'] .= ''.$SystemMsg['txt'].''; - } - } + $parse['SystemMsgBox'] = Overview\Screens\Overview\Components\FeedbackMessagesDisplay\render([ + 'input' => &$_GET, + ])['componentHTML']; // --- New Messages Information Box ---------------------------------------------------------------------- $parse['NewMsgBox'] = Overview\Screens\Overview\Components\NewMessagesInfo\render([