cleanup

lucille-bellepleure · Jun 1, 2019 · b3a3ab4 · b3a3ab4
1 parent 22836e9
commit b3a3ab4
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 136 deletions.
diff --git a/src/pages/Account/AccountRoot.jsx b/src/pages/Account/AccountRoot.jsx
@@ -0,0 +1,49 @@
+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}>Login</div>
+            <input type="text" placeholder="Handle" />
+            <input type="password" placeholder="Password" />
+            <NavLink to="/f">
+              <div className={styles.button}>Unlock</div>
+            </NavLink>
+            <NavLink to="/r" className={styles.createnew}>
+              <div>Create new FairDrive</div>
+            </NavLink>
+          </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/Account/RegisterRoot.jsx b/src/pages/Account/RegisterRoot.jsx
@@ -0,0 +1,50 @@
+import React from "react";
+import styles from "styles.module.css";
+import { NavLink } from "react-router-dom";
+import { connect } from "react-redux";
+
+class Register 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}>Register</div>
+            <input type="text" placeholder="Handle" />
+            <input type="password" placeholder="Password" />
+            <input type="password" placeholder="Password check" />
+            <NavLink to="/f">
+              <div className={styles.button}>Register</div>
+            </NavLink>
+            <NavLink to="/" className={styles.createnew}>
+              <div>Unlock FairDrive</div>
+            </NavLink>
+          </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
+)(Register);
diff --git a/src/pages/WalletRoot.jsx → src/pages/Account/WalletRoot.jsx b/src/pages/WalletRoot.jsx → src/pages/Account/WalletRoot.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import styles from "../styles.module.css";
+import styles from "styles.module.css";
 import { NavLink } from "react-router-dom";
 import { connect } from "react-redux";
 

diff --git a/src/pages/AccountRoot.jsx b/src/pages/AccountRoot.jsx
diff --git a/src/pages/Directory.jsx → src/pages/Files/Directory.jsx b/src/pages/Directory.jsx → src/pages/Files/Directory.jsx
@@ -1,14 +1,12 @@
 import React from "react";
-import styles from "../styles.module.css";
+import styles from "styles.module.css";
 import { NavLink } from "react-router-dom";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import RowFile from "../components/RowFile";
-import DefaultAvatar from "../images/defaultAvatar.png";
+import RowFile from "components/RowFile";
+import DefaultAvatar from "images/defaultAvatar.png";
 
-import {
-  getDirectories
-} from "../services/filebrowser/selectors";
+import { getDirectories } from "services/filebrowser/selectors";
 
 class Directory extends React.Component {
   render() {
@@ -27,18 +25,14 @@ class Directory extends React.Component {
           <div className={styles.breadcrumb}>{this.props.directory}</div>
 
           <NavLink to="/f">
-            <div className={styles.breadcrumbpath}>
-              Back to
-              SwarmDrive /
-        </div>
+            <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>
+                <div className={styles.icons8folder} />
                 <RowFile item={item} />
               </div>
             </NavLink>
@@ -53,7 +47,7 @@ const mapStateToProps = (_, ownProps) => {
   const { directory } = (ownProps.match || {}).params || {};
   return createStructuredSelector({
     directory: () => directory,
-    directories: state => getDirectories(state, directory),
+    directories: state => getDirectories(state, directory)
   });
 };
 
@@ -65,4 +59,3 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(Directory);
-
diff --git a/src/pages/Files.jsx → src/pages/Files/Files.jsx b/src/pages/Files.jsx → src/pages/Files/Files.jsx
@@ -1,13 +1,11 @@
 import React from "react";
-import styles from "../styles.module.css";
+import styles from "styles.module.css";
 import { NavLink } from "react-router-dom";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import RowFile from "../components/RowFile";
-import DefaultAvatar from "../images/defaultAvatar.png";
-import {
-  getDirectories
-} from "../services/filebrowser/selectors";
+import RowFile from "components/RowFile";
+import DefaultAvatar from "images/defaultAvatar.png";
+import { getDirectories } from "services/filebrowser/selectors";
 
 class Files extends React.Component {
   render() {
@@ -23,17 +21,14 @@ class Files extends React.Component {
               </div>
             </div>
           </NavLink>
-          <div className={styles.breadcrumb}>SwarmDrive / </div>
-          <div className={styles.breadcrumbpath}>
-            ~122GB
-        </div>
+          <div className={styles.breadcrumb}>FairDrive / </div>
+          <div className={styles.breadcrumbpath}>~122GB</div>
         </div>
         <div className={styles.innercontainer}>
-
           {this.props.directories.map(item => (
             <NavLink to={"d/" + item.name}>
               <div className={styles.directoryrow}>
-                <div className={styles.icons8folder}></div>
+                <div className={styles.icons8folder} />
                 <RowFile item={item} />
               </div>
             </NavLink>
@@ -44,7 +39,6 @@ class Files extends React.Component {
   }
 }
 
-
 const mapStateToProps = createStructuredSelector({
   directories: getDirectories
 });
@@ -57,4 +51,3 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(Files);
-
diff --git a/src/pages/RegisterRoot.jsx b/src/pages/RegisterRoot.jsx
diff --git a/src/pages/index.js b/src/pages/index.js
@@ -1,8 +1,8 @@
-import Files from "./Files";
-import Directory from "./Directory";
-import Account from "./AccountRoot";
-import Register from "./RegisterRoot";
-import Wallet from "./WalletRoot";
+import Files from "./Files/Files";
+import Directory from "./Files/Directory";
+import Account from "./Account/AccountRoot";
+import Register from "./Account/RegisterRoot";
+import Wallet from "./Account/WalletRoot";
 
 export default [
   { path: "/", exact: true, component: Account },