Merge pull request #38 from RaeNon/develop

LANG_003a & LANG_004 Hotfix, classNames and next/link import
sw20-tug · Apr 29, 2020 · 8da8c03 · 8da8c03
2 parents 7dc2ff5 + 97a2fc4
commit 8da8c03
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/client/pages/edit_vocabulary.js b/client/pages/edit_vocabulary.js
@@ -2,7 +2,7 @@ import InputGroup from 'react-bootstrap/InputGroup';
 import FormControl from 'react-bootstrap/FormControl';
 import { Form } from 'react-bootstrap';
 import Button from 'react-bootstrap/Button';
-import Link from 'next/Link';
+import Link from 'next/link';
 
 class EditVocabulary extends React.Component {
     constructor(props) {

diff --git a/client/pages/study_interface/DE.js b/client/pages/study_interface/DE.js
@@ -4,10 +4,6 @@ import { Container, Button, useRouter, Link, List } from "next/app";
 import { DropdownButton, Dropdown } from "react-bootstrap";
 
 class StudyInterface extends React.Component {
-    /* constructor(props) {
-         super(props);
-     }
- */
     constructor() {
         super();
         this.state = {
@@ -51,11 +47,11 @@ class StudyInterface extends React.Component {
                                         <td>{element.translations.DE}</td>
                                         <td>
                                             <Container>
-                                                EN:<div class="overlay" id={id}>
+                                                EN:<div className="overlay" id={id}>
                                                 {element.translations.EN}
                                                     </div> 
                                                     <br/>
-                                                FR:<div class="overlay" id={id}>
+                                                FR:<div className="overlay" id={id}>
                                                     {element.translations.FR}
                                                     </div>
                                             </Container>
@@ -74,14 +70,6 @@ class StudyInterface extends React.Component {
         );
     }
 }
-/*
-StudyInterface.getInitialProps = async function () {
-    const res = await fetch('http://localhost:8080/api/vocabulary')
-    const data = await res.json()
-    return {
-        vocabs: data.vocabulary
-    }
-}*/
 
 export default StudyInterface;
 
diff --git a/client/pages/study_interface/EN.js b/client/pages/study_interface/EN.js
@@ -51,11 +51,11 @@ class StudyInterface extends React.Component {
                                         <td>{element.translations.EN}</td>
                                         <td>
                                             <Container>
-                                                DE:<div class="overlay" id={id}>
+                                                DE:<div className="overlay" id={id}>
                                                 {element.translations.DE}
                                                     </div> 
                                                     <br/>
-                                                FR:<div class="overlay" id={id}>
+                                                FR:<div className="overlay" id={id}>
                                                     {element.translations.FR}
                                                     </div>
                                             </Container>

diff --git a/client/pages/study_interface/FR.js b/client/pages/study_interface/FR.js
@@ -51,11 +51,11 @@ class StudyInterface extends React.Component {
                                         <td>{element.translations.FR}</td>
                                         <td>
                                             <Container>
-                                                DE:<div class="overlay" id={id}>
+                                                DE:<div className="overlay" id={id}>
                                                 {element.translations.DE}
                                                     </div> 
                                                     <br/>
-                                                EN:<div class="overlay" id={id}>
+                                                EN:<div className="overlay" id={id}>
                                                     {element.translations.EN}
                                                     </div>
                                             </Container>