From d5fecf55b1d7e75a9ede873f48ce4f6043b20f9e Mon Sep 17 00:00:00 2001
From: mohit <mohitklamba@gmail.com>
Date: Sat, 22 May 2021 19:55:28 +0530
Subject: [PATCH] some changes in the UI

---
 package-lock.json                   | 82 +++++++++++++++++++++--------
 src/components/Card.js              |  2 +-
 src/components/Welcome.js           |  4 +-
 src/components/styles/AddButton.css |  4 +-
 src/components/styles/Card.css      | 14 +++--
 src/components/styles/Loading.css   |  2 +-
 src/components/styles/Welcome.css   |  4 +-
 src/pages/404.js                    |  2 +-
 src/pages/500.js                    |  2 +-
 src/pages/Exercises.js              |  2 +-
 10 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1531ebb..be13547 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2601,7 +2601,8 @@
             },
             "ansi-regex": {
               "version": "2.1.1",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -2619,11 +2620,13 @@
             },
             "balanced-match": {
               "version": "1.0.0",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -2636,15 +2639,18 @@
             },
             "code-point-at": {
               "version": "1.1.0",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -2747,7 +2753,8 @@
             },
             "inherits": {
               "version": "2.0.3",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -2757,6 +2764,7 @@
             "is-fullwidth-code-point": {
               "version": "1.0.0",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -2769,17 +2777,20 @@
             "minimatch": {
               "version": "3.0.4",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
             },
             "minimist": {
               "version": "0.0.8",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -2796,6 +2807,7 @@
             "mkdirp": {
               "version": "0.5.1",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -2868,7 +2880,8 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -2878,6 +2891,7 @@
             "once": {
               "version": "1.4.0",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -2953,7 +2967,8 @@
             },
             "safe-buffer": {
               "version": "5.1.2",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -2983,6 +2998,7 @@
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -3000,6 +3016,7 @@
             "strip-ansi": {
               "version": "3.0.1",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -3038,11 +3055,13 @@
             },
             "wrappy": {
               "version": "1.0.2",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             }
           }
         },
@@ -6581,7 +6600,8 @@
             },
             "ansi-regex": {
               "version": "2.1.1",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -6599,11 +6619,13 @@
             },
             "balanced-match": {
               "version": "1.0.0",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -6616,15 +6638,18 @@
             },
             "code-point-at": {
               "version": "1.1.0",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -6727,7 +6752,8 @@
             },
             "inherits": {
               "version": "2.0.3",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -6737,6 +6763,7 @@
             "is-fullwidth-code-point": {
               "version": "1.0.0",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -6749,17 +6776,20 @@
             "minimatch": {
               "version": "3.0.4",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
             },
             "minimist": {
               "version": "0.0.8",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -6776,6 +6806,7 @@
             "mkdirp": {
               "version": "0.5.1",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -6848,7 +6879,8 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -6858,6 +6890,7 @@
             "once": {
               "version": "1.4.0",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -6933,7 +6966,8 @@
             },
             "safe-buffer": {
               "version": "5.1.2",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -6963,6 +6997,7 @@
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -6980,6 +7015,7 @@
             "strip-ansi": {
               "version": "3.0.1",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -7018,11 +7054,13 @@
             },
             "wrappy": {
               "version": "1.0.2",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
-              "bundled": true
+              "bundled": true,
+              "optional": true
             }
           }
         }
diff --git a/src/components/Card.js b/src/components/Card.js
index 34bb1b4..4492d5c 100644
--- a/src/components/Card.js
+++ b/src/components/Card.js
@@ -12,7 +12,7 @@ const Card = ({ title, description, img, leftColor, rightColor }) => (
     >
         <div className="card-body">
             <div className="row center">
-                <div className="col-6">
+                <div className="col-5">
                     <img src={img || emptyImg} className="float-right" alt="exercise"/>
                 </div> 
                 <div className="col-6 Fitness-Card-Info">
diff --git a/src/components/Welcome.js b/src/components/Welcome.js
index b81126a..214b6a9 100644
--- a/src/components/Welcome.js
+++ b/src/components/Welcome.js
@@ -4,8 +4,8 @@ import './styles/Welcome.css'
 const Welcome = ({username}) => (
     <div className="container">
         <div className="Fitness-User-Info">
-            <h1>Hello {username}!</h1>
-            <p>Let´s workout to get someone gains!</p>
+            <h1>Hello {username}</h1>
+            <p>Let´s workout to help you get fit and healthy!</p>
         </div>
     </div>
 )
diff --git a/src/components/styles/AddButton.css b/src/components/styles/AddButton.css
index 22d185d..efe1b56 100644
--- a/src/components/styles/AddButton.css
+++ b/src/components/styles/AddButton.css
@@ -2,7 +2,7 @@
     display: block;
     margin-left: auto;
     margin-right: auto;
-    margin-top: 100px;
+    margin-top: 70px;
     margin-bottom: 80px;
-    height: 60px;
+    height: 80px;
 }
\ No newline at end of file
diff --git a/src/components/styles/Card.css b/src/components/styles/Card.css
index 923a8a0..9bf19e5 100644
--- a/src/components/styles/Card.css
+++ b/src/components/styles/Card.css
@@ -1,24 +1,28 @@
 .card {
     margin-top: 20px;
     border: none;
-    border-radius: 8px;
+    border-radius: 15px;
+    box-shadow: 10px 10px 5px #aaaaaa;    
     /* background: url('../../images/circles.png') no-repeat, linear-gradient(to right, #A74CF2, #617BFB); */
 }
 .Fitness-Card {
-    max-height: 140px;
+    max-height: 180px;
     max-width: 520px;
 }
 .Fitness-Card-Info {
     padding-left: 0;
-    padding-right: 75px;
+    padding-right: 15px;
 }
 .Fitness-Card-Info h1{
-    font-size: 23px;
+    font-size: 38px;
     color: white;
+    text-align: right;
+    margin-bottom: 25px;
 }
 .Fitness-Card-Info p{
-    font-size: 11px;
+    font-size: 13px;
     color: white;
+    font-weight: 600;
 }
 .Fitness-Add {
     display: block;
diff --git a/src/components/styles/Loading.css b/src/components/styles/Loading.css
index 5910294..8384b3f 100644
--- a/src/components/styles/Loading.css
+++ b/src/components/styles/Loading.css
@@ -21,7 +21,7 @@
   .loader:before {
     width: 50%;
     height: 50%;
-    background: #61dafb;
+    background: cyan;
     border-radius: 100% 0 0 0;
     position: absolute;
     top: 0;
diff --git a/src/components/styles/Welcome.css b/src/components/styles/Welcome.css
index 013636a..94f2be9 100644
--- a/src/components/styles/Welcome.css
+++ b/src/components/styles/Welcome.css
@@ -1,5 +1,5 @@
 .Fitness-User-Info {
-    margin-top: 50px;
+    margin-top: 40px;
     margin-bottom: 50px;
-    margin-left: 200px;
+    margin-left: 420px;
 }
\ No newline at end of file
diff --git a/src/pages/404.js b/src/pages/404.js
index db8fa1f..a6d9dfa 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -4,7 +4,7 @@ import NotFoundImg from '../images/404.png'
 
 const NotFound = () => (
     <div className="text-center">
-        <h1 className="Error_Text">Error: 404 Page Not Found</h1>    
+        <h1 className="Error_Text">Error:404  Page Not Found</h1>    
         <img src={NotFoundImg} alt="404 NotFound" className="Error_Image" />
     </div>
 )
diff --git a/src/pages/500.js b/src/pages/500.js
index 2cca668..9e2a4d0 100644
--- a/src/pages/500.js
+++ b/src/pages/500.js
@@ -4,7 +4,7 @@ import FatalErrorImg from '../images/500.png'
 
 const FatalError = () => (
     <div className="text-center">
-        <h1 className="Error_Text">Error: 500 Unexpected Error</h1>    
+        <h1 className="Error_Text">Error:500  Unexpected Error Please try again later</h1>    
         <img src={FatalErrorImg} alt="500 Unexpected Error" className="Error_Image" />
     </div>
 )
diff --git a/src/pages/Exercises.js b/src/pages/Exercises.js
index 7c383b1..77f966a 100644
--- a/src/pages/Exercises.js
+++ b/src/pages/Exercises.js
@@ -6,7 +6,7 @@ import AddButtom from '../components/AddButton'
 const Exercises = ({data}) => (
     <Fragment>
         <Welcome 
-            username="Raúl"
+            username="USER"
         />
         <ExerciseList 
             exercises={data}