cosmetics add to home screen etc

lucille-bellepleure · Jun 2, 2019 · 3486411 · 3486411
1 parent b3a3ab4
commit 3486411
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 138 deletions.
diff --git a/public/index.html b/public/index.html
@@ -1,20 +1,41 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <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.0, maximum-scale=1.0, user-scalable=0"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <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" />
-  <!--
+    <meta name="theme-color" content="#000000" />
+    <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-  <!--
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -23,20 +44,27 @@
       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`.
     -->
-  <meta name="mobile-web-app-capable" content="yes" />
-  <meta name="application-name" content="FairDrive" />
-  <meta name="apple-mobile-web-app-capable" content="yes" />
-  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-  <meta name="apple-mobile-web-app-title" content="FairDrive" />
-  <link rel="apple-touch-icon" href="manifest/icon-48x48.png" />
-  <link rel="apple-touch-icon" sizes="180x180" href="manifest/apple-touch-icon.png" />
-  <title>FairDrive</title>
-</head>
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="application-name" content="FairDrive" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta
+      name="apple-mobile-web-app-status-bar-style"
+      content="black-translucent"
+    />
+    <meta name="apple-mobile-web-app-title" content="FairDrive" />
+    <link rel="apple-touch-icon" href="manifest/icon-48x48.png" />
+    <link
+      rel="apple-touch-icon"
+      sizes="180x180"
+      href="manifest/apple-touch-icon.png"
+    />
+    <title>FairDrive</title>
+  </head>
 
-<body>
-  <noscript>You need to enable JavaScript to run this app.</noscript>
-  <div id="root"></div>
-  <!--
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 
@@ -46,6 +74,5 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-</body>
-
-</html>
+  </body>
+</html>
diff --git a/src/pages/Account/AccountRoot.jsx b/src/pages/Account/AccountRoot.jsx
@@ -8,14 +8,11 @@ class Account extends React.Component {
     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 className={styles.brand}>FairDrive / </div>
         </div>
         <div className={styles.innercontainer}>
           <div className={styles.register}>
-            <div className={styles.breadcrumbpath}>Login</div>
+            <div className={styles.loginregistertitle}>Login</div>
             <input type="text" placeholder="Handle" />
             <input type="password" placeholder="Password" />
             <NavLink to="/f">

diff --git a/src/pages/Account/RegisterRoot.jsx b/src/pages/Account/RegisterRoot.jsx
@@ -8,14 +8,14 @@ class Register extends React.Component {
     return (
       <div className={styles.container}>
         <div className={styles.topbar}>
-          <div className={styles.breadcrumb}>FairDrive / </div>
+          <div className={styles.brand}>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>
+            <div className={styles.loginregistertitle}>Register</div>
             <input type="text" placeholder="Handle" />
             <input type="password" placeholder="Password" />
             <input type="password" placeholder="Password check" />

diff --git a/src/pages/Account/WalletRoot.jsx b/src/pages/Account/WalletRoot.jsx
@@ -4,43 +4,42 @@ import { NavLink } from "react-router-dom";
 import { connect } from "react-redux";
 
 class Wallet extends React.Component {
-    render() {
-        return (
-            <div className={styles.container}>
-                <div className={styles.topbar}>
+  render() {
+    return (
+      <div className={styles.container}>
+        <div className={styles.topbar} />
+        <div className={styles.innercontainer}>
+          <div className={styles.register}>
+            <div className={styles.bigbalance}>132.33 FDT</div>
+            <div className={styles.address}>0x...</div>
 
-                </div>
-                <div className={styles.innercontainer}>
-                    <div className={styles.register}>
-                        <div className={styles.breadcrumb}>132.33</div>
-                        <div className={styles.breadcrumbpath}>Send</div>
-                        <input type="text" placeholder="0x..."></input>
-                        <input type="text" placeholder="Amount"></input>
-                        <NavLink to="/f">
-                            <div className={styles.button}>Send</div>
-                        </NavLink>
-
-                    </div>
-                </div>
-            </div>
-        )
-    }
-};
+            <div className={styles.space} />
+            <div className={styles.breadcrumbpath}>Send Fair Data Token</div>
+            <input type="text" placeholder="0x..." />
+            <input type="number" placeholder="Amount" />
+            <NavLink to="/f">
+              <div className={styles.button}>Send</div>
+            </NavLink>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
 
 const mapStateToProps = (_, ownProps) => {
-    const { directory } = (ownProps.match || {}).params || {};
-    // return createStructuredSelector({
-    //   directory: () => directory,
-    //   directories: state => getDirectories(state, directory),
-    // });
+  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 } })
+  //addHashtag: name => dispatch({ type: "ADD_HASHTAG", hashtag: { name } })
 });
 
 export default connect(
-    mapStateToProps,
-    mapDispatchToProps
+  mapStateToProps,
+  mapDispatchToProps
 )(Wallet);
-
diff --git a/src/pages/Files/Directory.jsx b/src/pages/Files/Directory.jsx
@@ -13,12 +13,11 @@ class Directory extends React.Component {
     return (
       <div className={styles.container}>
         <div className={styles.topbar}>
-          <NavLink to="/">
+          <NavLink to="/w">
             <div className={styles.myaccount}>
-              <img className={styles.avatar} src={DefaultAvatar} />
               <div className={styles.handlebalance}>
                 <div className={styles.handle}>KarsRhyder</div>
-                <div className={styles.balance}>124.21 SWT</div>
+                <div className={styles.balance}>124.21 FDT</div>
               </div>
             </div>
           </NavLink>

diff --git a/src/pages/Files/Files.jsx b/src/pages/Files/Files.jsx
@@ -12,12 +12,11 @@ class Files extends React.Component {
     return (
       <div className={styles.container}>
         <div className={styles.topbar}>
-          <NavLink to="/">
+          <NavLink to="/w">
             <div className={styles.myaccount}>
-              <img className={styles.avatar} src={DefaultAvatar} />
               <div className={styles.handlebalance}>
                 <div className={styles.handle}>KarsRhyder</div>
-                <div className={styles.balance}>124.21 SWT</div>
+                <div className={styles.balance}>124.21 FDT</div>
               </div>
             </div>
           </NavLink>