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

Issue 219 #235

Open
wants to merge 26 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
472d038
user_get backend
linazh Dec 30, 2017
5cf1464
User component
linazh Dec 30, 2017
5800c44
fixed conflicts
linazh Dec 30, 2017
3a08202
fixed conflicts User component
linazh Dec 30, 2017
6d15e35
merge changes
linazh Dec 30, 2017
26b96f8
fixed merging
linazh Dec 30, 2017
83574da
Верстка главной страницы
riskingh Jan 5, 2018
91d691d
Merge pull request #237 from riskingh/master
riskingh Jan 5, 2018
29e81e8
sidebar, topbar
riskingh Jan 12, 2018
fc802ff
Merge pull request #238 from riskingh/master
riskingh Jan 17, 2018
0b01980
unit tests for user_get
linazh Jan 24, 2018
c466e03
unit and functional tests for user_get
linazh Jan 24, 2018
cb593ae
fixed user groups_dict & added functional test for groups
linazh Jan 27, 2018
88e26fb
changed userdata->user & fixed user component
linazh Jan 27, 2018
ec5c63e
changed userdata->user & fixed user component
linazh Jan 27, 2018
2576ba1
user_get backend
linazh Dec 30, 2017
5016432
User component
linazh Dec 30, 2017
23d68d7
fixed conflicts
linazh Dec 30, 2017
bdc2c11
fixed conflicts User component
linazh Dec 30, 2017
9ef8678
fixed merging
linazh Dec 30, 2017
145a32a
unit tests for user_get
linazh Jan 24, 2018
84b7da7
unit and functional tests for user_get
linazh Jan 24, 2018
0d897f0
fixed user groups_dict & added functional test for groups
linazh Jan 27, 2018
aaac3c5
changed userdata->user & fixed user component
linazh Jan 27, 2018
331ade1
changed userdata->user & fixed user component
linazh Jan 27, 2018
5eff18a
merging fixes
linazh Jan 27, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions pynformatics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ def main(global_config, **settings):
config.add_route('user_settings.get', '/user/settings/main/get/{user_id}')
config.add_route('user.set_oauth_id', '/user/set_oauth_id')
config.add_route('user.reset_password', '/user/reset_password')

config.add_route('user_data.get', '/user/{user_id}')

config.add_route('comment.add', '/comment/add')
config.add_route('comment.get', '/comment/get/{contest_id}/{run_id}')
config.add_route('comment.get_count', '/comment/count')
Expand All @@ -57,18 +58,18 @@ def main(global_config, **settings):
config.add_route('comment.get_unread_limit', '/comment/unread/{start}/{stop}')
config.add_route('comment.get_unread_limit_html', '/comment/unread/{start}/{stop}/html')
config.add_route('comment.get_count_unread', '/comment/unread/count')

config.add_route('protocol.get', '/protocol/get/{contest_id}/{run_id}')
config.add_route('protocol.get_full', '/protocol/get-full/{contest_id}/{run_id}')
config.add_route('protocol.get_test', '/protocol/get_test/{contest_id}/{run_id}/{test_num}')
config.add_route('protocol.get_corr', '/protocol/get_corr/{contest_id}/{run_id}/{test_num}')
config.add_route('protocol.get_outp', '/protocol/get_output/{contest_id}/{run_id}/{test_num}')
config.add_route('protocol.get_submit_archive', '/protocol/get_submit_archive/{contest_id}/{run_id}')

config.add_route('run.rejudge', '/run/rejudge/{contest_id}/{run_id}/{status_id}')

config.add_route('team_monitor.get', '/team_monitor/get/{statement_id}')

config.add_route('contest.ejudge.reload.problem', '/contest/ejudge/reload/{contest_id}/{problem_id}')

config.add_route('problem.generate_samples', '/problem/{problem_id}/generate_samples')
Expand All @@ -84,23 +85,23 @@ def main(global_config, **settings):
config.add_route('problem.tests.get_test', '/problem/{problem_id}/tests/test/{test_num}')
config.add_route('problem.tests.set_preliminary', '/problem/{problem_id}/tests/set_preliminary')
config.add_route('problem.ant.submit', '/problem-ant/{problem_id}/submit')

config.add_route('contest.ejudge.reload', '/contest/ejudge/reload/{contest_id}')
config.add_route('contest.ejudge.get_table', '/contest/ejudge/get_table')
config.add_route('contest.ejudge.statistic', '/contest/ejudge/statistic')
config.add_route('contest.ejudge.clone', '/contest/ejudge/clone/{contest_id}')

config.add_route('region.submit', '/region/res')
config.add_route('region.submit_test', '/region/res_test')

config.add_route('rating.get', '/rating/get')

config.add_route('user.query', '/myuser')

config.add_route('search.user', '/search/user')

config.add_route('home', '/')

config.add_route('hint.get', '/hint/get')
config.add_route('hint.get_html', '/hint/get_html')
config.add_route('hint.get_by_problem', '/hint/get_by_problem')
Expand Down
2 changes: 1 addition & 1 deletion pynformatics/frontend/.babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["es2015"]
"presets": ["es2015", "react"]
}
1 change: 1 addition & 0 deletions pynformatics/frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules/
dist/
.eslint
src/js/isomorphic
Loading