fix merge conflicts

Author: Zhou

src/components/navigationBar/navigationBar.js

@@ -50,7 +50,7 @@ function NavigationBar() {
     }
 
     return(
-    <AppBar position="static" backgroundColor="#224878" elevation={0} className={classes.appBar}>
+    <AppBar position="static" elevation={0} className={classes.appBar}>
     <Toolbar className={classes.toolbar}>
       <Typography variant="h6" color="inherit" align="left" noWrap className={classes.toolbarTitle}>
         Planimation

src/pages/PageOne/dropAndFetch.jsx

@@ -5,26 +5,31 @@ import Container from "@material-ui/core/Container";
 import CloudUploadIcon from "@material-ui/icons/CloudUpload";
 import css from "./index.module.less";
 
+const dragsAndDrops=[
+  { name: "Domain", fileType: ".pddl", desc: "or predictes and actions." },
+  {
+    name: "Problem",
+    fileType: ".pddl",
+    desc: "for objects, initial state and goal.",
+  },
+  {
+    name: "Animation",
+    fileType: ".pddl",
+    desc: "object is representation.",
+  },
+];
 class DropAndFetch extends React.Component {
   constructor(props) {
     super(props);
     this.datas = {};
   }
 
-  state = {
-    dragsAndDrops: [
-      { name: "Domain", fileType: ".pddl", desc: "or predictes and actions." },
-      {
-        name: "Problem",
-        fileType: ".pddl",
-        desc: "for objects, initial state and goal.",
-      },
-      {
-        name: "Animation",
-        fileType: ".pddl",
-        desc: "object is representation.",
-      },
-    ],
+ 
+
+  componentWillUnmount = () => {
+    this.setState = (state, callback) => {
+      return;
+    };
   };
 
   uploadPDDL = async (files) => {
@@ -70,7 +75,7 @@ class DropAndFetch extends React.Component {
       <React.Fragment>
         <div>
           <Container component="main" className={css.dropareaBox}>
-            {this.state.dragsAndDrops.map((drag) => (
+            {dragsAndDrops.map((drag) => (
               <DropZone
                 key={drag.name}
                 name={drag.name}
@@ -80,7 +85,7 @@ class DropAndFetch extends React.Component {
               />
             ))}
           </Container>
-          <Container maxWidth="sm" component="main" marginTop="50">
+          <Container maxWidth="sm" component="main">
             <div className={css.buttonBox}>
               <Button
                 variant="contained"

src/pages/PageOne/index.module.less

@@ -1,36 +1,23 @@
-.buttonBox {
+.dropzoneBox {
   /* 
   background: #fff;
   */
-  display: flex;
+  display: inline-block;
   justify-content: space-around;
+  width: 30%;
   padding: 20px;
 }
 
-.textBox {
-  /* 
-  background: #fff;
-  */
-  display: flex;
-  justify-content: space-around;
+.buttonBox {
   padding: 20px;
-}
-
-.dropzoneBox {
-  /* 
-  background: #fff;
-  */
-  display: inline-block;
+  display: flex;
   justify-content: space-around;
-  width: 30%;
-  padding: 20px;
 }
 
 .dropareaBox {
   /* 
-  background: #fff;
-  */
+background: #fff;
+*/
   display: flex;
   justify-content: space-around;
-  width: 80%;
-}
+}

src/pages/PageTwo/index.js

@@ -167,9 +167,9 @@ class PageTwo extends React.Component {
 
                 </Container>
 
-                <Container maxWidth="sm" component="main"  marginTop="50">
+                <Container maxWidth="sm" component="main">
                 <div className={css.buttonBox}>
-                <Button variant="contained" color="#224878" onClick={this.handleOnClick} text-align="left">Cancel</Button>
+                <Button variant="contained" color="default" onClick={this.handleOnClick} text-align="left">Cancel</Button>
                 <Button  variant="contained" color="primary"  startIcon={<CloudUploadIcon />} onClick={()=>{
                     // eslint-disable-next-line no-restricted-globals
                     location.href = '/page4';

src/tests/App.test.js

@@ -7,6 +7,6 @@ test('renders learn react link', () => {
     <Router>
       <App />
     </Router>);
-  const linkElement = screen.getByText(/this is app/i);
-//   expect(linkElement).toBeInTheDocument();
+  const linkElement = screen.getByText(/Quickly build an visualisation animation form problem or VFG file shows the plan and subplan for each problem./i);
+  expect(linkElement).toBeInTheDocument();
 });