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.

Sign up for GitHub

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

Problem request review #266

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Problem request review #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f0aff2
Added ProblemRequest model and view
MaximPestryakov Apr 30, 2018
026da2a
Added EditProblem component
MaximPestryakov May 2, 2018
54aebb0
ProblemRequestsList and Review components (admin)
linazh May 2, 2018
7348203
ProblemRequest tests
linazh May 3, 2018
ba1d62f
Fixed PR
MaximPestryakov May 22, 2018
b07c95a
Merge branch 'problem-request' of https://github.com/MaximPestryakov/…
linazh May 22, 2018
30062d5
Fixed tests
linazh May 22, 2018
c5e3007
ProblemRequestReview fixes
linazh May 23, 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
39 changes: 24 additions & 15 deletions pynformatics/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import logging
from gevent import monkey
from logging.config import fileConfig

from gevent import monkey
from pyramid.config import Configurator
from pyramid_beaker import session_factory_from_settings
from sqlalchemy import engine_from_config

from pynformatics.models import DBSession
from pynformatics.view.comment import *
from pynformatics.utils.oauth import fill_oauth_config_secrets
from pynformatics.utils.url_encoder import init_url_encoder
from pynformatics.utils.redis import init_redis

from pynformatics.utils.url_encoder import init_url_encoder
from pynformatics.view.comment import *

log = logging.getLogger(__name__)
monkey.patch_all()
Expand Down Expand Up @@ -56,12 +56,12 @@ def main(global_config, **settings):
config.add_route('ideal.get_by_problem_html', '/ideal/get_by_problem_html')
config.add_route('ideal.suggested', '/ideal/suggested')
config.add_route('ideal.suggested_html', '/ideal/suggested_html')

config.add_route('user_settings.add', '/user/settings/main/add')
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('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 @@ -72,19 +72,19 @@ 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_v2', '/protocol/get_v2/{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 @@ -101,23 +101,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 Expand Up @@ -155,6 +155,15 @@ def main(global_config, **settings):

config.add_route('group_invite.get', 'group_invite')

config.add_route('problem_request.create', '/problem_request')

config.add_route('problem_requests.get', '/problem_requests')
config.add_route('problem_request.get', '/problem_request/{problem_request_id}')

config.add_route('problem_request.decline', '/problem_request/{problem_request_id}/decline')
config.add_route('problem_request.approve', '/problem_request/{problem_request_id}/approve')


try:
import uwsgi
config.add_route('websocket', 'websocket')
Expand Down
Loading