kayroy247 · Timidan · Feb 3, 2021 · Feb 4, 2021 · Feb 4, 2021 · Feb 6, 2021
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,18 @@
 node_modules/
 ReactFrontend/
-build/
-.vscode/
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 * `yarn dev` - This starts the local server
 
 ### To Test on Live server
-- Go To  [SafeKeep](https://musing-easley-52355d.netlify.app/client/html/)
+- Go To  [SafeKeep](https://modest-chandrasekhar-59988f.netlify.app)
 - On metamask, switch to the ropsten network
 - Click on the login button on our page to connect
 - Once you connect, you'll be redirected to your wallet

diff --git a/SafeKeep.json b/SafeKeep.json
diff --git a/client/html/TransactionHistory.html → client/NotUsed/TransactionHistory.html b/client/html/TransactionHistory.html → client/NotUsed/TransactionHistory.html
diff --git a/client/html/login.html → client/NotUsed/login.html b/client/html/login.html → client/NotUsed/login.html
diff --git a/client/html/signup.html → client/NotUsed/signup.html b/client/html/signup.html → client/NotUsed/signup.html
diff --git a/client/html/transfer.html → client/NotUsed/transfer.html b/client/html/transfer.html → client/NotUsed/transfer.html
diff --git a/client/contract/SafeKeep.js b/client/contract/SafeKeep.js
diff --git a/client/css/wallet.css b/client/css/wallet.css
@@ -1,61 +1,62 @@
-.uk-navbar-container {
+ .uk-navbar-container {
     width: 100%;
-    background-color: #001845 !important;
+    background-color: #0f1011 !important;
     color: #ffffff !important;
+    margin-bottom: 2rem;
 }
-.uk-navbar-nav>li>a {
+ .uk-navbar-nav>li>a {
     color: #ffffff !important;
     text-transform: capitalize !important;
 }
-.logo {
+ .logo {
     height: 45px;;
 }
-.font-size-nav {
-    font-size: 40px !important;
+ .font-size-nav {
+    font-size: 1.5rem !important;
 }
-.font-size-user {
-    font-size: 20px !important;
+ .font-size-user {
+    font-size: 1rem !important;
 }
-.uk-link, a {
+ .uk-link, a {
     color: #999999 !important;
     text-decoration: none;
     cursor: pointer;
     font-size: 16px !important;
 }
-.avatar {
+ .avatar {
     height: 65px;
     border-radius: 50%;
     width: 65px;
 }
-.wallet-address {
+ .wallet-address {
     width: 250px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
-.uk-tooltip {
+ .uk-tooltip {
     background-color: transparent !important;
 }
-.uk-navbar-dropdown {
+ .uk-navbar-dropdown {
     left: 100px !important;
 }
-hr {
+ hr {
     width: 100%;
     border: none;
     height: 1px;
     /* Set the hr color */
     color: #9999995c; /* old IE */
     background-color: #9999995c; /* Modern Browsers */
 }
-.header {
+ .header {
     font-weight: 400 !important;
     color: #666 !important;
 }
-.input-fields {
+ .input-fields {
     border-radius: 5px !important;
     background-color: #f6f6f6 !important;
     height: 50px !important;
 }
-.uk-link, a {
+ .uk-link, a {
     color: #999999 !important;
     text-decoration: none;
     cursor: pointer;
@@ -92,18 +93,63 @@ hr {
     padding: 10px 20px 10px 20px !important;
 }
 
+-container {
+    margin-left: auto;
+    margin-right: auto;
+    width: 1060px;
+    border: 1px solid rgba(0, 0, 0, 0.123);
+    height: 83vh;
+}
+
 .paddingCards {
     padding: 0px 40px 0px 40px !important;
 }
 
 .uk-card-title {
-    font-size: 30px !important;
+    font-size: 25px !important;
 }
 
 .uk-card-paragraph {
     font-size: 20px !important;
 }
 
+.balance-card {
+    padding: 20px !important;
+}
+
+.user-balance {
+    margin-bottom: -5px;
+}
+
+.user-balance-usd {
+    font-size: .8rem !important;
+    color: darkgray;
+}
+
+.depWith-button, .user-info-button {
+    border-color: black !important;
+    margin: 0 !important;
+}
+
+.ping-button {
+    border-color: transparent;
+    background: rgb(133, 219, 5);
+    color: white !important;
+}
+
+.depWith-button:nth-child(1) {
+    margin-right: 5px !important;
+}
+
+.depWith-button:hover {
+    color: whitesmoke !important;
+    background: black !important;
+}
+
+.user-info {
+    font-size: .875rem !important;
+}
+
 @media only screen and (max-width: 640px) {
     uk-grid {
         display: block !important;

diff --git a/client/html/about-us.html b/client/html/about-us.html
@@ -16,12 +16,16 @@
 
 <body>
   <nav class="uk-navbar-container uk-navbar-transparent uk-margin" uk-navbar="mode: click">
+<<<<<<< HEAD
     <a class="uk-navbar-item uk-logo" href="/client/html/"><img src="../images/LogoWhite.png" width="40px" height="100px"
+=======
+    <a class="uk-navbar-item uk-logo" href="../html/index.html"><img src="../images/LogoWhite.png" width="40px" height="100px"
+>>>>>>> 4fa2140413e6dd49ab998b1575c93a0edaf4b308
         alt="">&nbsp; SafeKeep</a>
     <div class="uk-navbar-right">
 
       <ul class="uk-navbar-nav">
-        <li class=""><a href="/client/html/">Home</a></li>
+        <li class=""><a href="../html/index.html">Home</a></li>
         <li class="uk-active"><a href="about-us.html">About Us</a></li>
         <li class=""><a href="roadmap.html">Roadmap</a></li>
         <li><a href="#"><button class="uk-button enableEthereumButton uk-button-default">Connect</button></a></li>

diff --git a/client/html/index.html b/client/html/index.html
@@ -16,12 +16,16 @@
 
 <body>
   <nav class="uk-navbar-container uk-navbar-transparent uk-margin" uk-navbar="mode: click">
+<<<<<<< HEAD
     <a class="uk-navbar-item uk-logo" href="/client/html/"><img src="../images/LogoWhite.png" width="40px" height="100px"
+=======
+    <a class="uk-navbar-item uk-logo" href="../html/index.html"><img src="../images/LogoWhite.png" width="40px" height="100px"
+>>>>>>> 4fa2140413e6dd49ab998b1575c93a0edaf4b308
         alt="">&nbsp; SafeKeep</a>
     <div class="uk-navbar-right">
 
       <ul class="uk-navbar-nav">
-        <li class="uk-active"><a href="/client/html/">Home</a></li>
+        <li class="uk-active"><a href="../html/index.html">Home</a></li>
         <li class=""><a href="about-us.html">About Us</a></li>
         <li class=""><a href="roadmap.html">Roadmap</a></li>
         <li><a href="#"><button class="uk-button enableEthereumButton uk-button-default">Connect</button></a></li>

diff --git a/client/html/roadmap.html b/client/html/roadmap.html
@@ -17,12 +17,16 @@
 
 <body>
   <nav class="uk-navbar-container uk-navbar-transparent uk-margin" uk-navbar="mode: click">
+<<<<<<< HEAD
     <a class="uk-navbar-item uk-logo" href="/client/html/"><img src="../images/LogoWhite.png" width="40px" height="100px"
+=======
+    <a class="uk-navbar-item uk-logo" href="../html/index.html"><img src="../images/LogoWhite.png" width="40px" height="100px"
+>>>>>>> 4fa2140413e6dd49ab998b1575c93a0edaf4b308
         alt="">&nbsp; SafeKeep</a>
     <div class="uk-navbar-right">
 
       <ul class="uk-navbar-nav">
-        <li class=""><a href="/client/html/">Home</a></li>
+        <li class=""><a href="../html/index.html">Home</a></li>
         <li class=""><a href="about-us.html">About Us</a></li>
         <li class="uk-active"><a href="roadmap.html">Roadmap</a></li>
         <li><a href="#"><button class="uk-button enableEthereumButton uk-button-default">Connect</button></a></li>