Merge branch 'Add_Wallet_Tab' into 'master'

Add_Wallet_Tab

See merge request control/artfi!20

app/static/css/style.css

@@ -163,8 +163,7 @@ body {
 }
 
 .alert-banner-row {
-	background-color: #6699CC;
-    background-image: linear-gradient(to bottom right, #b19cd9, #7d2ae8);
+	background-color: #7d2ae8;
 	border-radius: 1rem;
 	color: #fff;
 	overflow: hidden;
@@ -288,9 +287,9 @@ input.create_art-input {
 
 .hr_size{
   border: 2px solid rgb(177, 176, 176);
-  width:350px;
+  width:220px;
   border-radius: 5px;
-  margin-left:50px;
+  margin-left:20px;
 }
 .Choose-Time-for-Auction-ends {
   height:47px; 
@@ -319,12 +318,14 @@ input.create_art-input {
   background: #846add;
   line-height: 1.5;
   color: #fff;
+  width: 300px;
 }
 
 .update_password-form-btn {
   background: #846add;
   line-height: 1.5;
   color: #fff;
+  width: 300px;
 }
 
 .nav-tabs .nav-item .nav-link {
@@ -361,7 +362,11 @@ input.create_art-input {
 
 .change_password_location {
   position:relative;
-  left:40px;
+  left:-10px;
+}
+
+.Select_Picture_Button {
+  margin-left: 110px;
 }
 /*--------------------------------------------------------------
 # base.html

app/templates/login.html

@@ -21,7 +21,6 @@
                 <div class="form-outline form-white mb-4">
                   {{ form.passwd(placeholder="Password", class="form-control") }}
                 </div>
-                <p>***(reCAPTCHA): https://python.plainenglish.io/how-to-use-google-recaptcha-with-flask-dbd79d5ea193***</p>
                 <!--Button: Login-->
                 {{ form.submit(class="btn btn-outline-light btn-lg px-5") }}
               </div>

app/templates/profile.html

@@ -7,77 +7,99 @@
         <div class="row">
             <div class="col-md-4">
                 <div class="card">
-                    <div class="card-body">
-                        <div class="d-flex flex-column align-items-center text-center">
-                            {% if user.profile_image %}
-                            <img src="static/uploads/{{ user.profile_image }}" class="user_profile_image_size">
-                            {% else %}
-                            <img src="static/templates/defaultprofileimg.png" class="user_profile_image_size">
-                            {% endif %}
-                            <div class="mt-3">
-                                <h4>{{ user.username }}</h4>
-                                <p class="text-secondary mb-1">{{ user.email }}</p>
-                                <hr>
-                            <!------  Upload Profile Image ---------->
-                                <div class="mt-3">
-                                    <p><b>Upload Profile Image</b></p> 
-                                    <form action="" method="POST" enctype="multipart/form-data">
-                                    {{ form2.hidden_tag() }}
-                                    {{ form2.upload() }}
-                                    <br />
-                                    {{ form2.submit(class="btn btn-grey input-UploadProfile-Browse", accept="image/png, image/jpeg" ) }}
-                                    <p>**Accept Only <b>PNG's</b>, <b>JPEG's</b>**</p>
-                                    </form>
+                    <div class="container">
+                        <ul class="nav nav-pills mb-3 nav-tabs" id="pills-tab" role="tablist">
+                            <li class="nav-item">
+                                <a class="nav-link active" id="Profile-tab" data-toggle="tab" href="#Profile" role="tab" aria-controls="Profile" aria-selected="true">Profile</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" id="Wallet-tab" data-toggle="tab" href="#Wallet" role="tab" aria-controls="Wallet" aria-selected="false">Wallet</a>
+                            </li>
+                        </ul>
+                        <div class="tab-content" id="myTabContent">
+                            <div class="tab-pane fade show active" id="Profile" role="tabpanel" aria-labelledby="Profile-tab">   
+                                <div class="row row-cols-3">
+                                    <div class="d-flex flex-column align-items-center text-center">
+                                        {% if user.profile_image %}
+                                        <img src="static/uploads/{{ user.profile_image }}" class="user_profile_image_size">
+                                        {% else %}
+                                        <img src="static/templates/defaultprofileimg.png" class="user_profile_image_size">
+                                        {% endif %}
+                                        <div class="mt-3">
+                                            <h4>{{ user.username }}</h4>
+                                            <p class="text-secondary mb-1">{{ user.email }}</p>
+                                            <hr>
+                                        <!------  Upload Profile Image ---------->
+                                            <div class="mt-3">
+                                                <p><b>Upload Profile Image</b></p> 
+                                                <form action="" method="POST" enctype="multipart/form-data">
+                                                {{ form2.hidden_tag() }}
+                                                {{ form2.upload(class="Select_Picture_Button") }}
+                                                <br />
+                                                {{ form2.submit(class="btn btn-grey input-UploadProfile-Browse", accept="image/png, image/jpeg" ) }}
+                                                <p>**Accept Only <b>PNG's</b>, <b>JPEG's</b>**</p>
+                                                </form>
+                                            </div>
+                                        </div>
+                                        <!------  Change Password ---------->
+                                        <form method="POST">
+                                            {{ form.hidden_tag() }}
+                                            <div class="card-body">
+                                                <hr class="hr_size">
+                                                <p><b>Change Password</b></p><br>
+                                                <div class="row">
+                                                    <div class="col-sm-3">
+                                                        <h6 class="mb-0 change_password_location"><label for="password">Current Password</label></h6><br>
+                                                    </div>
+                                                    <div class="col-sm-9 text-secondary">
+                                                        {{ form.cpasswd() }}
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-sm-3">
+                                                        <h6 class="mb-0 change_password_location" ><label for="password">New Password</label></h6><br>
+                                                    </div>
+                                                    <div class="col-sm-9 text-secondary">
+                                                        {{ form.passwd_1() }}
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-sm-3">
+                                                        <h6 class="mb-0 change_password_location"><label for="password_confirm">Password<br>(Confirm)</label></h6><br>
+                                                    </div>
+                                                    <div class="col-sm-9 text-secondary">
+                                                        {{ form.passwd_2() }}
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-sm-12">
+                                                        {{ form.submit(class="btn btn-grey update_password-form-btn") }}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </form>
+                                    </div>
                                 </div>
                             </div>
-                            <!------  Change Password ---------->
-                            <form method="POST">
-                                {{ form.hidden_tag() }}
-                                <div class="card-body">
-                                    <hr class="hr_size">
-                                    <p><b>Change Password</b></p><br>
+                            <div class="tab-pane fade" id="Wallet" role="tabpanel" aria-labelledby="Wallet-tab">.
+                                <div class="row row-cols-3">
+                                    <form method="POST">
                                         <div class="row">
                                             <div class="col-sm-3">
-                                                <h6 class="mb-0 change_password_location"><label for="password">Current Password</label></h6><br>
+                                                <h6 class="mb-0 change_password_location"><label for="add_money">Add Money</label></h6><br>
                                             </div>
                                             <div class="col-sm-9 text-secondary">
-                                                {{ form.cpasswd() }}
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-sm-3">
-                                                <h6 class="mb-0 change_password_location" ><label for="password">New Password</label></h6><br>
+                                                Input
                                             </div>
-                                            <div class="col-sm-9 text-secondary">
-                                                {{ form.passwd_1() }}
+                                            <div class="row">
+                                                <div class="col-sm-12">
+                                                    {{ form.submit(class="btn btn-grey update_password-form-btn") }}
+                                                </div>
                                             </div>
                                         </div>
-                                    <div class="row">
-                                        <div class="col-sm-3">
-                                            <h6 class="mb-0 change_password_location"><label for="password_confirm">Password<br>(Confirm)</label></h6><br>
-                                        </div>
-                                        <div class="col-sm-9 text-secondary">
-                                            {{ form.passwd_2() }}
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col-sm-12">
-                                            {{ form.submit(class="btn btn-grey update_password-form-btn") }}
-                                        </div>
-                                    </div>
-                                    <hr class="hr_size">
-                                    <p><b>Security(Show 2FA. If the user turns on it, it will show a green tick. If not, it will show a red tick.)</b></p><br>
-                                    <div class="row">
-                                        <div class="col">
-                                            <h6 class="mb-0">
-                                                <img src="static/templates/tick_logo.jpg" alt="enable_logo" id="logo" width="12"/>
-                                                <img src="static/templates/cross_logo.jpg" alt="disable_logo" id="logo" width="12"/>
-                                                <label for="2FA">Two-Factor Authentication (2FA)</label>
-                                            </h6>
-                                        </div>
-                                    </div>
+                                    </form>
                                 </div>
-                            </form>
+                            </div>
                         </div>
                     </div>
                 </div>

app/templates/register.html

@@ -30,7 +30,6 @@
                 <div class="form-outline form-white mb-3">
                   {{ form.passwd_2(placeholder="Confirm Password", class="form-control") }}
                 </div>
-                <p>2. 2FA (Google Authenticator): https://github.com/GitauHarrison/how-to-implement-time-based-two-factor-auth-in-flask</p>
                 <!--Button: Sign up-->
                 {{ form.submit(class="btn btn-outline-light btn-lg px-5") }}
               </div>