From 6d9a54a6fe6c4f26e44ddf9a3da690c022650fe4 Mon Sep 17 00:00:00 2001
From: Allie Bopp <aebopp@umich.edu>
Date: Wed, 17 Jun 2020 01:02:33 -0400
Subject: [PATCH] personalized index page and service points tracking
---
.../__pycache__/__init__.cpython-36.pyc | Bin 433 -> 400 bytes
.../__pycache__/config.cpython-36.pyc | Bin 437 -> 404 bytes
.../__pycache__/model.cpython-36.pyc | Bin 1595 -> 1562 bytes
servicePoints/templates/index.html | 8 +++++-
.../views/__pycache__/__init__.cpython-36.pyc | Bin 303 -> 270 bytes
.../views/__pycache__/accounts.cpython-36.pyc | Bin 6477 -> 6823 bytes
servicePoints/views/accounts.py | 23 ++++++++++++++----
sql/schema.sql | 1 +
var/servicePoints.sqlite3 | Bin 20480 -> 20480 bytes
9 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/servicePoints/__pycache__/__init__.cpython-36.pyc b/servicePoints/__pycache__/__init__.cpython-36.pyc
index b890e80cc2b9d8fb67beb2525dc9b78ddd312088..ae8c520b2453458e48760c1786f565c6eb628aac 100644
GIT binary patch
delta 62
zcmdnUJb{_rn3tDJk?;9Nc1=c2C;i;K68&WT(BjmhV*SMQtfYMX)YRl+6H8Nlpio(6
Qa%w<+W?o70<SIsU064%C-v9sr
delta 95
zcmbQhypfsRn3tDpb->Gw?3#>T$@;l@CHl$wp~b01#rnC4B_+lBF8Rr&xv6<TR&a7g
tetu4Peo?l5aA|ICYLStFk%7Let8=i4rD;G>epYI7iGBfuo*c<&4gm3?AX@+c
diff --git a/servicePoints/__pycache__/config.cpython-36.pyc b/servicePoints/__pycache__/config.cpython-36.pyc
index 7819c87184adca4b2189b0bb5511bcb4c6f8f407..b5b6b7bc54a83e82d9e0f29d63af858771214640 100644
GIT binary patch
delta 62
zcmdnWJcXIvn3tF9H}CU}?7EDa4*I!yCHl$wp~b01#rlcqSxNc&sj11uCYGl9K%uhC
Q<kW!t%)FA~$#sn80B8sl#sB~S
delta 95
zcmbQjyp@^Vn3tDpb->Gw?7ECziTb&DCHl$wp~b01#rnC4B_+lBF8Rr&xv6<TR&a7g
tetu4Peo?l5aA|ICYLStFk%7Let8=i4rD;G>epYI7iGBfuo*c_)4gmE<AZY*q
diff --git a/servicePoints/__pycache__/model.cpython-36.pyc b/servicePoints/__pycache__/model.cpython-36.pyc
index 86bb7b3a23476b2371ea8739ac81138b684f2091..987ba06aecd14df951ced9f5575b13c29be1c283 100644
GIT binary patch
delta 63
zcmdnZGmD4an3tF9!rx~b*)K6_+Uw`$mFOqyhZd(673(LaXC>w9r=}(sn^>Ca1BJ>m
SlT!ooGxJJ{H!CwqumAwc&K36n
delta 96
zcmbQmvzv$An3tDpb->Gw?3Wn567+NPO7xTULyJ?3iuH37OG=9MUGkGlb5rwxtl;E~
u{QR8o{Gx3A;L_aO)FLATBLjU`SLa|8OVfa&{H)aE68!=Qy_tzgf&~CnRUp;?
diff --git a/servicePoints/templates/index.html b/servicePoints/templates/index.html
index 9891e21..dc70c0f 100644
--- a/servicePoints/templates/index.html
+++ b/servicePoints/templates/index.html
@@ -2,9 +2,15 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="/css/style.css">
- <title>ServicePoints</title>
+ <h1 style="text-align:center">Welcome to ServicePoints!</h1>
+ <p>{{username}}</p>
+ <p>{{org}}</p>
+ <p>Hours: {{hours}}</p>
<a href="/accounts/logout/">logout</a>
<a href="/accounts/delete/">delete</a>
<a href="/accounts/mask/">mask</a>
+ {% if leader == 1 %}
+ <p>leader!</p>
+ {% endif %}
</head>
</html>
diff --git a/servicePoints/views/__pycache__/__init__.cpython-36.pyc b/servicePoints/views/__pycache__/__init__.cpython-36.pyc
index 180037e3f49e55ada44d0f5f95254730be1535b7..1d30055a28038c24f70515e1ec1990883944f38d 100644
GIT binary patch
delta 60
zcmZ3_)W^hb%*)GV&i8yG`*KYW{oK3~{bc>n;?$yI{lxUFq<sC<)Z}6lOH+NIP+4Yj
OYCwKwUP<x9ALaly@D$Ae
delta 93
zcmeBUTF=C8%*)HQI^g9*_T^rg`nh=}`pNpC#i>Qb`nicECB^zK`N^fZsd+$FaB@a|
reolCPQMP_?X>M+6k&%IsfxfG&bFhh}X+TkaR%&vIegTA@c-<TT>LMXC
diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc
index a9c6c8cd912ccd7d4a422c9e00d7679dfcaa9305..c356eda9522b3f823f962c3ee53e87c648fb3e8c 100644
GIT binary patch
delta 2162
zcmbtVO>7%Q6yDiguh;9JI6sb)k~W6Yrp}MIY8#rCCM3!aRaKHUX=oJ$!SQZfJGM7^
zyQWoSE0H2`Y9ql^;!+_Hl|TqpMHS-4j|9g8XWx)G&|WwoaR@@<y>Z*5A<zT1=G)nC
z=FNNa-h8w7j(ps291Vw!@<;dIxP9nz<5Pvz_!r6`i}2r-JFJc0Qm?1FBuUylZ5B(O
znK5Tw8(cG;%`Z5nZD-tLC;CmK-pXa{b55@0xqQu+VM+drZ{chb4U;}-zz0MTYQ9Xt
zP6IR&(L_K?Z-YZLNh>&6r|flO-&GML#bD6G-_`aT8orGZf0KW$b+e7T544l4)oNVS
zs(w$)`}6v`RMjhbK4dlV0evrzh7CTif9D5=Rx5Av1A!rbZ{o632A7|U#QBv#i*^i$
zl8yZBNGjTf-J0Th0PWa=J^aT&S4fa*DP6Rom&-;nc96!lBB!7s#fOdIh|UbAF-?xj
zDnn|+I2e2!@+Fynqjf1VoZ%0&)ZKXS6Q)|>MU8(OT4TNZy58LaedIro0Xyy4Q;<zE
zF!@?|tn~=-kz6U`6qgIOXHPg#grmF`KF<ERCo2-yM$n+Xr&S6c`U&cLqTUM#HKkye
zV1Qm_grost<_RKt2~Hx+1w3ayZCMx$yh!9JBK;0z$I@OJ28r4&9YZ)UkIg;9Qw@Ww
zI%~nqgtl@+<D1OP;6wcUh(2thxYw{_F;B{~B@HU{v{<`Tl{`7G<W;ONtFXM!k}aho
z<=DDhl`C>yLtYWQ`j}TMD)H8;Z%KzsmR9wZRLfuWRiuhy>FtC8M4x5cRI8fjx55=|
zgUv|jQpXmsLhEcD-;<G*rfIum*^tN~UQH~gvvvxov@88H<7dZ5FC;J}lXyfP9<Id1
z^wcYfGHE4o@ic!u9OAbXZ65^4r0+?S`dqZ<?<=k6C&f{P5Ka_jsQJWcO{&6OO~H9E
zhJz>*JB<--8X~0BWv^HOAvgvv<2cr{t~>r=q<M7@Ek{)swcZk7(l3@3rJoDCUfHrs
z-V|g<%TV)!?UoCkI~S;XLJlTqiQNiL1$+;i+krrerN1T{OefT-_Na+gek%G73-TYL
zZ84e%dkOXtbP^=^pV9W$o~7<{1p5h|CpdsG*R-5=-75}Q^VY&Vsx(*1?$jZj=g+XY
zbl*tmlH$-=R5TdiPGhZyva}hrY*LcQ8|rKlxn!uGvS#c<3qh2UH$gWMhzxFBTtYG`
z2(^$<{#6P!t?uYcey`~nHpTBZ-D;))=7L~nbFOCtrW=O%2hDBc=a9#Wh`MbBA!NJ5
zGuyQYhtd9f{#SFH9p<r?8!_Q0T)$36G8v~_^6*yrs-<K6{QvZ1p#4w0GZtqCKOVcv
zOnxV}@8UGAs_l$_N9Zz`IBnPX#r21Su8ttdAyGEy;|E%ctK!CpS>@$IE>pi9Np6qI
zH-qz^>UsC1y@aMeW83BwFK=R3I?Z%FYp%%~<BO{l_-6By*YKkVF5uWxBlwTK52O9B
z*tUhCGaz=Q;b9p3kNC*!EHZdr#rfNHLp8OSc9(vmrNq~hK1HvRQ9B69oxy%hcHDZI
zXdQ_0Yi&o)(`kVof)oKI97xvnZ^RV!=zsy$UVN!Ul0=BY!8R#&(Ue2Hq1|kV>A{Xj
LN3g@_@YDZq<;}6Q
delta 1927
zcmbtVPiP!v6rXQ*c6Mg=PyTJPS>4psnxvC7nV2S|ttM?rQ?%A5ZD<RN8m2ST&2DyQ
z;+t6vAu&q8lM3Y%g&yjqAoO4>K@dE6C>{#-CW7P5gW$o7-r~jgW{sOHQ3|qrzxlrR
z{dxa>@9k$3kH^&Gsg(NXd%wOR^nan=i?Ra$GCIXl{Ez4ZmgRTF59ay>LD(tjRmay&
z{i<h!r&kT%_w;kFS*zL(&KAri*R5Q4VOd|ORjW3PjgF1#v$Hb`<0mKP!7baSudmd<
zd@*LSqx@m)#>J!fvKE6hexL;*h?y1J0B9va8v*Iw0|RtOs<=hB<`3fB6A^@{%3zSc
zDIHN`xSApPZGJ}@Wbbc3l1{PA&DciVm&)<7yd`YN>vB11weg(Xqjan*AF>5O%kb0k
zw~@7LJfTeUc_qusN?YPMzN58;#_@NR;bai?e1LA0LXLl<3?#ES4MfL4cZc}ziq_dj
zdku@pSQzG`>Y22}R3<Sg(i#yNir!ZH8>U|4pR0rHrR^WpA6VpOjBh93VME-J2eWXD
zG$<z6hHuY7QDZQI68^Q^$8V?dUC+~Yy5yK{b){na_IVeoFvh=2O|ph7W;&BNg9jU~
zjBJkM`fpEYHh~aCE4BlZw2UBVDv*0{f?$Z?Btk*)-9^K)&=xpF!WT#wccFOB@C|s8
zL<a?73O5#Ucoz@^k?SodvJ%T+P?C+X(4ig1?_{%^#0!i0LYXZ~&|MNX1V3Vl>jEVU
zrBNKB72RT6l)Ttl`xV=<Z0Ic^uJ*1NMSBD!dQA-_BTIg@0wLEJ5Igo#F7&oRI1F*0
z@Ep3)l*Tw-`viw4BM{+4{&Cx_O%)fK5{R{0$qHhG<3V)EUWKP|1M&nt1cwNoK?uaM
zTXM8`A+ch3-diqMizNqoY5Oq2vjj&7&<LT>{?94v#v;<M<P`T>rqDsk*{A$|dyY-=
zN9{ovyq$z)6C*;`(WjU3jFzkyT033pAfS?i3_&MB7lB5QBWM(1NC>gc1){;fCOVKT
z`!MOfho?MJBt(-T_0<UFx|O9FT;MaAyP=hZ1lYxr=i5Mp3iIEJT)O1?=iQoP?Hd0I
zKBL8(jSma4$wo>Zn%9&&9c5qP@Tkv_L1>5)T7$)?bGP%OP9jGkRWG!&rit2pEYt3;
z{OcES=l>|D6g|XIR~`wK@9I|gt*%uz!qx1d>#vd?soBXU{~}@iALt~tipQiUBq-`>
zWio?fd^1~RQ~bAV&y`D0qT%2OPUF?@_dkxIo93@|*EXpm?R4yKLc5updlHrZ;nZoo
z|I>cG=oCrUT681K6Q9qWy*f{NSiNx_=s_S>4R85pdMf<Kpf-G&F6HW#I*aol;(GP?
z6W<}jf60wqCSm~n)4(tRaTKT*)H@}$Ga!0FSc#Mapjd?_h6?s@F=XWcFFmEV$Z{f|
M&L{F}K2E>C068>oIsgCw
diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py
index 4d61055..fbbd27b 100644
--- a/servicePoints/views/accounts.py
+++ b/servicePoints/views/accounts.py
@@ -82,10 +82,10 @@ def create():
pw = hash_pass(flask.session['password'])
data = (flask.session['username'], flask.session['fullname'],
flask.session['email'], flask.session['orgName'],
- pw)
+ pw, 0)
cur = servicePoints.model.get_db()
cur.execute("INSERT INTO users(username, fullname, email, orgName, "
- "password) VALUES (?, ?, ?, ?, ?)", data)
+ "password, hours) VALUES (?, ?, ?, ?, ?, ?)", data)
return flask.redirect(flask.url_for('index'))
@@ -136,12 +136,12 @@ def createOrg():
pw = hash_pass(flask.session['password'])
data = (flask.session['username'], flask.session['fullname'],
flask.session['email'], flask.session['orgName'],
- pw)
+ pw, 0)
orgData = (flask.session['username'], flask.session['orgName'])
cur = servicePoints.model.get_db()
cur.execute("INSERT INTO orgs(username, orgName) VALUES (?, ?)", orgData)
cur.execute("INSERT INTO users(username, fullname, email, orgName, "
- "password) VALUES (?, ?, ?, ?, ?)", data)
+ "password, hours) VALUES (?, ?, ?, ?, ?, ?)", data)
return flask.redirect(flask.url_for('index'))
@@ -152,7 +152,20 @@ def createOrg():
def index():
"""Render index page."""
if 'username' in flask.session:
- context = {}
+ username = flask.session["username"]
+ cursor = servicePoints.model.get_db()
+ studentOrgCur = cursor.execute('SELECT orgName, hours FROM users WHERE '
+ 'username =:who',
+ {"who": username})
+ results = studentOrgCur.fetchone()
+ leaderCur = cursor.execute('SELECT orgName FROM orgs WHERE '
+ 'username =:who',
+ {"who": username})
+ if leaderCur.fetchone() is None:
+ leader = 0
+ else:
+ leader = 1
+ context = {'username': username, 'org': results["orgName"], 'hours': results["hours"], 'leader': leader}
return render_template('index.html', **context)
return flask.redirect(flask.url_for('login'))
diff --git a/sql/schema.sql b/sql/schema.sql
index 989a33b..cf8c4be 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -6,6 +6,7 @@ CREATE TABLE users(
email VARCHAR(40) NOT NULL,
orgName VARCHAR(40) NOT NULL,
password VARCHAR(256) NOT NULL,
+ hours VARCHAR(40) NOT NULL,
PRIMARY KEY(username)
);
diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3
index a77f946ef28eb1357e2030f2d6a071479f3a9c43..85d5394bf56a9cd92efe500641195ec587d06417 100644
GIT binary patch
delta 545
zcmXw#y>3)75QXpEAMzuuEfhtIL<)koMjm@SV<U<P8eW3JzP6PHA#H@V+-%?hHo6@R
z`v^fRK@SxLPeL7uC=CuGUwh7(b2R6h_I%T>AGf2+qgRKc=GoEJME+?;;-C>f<S%g`
zK7Cnzp7bED_AhqYo#}Miet6se7C#^CoxXcNKkHw}NBu^K{=0m+I}qzez8354@sp2Y
zxw3;@S-E&4=kxjE>@--=GpmcY$gw2M$eCQBgq>oYBWsn)ERZ7AX_q?#F;hz1IqPi(
z!_H&|4yHr`BGT0bq259=0lW`JB?Qbl1~9PHIws1&7Ht(JYg0iL5jYvg$)<Ey%+azp
z+$D4v6nC~WtX8(YAHJyE5BDZ13Pnfdu!I;(aTI|ofotiEC=wDm<f2ndOVXBeRGc~K
zoL#gQLN=C72qjQ;kR>0o14JsevrHM2H{cwxGQl7yl{K@*VlWsJ3i!I70gFcERVYPk
zP#z%0km@_se$zAqdELlsdE0ECo_v*;YkfE#%62{&4dvcqQVp%VY2?lJ_~ctv-NSJ^
Ulyb4Si?%f-Z~rUL$Nv(40g&90egFUf
literal 20480
zcmeI3OK;p%6vyp&9-X#{iK5YLs5Fa_NF-F<_d^vTp^5}FEi@FQE~@B0X+)ACnM7eb
zWzT0}$roT(Bvz;_D|QI6KrBFPIG$#zHc-K$i!RQcT>JX^+Ww#4ImeQHosVvB?H;FL
z9v|(y;~_6zE6TE19}bJ6xB#^cbzT;r(VB0-x_qYnqUMF->g!)G)_)YOC0Z;!uD@HN
zOW(X`F!mz>B!C2v01`j~NB{{S0VIF~kiaWMVA`s>gMPo9es=8qUK$^LI%#U_`u66=
zoz3B$jd!*-hfUAw#olmuGD$}VZa)n_+1S4R?#A{iBWuH3AKV$<`gm*W&1M7)z4hz>
zaelyu+wa}n*uFcwv3Ym(Z1CE}wKrOw!L@!_>>kAQ#pG}g9%6Ug$?<r$z0+KOhc?Uh
zbhqpd27~fTI@8+-n#>jp&ncdD{ZGmHWN+^|qt0pWrG2-%_tfO`d;i1Y-sf&IIUOIx
zrzc=iorCr)lR095vbN9}yft_cl$nV;bhfG>qMGOXVi9WR(rHn@zx37O_lrxHZ@>l?
zB!C2v01`j~NB{{S0VIF~UM7L*?N0YfpY|Wz+drCw`v+<FraL~Kx7Sbhcf<XwDW2Sf
z_2j;jl#PPsLK7Di)k;|AJQ2()>pYj97?nmmW-7dho^j!sOF}4?C>(03(?nWsXp}A`
zl5DmD4w8X0Dp-`-TN9P`&W98NqlPQZqmU-B<l$t7m`J$~&IBGJ;XVf|iPl<5odpjr
zGH%&)z1=(+f=yvO-eb*TUe8SM)Dt)`XB~uKE;<&uPfRAwC0yQ&gjdm!#u_H0p)?R7
zBrGTwDj4lG2`YGPGF8N7(3XhQgvu-x&6!yeqsoSJORSg5gMpbl2dx~fNg~p0t#yV(
zZ4LL)IU<R-J`-TrTyOezs|yyKnJ`!1tj{dqiA!hUlGZ4pjrGji;9LwDxN`4Cgc8dg
zafwqam}e>pqL|Z`$PE4x)=*IBq!fxfm8A5bOM0MAjFyDPEGbu<Q0k<RJX4(kld#}z
z<rr9~G_?`D%8B=IoT3EqE1L+5pg>NqRoxXR5AL0gPoMsssfXAJGC5{hU_!HCfJz4E
zN~1uBAS1z(wv-2EtTZGO1MUKXi6~{YCXoxtGF*sx&p@zuk}(cOLR>gwbxc9zoOpIQ
zkj%hjFLE?4Wgr2uOGV}oFV<)SUST#utPw_|@>U7hsit<JyS%*Iq(y3e2kG>5uH6M{
zat^`*7!!h%CIxE&L9$k8I?`0e?3MB~SS~fVCis*bL}#EHf?k5}!5l@5(G1dqW&`4r
zg37sY4gw}5lQ?wP9HdrW3y5=wMgi%jT@!vBOk>~$4uYBHHX7&$pCoX}l$YHa%7c4{
zP|j2<;2C-3T5}?@G|od%=K#S$RgjL4bOs@iwG8A01;HJJ77Q{KU_s!Um^@^ShIC+H
ztp&ruYd`=_23c#h3Q_CqBUqi43nVo023bLY2HYDGBiZBt0hc|by4D`<6$w%vx|xCm
zz6f`<PW`Z`f2x11f3F|bf7QRd%o`n^3ke_rB!C2v01`j~NB{{S0VIF~kN^^Rxdbj(
zSIYS-#7?gol+BAP*1k~nXRTJZS}Ea`P}QlH%l)*_s_NchGymVNzb)!N>tEp=zz@*G
zf&`EN5<mh-00|%gB!C2v01`j~NB{}EiUjI*b)`Rl@^3yFy40%r{rTrBy{cMSdGaYp
zZ=qW5Kl!YpT~>8{c-YMUx9dkm{iuFi{|2-FKfj6wq9!DO1dsp{Kmter2_OL^fCP{L
d5<mh-;NJ)|lm5+{fPc>ZH+!1@t9Ua1|2IQ*2LJ#7
--
GitLab