diff --git a/.eslintrc.js b/.eslintrc.js index 6d44a27..f572f7a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -18,7 +18,7 @@ module.exports = { 'no-prototype-builtins': 'off', 'id-length': [ 'warn', - { exceptions: ['x', 'i', 'j', 't', 'Q', 'A', 'C', 'q', 'a', 'b'] }, + { exceptions: ['x', 'i', 'j', 't', 'Q', 'A', 'C', 'q', 'a', 'b', 'e'] }, ], }, root: true, diff --git a/.gitignore b/.gitignore index 1f18056..f9ef1ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ node_modules/ .next/ out/ - /.vs +public/ diff --git a/src/components/Button.js b/src/components/Button.js index 8cda1d4..8395434 100644 --- a/src/components/Button.js +++ b/src/components/Button.js @@ -1,13 +1,11 @@ import styles from './button.module.css' -export default function Button (props) { +export default function Button(props) { return (
-
- {props.text} -
+
{props.text}
diff --git a/src/components/Question.js b/src/components/Question.js index 549d512..8c100db 100644 --- a/src/components/Question.js +++ b/src/components/Question.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react' class Question extends PureComponent { - render () { + render() { const { question } = this.props let qdata = question.data @@ -15,16 +15,10 @@ class Question extends PureComponent { } return ( -
-
- {question.Q} -
-
- {question.A} -
-
- {qdata || null} -
+
+
{question.Q}
+
{question.A}
+
{qdata || null}
) } diff --git a/src/components/Questions.js b/src/components/Questions.js index b2107cf..d1c0555 100644 --- a/src/components/Questions.js +++ b/src/components/Questions.js @@ -5,7 +5,7 @@ import Question from './Question.js' import styles from './Questions.module.css' class Questions extends PureComponent { - render () { + render() { const { subjs } = this.props return ( @@ -13,16 +13,9 @@ class Questions extends PureComponent { {subjs.map((subj, i) => { return (
-
- {subj.Name} -
- { subj.Questions.map((question, i) => { - return ( - - ) +
{subj.Name}
+ {subj.Questions.map((question, i) => { + return })}
) diff --git a/src/components/Subject.js b/src/components/Subject.js index 8235b5e..cd88281 100644 --- a/src/components/Subject.js +++ b/src/components/Subject.js @@ -3,26 +3,19 @@ import React, { PureComponent } from 'react' import Question from './Question.js' class Subject extends PureComponent { - render () { + render() { const { subj } = this.props if (subj) { return ( -
+
{subj.Questions.map((question, i) => { - return ( - - ) + return })}
) } else { - return ( -
- ) + return
} } } diff --git a/src/components/SubjectSelector.js b/src/components/SubjectSelector.js index 3918c99..735add3 100644 --- a/src/components/SubjectSelector.js +++ b/src/components/SubjectSelector.js @@ -1,10 +1,10 @@ import styles from './SubjectSelector.module.css' -export default function SubjectSelector (props) { +export default function SubjectSelector(props) { const { activeSubjName, searchTerm, data, onSubjSelect } = props return ( -
+
{data.map((subj, i) => { if (!subj.Name.toLowerCase().includes(searchTerm.toLowerCase())) { return null @@ -12,16 +12,15 @@ export default function SubjectSelector (props) { return (
onSubjSelect(subj.Name)} > - - {subj.Name} - + {subj.Name} [ {subj.Questions.length} ] diff --git a/src/components/comments.js b/src/components/comments.js new file mode 100644 index 0000000..5323f09 --- /dev/null +++ b/src/components/comments.js @@ -0,0 +1,227 @@ +import React, { useState } from 'react' + +import ReactButton from './reactButton.js' +import Modal from './modal.js' + +import styles from './comments.module.css' + +function CommentInput({ onSubmit, onCancel }) { + const [val, setVal] = useState('') + return ( +
+