second commit

lucille-bellepleure · May 28, 2019 · 2b07720 · 2b07720
1 parent f59ca3c
commit 2b07720
Show file tree

Hide file tree

Showing 15 changed files with 379 additions and 28 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,10 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
+<link rel="mask-icon" href="/images/safari-pinned-tab.svg" color="#5bbad5">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <!--
@@ -19,7 +22,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>FairDrive</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/images/android-chrome-192x192.png b/src/images/android-chrome-192x192.png
diff --git a/src/images/android-chrome-512x512.png b/src/images/android-chrome-512x512.png
diff --git a/src/images/apple-touch-icon.png b/src/images/apple-touch-icon.png
diff --git a/src/images/favicon-16x16.png b/src/images/favicon-16x16.png
diff --git a/src/images/favicon-32x32.png b/src/images/favicon-32x32.png
diff --git a/src/images/favicon.ico b/src/images/favicon.ico
diff --git a/src/images/mstile-150x150.png b/src/images/mstile-150x150.png
diff --git a/src/images/safari-pinned-tab.svg b/src/images/safari-pinned-tab.svg
diff --git a/src/pages/AccountRoot.jsx b/src/pages/AccountRoot.jsx
@@ -0,0 +1,53 @@
+import React from "react";
+import styles from "../styles.module.css";
+import { NavLink } from "react-router-dom";
+import { connect } from "react-redux";
+
+class Account extends React.Component {
+    render() {
+        return (
+            <div className={styles.container}>
+                <div className={styles.topbar}>
+                    <div className={styles.breadcrumb}>FairDrive / </div>
+                    {/* <div className={styles.breadcrumbpath}>
+        by Fair Data Society
+        </div> */}
+
+                </div>
+                <div className={styles.innercontainer}>
+                    <div className={styles.register}>
+                        <div className={styles.breadcrumbpath}>Unlock</div>
+                        <input type="text" placeholder="Email"></input>
+                        <input type="password" placeholder="Password"></input>
+                        <div className={styles.button}>Unlock</div>
+                    </div>
+                    <div className={styles.register}>
+                        <div className={styles.breadcrumbpath}>Register</div>
+                        <input type="text" placeholder="Email"></input>
+                        <input type="password" placeholder="Password"></input>
+                        <input type="password" placeholder="Password again"></input>
+                        <div className={styles.button}>Register</div>
+                    </div>
+                </div>
+            </div>
+        )
+    }
+};
+
+const mapStateToProps = (_, ownProps) => {
+    const { directory } = (ownProps.match || {}).params || {};
+    // return createStructuredSelector({
+    //   directory: () => directory,
+    //   directories: state => getDirectories(state, directory),
+    // });
+};
+
+const mapDispatchToProps = dispatch => ({
+    //addHashtag: name => dispatch({ type: "ADD_HASHTAG", hashtag: { name } })
+});
+
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(Account);
+
diff --git a/src/pages/Directory.jsx b/src/pages/Directory.jsx
@@ -12,27 +12,32 @@ import {
 class Directory extends React.Component {
   render() {
     return (
-  <div className={styles.container}>
-    <div className={styles.topbar}>
-      <div className={styles.breadcrumb}> {this.props.directory}</div>
-      <div className={styles.breadcrumbpath}>
-        Back to 
-        FairDrive /</div>
-        <i className={styles.flaticon}>abcdefg</i>
-    </div>
-    <div className={styles.innercontainer}>
-            {this.props.directories.map(item => (
-               <NavLink to={item} key={item}>
-                 <div className={styles.directoryrow}>
-                 <div className={styles.icons8folder}></div>
-                 <RowFile name={item} />
-                 </div>
-               </NavLink>
-            ))}
-    </div> 
-    </div>
+      <div className={styles.container}>
+        <div className={styles.topbar}>
+          <div className={styles.breadcrumb}> {this.props.directory}</div>
+
+          <NavLink to="/">
+            <div className={styles.breadcrumbpath}>
+              Back to
+              FairDrive /
+        </div>
+          </NavLink>
+
+        </div>
+        <div className={styles.innercontainer}>
+          {this.props.directories.map(item => (
+            <NavLink to={"d/" + item} key={item}>
+              <div className={styles.directoryrow}>
+                <div className={styles.icons8folder}></div>
+                <RowFile name={item} />
+              </div>
+            </NavLink>
+          ))}
+        </div>
+      </div>
     );
-  }}
+  }
+}
 
 const mapStateToProps = (_, ownProps) => {
   const { directory } = (ownProps.match || {}).params || {};

diff --git a/src/pages/Files.jsx b/src/pages/Files.jsx
@@ -19,7 +19,7 @@ class Files extends React.Component {
     <div className={styles.innercontainer}>
 
             {this.props.directories.map(item => (
-               <NavLink to={item}>
+               <NavLink to={"d/" + item}>
                  <div className={styles.directoryrow}>
                  <div className={styles.icons8folder}></div>
                  <RowFile name={item} />