From 649f942ea2058b25d1233b68d7695538c062872a Mon Sep 17 00:00:00 2001
From: Albert Ruan <berty.ruan@gmail.com>
Date: Thu, 2 Mar 2023 20:15:43 +0800
Subject: [PATCH] adds error message for wrong input

---
 .../Control-Template.component.jsx            | 31 ++++++++++++-------
 .../Control-Template.styles.css               |  8 +++++
 src/redux/control/control.reducer.js          |  4 +++
 src/redux/control/control.selectors.js        |  2 ++
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/Components/Control-Template/Control-Template.component.jsx b/src/Components/Control-Template/Control-Template.component.jsx
index 7b18883..96a538f 100644
--- a/src/Components/Control-Template/Control-Template.component.jsx
+++ b/src/Components/Control-Template/Control-Template.component.jsx
@@ -2,10 +2,10 @@ import React from 'react';
 import './Control-Template.styles.css';
 import { createStructuredSelector } from 'reselect';
 import { connect } from 'react-redux';
-import { selectLevel, selectSpellInput } from '../../redux/control/control.selectors';
+import { selectLevel, selectSpellInput, selectErrorMessage } from '../../redux/control/control.selectors';
 import { HandleSpellInputChange, OnSpellSubmit } from '../../redux/control/control.actions';
 
-const ControlTemplate = ({ submitSpell, spell_input, hints, headerText, level, handleChange }) => {
+const ControlTemplate = ({ submitSpell, spell_input, hints, headerText, level, handleChange, error_message }) => {
   //they are the only unique things to each Control //level comes from reducer now
   //the caveat of using controlTemplate is that ,now , we have to clear our spell_input every time a user submit the spell correctly
   //to make classnames dynamic to the level value.
@@ -22,18 +22,24 @@ const ControlTemplate = ({ submitSpell, spell_input, hints, headerText, level, h
           {hints}
 
           <p className='hint'>Don't forget to finish your spell with semicolon &#59; </p>
-          <p>#fire_spell &#123;</p>
-          <p>display: flex;</p>
           <section>
-            <textarea
-              className='control_input'
-              type='input'
-              value={spell_input} //to clear the textarea with redux
-              onChange={handleChange}
-              autoFocus={true}
-              required={true}
-            />
+            <p>#board &#123;</p>
+            <div className="code_indent">
+              <p>display: flex;</p>
+              <textarea
+                className='control_input'
+                type='input'
+                value={spell_input} //to clear the textarea with redux
+                onChange={handleChange}
+                autoFocus={true}
+                required={true}
+              />
+            </div>
+            
             <p>&#125;</p>
+            {
+              error_message && <span className='error_message'> {error_message} </span>
+            }
             <div className='control_submit'>
               <button className='record_btn' onClick={() => submitSpell(level)}>
                 Next
@@ -49,6 +55,7 @@ const ControlTemplate = ({ submitSpell, spell_input, hints, headerText, level, h
 const mapStateToProps = createStructuredSelector({
   level: selectLevel,
   spell_input: selectSpellInput,
+  error_message: selectErrorMessage,
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/src/Components/Control-Template/Control-Template.styles.css b/src/Components/Control-Template/Control-Template.styles.css
index 5740dc5..14b4507 100644
--- a/src/Components/Control-Template/Control-Template.styles.css
+++ b/src/Components/Control-Template/Control-Template.styles.css
@@ -35,4 +35,12 @@
 .control_submit{
     display: flex;
     justify-content: flex-end;
+}
+
+.error_message {
+    color: red;
+}
+
+.code_indent {
+    padding-left: 2rem;
 }
\ No newline at end of file
diff --git a/src/redux/control/control.reducer.js b/src/redux/control/control.reducer.js
index 6f9c852..04bc0be 100644
--- a/src/redux/control/control.reducer.js
+++ b/src/redux/control/control.reducer.js
@@ -9,6 +9,7 @@ const INITIAL_STATE = {
   fire_spell: {}, //this is input that users type on <input />
   spell_input: '',
   levels: new Levels(), //an object with all of the levels
+  error_message: ""
 };
 
 const ControlReducer = (state = INITIAL_STATE, action) => {
@@ -20,16 +21,19 @@ const ControlReducer = (state = INITIAL_STATE, action) => {
         score: state.score + 100,
         spell_input: '',
         fire_spell: {},
+        error_message: "",
       };
     case ControlActionTypes.INCORRECT_SPELL_INPUT:
       return {
         ...state, //we can decrease scores or show errors from here if we want
+        error_message: `Oops, your spell misfired!`,
       };
     case ControlActionTypes.SPELL_INPUT_CHANGE:
       return {
         ...state,
         spell_input: action.payload,
         fire_spell: SpellParsing(state.spell_input),
+        error_message: "",
       };
     default:
       return state;
diff --git a/src/redux/control/control.selectors.js b/src/redux/control/control.selectors.js
index 99f0e59..e3e46cc 100644
--- a/src/redux/control/control.selectors.js
+++ b/src/redux/control/control.selectors.js
@@ -11,3 +11,5 @@ export const selectScore = createSelector([selectControl], control => control.sc
 export const selectFireSpell = createSelector([selectControl], control => control.fire_spell);
 
 export const selectSpellInput = createSelector([selectControl], control => control.spell_input);
+
+export const selectErrorMessage = createSelector([selectControl], control => control.error_message);
\ No newline at end of file