Conflict fix

Raandino · May 17, 2020 · 8b58758 · 8b58758
2 parents ed33e8d + 7e2db00
commit 8b58758
Show file tree

Hide file tree

Showing 4 changed files with 9,131 additions and 2 deletions.
diff --git a/js/app/components/Navbar.js b/js/app/components/Navbar.js
@@ -4,13 +4,19 @@ import { Button } from 'antd/lib/button/button';
 
 
 const Navbar = (props) => {
+<<<<<<< HEAD
     return (
     <nav>
         <Button type='primary'>
             <Link activeClassName="active" href="/"> Todo page</Link>
+=======
+    return (<nav>
+        <Button type='pri'>
+            <Link activeClassName="active" href="/">! Todo page !</Link>
+>>>>>>> 7e2db008e5374bf984c51e053622f1eb58462878
         </Button>
         <Button>
-            <Link activeClassName="active" href="/login"> Login page</Link>
+            <Link activeClassName="active" href="/login">! Login page !</Link>
         </Button>
     </nav>
     )

diff --git a/js/app/components/test.js b/js/app/components/test.js
@@ -0,0 +1,28 @@
+import { h} from 'preact';
+
+function TodoItems() {
+  return (
+    <ul>
+      <li>A</li>
+      <li>B</li>
+      <li>C</li>
+    </ul>
+  )
+}
+
+export default TodoItems;
+//const App = (
+//  <ul>
+//    <TodoItems />
+//    <li>D</li>
+//  </ul>
+//);
+
+//render(App, container);
+// Renders:
+// <ul>
+//   <li>A</li>
+//   <li>B</li>
+//   <li>C</li>
+//   <li>D</li>
+// </ul>
diff --git a/js/app/pages/TodoPage.js b/js/app/pages/TodoPage.js
@@ -1,11 +1,12 @@
 import  { h, Fragment } from 'preact'
-
+import TodoItems from '../components/test'
 
 const TodoPage = (props) => {
 
     return (
     <Fragment>
         <h1> Todo Page</h1>
+        <TodoItems></TodoItems>
     </Fragment>