From ea28f7741d9cd4c7f04d7c9a12d4d5c2f48d2afc Mon Sep 17 00:00:00 2001
From: Shenyuan Jin <shenyuan.jin@ucdconnect.ie>
Date: Mon, 29 Nov 2021 13:34:07 +0800
Subject: [PATCH] new login page test

---
 app/templates/Posts/question.html          |   1 -
 app/templates/auth/login-and-register.html |  40 ++++++++++-----------
 data-dev.sqlite                            | Bin 6885376 -> 6885376 bytes
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/templates/Posts/question.html b/app/templates/Posts/question.html
index 1e63d7d..7756ed9 100644
--- a/app/templates/Posts/question.html
+++ b/app/templates/Posts/question.html
@@ -124,7 +124,6 @@
 
                     <div class="tabbable">
                         <ul class="nav post-nav">
-                            {% if  %}
                             <li id="btn-1">
                                 <a href="{{ url_for('.save_question', question_id=question.id ) }}" class="glyphicon glyphicon-bookmark"> Follow</a>
                             </li>
diff --git a/app/templates/auth/login-and-register.html b/app/templates/auth/login-and-register.html
index d029d09..9b34555 100644
--- a/app/templates/auth/login-and-register.html
+++ b/app/templates/auth/login-and-register.html
@@ -61,7 +61,7 @@
                     <input name="confirm_pwd" id="confirm_pwd" type="password" class="form-control" placeholder="Confirm password">
                     <p id="pwd"></p>
 
-                    <button class="btn btn-lg btn-warning btn-block chose" disabled="disabled" id="submit" type="submit">Submit</button>
+                    <button class="btn btn-lg btn-warning btn-block chose" disabled="disabled" id="submit1" type="submit">Submit</button>
                 </form>
         </div>
         <div class="form-container sign-in-container">
@@ -80,16 +80,16 @@
                     <p id="p2" class="text-danger"></p>
 
                     <div>
-{#                        <label>完成验证：</label>#}
+                        <label>完成验证：</label>
                         <div id="captcha">
-{#                            <p id="wait" class="show"></p>#}
+                            <p id="wait" class="show"></p>
                         </div>
                     </div>
                     <br>
                     <p id="notice" class="hide">请先完成验证</p>
 
 
-                    <button class="btn btn-lg btn-warning btn-block chose" id="submit" disabled="disabled"
+                    <button class="btn btn-lg btn-warning btn-block chose" id="submit0" disabled="disabled"
                             type="submit">Sign in
                     </button>
 
@@ -125,23 +125,23 @@
         var info = document.getElementById('p1');
         var pwd = document.getElementById('inputPassword');
         //学号
-        {#stuID.onblur = function () {#}
-        {#    var stuid = this.value;#}
-        {#    var reg = /[0-9]{1,4}/;#}
+        stuID.onblur = function () {
+            var stuid = this.value;
+            var reg = /[0-9]{1,4}/;
             {#var reg = /^\d{1，8}$/;#}
-        {#    // 不符合规则的话#}
-        {#    if (!reg.test(stuid)) {#}
-        {#        info.innerHTML = 'Please enter StudentID or OrganizationID';#}
-        {#        info.className = 'text-danger';#}
-        {#        document.getElementById("submit").disabled = true;#}
-        {#    } else {#}
-        {#        info.innerHTML = '';#}
-        {#        info.className = 'text-success';#}
-        {#    }#}
-        {#    if (info.className == 'text-success') {#}
-        {#        document.getElementById("submit").disabled = false;#}
-        {#    }#}
-        {#}#}
+            // 不符合规则的话
+            if (!reg.test(stuid)) {
+                info.innerHTML = 'Please enter StudentID or OrganizationID';
+                info.className = 'text-danger';
+                document.getElementById("submit0").disabled = true;
+            } else {
+                info.innerHTML = '';
+                info.className = 'text-success';
+            }
+            if (info.className == 'text-success') {
+                document.getElementById("submit0").disabled = false;
+            }
+        }
         var handler = function (captchaObj) {
             $("#submit").click(function (e) {
                 var result = captchaObj.getValidate();
diff --git a/data-dev.sqlite b/data-dev.sqlite
index 53ff6ffdb824a194ea57f1793f1a76a71adcd9cc..b0c9b04816df6a255d220c681d5a511bc68e4d61 100644
GIT binary patch
delta 709
zcmajcNlz1T9LDi!OR-exNL^VhrS40I`Oo6eu^n1m5uxI)sJImI$iaBEO^}95EvI_W
z&;u8}G-`B0V&V(%Js4xsf~WQs7{A2ClZnaib9tWM?a5bHe0h|6ykTRhZ=^kJNXl5b
zkb9o<e9U>jCc6?*RkL-?7DI}juo9|p(<yJ(vymINuG*@hn8GxKUaUG^_|OJF+OY`%
zbRdY$*n&=kAY&`K5XLra#}4eoF6>4(deDnL>_G(mh++US?8QFp#{nF~AsogL9K|uj
zp<oay1T^Sw)iGuYuK&C7OZJRcBGcAex0bdhW&f-s`6eonto6fPQ>|{<^JJlAd}^6(
zt)MS7FUci27MlMskbfF_R_OHwrPSzDrX!FE{46dt+;{6=UNv6U>ZRqz;%dEIX?|Y*
zo7Y#~Y+P-1?RCEXqPAXItS`Jz&N=^i7@TuDgPN*|xDave&rl4aE27^tOjG@5WoniX
z#aQz=EDRw58z+!N3J!*mMg}7|iBmX@GdPQL7{z&v;R41nfh;a!5|?lpS8x^Aa2+>r
f6Spvh+qi?fn8rQa#{)b>4l{U!SvS^v{4M$$Kffbs

delta 553
zcmWN=xlY0W0DxiID&kq{eT((JkU}e16$B4d6uj>P1(nsr#1#g^W^{I8@BvJWc6Ij!
zoO}g&00;js`Lcx<Da*%JQMr9;kJy!4n>+NKOW&u3_q6ymtpr?}&-D0AukQBinqlbH
z?2MQY6u(RJn%acvGu)ct(E@tD5ELn~gr&5zj1HEwf|aadHESr-NrknnV?7(#$R;+k
zg{^F3J3H9PF1pxFl|AfbANx7LK@M@4BOK)z-5jTf8ol&cg`j?!vr3a0!D-oFBXL1)
z$wjMdcYi~F{;=Q(JFL`A=D9|cVjrKn<jhM&-I9uiP;`j0YLg#i^{qSGDCgDR3Hlk}
zBu!3nnllVC#94+J;T-3=z(q#6#AU89##OE{&IH%F!A)*)n>*a)9`|{`Lmu&%Cp_gD
UlRW1IQ%v)cSG=~=-^`EeAMzO2IsgCw