From dcae204f5db6894d0946e33024eb24b2322bf427 Mon Sep 17 00:00:00 2001
From: Prashanth G K <prashkammar17@yahoo.com>
Date: Sat, 18 Apr 2020 15:52:36 +0530
Subject: [PATCH 1/6] MCQ's added, About us template is created. Drop down
 setting yet to be done

---
 __pycache__/app.cpython-37.pyc | Bin 4860 -> 5136 bytes
 app.py                         |  26 ++++++++++++++++++--------
 database3.db                   | Bin 16384 -> 20480 bytes
 templates/about.html           |   7 +++++++
 templates/layout.html          |  10 +---------
 templates/profile.html         |   8 +++++---
 templates/quiz.html            |  11 +++++++----
 7 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 templates/about.html

diff --git a/__pycache__/app.cpython-37.pyc b/__pycache__/app.cpython-37.pyc
index 2f731f1a19e3edb641929c90ffe8a563d753141c..e4edfcf6da300c261f4acc77d026c9ee3e80d772 100644
GIT binary patch
delta 1117
zcmX|=O>7%Q6vyYS*SqWWe#9<K%|fW-e06D(rfpJ_0x4;sMSPgj5-M4MWinfE8obHu
znh0ylmn%3`3L1$+)k?8I>IDu6sRy{CN}Lc<g~VPE;?9i=;=p@bsbkG=XaDo&dEUqV
zH?@1nIc?h}!*To98*klv=nJO;pME!U0hZjo1AKZ2e1;#o#s<(l7&zR&qU?hBkUt){
zttvl^91q;R+K>U`vlp2^_x(*sRd_>M>OuLXR;vcNJ(U|sofn2MRGKC?dGQ)+7P*D?
zw!Et?eALv#t+*3*qs}fcwyx4`aL`l1c?M@Ribx<~EtcevkSIunGjswCKbOLG3hfj^
zUlo&RDi#RG2uBH}2Po5O3Nec_(hwB}8vgqBtG!NtzSZh<J8`Sk@GTkY$KjY9*T&?J
zdO@cw8Bmr#>tF9%q{9Y+DH<4xp@_Qt*tiEva;<O|o|KQ86<C%_<}#d;p*aVu@|O9R
z_5|9CCHYzLb2M=*&wGl5JR;3)g<IljdVP$rB2QZ@X!MCSlRt?<Q+{h5hm-P8RO_;8
z*WDddqbya50phH@Y(Izl-`J}sC|?QfQgC!X3j}HX{E=;paGg{dbbTFXmfxS`g!9#O
zqHb6NxT+`mp3RLRu40E55;f5hJz?Cup2vI_<!?@P@n4wj7s%iIyYYLQzM77#_k;+#
zacjF5L{v^Oj?U8@);3jn*bRJF*4$HGnu}tQl_t$cTbrF&<j~GH#7lC+oi4pVhg9;B
zofj|4n{GuLpc+leAKaP_CYXv?lYh7;;D#I>Iky;FNqzuGWy2o86-DqwjTu)5P-j=w
zu7NS&K4AYmP(fZFS#CU!Ui*j7i{SlE*o&&|ZnP7K>P|bVUJ_yVo%!nOePz8Zg3G<l
z%@4#HU3I^B1s`ILu%GZUp&|bnsXd#O@I1X|eMdbbCI~)(N-drtP~`+wz}EzYEG`mW
zBV3SgmZlbN;WF|NEQd`8qZqWQl)+IA#mf2>lkht3_O&DJx5Hj6|JFyx$RWlE1Hd{d
zjlP*}-LDYHhT-kYXUZM4i|E^8int_imyW`O{JqqH6?vvSKUqgztP-g8#90D0Nfv$f
ir+8?$yaKcGmvZHR;}yL}ys>iL(><^9a9K68`~45HJMxME

delta 936
zcmZ9K&rcIU6vy{%x7+P@cl%4AsS!%Cz*hOC&{~uqVh}||#Dm6zm9ULgY75ggCe11#
zm>6SBFq3Gw7*P+NFh&#o3rzIl#fy7WBM0w#GST-+<lrRpnK$pfd6}8-TkZUvFvfIU
z6>uzlU%U7@eBX$`!pn{sXfv$#d2tn3!RpBQvn^I9GM4i{Ze15Zu*|c9nS8YYjs%mu
zS!&_W<+x!fmiLx$LA6wj`uGpIcWKT=wQ<lY;yi-096;D$3t7PykzfgU0H#dQfkg*q
zO&8mZ8LXGkM+j~sL{<W^2WMGA2p~gEKU2-uy0h7QF<;4Mr%WGf#|YzZJYA6B%X*Wa
zb)kctWd)(|kn$|N@84DsWl%&#WGVh$`2_v^k@p=8BAY~ZfZtRzFvQ=gT`<Zw)o*ed
zkFkFK(RX`b5KS}4c95rm&`9tQ4iel5$F)#eV25biOc>&KwPCFOLF;g5&~cvs()L4!
zC-q@S@w}e)SJAumHc<gK&R^)`82_msPK{xtMo}3-x7L8weeRw`{DC?0(x4kqO8vVx
zc)@rYuoPReWm~Yk_ayvol@Iu1duv`g)_tXNtzf#Gz+9EFT(Oc}tmev<e5uG<v4$gA
zrDD$1_#OX<mywXBhaKl%{q4zP^)O}EGyl`ck*N4G=9FVR9f-R`Hq9>uQt*I33{3Re
z?#J3XcEDAAUStJZstA^}0%_rfWW%-%MWtd`?iB!mhk}`&39MGr&aqPQa%{F(zMf-j
znr_s<PU2D*c}s{%+MeKR!T3@7ddFQTQF6VVsNq=~!6cAKY=l7l#Hc?^nbF(W6yY@C
z6#o-UB-YR@M-hTcfe<u;DypJ^Di|&W)sS(|X87w+AH?})D35J39qw*PQGrnc>CMIo
kq+0#znExa^3`zba9BI&^zUa>Au8=$GiAEw#Dpr)?FFy~y8~^|S

diff --git a/app.py b/app.py
index fd8402e..3397ffc 100644
--- a/app.py
+++ b/app.py
@@ -37,12 +37,14 @@ def __init__(self,name,email,phone,password,score,nextq):
 
 class Quiz(db.Model):
     id=db.Column('id',db.Integer,primary_key=True)
-    q=db.Column('questions',db.String(1000))
+    q=db.Column('questions',db.String(1000)) 
     a=db.Column('answer',db.String(200))
+    o=db.Column('options',db.String(400))
 
-    def __init__(self,q,a):
-        self.q=q
-        self.a=a 
+    def __init__(self,q,o,a):
+        self.q=q 
+        self.a=a
+        self.o=o 
 
 
 
@@ -147,8 +149,10 @@ def quiz():
         current_question=ques 
     
     score=int(u.score)
+    opt=str(current_question.o)
+    opt=opt.split(',')
 
-    return render_template('quiz.html',current_question=current_question,score=score,done=done)
+    return render_template('quiz.html',current_question=current_question,score=score,opt=opt,done=done)
 
 @app.route('/process/<current_question>',methods=['POST'])
 def process(current_question):
@@ -160,19 +164,25 @@ def process(current_question):
 
     answer=request.form['ans']
 
-    if answer.lower()==ques.a:
+    if str(answer)==str(ques.a):
         score+=int(1)
-        question_num+=int(1)
+        
     
     else:
-         flash('Wrong answer')
+         flash('Previous answer was Wrong. Answer carefully')
 
+    question_num+=int(1)
     u.score=score
     u.nextq=question_num 
     db.session.commit()
 
     return redirect(url_for('quiz'))
 
+
+@app.route('/about')
+def about():
+    return render_template('about.html')
+
 if __name__=='__main__':
     app.debug=True
     app.secret_key="efrwwseq4sfcwasdr3142qwdsf24wsd"
diff --git a/database3.db b/database3.db
index bfbea59d2961c8a9223a8081646ad5296de67c6c..940045aa4f1e9c4af1e1f66bcc2790c61d8ffff0 100644
GIT binary patch
delta 1060
zcmb7@O-~a+7{_<}0+gh?8bX?eM23b0h#R19f-y0cvh;OJyOd(lK&IV+U1+E6><(Bj
zr5NuJ&m_h#K$N2w{RDmhKLQs`Ja973mL@7(^e`{a|H=HH-!qdrI^vJs@+V_=w>XY-
z_Xp2b&#4q1-Qs2+ee;S}oKr}1!gukDkoI=pcfH<@c*Qq;b94N$Y{5zmnXOu7+d}o`
zb}!rx-x6GLRgM*9P>d~QWe~WP4}j@mPr%Ruo>Z<VCu9}mR*N9Fp3O>3Z&74gMgyAx
zPbsFxlbx749h{$^pRtn=n}>+>Gb|D6>y75`BdmwdJ>L5_dApPDLEq>oe|(*3QRAgO
zZt&XDABdfQVEkXic#@rnT(jrZloC_RAS0Kj?Ms;%p6Nd0dz`QQtb>c6!Vo`n$%*g8
z72)zixbs!$@cy#X!}%sgx-OolCL+<^^rQ}rS}?RY8LCVMLzCsui?TtjMpSQPDw%vs
z&+oP@O5#te?My~Nsp|UXZd8$J;VFdah>A*kx<y?Bn-1IB*L8V%))Ct}(zgyrBFtR2
z-L0aWva-qs)e{*jnl425;>ian*xsz0rJY5BADRnjRo-ka&(4RksrUxn$nI0ubKW-h
zcilYy=EuE)!#VH)T#8dsr^o5LF6S6>`aE{cuvbiRZsD90KZy?UwU`&qFDAg5&?&gx
z-1t;GudIR;)(n_~1YwOppfoh&uRv0vPHP|mv8Ef60^9HaT5K01@W8+t*hhQBID|DI
zJKWsDcp(m(hQ-3h4%mkTLksRhu!Qg~tWiSyn+~B;Tt^r~W=ZQ6wj|pcBCrBA@gq0L
zepJ}y<`N?_`5J5^0uBvJ2T95hkp`*=vo|o1xuzCN8A(}NmSRiG5{n{E)|Ow%rDR~3
zz`#n|WJQy-Qh_yAsTWC%VeOhmTGk;sgqr=47asGBe=M<L5YqyzEJhaCA&ojPDOM1v
fQqnFVOid|GS%-*7eNoDxrbRJg7h4riPtJY;@BBP#

delta 589
zcmX|;-*3`T6vtay6g2c|7E+NIE(wWSGF>S@<`y5UqzW5bSO*jE>6W%|r7du8E5gg*
zKhW$S*o%+8$baBJ;2&W80~Qk#pY+kfew^f-<a|%^{hXXLJ7;Gz_G9vXnPC_{$m<Aw
z+RUw$nWxfj4E$p_0W-oM@Lj-*H2fRen1{LBVm!{y9S`ZYIr8yznS4o8mAVS+%FC(>
zm&(~gkW@y#Nj*GpDLhfMQd!Z~vyvojY{ENH<kGQ8Zglxdu4$D6MQg!*wFTF)vG^@K
zU?UeC_zYCxVj<l7A>3_qQASKB=HW=>>`UtC^lfO_i*uf3eQFYURbDs<+j4gMSuP{%
znXH`2TE(4isnI&De#jq;M|wYZNca8zUSnJ^n&kC6t&OMkUaMmeyKD5Ue4(W0C*fPc
zRa)$&f52N>XIEwApOtg@!t*OYhc=0S(%jN_tm&}UEmms?HGNF1t%m;Qs4tZjz33V8
z9zB+-hWWlWb*Ogy75)N`b6k`YFLw_`I5D~c!~${{*bMjyzJYTv2X^p)HaJ}i^Gqsn
zSWzLS5WCKV`ow?4^Grc(3_Ak{yIt7m&>`&f5GK16jgbpEp4m>m!i0KoXd~D3phX4_
zq`vEzq~nuGBE&OK#1a}}57}^F!HR2OWSDjjr`f<ebv=p)vpym&@=zb?rrSk!!2b{R
C%cvay

diff --git a/templates/about.html b/templates/about.html
new file mode 100644
index 0000000..c9b118f
--- /dev/null
+++ b/templates/about.html
@@ -0,0 +1,7 @@
+{% extends "layout.html" %}
+{% block body %}
+<div>
+   <p> About UCSP Research Group
+    #descreption about group# </p>
+</div>
+     {% endblock %}
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
index 57a4b8a..9bb581c 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -9,7 +9,7 @@
 </head>
 <body>
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-        <a class="navbar-brand" href="#">About Us</a>
+        <a class="navbar-brand" href="/about">About Us</a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
@@ -33,14 +33,6 @@
                 <a class="nav-link" href="/login">Log in</a>
               </li>
             {% endif %}
-
-
-              
-              
-
-
-
-
             <!-- <li class="nav-item dropdown"> -->
               <!-- <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Dropdown
diff --git a/templates/profile.html b/templates/profile.html
index 9122560..ca95ec5 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -1,7 +1,9 @@
 {% extends "layout.html" %}
 {% block body %}
-     <h1> Are you ready to play  {{g.user.name}}? If yes enter now!  </h1> 
+     <h2> Hello {{g.user.name}}! </h2> 
+     <br/>
      <div>
-          <p><a type="button" class="btn btn-link" href="{{url_for('quiz')}}"><button>Enter</button></a></p>
+          <p><a href="{{url_for('quiz')}}" class="btn btn-primary" role="button">Next</a></p>
      </div>  
-     {% endblock %}
\ No newline at end of file
+     {% endblock %}
+     
\ No newline at end of file
diff --git a/templates/quiz.html b/templates/quiz.html
index d12e465..527c686 100644
--- a/templates/quiz.html
+++ b/templates/quiz.html
@@ -6,13 +6,16 @@ <h3>Your Score:{{ score }}</h3>
    <p>
       <b>{{ current_question.id }}:{{ current_question.q }}</b>
    </p>
-      <ul>
-         <input type="text" name="ans" value="" />
-      </ul>
+   <ul style="list-style: none;">
+      {% for option in opt %}
+      <li style="display: inline-block;"><input type="radio" name="ans" value="{{ option }}" /></li>
+      {{ option }} {% endfor %}
+    </ul>
+
       <input type="submit" value="Next" class="btn btn-primary " >
    
    </form>
    {% else %}
       <h3>Thank You for Playing</h3>
       {% endif %}
-     {% endblock %}
\ No newline at end of file
+   {% endblock %}
\ No newline at end of file

From c763c40fb1916969e44cf70f30576de08fbe032d Mon Sep 17 00:00:00 2001
From: S <Shivaprasad.S@philips.com>
Date: Sat, 18 Apr 2020 18:16:55 +0530
Subject: [PATCH 2/6] Initial commit. added .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..56e6201
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+__pycache__
+database3.db.sqbpro
\ No newline at end of file

From f28e42880c3cf26713d713da068cdab63cc369cb Mon Sep 17 00:00:00 2001
From: S <Shivaprasad.S@philips.com>
Date: Sat, 18 Apr 2020 18:25:24 +0530
Subject: [PATCH 3/6] deleted unrequired files

---
 __pycache__/app.cpython-37.pyc | Bin 5136 -> 0 bytes
 database3.db.sqbpro            |   1 -
 2 files changed, 1 deletion(-)
 delete mode 100644 __pycache__/app.cpython-37.pyc
 delete mode 100644 database3.db.sqbpro

diff --git a/__pycache__/app.cpython-37.pyc b/__pycache__/app.cpython-37.pyc
deleted file mode 100644
index e4edfcf6da300c261f4acc77d026c9ee3e80d772..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5136
zcmai2OLH5?5#HGs-Xujyltft)Z21LSCT&?MC$^%Prc7J0Mad=|m$&F_ftVo)5Lke-
z1JOi*IfTB-Wmoy6s-(z^Q@Q4lL(VzmnyQ@knoIN-e9G6o00gq+1gLHFOwa7jPJjJ%
z58f-4@)kaS`sbtH{_Bio{hJ!Yj|=5pT=DOPWl2klrqvRGXxV|?assF225!p>yp|vM
ztxS+<WrJ)h7vuzuwVU}?At<o!G>ffLP!g6BYT`fyld7a9@jE45HQ6{Ny_=TwS<BqC
zRDo^NXrGo@nfuzp$kQKKGA|2XTe6_08)puj;4FHIvV@+}pl1d%&dCWmDW^7VdFr7p
zr{!s$eV#36#w=&$3|lU+<=mL%yu84cSv7fhPR<?)c~L&YJr{ZGrLnP><rTI(!<O=x
z<yrY0TQ0HXDpn+TMbFC@xc@TW{YBjUCHXS<Tu~FUvTc7W^zY;=YBDU#S0SIpxaW>6
z?BcZ*tMb}o@=PU{cuUP{yq!#H6-lK-qgtJ2)u<$^m8@%3Gf5^^aa?aliC0~3YqYi6
z>8cn?S2x3rwob%m;%(qITNRPyS3dc8p;_Bftv$5-_iB2tV|p|3PP1;*+w=4DvTCa9
z)mXhbC)a~>H2UMk58uE0MR<E*b>Y2*mG{HXKE1OPTpqKme!8&uQF!;>?K?|%78h3U
z+*@9$(emkI53WW0#y230)ewjFk+l!#7$<b4Fy6MWUzfIYzP9?-ZGb?!7p#5J7i_n%
z9o{nDCdT{MWeou358c_rwSp_Y46%vXU(V3HhGm4bE?C>PcKhNxd&k8+gf3xF#ZK(H
z)HIRQxz`i%)t@bW3hf`?S$uo#Gdv|;yRWfZ)yQm>KPZ2+b}v%5b^U=_yRG7F)9$RP
z2P!gaw58kE*Q%Y)Txajc{LN-PHnn!EbBk^k)AD?)_uRUI3sg98%G}LnyH;(+x1bD%
zYkH%KpSbkw#DnwnUgA`nO`U@wap}c}3-+iH>vJ&hno}`N<0g(jserzi1K!CCUu4C!
z&==4*@(gq=a1i$2Kv7nJT?=gGG~g9Tk9_jb34HExm2;Sp9)N61AH7+$U6~p79@#;T
zd#Insp(oEh)IaPga1Z($9_&SKp^saoG|YnuIRSr7YLJwrCm>b<)j~(tTUEUmZmYe-
zjjAp6_&Q7k;%-#OrX`+gRqM^f>uj|n1W2bE$GdGU6ECj81DK<}GPMlm(1(7>MU2ar
zq4Y)H3a!2kDf$ki-FG3Kz6a^{eMnCd7R7SK*B3EE6X^665@iz4LL?qNWv7x!+*ma?
zesY|?N;3#3V;;<gVLhswFua8RxCmjvbHi`1MEIB+j#;iuCYV4Q5r#=V3|np4ZIWIL
z!<}xmIk4DrJ@FUY&2B47GIt`QHi0JE)Wlygx*l!*pEbUKp<@f>B@^D*JLI8w3WDG@
zgNwcsV!~$Y)1kJ8;r|P20M!U;fJh26KoAhh9ElS!%W+RW%@{#J7U7^$;(pSt_lC&P
zvv^>TV@?E3#`XU=^zzjx-c|bXKggJAcMO}pMJU!N7t)7*M-Z7oV*n8XhhU)CLqIr*
z*hxe+5$%erpT|)BItc=(euKnuPixxLYq(+xz|_gT5-obny+!>ZZ2Bb<1W;We@d}Ao
zNstdU-6VY$KZYOplOB5wgXx}33*<5W+M4=*6!VGm!TYO;d;i`F#apJO%vM{*$DBCY
z4uU>0c|2ikDGtPng<pH{%k7G@+{<mXTWW60w3@wQN4GcX&9qf<nA%brgEz+aX9Tds
zrP-7+;w*$^gT(Btt>1#)%gt-G2?AAmv_9fGit0sN@edGE?DHC>jXdy2tQKrWd4)B~
zFg9x*G>0`Gn#)=SnuqxJF!LLk-S=^24EV0^9*O;|@c;!IERh8-WDflOobel(!)zaL
z6c+0_O64YR3Nm-V`yumKO;Hy5C}tko*e~d`UzO5wV(Fh@y-y3oWU|(dHtM=HWHU|{
ziPvmz)}!9p`vZ<E%estSGUZm))V6x1;ok7p!<QaHzO5@IP5YDhsb>=xiK&(N>s$f^
zGn*<>8l^=zd{nrFB$$#gLyvMM@{*K^k2Ke+8%+_S$vK*wSjp>mNPikP{(=ldkW73*
zrnAd;53-Tk4LQLbj}WSFQvd!6lVS=f%W*~i$=AsW7vDTUT!bvzE-t-*aXo*Yw`YV5
z3Nl(MBjaySHmUj$jD$fgVkqYkPX1!NLti@5I<nzEr;*`W#Ac0=f_d&&WvWxYJP(X`
zjclLh1$}Sd-C2@A(9Y85R^Qc+Oztq>cN>Mib7bpB(2B;B4i&)oMfqz=GJ8OHnJ|+>
zl=NLmRm%@Ri!f6_ix{8<`T#BZ=Xiq@FjUZ_S*Q$cHF5CXy(?d|yJb+DD#zVg4YlD$
zx7pk)!?dYnxsEI_2*uuwI}tJ?6_Mo{%1P8Tb(AJ^<@-&A0<es>(&Y!$W?hcidwJg6
z0kqiTl~XB7&eC#-C>dw^CTS^XI_-}BB{ex^-hvjKMh#lqJ^{8ejbUP=Xg-NAU!SL5
z1{vRohjT4NIp`$GzKy;BS4^B~0Us%TiZ-FhW$D{QgLza(S)d1qvWr5~yk3Sd)b5%Q
zi0B@Kat0CQJ!2gT4sw8lD3IM_FEc+O3-F73HEg9Gdygk5f5LNq`lMalGbWf?ScqQ2
zZ!bGPaMjaSF^e&vD-lndu{9U~nb+bhr>}CHdc85~Js!Vf`!`ygrq}J`N;4HW7#l==
zJ#T&o`D(N<Vu2C+{vC}W`!*<cT&g7>ibEfDzmU$pjT$`z*3I^v12E~ftCzv2BFvav
zLp1EZE#1LrS9<$awA6Q`kGP0ZyF^qD?1;d9H+qrnj{Y8;Y;Ozw{op>%@o{*bXygyX
zzHbT?kI*vx%pu|ste!CwG6&8Fql2UK4?S>mVR;GX1|qb_<WJ~ajxq^9My-Ifd98=i
z0*RZlT*XbMYF$KBWKe?P42Gg2Eejn~7>O%Um=5b&3YH{?l!zb;*Z0P}LXX3Nt*&Fk
zY?(Oq$Z(P#+zb6&TA;G+;MkUuZ&rUy^F%k8G;LFDjusFn#o=1QsN2%NreQ91rG)$u
z+GDP#+K$Zi-T}0fc@aA^h#nu&;UiwssPXM7=xH3~ZT%TW_bw7(iF4*}p4^99qk|jK
zv4e|X6hDG6Kp0#h3|!xEKzRbrbpaLIc+^7)wUK22Q7@8p-)SJNB3b7f1y1UoDfYbs
z0ckf%2Le!$eWY^f9*DO<$x#;0g<YVA8}$k}+X-_><xV(hrW&UXr#YTan={fM#B*kO
z;PU|t0ta=Y{t%1qy?S4(2laM0E~lkrdAAyuKiBPObFRF=#bvox)r#4dcc*ez-^0Yz
zlgyQOskuyo2;~F>QtwbqrPO(!v^PjFH(n)el$Z6p)Evb#PAKGNO=n}hO5#%zoPg&@
zd%{EPZ%PT|wm-lY6RlWCuT;_J?YxbO-p#V>eYEv&U`2|>pA9G2aa0@<7hso%jM&Tb
z*kQ&X*N;7aL^b^XMc4clW<ESyw*DMC9ddB4i^6a<xS}@n?ryAhZp0fkY`4^JzH#IF
z&aR9%uHV>=<#Od}!2fh?Yg!BkM!G2!y_$fRrY5dg=yc6{8BFm}KE$6O)%33sO{eFe
zn0BWHlBV+*m*l8{IvveP422M?v(3~Gbh-|_yKSkOsXwW%4m^#0Qk)gII$=&`dS@PG
zWbmG*Z|h05-rWrHu|i5VeAsn#H+t%ZWpAcuzFWjZF&zc2fu1RkWs%d6)$EDf^z`(^
YY+?4|?4@aMHZwbW{=&3N{|ETuza>gtG5`Po

diff --git a/database3.db.sqbpro b/database3.db.sqbpro
deleted file mode 100644
index 8ee5422..0000000
--- a/database3.db.sqbpro
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><sqlb_project><db path="C:/Users/Prashanth G K/OneDrive/Desktop/event/flask2/database3.db" foreign_keys="1" case_sensitive_like="0" temp_store="0" wal_autocheckpoint="1000" synchronous="2"/><attached/><window><current_tab id="1"/></window><tab_structure><column_width id="0" width="300"/><column_width id="1" width="0"/><column_width id="2" width="125"/><column_width id="3" width="1330"/><column_width id="4" width="0"/><expanded_item id="0" parent="1"/><expanded_item id="1" parent="1"/><expanded_item id="2" parent="1"/><expanded_item id="3" parent="1"/></tab_structure><tab_browse><current_table name="user"/><default_encoding codec=""/><browse_table_settings><table schema="main" name="quiz" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths/><filter_values/><display_formats/><hidden_columns/><plot_y_axes/></table><table schema="main" name="user" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths/><filter_values/><display_formats/><hidden_columns/><plot_y_axes/></table></browse_table_settings></tab_browse><tab_sql><sql name="SQL 1"></sql><current_tab id="0"/></tab_sql></sqlb_project>

From 0ba2202bf99c85d9ea28ee817ebdf16c7cbc3f84 Mon Sep 17 00:00:00 2001
From: S <Shivaprasad.S@philips.com>
Date: Sat, 18 Apr 2020 19:41:16 +0530
Subject: [PATCH 4/6] duplicate users and incorrect password warnings Added

---
 app.py | 70 ++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/app.py b/app.py
index 3397ffc..423019b 100644
--- a/app.py
+++ b/app.py
@@ -47,6 +47,11 @@ def __init__(self,q,o,a):
         self.o=o 
 
 
+def user_already_exists(users, email):
+    for user in users:
+        if user.email == email:
+            return True
+    return False
 
 
 @app.route('/',methods=['GET','POST'])
@@ -64,6 +69,9 @@ def home():
 def register():
     
     error=''
+    status = ''
+    users = User.query.all()
+
     if request.method=='POST':
         name=request.form['name']
         email=request.form['email']
@@ -71,50 +79,58 @@ def register():
         password=request.form['password']
         confirmpassword=request.form['confirmpassword']
 
-        
-        if password==confirmpassword: 
-            score=0
-            nextq=0
-            pw_hash=bcrypt.generate_password_hash(password)
-            new_user=User(name,email,phone,pw_hash,score,nextq)
-            db.session.add(new_user)
-            db.session.commit()
-            return redirect(url_for('login'))
+        if user_already_exists(users, email):
+            status = 'show'
+            error = 'User already exists'
         else:
-            error="Password didn't match"
-            return render_template('register.html',error=error)
+            if password==confirmpassword: 
+                score=0
+                nextq=0
+                pw_hash=bcrypt.generate_password_hash(password)
+                new_user=User(name,email,phone,pw_hash,score,nextq)
+                db.session.add(new_user)
+                db.session.commit()
+                return redirect(url_for('login'))
+            else:
+                status = 'show'
+                error="Password didn't match"
+                return render_template('register.html', status=status, error=error)
 
-    return render_template('register.html')
+    return render_template('register.html', status=status, error=error)
 
     
 @app.route('/login',methods=['GET','POST'])
-def login(): 
+def login():
+
     users=[]
     error=''
+    status = ''
     users= User.query.all()
     if request.method=='POST':
         session.pop('user_id',None)
-
         email=request.form['email']
         password=request.form['password']
-        user=''
+        user=None
         #user= [x for x in users if x.email==email ][0]
         for x in users:
-            if x.email==email:
-                user=x
-            else:
-                user=None
-        if user and bcrypt.check_password_hash(user.password,password) :
+            if x.email == email:
+                user = x
+                break
+
+        if user and bcrypt.check_password_hash(user.password,password):
             session['user_id']=user.id
             session["log"]=True
-            flash('You were successfully logged in')
+            flash('You were successfully logged in', "message")
             return redirect(url_for('profile'))
+        elif user == None:
+            status = 'show'
+            error="Incorrect credentials or user does not exist. Please Register"
+        else:
+            status = 'show'
+            error = 'Incorrect email address or password'
         
-        elif user==None:
-            error="Incorrect credentials. Please enter valid credential"
-
-        return render_template('login.html',error=error)
-    return render_template('login.html')
+        return render_template('login.html', status=status, error=error)
+    return render_template('login.html', status=status, error=error)
 
 @app.route('/logout')
 def logout():
@@ -184,6 +200,6 @@ def about():
     return render_template('about.html')
 
 if __name__=='__main__':
-    app.debug=True
+    # app.debug=True
     app.secret_key="efrwwseq4sfcwasdr3142qwdsf24wsd"
     app.run() 
\ No newline at end of file

From 06ab287d6596002178e66dc7efba7d553b42de5a Mon Sep 17 00:00:00 2001
From: S <Shivaprasad.S@philips.com>
Date: Sat, 18 Apr 2020 19:41:32 +0530
Subject: [PATCH 5/6] db

---
 database3.db | Bin 20480 -> 20480 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/database3.db b/database3.db
index 940045aa4f1e9c4af1e1f66bcc2790c61d8ffff0..43b865833f78fec23918f347f175cfbaf397fbea 100644
GIT binary patch
delta 432
zcmZozz}T>Wae_2s_Cy(H)@%kn6NQZ_3;1Q&cuz6#FXDIOd(GF$r@?!Q*B=2lD=HZB
zP7ai<tdC*iWDr-BZDir#C@oGcvIG+jxrv!MX2ynQmKKJ_Dn>~vhDIudQI@$8sfJEf
zRc_{0<=!S~`Jp}@{{DGhhF%`2NkvJf;h`l3-mWH=j$R?@Y568DM#&y}@vI=z<r`TT
z89@e{g9)(dMrP)QX2zEF7KTvsbBZb|T(TT9+%f_}QnHIZ3rdWmGE&VdUG#&@qe25i
z&5A7|vrQ^|!z;q`GK?z=T?)MPyjj^2SU@%?!fY@D*<c2?!Q9Bu%)-*Z(8K_0gIij5
zWpJ@~MUtCAv2TV`Nnu`PrLtM7VP27MR&c(nacY=%sGdn=aaLYxzPEp-Z<cXhRcJ6P
z+veADl8iEJ{6`u1zw^K4f6RZA|2+Ru{ze4c%;=E9Ke<KUQI3;Y9PCp|HW<sC6~;1S
K+5A{vRsjG`MSh6@

delta 432
zcmZozz}T>Wae_2s+(a2?);I<|>kk`K7Vyh3^Sx%^U&Qam_nOxq9d1@sFyx&aC|g;t
zVw9v}XrvNo;vJaf98#5)<5yu^=@;ebV^ENuYMhpvTM|%gYOWXMU1F4B9A;i<5Sr?j
z7?fR=lM@om%ErLJ_(NP%ype^2qqI1+$QVpG<R)h3=q2ap8X6g!m_jWG%}&X5Es9Ky
z2n)$cck?w0GRrKfNX@JF%qdRK@(HLa&Ga{ma5OH~_fNF&DG7B6Oe`~UPX(Gk6Ulrd
zkoiVf%?}PqE;r85Pj$&Fiu5u|_KOP2PBlzTc8dxR%kwsK%qvN8O$|-VHZU{uGcqkr
zO)T>_stRUcP-e6emK7IgWK7S<1R}7}U}u8~um>eKzm}6^lwsz7%)tMh|1JMx{zi1T
unb9GIe{zeyqg-ZQIxtWe%yaYdS%I{EL17UKkXA1!N-WMu-27NyRsjG?6n+2z


From e5c79121d718a909036eabde053dc34032d70425 Mon Sep 17 00:00:00 2001
From: S <Shivaprasad.S@philips.com>
Date: Sat, 18 Apr 2020 19:42:47 +0530
Subject: [PATCH 6/6] Added alerts for error messages

---
 templates/layout.html   |  3 ++
 templates/login.html    | 56 ++++++++++++++---------
 templates/register.html | 99 +++++++++++++++++++++++++++++------------
 3 files changed, 109 insertions(+), 49 deletions(-)

diff --git a/templates/layout.html b/templates/layout.html
index 9bb581c..44d4910 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -65,5 +65,8 @@
     {% endwith %}
     {% block body %}
     {%endblock %}
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
index 4dfe635..d786620 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,21 +1,37 @@
-{% extends "layout.html" %}
-{% block body %}
-	<div class="continer">          
-           <form action="" method="POST">
-
-			<div class="app-title"> 
-				<h1>Log in</h1>
-			</div>            			 
-               <div class="form-group">
-				<input type="email" class="form-control" value="" placeholder="Email" name="email" required>                   
-                </div>                                                  
-				<div class="form-group">
-                  <input type="password" class="form-control" value="" placeholder="Password" name="password" required>
-                </div> 
-             <input type="submit" value="Log in" class="btn btn-primary " >                         
-            </form>            
+{% extends "layout.html" %} {% block body %}
+<div class="container">
+  <form action="" method="POST">
+    <div class="app-title">
+      <h1>Log in</h1>
     </div>
-        <p>
-            <h4>{{error}}</h4>
-        </p>
-{% endblock %}
\ No newline at end of file
+    <div class="form-group">
+      <input
+        type="email"
+        class="form-control"
+        value=""
+        placeholder="Email"
+        name="email"
+        required
+      />
+    </div>
+    <div class="form-group">
+      <input
+        type="password"
+        class="form-control"
+        value=""
+        placeholder="Password"
+        name="password"
+        required
+      />
+    </div>
+    <input type="submit" value="Log in" class="btn btn-primary" />
+  </form>
+<br>
+<div class="alert alert-danger alert-dismissible fade {{ status }}" role="alert">
+  {{ error }}
+  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+</div>
+{% endblock %}
diff --git a/templates/register.html b/templates/register.html
index 76c0f97..7c6d269 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -1,31 +1,72 @@
-{% extends "layout.html" %}
-{% block body %}
-	<div class="continer">          
-           <form action="" method="POST">
-
-			<div class="app-title"> 
-				<h1>Register Now!</h1>
-			</div>            			
-				<div class="form-group">
-                    <input type="text" class="form-control" value="" placeholder="Name" name="name" required>
-                </div>   
-               <div class="form-group">
-				<input type="email" class="form-control" value="" placeholder="Email" name="email" required>                   
-                </div>                         
-                <div class="form-group">
-                    <input type="text" class="form-control" value="" placeholder="Phone" name="phone" required>                   				
-                </div>                           
-				<div class="form-group">
-                  <input type="password" class="form-control" value="" placeholder="Password" name="password" required>
-                </div> 
-                <div class="form-group">
-                    <input type="password" class="form-control" value="" placeholder="Confirm Password" name="confirmpassword" required>
-                  </div> 
-                  <p>
-                    <h1>{{error}}</h1>
-                </p>
-             <input type="submit" value="Sign up" class="btn btn-primary " >                         
-            </form>           
+{% extends "layout.html" %} {% block body %}
+<div class="container">
+  <form action="" method="POST">
+    <div class="app-title">
+      <h1>Register Now!</h1>
+    </div>
+    <div class="form-group">
+      <input
+        type="text"
+        class="form-control"
+        value=""
+        placeholder="Name"
+        name="name"
+        required
+      />
+    </div>
+    <div class="form-group">
+      <input
+        type="email"
+        class="form-control"
+        value=""
+        placeholder="Email"
+        name="email"
+        required
+      />
+    </div>
+    <div class="form-group">
+      <input
+        type="text"
+        class="form-control"
+        value=""
+        placeholder="Phone"
+        name="phone"
+        required
+      />
+    </div>
+    <div class="form-group">
+      <input
+        type="password"
+        class="form-control"
+        value=""
+        placeholder="Password"
+        name="password"
+        required
+      />
+    </div>
+    <div class="form-group">
+      <input
+        type="password"
+        class="form-control"
+        value=""
+        placeholder="Confirm Password"
+        name="confirmpassword"
+        required
+      />
     </div>
+    <input type="submit" value="Sign up" class="btn btn-primary" />
+  </form>
+  <br />
+  <div
+    id="error_msg"
+    class="alert alert-danger alert-dismissible fade {{ status }}"
+    role="alert"
+  >
+    {{ error }}
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+</div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}