|
@@ -284,7 +294,7 @@
© Copyright 2018 - 2019, SamR1.
- Created using Sphinx 2.2.0.
+ Created using Sphinx 2.2.1.
diff --git a/docs/index.html b/docs/index.html
index b3941d93..04cea1a3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -168,6 +168,7 @@ Map.
API documentation
- Activities
- Authentication
+- Configuration
- Records
- Sports
- Statistics
@@ -204,7 +205,7 @@ Map.
© Copyright 2018 - 2019, SamR1.
- Created using Sphinx 2.2.0.
+ Created using Sphinx 2.2.1.
diff --git a/docs/installation.html b/docs/installation.html
index 302c7c05..93592eb3 100644
--- a/docs/installation.html
+++ b/docs/installation.html
@@ -363,7 +363,7 @@ $ make upgrade-db
© Copyright 2018 - 2019, SamR1.
- Created using Sphinx 2.2.0.
+ Created using Sphinx 2.2.1.
diff --git a/docs/objects.inv b/docs/objects.inv
index 6eb13caa65b49afe82df8717db82d8f4644ea432..ffc646245d7e246ab605bb4b10646dbf839222e7 100644
GIT binary patch
delta 721
zcmV;?0xtcb2E+!Ce}BP_+aM5z?>q%kFX@3=z2>&6w9+0bt-9NDMC^%;>KF@;tIgXN
z4A>Z)tliCCA~XE|$1sL*GTw@e=P3RP6wuKMvE7$|^gEr;e5>$Wf6+6H=?NBC7|E6(
zt?aH*%+&jsY$qDryYb~9imw)2Kn)02&~`G0GlOC?)avCn6@TL+3$+~c>RQFj+XDrD#%`o=P}6#;iO7$R3l8j(};4&TrHq
zpcOgx3YOZ{2!EM1D#P)ntDrTTS%fHg5;d&dkC!hXGAIOYNXEL@;0kdHO3@*x^{CO|
zFu80_qKvm>qrKuNWE1VpITrk3-(4UCt#{67MU!OEcc9{nFzB2|K`vF1d}duZGJ3J|
zcCA#HSZy?NI_b>lT8VjHy2m#-u0@Q__pxC~LvT>b+ka@}o@^>Qbj9Q4FzAxRjW*8P
z#4OwU+33H$28uI$V2Qy#TY=a0dY%zG_i&WfoG&X3UD?j3wA#-m%Q9)+i#8F1t`z-I
z?6BAuGN){@`bpZ{Sk%+f@lhOi=9KzE&BXK
z^-OO*o_~|eU);zS-g5fO4oGmbBYALf=*#d-#>10n#}h?gOd_4GgO%IU5y_{QMt_?}
zqW>#3CFoCCs2qc?I>V6aF*yM@FLcKBF)My_BT_;$6|v?=sEyc1t@z12lBCvw;!)tM
z;`tu{Ez_H=>*Sq=agUuMUD2XrARqcikkGia$o{h0V6Y1*?(Vu
zg0a~RG@HxH_Pp=o@!*fmSC*(RBnJ4Rtnj7imd@{NuajlK>)?=3K{dDqQpML{+3m=%m*cUUfrrFNZV&^tn
zY0Lhy!qAl;d`g@BbhfOMmiNFeVsIlwf6@jlkEJLGUA=9|-PF(g$xJN%w30j3QqKo3
z7;@1W1Mf(>UoCdA(hv^d4&t8G)~b8F)O}zy{v+6E@H!8
zpwVJKYQ+z_nI*Lj6!#pTB`f{_D4AMp)0k>6)$_Q=&LdeX%9T9&GxY)M`6}Q^Z)<=
diff --git a/docs/search.html b/docs/search.html
index bc0a9a88..066ebb39 100644
--- a/docs/search.html
+++ b/docs/search.html
@@ -147,7 +147,7 @@
© Copyright 2018 - 2019, SamR1.
- Created using Sphinx 2.2.0.
+ Created using Sphinx 2.2.1.
diff --git a/docs/searchindex.js b/docs/searchindex.js
index 813c66c3..d94f10c2 100644
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["api/activities","api/auth","api/index","api/records","api/sports","api/stats","api/users","changelog","features","index","installation","troubleshooting/administrator","troubleshooting/index","troubleshooting/user"],envversion:{"sphinx.domains.c":1,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":1,"sphinx.domains.javascript":1,"sphinx.domains.math":2,"sphinx.domains.python":1,"sphinx.domains.rst":1,"sphinx.domains.std":1,sphinx:56},filenames:["api/activities.rst","api/auth.rst","api/index.rst","api/records.rst","api/sports.rst","api/stats.rst","api/users.rst","changelog.md","features.rst","index.rst","installation.rst","troubleshooting/administrator.rst","troubleshooting/index.rst","troubleshooting/user.rst"],objects:{"":{"/api/activities":[0,1,1,"post--api-activities"],"/api/activities/(int:activity_id)":[0,3,1,"patch--api-activities-(int-activity_id)"],"/api/activities/(int:activity_id)/chart_data":[0,0,1,"get--api-activities-(int-activity_id)-chart_data"],"/api/activities/(int:activity_id)/chart_data/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-chart_data-segment-(int-segment_id)"],"/api/activities/(int:activity_id)/gpx":[0,0,1,"get--api-activities-(int-activity_id)-gpx"],"/api/activities/(int:activity_id)/gpx/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-gpx-segment-(int-segment_id)"],"/api/activities/map/(map_id)":[0,0,1,"get--api-activities-map-(map_id)"],"/api/activities/no_gpx":[0,1,1,"post--api-activities-no_gpx"],"/api/auth/login":[1,1,1,"post--api-auth-login"],"/api/auth/logout":[1,0,1,"get--api-auth-logout"],"/api/auth/picture":[1,1,1,"post--api-auth-picture"],"/api/auth/profile":[1,0,1,"get--api-auth-profile"],"/api/auth/profile/edit":[1,1,1,"post--api-auth-profile-edit"],"/api/auth/register":[1,1,1,"post--api-auth-register"],"/api/ping":[6,0,1,"get--api-ping"],"/api/records":[3,0,1,"get--api-records"],"/api/sports":[4,0,1,"get--api-sports"],"/api/sports/(int:sport_id)":[4,3,1,"patch--api-sports-(int-sport_id)"],"/api/stats/(int:user_id)/by_sport":[5,0,1,"get--api-stats-(int-user_id)-by_sport"],"/api/stats/(int:user_id)/by_time":[5,0,1,"get--api-stats-(int-user_id)-by_time"],"/api/stats/all":[5,0,1,"get--api-stats-all"],"/api/users":[6,0,1,"get--api-users"],"/api/users/(user_id)":[6,0,1,"get--api-users-(user_id)"],"/api/users/(user_id)/picture":[6,0,1,"get--api-users-(user_id)-picture"]}},objnames:{"0":["http","get","HTTP get"],"1":["http","post","HTTP post"],"2":["http","delete","HTTP delete"],"3":["http","patch","HTTP patch"]},objtypes:{"0":"http:get","1":"http:post","2":"http:delete","3":"http:patch"},terms:{"0mb":[0,1],"10mb":10,"1mb":10,"default":[0,5,10],"export":9,"float":0,"int":[0,4,5],"null":[0,1,6],"return":[0,3],"static":10,"true":[1,4,6,10],"try":[0,1],For:10,NOT:[0,1,4],Not:[0,1,4,5,6],That:1,The:[7,10],Use:7,accord:9,account:[7,8],acit:0,activ:[2,4,5,7,9],activity_d:[0,3],activity_id:[0,3],adapt:10,add:[7,8,9],admin:[1,4,6,7,8,10],administr:[0,1,7,8,9,12],again:[0,1,3,4,5,6],all:[3,4,5,6,10],allow:[0,1,9,10],alpinequest:9,alreadi:1,also:9,android:9,anymor:7,api:[0,1,3,4,5,6,7,8,9,10,11],app:[9,10],applic:[0,1,3,4,5,6,9,10],arch:10,archiv:10,archlinux:10,ascent:0,auth:[0,1,3,4,5,6],auth_token:1,auth_user_id:[0,3,4,5,6],authent:[0,2,3,4,5,6,9],author:[0,1,3,4,5,6],avail:3,ave_spe:0,ave_speed_from:0,ave_speed_to:0,averag:[0,3,7,8],backup:10,bad:[0,1,4],bearer:[0,1,3,4,5,6],befor:10,beta:10,bike:[0,4,7,8],bio:[1,6],biographi:1,birth:1,birth_dat:[1,6],bound:0,build:10,by_sport:5,by_tim:5,calcul:7,calendar:[7,8],can:[7,8,9,10],chang:[9,10],charact:[1,12],chart:[0,7,8,10],chart_data:0,check:[6,11],choos:7,client:[10,11],clone:10,code:[0,1,3,4,5,6],column:12,com:[1,6,10],config:[10,11],confirm:1,contact:[0,1],content:[0,1,3,4,5,6],coordin:10,copi:10,correctli:[7,11],creat:[0,1,7,8],created_at:[1,6],creation:[7,8],creation_d:0,credenti:1,current:7,custom:[10,11],cycl:[4,7,8],dai:7,dark:10,darkski:[7,8,10],dashboard:[7,9],data:[0,1,3,4,5,6,9,10,12],databas:10,date:[0,1,5,7,8],debian:10,defaut:10,defin:10,delet:[0,1,7,8],depend:7,desc:0,descent:0,describ:10,descript:10,detail:[6,7,9],develop:9,directori:10,disabl:[1,7,8],displai:[0,7,8,9,10],distanc:[0,3,7,8],distance_from:0,distance_to:0,document:[7,9,10],doe:[0,1,5,6],don:1,download:10,durat:[0,3,7,8],duration_from:0,duration_to:0,dure:[0,1],edit:[1,7,8],elev:[0,7,8,10],email:[1,6,10],encount:10,end:[0,5],endpoint:[2,6,12],enter:[7,8],entiti:[0,1],environ:9,environn:11,error:[0,1,4,7],europ:[1,6],even:[7,8],exampl:[0,1,3,4,5,6,9,10,11],exce:[0,1],exist:[0,1,5,6,9,11],exodu:9,expir:[0,1,3,4,5,6],extens:[0,1],fa33f4d996844a5c73ecd1ae24456ab8:0,fals:[0,1,4,6],farest:[3,7,8],featur:9,fetch:10,file:[0,1,7,8,9,10,11],filter:[7,8],first:[1,9],first_nam:[1,6],fittracke:10,fittrackee_api:10,fix:9,flask:10,flaticon:10,follow:[3,10],forbidden:[0,1,4,5],forecast:10,form:[0,1],format:[0,1,5],former:10,forrunn:9,found:[0,1,4,5,6],frame:5,freepik:10,fri:0,from:[0,3,4,5,6,9,10],gener:10,get:[0,1,3,4,5,6],gif:1,git:10,github:10,gmt:[0,1,3,6],gpl:9,gpx:[0,7,8,9,10],gpxpy:10,has_act:4,have:[0,4,5],header:[0,1,3,4,5,6],health:6,hike:[4,7,8],his:[7,8],http:[0,1,3,4,5,6,10,11],icon:10,imag:[0,1,6,10],img:4,improv:9,incorrect:7,info:1,inform:[7,9],initi:[10,11],instal:9,instanc:10,integ:[0,3,4,5,6],intern:[0,1,4],invalid:[0,1,3,4,5,6],is_act:4,issu:[9,10],jan:0,javascript:10,jpeg:6,jpg:1,json:[0,1,3,4,5,6,12],jul:[0,1,3,6],keep:9,kei:[7,8,10],label:4,languag:1,larg:[0,1],last:[1,10],last_nam:[1,6],latitud:0,leaflet:[0,10],least:0,limit:7,line:12,linux:10,list:[7,9],local:9,localhost:[10,11],locat:[1,6],log:[0,1,3,4,5,6,9,10],login:[1,10],logout:1,longest:[3,7,8],longitud:0,made:[10,11],mai:10,make:10,makefil:[10,11],manag:7,mandatori:[0,10],map:[0,7,8,9,10],map_id:0,match:1,max:[0,10],max_alt:0,max_spe:0,max_speed_from:0,max_speed_to:0,maxim:0,maximum:[3,7,8],mean:11,messag:[0,1,6],min_alt:0,minim:0,mobil:9,modification_d:0,mon:0,mondai:[1,5],montain:[7,8],month:[5,7,8],more:[7,9],morn:0,mountain:4,mous:7,move:[0,7],mpwoadmin:10,multipart:[0,1],must:[1,4,7,8,10],name:1,nb_activ:[1,5,6],nb_sport:[1,6],necessari:10,need:10,network:11,next_act:0,no_gpx:0,non:4,note:[0,7,8,10],now:[7,8,10],number:[0,10],oauth:[0,1,3,4,5,6],object:[0,1,4],one:0,onli:[0,7,8],open:[9,10],option:10,order:0,other:10,out:1,outdoor:9,over:7,own:9,owner:[7,8],packag:[7,10],page:0,pagin:0,paramet:[0,1,3,4,5,6],pari:[1,6],pars:[10,12],part:[0,1],password:[1,10],password_conf:1,past:10,patch:[0,4],paus:[0,7],payload:[0,1,4],per:0,per_pag:0,permiss:[0,4,5],pg_dump:10,pictur:[0,1,6,10],ping:6,pipenv:7,pleas:[0,1,3,4,5,6],png:[0,1,4],poetri:[7,10],point:7,pong:6,possibl:9,post:[0,1],postgresql:10,prefer:1,prerequisit:9,previous_act:0,privai:9,product:[9,10],profil:1,project:10,proprietari:9,provid:[0,1,3,4,5,6,7,8],pull:10,python:[7,10],queri:[0,5],react:10,react_app_allow_registr:10,react_app_api_url:11,react_app_gpx_limit_import:10,react_app_max_single_file_s:10,react_app_max_zip_file_s:10,react_app_thunderforest_api_kei:10,readi:[9,10],rebuild:11,rechart:[0,10],record:[0,2,7,8,9],record_typ:[0,3],redux:10,regist:[1,10],registr:[1,7,8],relat:10,releas:[9,10],replac:7,repo:10,report:9,repositori:10,request:[0,1,3,4,5,6,11],requir:1,respons:[0,1,3,4,5,6],restart:10,run:[4,7,8,10],runner:9,sam:[1,6],samr1:10,sat:6,search:7,second:0,see:[7,8,9,10,11],segment:[0,7,8],segment_id:0,select:[0,1],serv:10,server:[0,1,4,9,10],set:10,sever:9,show:7,signatur:[0,1,3,4,5,6],sinc:10,singl:6,size:[0,1,7,10],sky:10,some:[0,7,10],sorri:1,sort:0,speed:[0,3,7,8,10],sport:[0,2,5,7,8,9,10],sport_id:[0,3,4,5],sports_list:[1,6],standard:[7,8],start:[0,1,5,10],stat:[5,7],staticmap:10,statist:[2,9],statu:[0,1,3,4,5,6],step:10,still:9,stop:10,store:9,street:9,string:[0,1,4,5],success:[0,1,3,4,5,6],successfulli:1,sun:[0,1,3,6],sundai:[0,5],support:[7,8],system:10,tab:11,tar:10,test:10,them:9,thi:[0,7,9,10],thunderforest:10,time:[0,1,5,7,8],timezon:[1,6,7],titl:0,todo:[10,13],token:[0,1,3,4,5,6],too:[0,1],tooltip:7,total:7,total_dist:[1,5,6],total_dur:[1,5,6],track:9,tracker:9,transport:[4,7,8],troubleshoot:9,type:[0,1,3,4,5,6],unauthor:[0,1,3,4,5,6],undefin:11,under:9,unexpect:12,updat:[0,1,4,7,10],upgrad:9,upload:[7,8,10],user:[0,1,2,3,4,5,7,9,10,12],user_id:[0,3,5,6],usernam:[1,6],usernanm:1,using:[0,9],valid:[0,1,3,4,5,6],valu:[0,3,10],variabl:[9,11],version:[9,10],view:7,virtualenv:10,walk:[4,7,8],weather:[7,8,10],weather_api:10,weather_end:0,weather_start:0,web:[0,1,3,4,5,6,9],week:[1,5,7],weekm:[1,5],were:7,wget:10,when:7,wiki:7,with_gpx:0,without:[0,5,7,8,9],workout:9,written:10,www:10,xzf:10,yaourt:10,yarn:10,year:5,yet:[9,10],you:[0,4,5,9],your:9,zip:[0,10],zone:1},titles:["Activities","Authentication","API documentation","Records","Sports","Statistics","Users","Change log","Features","FitTrackee","Installation","Administrator","Troubleshooting","User"],titleterms:{"new":7,activ:[0,8],administr:11,api:2,authent:1,bug:7,chang:7,charact:11,close:7,column:11,content:9,dashboard:8,data:11,detail:8,dev:10,document:2,environ:10,featur:[7,8],first:7,fittracke:9,fix:7,improv:7,instal:10,issu:7,json:11,line:11,list:8,log:7,misc:7,pars:11,prerequisit:10,prod:10,record:3,releas:7,sport:4,statist:[5,7,8],tabl:9,troubleshoot:12,unexpect:11,upgrad:10,user:[6,8,13],variabl:10,version:7,workout:8}})
\ No newline at end of file
+Search.setIndex({docnames:["api/activities","api/auth","api/configuration","api/index","api/records","api/sports","api/stats","api/users","changelog","features","index","installation","troubleshooting/administrator","troubleshooting/index","troubleshooting/user"],envversion:{"sphinx.domains.c":1,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":1,"sphinx.domains.javascript":1,"sphinx.domains.math":2,"sphinx.domains.python":1,"sphinx.domains.rst":1,"sphinx.domains.std":1,sphinx:56},filenames:["api/activities.rst","api/auth.rst","api/configuration.rst","api/index.rst","api/records.rst","api/sports.rst","api/stats.rst","api/users.rst","changelog.md","features.rst","index.rst","installation.rst","troubleshooting/administrator.rst","troubleshooting/index.rst","troubleshooting/user.rst"],objects:{"":{"/api/activities":[0,1,1,"post--api-activities"],"/api/activities/(int:activity_id)":[0,3,1,"patch--api-activities-(int-activity_id)"],"/api/activities/(int:activity_id)/chart_data":[0,0,1,"get--api-activities-(int-activity_id)-chart_data"],"/api/activities/(int:activity_id)/chart_data/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-chart_data-segment-(int-segment_id)"],"/api/activities/(int:activity_id)/gpx":[0,0,1,"get--api-activities-(int-activity_id)-gpx"],"/api/activities/(int:activity_id)/gpx/segment/(int:segment_id)":[0,0,1,"get--api-activities-(int-activity_id)-gpx-segment-(int-segment_id)"],"/api/activities/map/(map_id)":[0,0,1,"get--api-activities-map-(map_id)"],"/api/activities/no_gpx":[0,1,1,"post--api-activities-no_gpx"],"/api/auth/login":[1,1,1,"post--api-auth-login"],"/api/auth/logout":[1,0,1,"get--api-auth-logout"],"/api/auth/picture":[1,1,1,"post--api-auth-picture"],"/api/auth/profile":[1,0,1,"get--api-auth-profile"],"/api/auth/profile/edit":[1,1,1,"post--api-auth-profile-edit"],"/api/auth/register":[1,1,1,"post--api-auth-register"],"/api/config":[2,3,1,"patch--api-config"],"/api/ping":[7,0,1,"get--api-ping"],"/api/records":[4,0,1,"get--api-records"],"/api/sports":[5,0,1,"get--api-sports"],"/api/sports/(int:sport_id)":[5,3,1,"patch--api-sports-(int-sport_id)"],"/api/stats/(int:user_id)/by_sport":[6,0,1,"get--api-stats-(int-user_id)-by_sport"],"/api/stats/(int:user_id)/by_time":[6,0,1,"get--api-stats-(int-user_id)-by_time"],"/api/stats/all":[6,0,1,"get--api-stats-all"],"/api/users":[7,0,1,"get--api-users"],"/api/users/(user_id)":[7,0,1,"get--api-users-(user_id)"],"/api/users/(user_id)/picture":[7,0,1,"get--api-users-(user_id)-picture"]}},objnames:{"0":["http","get","HTTP get"],"1":["http","post","HTTP post"],"2":["http","delete","HTTP delete"],"3":["http","patch","HTTP patch"]},objtypes:{"0":"http:get","1":"http:post","2":"http:delete","3":"http:patch"},terms:{"0mb":[0,1],"10mb":11,"1mb":11,"boolean":2,"default":[0,6,11],"export":10,"float":0,"int":[0,5,6],"null":[0,1,7],"return":[0,4],"static":11,"true":[1,2,5,7,11],"try":[0,1],For:11,NOT:[0,1,5],Not:[0,1,5,6,7],That:1,The:[8,11],Use:8,accord:10,account:[8,9],acit:0,activ:[3,5,6,8,10],activity_d:[0,4],activity_id:[0,4],adapt:11,add:[8,9,10],admin:[1,2,5,7,8,9,11],administr:[0,1,8,9,10,13],again:[0,1,2,4,5,6,7],all:[4,5,6,7,11],allow:[0,1,2,10,11],alpinequest:10,alreadi:1,also:10,android:10,anymor:8,api:[0,1,2,4,5,6,7,8,9,10,11,12],app:[10,11],applic:[0,1,2,4,5,6,7,10,11],arch:11,archiv:[2,11],archlinux:11,ascent:0,auth:[0,1,2,4,5,6,7],auth_token:1,auth_user_id:[0,2,4,5,6,7],authent:[0,2,3,4,5,6,7,10],author:[0,1,2,4,5,6,7],avail:4,ave_spe:0,ave_speed_from:0,ave_speed_to:0,averag:[0,4,8,9],backup:11,bad:[0,1,2,5],bearer:[0,1,2,4,5,6,7],befor:11,beta:11,bike:[0,5,8,9],bio:[1,7],biographi:1,birth:1,birth_dat:[1,7],bound:0,build:11,by_sport:6,by_tim:6,calcul:8,calendar:[8,9],can:[8,9,10,11],chang:[10,11],charact:[1,13],chart:[0,8,9,11],chart_data:0,check:[7,12],choos:8,client:[11,12],clone:11,code:[0,1,2,4,5,6,7],column:13,com:[1,7,11],config:[2,11,12],configur:[3,10],confirm:1,contact:[0,1],content:[0,1,2,4,5,6,7],coordin:11,copi:11,correctli:[8,12],creat:[0,1,8,9],created_at:[1,7],creation:[8,9],creation_d:0,credenti:1,current:8,custom:[11,12],cycl:[5,8,9],dai:8,dark:11,darkski:[8,9,11],dashboard:[8,10],data:[0,1,2,4,5,6,7,10,11,13],databas:11,date:[0,1,6,8,9],debian:11,defaut:11,defin:11,delet:[0,1,8,9],depend:8,desc:0,descent:0,describ:11,descript:11,detail:[7,8,10],develop:10,directori:11,disabl:[1,8,9],displai:[0,8,9,10,11],distanc:[0,4,8,9],distance_from:0,distance_to:0,document:[8,10,11],doe:[0,1,6,7],don:1,download:11,durat:[0,4,8,9],duration_from:0,duration_to:0,dure:[0,1],edit:[1,8,9],elev:[0,8,9,11],email:[1,7,11],enabl:2,encount:11,end:[0,6],endpoint:[3,7,13],enter:[8,9],entiti:[0,1],environ:10,environn:12,error:[0,1,2,5,8],europ:[1,7],even:[8,9],exampl:[0,1,2,4,5,6,7,10,11,12],exce:[0,1],exist:[0,1,6,7,10,12],exodu:10,expir:[0,1,2,4,5,6,7],extens:[0,1],fa33f4d996844a5c73ecd1ae24456ab8:0,fals:[0,1,2,5,7],farest:[4,8,9],featur:10,fetch:11,file:[0,1,2,8,9,10,11,12],filter:[8,9],first:[1,10],first_nam:[1,7],fittracke:11,fittrackee_api:11,fix:10,flask:11,flaticon:11,follow:[4,11],forbidden:[0,1,2,5,6],forecast:11,form:[0,1],format:[0,1,6],former:11,forrunn:10,found:[0,1,5,6,7],frame:6,freepik:11,fri:0,from:[0,2,4,5,6,7,10,11],gener:11,get:[0,1,2,4,5,6,7],gif:1,git:11,github:11,gmt:[0,1,4,7],gpl:10,gpx:[0,8,9,10,11],gpx_limit_import:2,gpxpy:11,has_act:5,have:[0,2,5,6],header:[0,1,2,4,5,6,7],health:7,hike:[5,8,9],his:[8,9],http:[0,1,2,4,5,6,7,11,12],icon:11,imag:[0,1,7,11],img:5,improv:10,incorrect:8,info:1,inform:[8,10],initi:[11,12],instal:10,instanc:[2,11],integ:[0,2,4,5,6,7],integr:2,intern:[0,1,2,5],invalid:[0,1,2,4,5,6,7],is_act:5,is_registration_en:2,issu:[10,11],jan:0,javascript:11,jpeg:7,jpg:1,json:[0,1,2,4,5,6,7,13],jul:[0,1,4,7],keep:10,kei:[8,9,11],label:5,languag:1,larg:[0,1],last:[1,11],last_nam:[1,7],latitud:0,leaflet:[0,11],least:0,limit:8,line:13,linux:11,list:[8,10],local:10,localhost:[11,12],locat:[1,7],log:[0,1,2,4,5,6,7,10,11],login:[1,11],logout:1,longest:[4,8,9],longitud:0,made:[11,12],mai:11,make:11,makefil:[11,12],manag:8,mandatori:[0,11],map:[0,8,9,10,11],map_id:0,match:1,max:[0,2,11],max_alt:0,max_single_file_s:2,max_spe:0,max_speed_from:0,max_speed_to:0,max_us:2,max_zip_file_s:2,maxim:0,maximum:[4,8,9],mean:12,messag:[0,1,7],min_alt:0,minim:0,mobil:10,modification_d:0,mon:0,mondai:[1,6],montain:[8,9],month:[6,8,9],more:[8,10],morn:0,mountain:5,mous:8,move:[0,8],mpwoadmin:11,multipart:[0,1],must:[1,2,5,8,9,11],name:1,nb_activ:[1,6,7],nb_sport:[1,7],necessari:11,need:11,network:12,next_act:0,no_gpx:0,non:5,note:[0,8,9,11],now:[8,9,11],number:[0,2,11],oauth:[0,1,2,4,5,6,7],object:[0,1,2,5],one:0,onli:[0,8,9],open:[10,11],option:11,order:0,other:11,out:1,outdoor:10,over:8,own:10,owner:[8,9],packag:[8,11],page:0,pagin:0,paramet:[0,1,2,4,5,6,7],pari:[1,7],pars:[11,13],part:[0,1],password:[1,11],password_conf:1,past:11,patch:[0,2,5],paus:[0,8],payload:[0,1,2,5],per:0,per_pag:0,permiss:[0,2,5,6],pg_dump:11,pictur:[0,1,7,11],ping:7,pipenv:8,pleas:[0,1,2,4,5,6,7],png:[0,1,5],poetri:[8,11],point:8,pong:7,possibl:10,post:[0,1],postgresql:11,prefer:1,prerequisit:10,previous_act:0,privai:10,product:[10,11],profil:1,project:11,proprietari:10,provid:[0,1,2,4,5,6,7,8,9],pull:11,python:[8,11],queri:[0,6],react:11,react_app_allow_registr:11,react_app_api_url:12,react_app_gpx_limit_import:11,react_app_max_single_file_s:11,react_app_max_zip_file_s:11,react_app_thunderforest_api_kei:11,readi:[10,11],rebuild:12,rechart:[0,11],record:[0,3,8,9,10],record_typ:[0,4],redux:11,regist:[1,2,11],registr:[1,2,8,9],relat:11,releas:[10,11],replac:8,repo:11,report:10,repositori:11,request:[0,1,2,4,5,6,7,12],requir:1,respons:[0,1,2,4,5,6,7],restart:11,run:[5,8,9,11],runner:10,sam:[1,7],samr1:11,sat:7,search:8,second:0,see:[8,9,10,11,12],segment:[0,8,9],segment_id:0,select:[0,1],serv:11,server:[0,1,2,5,10,11],set:11,sever:10,show:8,signatur:[0,1,2,4,5,6,7],sinc:11,singl:[2,7],size:[0,1,2,8,11],sky:11,some:[0,8,11],sorri:1,sort:0,speed:[0,4,8,9,11],sport:[0,3,6,8,9,10,11],sport_id:[0,4,5,6],sports_list:[1,7],standard:[8,9],start:[0,1,6,11],stat:[6,8],staticmap:11,statist:[3,10],statu:[0,1,2,4,5,6,7],step:11,still:10,stop:11,store:10,street:10,string:[0,1,5,6],success:[0,1,2,4,5,6,7],successfulli:1,sun:[0,1,4,7],sundai:[0,6],support:[8,9],system:11,tab:12,tar:11,test:11,them:10,thi:[0,8,10,11],thunderforest:11,time:[0,1,6,8,9],timezon:[1,7,8],titl:0,todo:[11,14],token:[0,1,2,4,5,6,7],too:[0,1],tooltip:8,total:8,total_dist:[1,6,7],total_dur:[1,6,7],track:10,tracker:10,transport:[5,8,9],troubleshoot:10,type:[0,1,2,4,5,6,7],unauthor:[0,1,2,4,5,6,7],undefin:12,under:10,unexpect:13,updat:[0,1,2,5,8,11],upgrad:10,upload:[8,9,11],user:[0,1,2,3,4,5,6,8,10,11,13],user_id:[0,4,6,7],usernam:[1,7],usernanm:1,using:[0,10],valid:[0,1,2,4,5,6,7],valu:[0,4,11],variabl:[10,12],version:[10,11],view:8,virtualenv:11,walk:[5,8,9],weather:[8,9,11],weather_api:11,weather_end:0,weather_start:0,web:[0,1,2,4,5,6,7,10],week:[1,6,8],weekm:[1,6],were:8,wget:11,when:8,wiki:8,with_gpx:0,without:[0,6,8,9,10],workout:10,written:11,www:11,xzf:11,yaourt:11,yarn:11,year:6,yet:[10,11],you:[0,2,5,6,10],your:10,zip:[0,2,11],zone:1},titles:["Activities","Authentication","Configuration","API documentation","Records","Sports","Statistics","Users","Change log","Features","FitTrackee","Installation","Administrator","Troubleshooting","User"],titleterms:{"new":8,activ:[0,9],administr:12,api:3,authent:1,bug:8,chang:8,charact:12,close:8,column:12,configur:2,content:10,dashboard:9,data:12,detail:9,dev:11,document:3,environ:11,featur:[8,9],first:8,fittracke:10,fix:8,improv:8,instal:11,issu:8,json:12,line:12,list:9,log:8,misc:8,pars:12,prerequisit:11,prod:11,record:4,releas:8,sport:5,statist:[6,8,9],tabl:10,troubleshoot:13,unexpect:12,upgrad:11,user:[7,9,14],variabl:11,version:8,workout:9}})
\ No newline at end of file
diff --git a/docs/troubleshooting/administrator.html b/docs/troubleshooting/administrator.html
index e45d4b49..4c1e44f3 100644
--- a/docs/troubleshooting/administrator.html
+++ b/docs/troubleshooting/administrator.html
@@ -148,7 +148,7 @@
© Copyright 2018 - 2019, SamR1.
- Created using Sphinx 2.2.0.
+ Created using Sphinx 2.2.1.
diff --git a/docs/troubleshooting/index.html b/docs/troubleshooting/index.html
index 14c87fb8..36899da4 100644
--- a/docs/troubleshooting/index.html
+++ b/docs/troubleshooting/index.html
@@ -150,7 +150,7 @@
© Copyright 2018 - 2019, SamR1.
- Created using Sphinx 2.2.0.
+ Created using Sphinx 2.2.1.
diff --git a/docs/troubleshooting/user.html b/docs/troubleshooting/user.html
index 432c20b3..5539551a 100644
--- a/docs/troubleshooting/user.html
+++ b/docs/troubleshooting/user.html
@@ -141,7 +141,7 @@
© Copyright 2018 - 2019, SamR1.
- Created using Sphinx 2.2.0.
+ Created using Sphinx 2.2.1.
diff --git a/docsrc/source/api/configuration.rst b/docsrc/source/api/configuration.rst
new file mode 100644
index 00000000..ff0214f0
--- /dev/null
+++ b/docsrc/source/api/configuration.rst
@@ -0,0 +1,7 @@
+Configuration
+#############
+
+.. autoflask:: fittrackee_api:create_app()
+ :endpoints:
+ config.get_application_config,
+ config.update_application_config
\ No newline at end of file
diff --git a/docsrc/source/api/index.rst b/docsrc/source/api/index.rst
index 7806aad6..3eb6f45d 100644
--- a/docsrc/source/api/index.rst
+++ b/docsrc/source/api/index.rst
@@ -7,6 +7,7 @@ API documentation
activities
auth
+ configuration
records
sports
stats
diff --git a/fittrackee_api/fittrackee_api/__init__.py b/fittrackee_api/fittrackee_api/__init__.py
index 17bea178..b49ef10c 100644
--- a/fittrackee_api/fittrackee_api/__init__.py
+++ b/fittrackee_api/fittrackee_api/__init__.py
@@ -45,7 +45,7 @@ def create_app():
from .activities.records import records_blueprint # noqa
from .activities.sports import sports_blueprint # noqa
from .activities.stats import stats_blueprint # noqa
- from .application.config import config_blueprint # noqa
+ from .application.app_config import config_blueprint # noqa
app.register_blueprint(users_blueprint, url_prefix='/api')
app.register_blueprint(auth_blueprint, url_prefix='/api')
diff --git a/fittrackee_api/fittrackee_api/application/config.py b/fittrackee_api/fittrackee_api/application/app_config.py
similarity index 100%
rename from fittrackee_api/fittrackee_api/application/config.py
rename to fittrackee_api/fittrackee_api/application/app_config.py
diff --git a/fittrackee_api/fittrackee_api/tests/conftest.py b/fittrackee_api/fittrackee_api/tests/conftest.py
index 0bcf35cb..708c5aaf 100644
--- a/fittrackee_api/fittrackee_api/tests/conftest.py
+++ b/fittrackee_api/fittrackee_api/tests/conftest.py
@@ -36,13 +36,22 @@ def app_config_registration_disabled():
return config
-@pytest.fixture
-def app():
+def get_app_config(app_type):
+ if app_type == 'with_registration':
+ return app_config_with_registration()
+ elif app_type == 'no_registration':
+ return app_config_registration_disabled()
+ else:
+ return None
+
+
+def get_app(app_type=None):
app = create_app()
with app.app_context():
db.create_all()
- app_db_config = app_config_with_registration()
- update_app_config_from_database(app, app_db_config)
+ app_db_config = get_app_config(app_type)
+ if app_db_config:
+ update_app_config_from_database(app, app_db_config)
yield app
db.session.remove()
db.drop_all()
@@ -53,33 +62,19 @@ def app():
return app
+@pytest.fixture
+def app():
+ yield from get_app('with_registration')
+
+
@pytest.fixture
def app_no_config():
- app = create_app()
- with app.app_context():
- db.create_all()
- yield app
- db.session.remove()
- db.drop_all()
- # close unused idle connections => avoid the following error:
- # FATAL: remaining connection slots are reserved for non-replication
- # superuser connections
- db.engine.dispose()
- return app
+ yield from get_app()
@pytest.fixture
def app_no_registration():
- app = create_app()
- with app.app_context():
- db.create_all()
- app_db_config = app_config_registration_disabled()
- update_app_config_from_database(app, app_db_config)
- yield app
- db.session.remove()
- db.drop_all()
- db.engine.dispose()
- return app
+ yield from get_app('no_registration')
@pytest.fixture()
diff --git a/fittrackee_api/fittrackee_api/tests/test_app_config_api.py b/fittrackee_api/fittrackee_api/tests/test_app_config_api.py
index bd1991ab..944bf918 100644
--- a/fittrackee_api/fittrackee_api/tests/test_app_config_api.py
+++ b/fittrackee_api/fittrackee_api/tests/test_app_config_api.py
@@ -50,9 +50,7 @@ def test_get_config_no_config(app_no_config, user_1_admin):
assert 'Error on getting configuration.' in data['message']
-def test_get_config_several_config(
- app, app_config, user_1_admin
-):
+def test_get_config_several_config(app, app_config, user_1_admin):
client = app.test_client()
resp_login = client.post(
'/api/auth/login',
@@ -84,9 +82,7 @@ def test_update_config_as_admin(app, user_1_admin):
response = client.patch(
'/api/config',
content_type='application/json',
- data=json.dumps(
- dict(registration=True, max_users=10)
- ),
+ data=json.dumps(dict(registration=True, max_users=10)),
headers=dict(
Authorization='Bearer '
+ json.loads(resp_login.data.decode())['auth_token']
@@ -150,9 +146,7 @@ def test_update_config_not_admin(app, user_1):
response = client.patch(
'/api/config',
content_type='application/json',
- data=json.dumps(
- dict(registration=True, max_users=10)
- ),
+ data=json.dumps(dict(registration=True, max_users=10)),
headers=dict(
Authorization='Bearer '
+ json.loads(resp_login.data.decode())['auth_token']
@@ -199,9 +193,7 @@ def test_update_config_no_config(app_no_config, user_1_admin):
response = client.patch(
'/api/config',
content_type='application/json',
- data=json.dumps(
- dict(registration=True, max_users=10)
- ),
+ data=json.dumps(dict(registration=True, max_users=10)),
headers=dict(
Authorization='Bearer '
+ json.loads(resp_login.data.decode())['auth_token']
diff --git a/fittrackee_api/migrations/versions/14_8a0aad4c838c_add_app_config_in_database.py b/fittrackee_api/migrations/versions/14_8a0aad4c838c_add_app_config_in_database.py
index 45a13925..aeda6a3d 100644
--- a/fittrackee_api/migrations/versions/14_8a0aad4c838c_add_app_config_in_database.py
+++ b/fittrackee_api/migrations/versions/14_8a0aad4c838c_add_app_config_in_database.py
@@ -1,4 +1,4 @@
-"""empty message
+"""add application config in database
Revision ID: 8a0aad4c838c
Revises: 1345afe3b11d
|