Merge branch 'master' of TradeByte into fix/iampavangandhi#60

fabcodingzest · Aug 28, 2020 · 85b2a52 · 85b2a52
2 parents 425793e + a16bdd7
commit 85b2a52
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 34 deletions.
diff --git a/public/css/style.css b/public/css/style.css
diff --git a/public/css/tailwind.css b/public/css/tailwind.css
@@ -38,8 +38,8 @@ body {
 }
 
 .tick {
-  height: 22px;
-  width: 22px;
+  height: 20px;
+  width: 20px;
   border-radius: 50%;
   background-color: #38cda0;
   color: white;

diff --git a/views/addBalance.ejs b/views/addBalance.ejs
@@ -28,6 +28,7 @@
             max="4999"
             value="50"
             type="number"
+            onchange="check(this.value)"
             class="shadow appearance-none border rounded w-2/5 py-2 px-3 my-2 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
             name="addAmount"
             placeholder="$ Amount"
@@ -51,14 +52,16 @@
           class="w-full bg-white my-4 rounded overflow-hidden shadow-lg mx-auto"
         >
           <div class="px-6 py-4">
-            <div class="font-bold text-xl mb-2">Test Card 1</div>
-            <p class="text-gray-700 mb-6 text-base text-base">
+            <div class="font-bold text-xl mb-2">VISA</div>
+            <p
+              class="bg-gray-100 text-gray-700 italic mb-1 flex justify-center font-bold text-2xl mt-6"
+            >
               4242 4242 4242 4242
             </p>
           </div>
           <div class="px-6 pt-4 pb-2">
             <span
-              class="inline-block bg-gray-200 px-4 py-1 text-sm font-semibold text-gray-700 mr-6 mb-2"
+              class="inline-block bg-gray-200 px-4 py-1 text-sm font-semibold text-gray-700 ml-4 mr-6 mb-2"
               >MM/YY : 01/30</span
             >
             <span
@@ -71,14 +74,16 @@
           class="w-full bg-white my-4 rounded overflow-hidden shadow-lg mx-auto"
         >
           <div class="px-6 py-4">
-            <div class="font-bold text-xl mb-2">Test Card 2</div>
-            <p class="text-gray-700 mb-6 text-base text-base">
+            <div class="font-bold text-xl mb-2">VISA PREPAID</div>
+            <p
+              class="bg-gray-100 text-gray-700 italic mb-1 flex justify-center font-bold text-2xl mt-6"
+            >
               5555 5555 5555 4444
             </p>
           </div>
           <div class="px-6 pt-4 pb-2">
             <span
-              class="inline-block bg-gray-200 px-4 py-1 text-sm font-semibold text-gray-700 mr-6 mb-2"
+              class="inline-block bg-gray-200 px-4 py-1 text-sm font-semibold text-gray-700 ml-4 mr-6 mb-2"
               >MM/YY : 12/40</span
             >
             <span
@@ -91,14 +96,16 @@
           class="w-full bg-white my-4 rounded overflow-hidden shadow-lg mx-auto"
         >
           <div class="px-6 py-4">
-            <div class="font-bold text-xl mb-2">Test Card 3</div>
-            <p class="text-gray-700 mb-6 text-base text-base">
+            <div class="font-bold text-xl mb-2">MASTERCARD</div>
+            <p
+              class="bg-gray-100 text-gray-700 italic mb-1 flex justify-center font-bold text-2xl mt-6"
+            >
               5105 1051 0510 5100
             </p>
           </div>
           <div class="px-6 pt-4 pb-2">
             <span
-              class="inline-block bg-gray-200 px-4 py-1 text-sm font-semibold text-gray-700 mr-6 mb-2"
+              class="inline-block bg-gray-200 px-4 py-1 text-sm font-semibold text-gray-700 ml-4 mr-6 mb-2"
               >MM/YY : 11/31</span
             >
             <span
@@ -133,3 +140,11 @@
 </section>
 
 <script src="https://js.stripe.com/v3/"></script>
+<script>
+  function check(value) {
+    if (value < 50) {
+      alert("Minimum $50 is valid only");
+      document.getElementById("amount").value = 50;
+    }
+  }
+</script>
diff --git a/views/edit.ejs b/views/edit.ejs
@@ -4,12 +4,12 @@
 
     <header class="my-4 absolute-center">
       <span
-        class="text-gray-700 text-3xl font-semibold leading-none tracking-wider"
+        class="text-gray-700 lg:text-6xl text-5xl font-semibold leading-none tracking-wider"
         >Edit Profile</span
       >
     </header>
 
-    <hr class="line my-4" />
+    <hr class="line my-4 mb-8" />
 
     <!--form  -->
 
@@ -18,7 +18,7 @@
       <div class="md:flex md:items-center mb-6">
         <div class="md:w-1/3">
           <label
-            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            class="block text-gray-600 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
             for="inline-full-name"
           >
             Display :
@@ -37,7 +37,7 @@
       <div class="md:flex md:items-center mb-6">
         <div class="md:w-1/3">
           <label
-            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            class="block text-gray-600 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
             for="inline-full-name"
           >
             First Name :
@@ -55,7 +55,7 @@
       <div class="md:flex md:items-center mb-6">
         <div class="md:w-1/3">
           <label
-            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            class="block text-gray-600 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
             for="inline-full-name"
           >
             Last Name :
@@ -74,7 +74,7 @@
       <div class="md:flex md:items-center mb-6">
         <div class="md:w-1/3">
           <label
-            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            class="block text-gray-600 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
             for="inline-full-name"
           >
             Email :
@@ -95,16 +95,18 @@
         <input
           type="submit"
           value="Save"
-          class="save_btn ml-6 cursor-pointer lg:ml-24 btn mb-4 shadow bg-blue-700 hover:bg-blue-800 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded"
+          class="save_btn ml-6 mx-2 cursor-pointer lg:ml-24 btn mb-4 shadow bg-blue-700 hover:bg-blue-800 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded"
         />
 
-        <button
-          class="mb-4 ml-6 shadow bg-yellow-500 hover:bg-yellow-600 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded"
-          type="button"
-          style="margin-left: 6px"
-        >
-          <a href="/portfolio">Cancel</a>
-        </button>
+        <a href="/portfolio">
+          <button
+            class="mb-4 ml-6 mx-2 shadow bg-yellow-500 hover:bg-yellow-600 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded"
+            type="button"
+            style="margin-left: 6px"
+          >
+            Cancel
+          </button>
+        </a>
       </div>
     </form>
   </div>

diff --git a/views/partials/_nav.ejs b/views/partials/_nav.ejs
@@ -168,25 +168,22 @@
           fill="none "
           stroke-linecap="round "
           stroke-linejoin="round "
-          stroke-width="1 "
+          stroke-width="1.5 "
           viewBox="0 0 24 24 "
           stroke="currentColor "
         >
           <path
-            fill="none"
-            d="M3.254,6.572c0.008,0.072,0.048,0.123,0.082,0.187c0.036,0.07,0.06,0.137,0.12,0.187C3.47,6.957,3.47,6.978,3.484,6.988c0.048,0.034,0.108,0.018,0.162,0.035c0.057,0.019,0.1,0.066,0.164,0.066c0.004,0,0.01,0,0.015,0l2.934-0.074c0.317-0.007,0.568-0.271,0.56-0.589C7.311,6.113,7.055,5.865,6.744,5.865c-0.005,0-0.01,0-0.015,0L5.074,5.907c2.146-2.118,5.604-2.634,7.971-1.007c2.775,1.912,3.48,5.726,1.57,8.501c-1.912,2.781-5.729,3.486-8.507,1.572c-0.259-0.18-0.618-0.119-0.799,0.146c-0.18,0.262-0.114,0.621,0.148,0.801c1.254,0.863,2.687,1.279,4.106,1.279c2.313,0,4.591-1.1,6.001-3.146c2.268-3.297,1.432-7.829-1.867-10.101c-2.781-1.913-6.816-1.36-9.351,1.058L4.309,3.567C4.303,3.252,4.036,3.069,3.72,3.007C3.402,3.015,3.151,3.279,3.16,3.597l0.075,2.932C3.234,6.547,3.251,6.556,3.254,6.572z"
+            d="M10.25,2.375c-4.212,0-7.625,3.413-7.625,7.625s3.413,7.625,7.625,7.625s7.625-3.413,7.625-7.625S14.462,2.375,10.25,2.375M10.651,16.811v-0.403c0-0.221-0.181-0.401-0.401-0.401s-0.401,0.181-0.401,0.401v0.403c-3.443-0.201-6.208-2.966-6.409-6.409h0.404c0.22,0,0.401-0.181,0.401-0.401S4.063,9.599,3.843,9.599H3.439C3.64,6.155,6.405,3.391,9.849,3.19v0.403c0,0.22,0.181,0.401,0.401,0.401s0.401-0.181,0.401-0.401V3.19c3.443,0.201,6.208,2.965,6.409,6.409h-0.404c-0.22,0-0.4,0.181-0.4,0.401s0.181,0.401,0.4,0.401h0.404C16.859,13.845,14.095,16.609,10.651,16.811 M12.662,12.412c-0.156,0.156-0.409,0.159-0.568,0l-2.127-2.129C9.986,10.302,9.849,10.192,9.849,10V5.184c0-0.221,0.181-0.401,0.401-0.401s0.401,0.181,0.401,0.401v4.651l2.011,2.008C12.818,12.001,12.818,12.256,12.662,12.412"
           ></path></svg
-        >Transactions History</a
+        >History</a
       >
 
       <a
         class="block px-4 py-2 mt-2 text-sm font-semibold text-gray-900 hover:text-blue-800 focus:text-blue-900 hover:bg-blue-100 focus:bg-blue-200 focus:outline-none focus:shadow-outline flex <%= href === '/auth/logout' ? 'border tab-color border-l-8': '' %>"
         href="/auth/logout"
-        ><svg class="w-6 ml-2 mr-1" fill="currentColor" viewBox="0 0 20 20">
+        ><svg class="w-5 ml-2 mr-1" fill="currentColor" viewBox="0 0 20 20">
           <path
-            fill-rule="evenodd"
-            d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
-            clip-rule="evenodd"
+            d="M15.898,4.045c-0.271-0.272-0.713-0.272-0.986,0l-4.71,4.711L5.493,4.045c-0.272-0.272-0.714-0.272-0.986,0s-0.272,0.714,0,0.986l4.709,4.711l-4.71,4.711c-0.272,0.271-0.272,0.713,0,0.986c0.136,0.136,0.314,0.203,0.492,0.203c0.179,0,0.357-0.067,0.493-0.203l4.711-4.711l4.71,4.711c0.137,0.136,0.314,0.203,0.494,0.203c0.178,0,0.355-0.067,0.492-0.203c0.273-0.273,0.273-0.715,0-0.986l-4.711-4.711l4.711-4.711C16.172,4.759,16.172,4.317,15.898,4.045z"
           ></path></svg
         >Logout</a
       >