Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

submit user info #34

Merged
merged 7 commits into from
Mar 2, 2020
Merged

Conversation

zhaofeng-shu33
Copy link
Member

Issue #11

@zhaofeng-shu33 zhaofeng-shu33 changed the title [WIP]submit user info submit user info Mar 1, 2020
@lovepoem
Copy link
Collaborator

lovepoem commented Mar 2, 2020

LGTM

@lovepoem lovepoem merged commit de3a9d4 into wuhan2020:master Mar 2, 2020
@zhaofeng-shu33 zhaofeng-shu33 deleted the submit-user-info branch March 5, 2020 15:54
lovepoem pushed a commit that referenced this pull request Mar 8, 2020
* move name and website to config file (#3)

* move name and website to config file

* second send email frontend_url abstraction

* move 5 drawing magic number to config

* update sample number

* improve docs (#4)

* improve docs

* re-add add new names

* some format

* [WIP]add frontend code (#5)

* add frontend code

* add logical code

* make a local config file

* add empty css

* add frontend ci

* update path

* use echo

* use data-source

* upload bundle.js

* fix yml syntax

* add frontend docs

* bind this

* tuning doc

* remove .DS_Store

* add dist html template (#6)

* add new api for adding new people

* add test for add new user

* slight change in test file

* save image web api (#79) (#8)

* Update app.py

* Update pic_email.py

* Update test.py

* Update test.py

Co-authored-by: Egria <ned1_32@sina.com>

* add upload image endpoint

* add test for upload image

* fix write image bug

* add missing sample images

* add api doc

* customized EmailDuplicateException (#11)

* customized EmailDuplicateException

* trigger customized EmailDuplicateException

Co-authored-by: 赵丰 (Zhao Feng) <616545598@qq.com>

* switch between normal volunteers and admin

* add option test to increase code coverage

* add frontend switch for two pages

* Implement confirm_admin_token() to be tested

* Update model.py (#12)

Co-authored-by: 赵丰 (Zhao Feng) <616545598@qq.com>

* add admin token in config file

* fix admin_token with utils.get_org_config()

* add token input

* Update test.py

* update admin.js

* test return code

* Update test.py

* update org config (#18)

* Update utils.py

* Update utils.py

* Update app.py

* Update test.py

* Update app.py

* Update app.py

* Update app.py

Co-authored-by: 赵丰 (Zhao Feng) <616545598@qq.com>

* handle token changes (#17)

* handle token changes

* add handle event

* fix classname and target files

* update status

* finish frontend webapi

* fix frontend several problems

Co-authored-by: Egria <ned1_32@sina.com>

* ignore org.json

* add token test

* update readme

* add admin input forms (#23)

* add admin required information

* add form data collect

* add corresponding info

* fix method problem

* fix typo (#22)

* add scss files (#21)

* add scss files

* add missing dev-dep

* add scss contents

* fix data-source reference

* bind resize function

* fix upload image problem

* add volunteer emails (#24)

* change add people api to accept list instead

* add email check in backend

* fix typo

* add returned succ info

* backend add missing contents (#25)

* add name_horizontal_key; add updateOrgConfig api

* add get smtp url

* import right function

* import right module

* add trigger send email (#26)

* add trigger send email

* wrapper a job to a class

* add start send email job api

* import jobs

* use new api in send email job

* change web api name

* add send-email button

* add /api/email test

* add wrong token test

* fix key error

* fix test error

* support not write serial number and date on the template (#28)

* support not write serial number and date on the template

* update example config files

* update image path to image file

* add update_email_config (#27)

* add update_email_config

* format code

* Update app.py

* Update test.py

* change update config api

* Update app.py

* Update test.py

* update api key

* empty string not update

Co-authored-by: 赵丰 (Zhao Feng) <616545598@qq.com>

* add frontend_url and smtp address on the fly (#29)

* add frontend_url and smtp address on the fly

* test inserted key

* wrapper get_smtp_url

* return uniform response (#30)

* change input type to number (#31)

* change input type to number

* use parseint to convert

* create images dir (#32)

* create images dir

* fix message domain

* change start email button type to common button

* bug fix (#35)

* add user doc (#34)

* add user doc

* add user mode pic

Co-authored-by: Egria <ned1_32@sina.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants