Data.json new structure fix

src/components/QuestionSearchResult.js

@@ -5,7 +5,7 @@ import Questions from './Questions.js'
 import constants from '../constants.json'
 
 class QuestionSearchResult extends PureComponent {
-  render () {
+  render() {
     const { data, searchTerm, onChange, deleteQuestion } = this.props
 
     let subjs = []
@@ -16,14 +16,17 @@ class QuestionSearchResult extends PureComponent {
     }
 
     if (searchTerm) {
-      subjs = data.Subjects.reduce((acc, subj) => {
+      subjs = data.reduce((acc, subj) => {
         const resultQuestions = subj.Questions.reduce((qacc, question) => {
-          const keys = [ 'Q', 'A', 'data' ]
+          const keys = ['Q', 'A', 'data']
           keys.some((key) => {
             if (typeof question[key] !== 'string') {
               return false
             }
-            if (question[key] && question[key].toLowerCase().includes(searchTerm.toLowerCase())) {
+            if (
+              question[key] &&
+              question[key].toLowerCase().includes(searchTerm.toLowerCase())
+            ) {
               qacc.push(question)
               return true
             }
@@ -34,20 +37,22 @@ class QuestionSearchResult extends PureComponent {
           acc.push({
             Name: subj.Name,
             Questions: resultQuestions,
-            ind: subj.ind
+            ind: subj.ind,
           })
         }
         return acc
       }, [])
       results = subjs.reduce(countReducer, 0)
     } else {
-      results = data.Subjects.reduce(countReducer, 0)
+      results = data.reduce(countReducer, 0)
     }
 
     const renderCount = () => {
       return (
         <div>
-          {searchTerm ? '' : 'Kezdj el írni kereséshez!'} {results} {searchTerm ? 'találat' : 'kérdés' } {searchTerm ? subjs.length : data.Subjects.length} tárgy
+          {searchTerm ? '' : 'Kezdj el írni kereséshez!'} {results}{' '}
+          {searchTerm ? 'találat' : 'kérdés'}{' '}
+          {searchTerm ? subjs.length : data.length} tárgy
         </div>
       )
     }
@@ -56,10 +61,8 @@ class QuestionSearchResult extends PureComponent {
       return renderCount()
     } else {
       return (
-        <div >
-          <div>
-            {renderCount()}
-          </div>
+        <div>
+          <div>{renderCount()}</div>
           <div>
             <Questions
               deleteQuestion={deleteQuestion}

src/components/SubjectSelector.js

@@ -1,27 +1,26 @@
 import styles from './SubjectSelector.module.css'
 
-export default function SubjectSelector (props) {
+export default function SubjectSelector(props) {
   const { activeSubjName, searchTerm, data, onSubjSelect } = props
 
   return (
     <div className={styles.subjectSelector}>
-      {data.Subjects.map((subj, i) => {
+      {data.map((subj, i) => {
         if (!subj.Name.toLowerCase().includes(searchTerm.toLowerCase())) {
           return null
         }
 
         return (
           <div
-            className={activeSubjName === subj.Name
-              ? 'subjItem activeSubjItem'
-              : 'subjItem'
+            className={
+              activeSubjName === subj.Name
+                ? 'subjItem activeSubjItem'
+                : 'subjItem'
             }
             key={i}
             onClick={() => onSubjSelect(subj.Name)}
           >
-            <span className={styles.subjName}>
-              {subj.Name}
-            </span>
+            <span className={styles.subjName}>{subj.Name}</span>
             <span className={styles.questionCount}>
               [ {subj.Questions.length} ]
             </span>

src/components/subjectView.js

@@ -6,7 +6,7 @@ import SubjectSelector from '../components/SubjectSelector.js'
 
 import styles from './subjectView.module.css'
 
-export default function SubjectView (props) {
+export default function SubjectView(props) {
   const { data, onChange, deleteQuestion } = props
   const [activeSubjName, setActiveSubjName] = useState('')
   const [searchTerm, setSearchTerm] = useState('')
@@ -15,14 +15,16 @@ export default function SubjectView (props) {
   const [qCount, setQCount] = useState(0)
 
   useEffect(() => {
-    setSCount(data.Subjects.length)
-    setQCount(data.Subjects.reduce((acc, subj) => {
-      return acc + subj.Questions.length
-    }, 0))
+    setSCount(data.length)
+    setQCount(
+      data.reduce((acc, subj) => {
+        return acc + subj.Questions.length
+      }, 0)
+    )
   }, [])
 
   if (data) {
-    let currSubj = data.Subjects.find((subj) => {
+    let currSubj = data.find((subj) => {
       return subj.Name === activeSubjName
     })
 
@@ -30,11 +32,13 @@ export default function SubjectView (props) {
       <div>
         <div className={styles.searchContainer}>
           <input
-            placeholder='Keresés...'
+            placeholder="Keresés..."
             className={styles.searchBar}
-            type='text'
+            type="text"
             value={searchTerm}
-            onChange={(e) => { setSearchTerm(e.target.value) }}
+            onChange={(e) => {
+              setSearchTerm(e.target.value)
+            }}
           />
           <button
             onClick={() => {
@@ -42,7 +46,7 @@ export default function SubjectView (props) {
             }}
             className={styles.clearButton}
           >
-             X
+            X
           </button>
         </div>
         <hr />
@@ -50,7 +54,9 @@ export default function SubjectView (props) {
           data={data}
           activeSubjName={activeSubjName}
           searchTerm={searchTerm}
-          onSubjSelect={(subjName) => { setActiveSubjName(subjName) }}
+          onSubjSelect={(subjName) => {
+            setActiveSubjName(subjName)
+          }}
         />
         <hr />
         <div>
@@ -66,8 +72,6 @@ export default function SubjectView (props) {
       </div>
     )
   } else {
-    return (
-      <LoadingIndicator />
-    )
+    return <LoadingIndicator />
   }
 }