Issue 241

pynformatics/__init__.py

@@ -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')
@@ -57,19 +58,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')
@@ -85,23 +86,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')

pynformatics/frontend/src/js/actions/userActions.jsx

@@ -60,3 +60,25 @@ export function oauthConnect(provider, code) {
  });
  };
 }
+
+export function fetchUser(userId) {
+ const url = `/user/${userId}`;
+
+ console.log("action", url);
+
+ axios.get(url)
+ .then(function (response) {
+ console.log("axios", response);
+ })
+ .catch(function (error) {
+ console.log("axios", error);
+ });
+
+ return {
+ type: 'GET_USER',
+ payload: axios.get(url),
+ meta: {
+ userId,
+ },
+ };
+}

pynformatics/frontend/src/js/components/App.jsx

@@ -12,10 +12,12 @@ import Sidebar from './Sidebar/Sidebar';
 
 import StatementPage from '../pages/Statement/Statement';
 import MainPage from '../pages/Main/Main';
+import TeamTask from '../pages/Team/TeamTask';
 import Auth from '../pages/Auth/Auth';
 import ProblemPage from '../pages/Problem/Problem';
 import TempGotoProblemPage from '../pages/TempGotoProblem';
 
+import User from './User';
 import StatementAdmin from '../pages/StatementAdmin';
 import StatementSettingsForm from './StatementSettingsForm';
 
@@ -74,6 +76,7 @@ export default class App extends React.Component {
  <Route exact path="/goto" component={TempGotoProblemPage} />
  <Route exact path="/login" component={Login} />
  <Route exact path="/problem/:problemId" component={ProblemPage} />
+ <Route exact path="/team-task" component={TeamTask} />
  </Switch>
  </Content>
  </Layout>
@@ -127,6 +130,7 @@ export default class App extends React.Component {
  // )
  // }
  // />
+ // <Route exact path="/user/:userId" component={User} />
  // </Switch>
  // </div>
  // </div>

pynformatics/frontend/src/js/components/User.jsx

@@ -0,0 +1,46 @@
+import React from 'react';
+import { connect } from 'react-redux';
+
+import * as userActions from '../actions/userActions';
+
+
+@connect(state => ({
+ user: state.user,
+}))
+export default class User extends React.Component {
+ constructor(props) {
+ super(props);
+ this.userId = parseInt(this.props.match.params.userId, 10);
+ console.log("constr", this.userId);
+ this.fetchUser(this.userId);
+ }
+
+ fetchUser(userId) {
+ this.props.dispatch(userActions.fetchUser(userId));
+ }
+
+ render() {
+ const data = this.props.user[this.userId];
+
+ console.log("!! componenta ", data);
+
+ if (!data) {
+ return <div> user data not found </div>
+ }
+
+ return (
+ <div>
+ <h1>Name: {data.firstname} {data.lastname}</h1>
+ <h3>Email:</h3> {data.email}
+ <h3>Groups:</h3>
+ <ul>
+ {Object.keys(data.groups).map(id =>
+ <li key={id}>
+ id: {id}, name: {data.groups[id]}
+ </li>
+ )}
+ </ul>
+ </div>
+ );
+ }
+}

pynformatics/frontend/src/js/components/utility/PopConfirm.jsx

@@ -0,0 +1,75 @@
+import React from 'react';
+import styled, { injectGlobal } from 'styled-components';
+
+import {
+ rowStyle,
+ Row,
+} from '../../components/utility/Grid';
+
+import Button from './Button'
+import Tooltip from './Tooltip';
+
+
+injectGlobal`
+ .PopConfirmWrapper {
+ .ant-tooltip-arrow { display: none; }
+ .ant-tooltip-inner {
+ background: #FFFFFF;
+ padding: 20px;
+ max-width: 300px;
+ border-radius: 6px;
+ box-shadow: 0 0 24px 0 rgba(182, 189, 197, 0.42);
+ }
+ }
+`;
+
+const PopConfirmTitleWrapper = styled.div`
+ font-size: 14px;
+ color: #343a40;
+`;
+
+const PopConfirmTitle = ({title}) => (
+ <PopConfirmTitleWrapper>{title}</PopConfirmTitleWrapper>
+);
+
+export default class PopConfirm extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {visible: false};
+ this.closeFunction = this.closeFunction.bind(this);
+ }
+ closeFunction = (func) => {
+ this.setState({...this.state, visible: false});
+ func();
+ };
+ render() {
+ return (
+ <Tooltip
+ trigger="onclick"
+ placement={this.props.placement}
+ overlayClassName="PopConfirmWrapper"
+ visible={this.state.visible}
+ onVisibleChange = {() => this.setState({...this.state, visible: !this.state.visible})}
+ title={
+ <div>
+ <Row style={{...rowStyle, marginBottom: '20px'}}>
+ <PopConfirmTitle title={this.props.title}/>
+ </Row>
+ <Row style={rowStyle}>
+ <Button type="primary" size="small"
+ onClick={() => {this.closeFunction(this.props.onConfirm)}} style={{marginRight: '15px'}}>
+ {this.props.okText}
+ </Button>
+ <Button type="primary" size="small"
+ onClick={() => {this.closeFunction(this.props.onCancel)}}>
+ {this.props.cancelText}
+ </Button>
+ </Row>
+ </div>
+ }
+ >
+ {this.props.children}
+ </Tooltip>
+ );
+ }
+}

pynformatics/frontend/src/js/components/utility/TeamTaskWrapper.jsx

@@ -0,0 +1,119 @@
+import MainContentWrapper from './MainContentWrapper';
+
+const TeamTaskWrapper = MainContentWrapper.extend`
+ padding-top: 86px;
+
+ .title_contest {
+ width: 222px;
+ height: 26px;
+ margin-top: 41.5px;
+
+ font-size: 20px;
+ font-weight: normal;
+ font-style: normal;
+ font-stretch: normal;
+ line-height: normal;
+ letter-spacing: 0.6px;
+ text-align: left;
+ color: #393a39;
+ }
+
+ .title_team {
+ width: 222px;
+ height: 21px;
+ margin-top: 46.5px;
+
+ font-size: 16px;
+ font-weight: normal;
+ font-style: normal;
+ font-stretch: normal;
+ line-height: normal;
+ letter-spacing: 0.6px;
+ text-align: left;
+ color: #2d3446;
+ }
+
+ .text_block {
+ width: 365px; 
+ height: 140px;
+ margin-top: 28.5px;
+
+ font-size: 14px;
+ font-weight: normal;
+ font-style: normal;
+ font-stretch: normal;
+ line-height: 1.5;
+ letter-spacing: normal;
+ text-align: left;
+ color: #343a40;
+ }
+
+ @media (max-width: 767px) {
+ width: 100%;
+ height: 100%;
+ margin: 0 auto;
+
+ .title_contest {
+ width: 100%;
+ height: 40px;
+ line-height: 40px;
+ margin-top: 17px;
+
+ font-size: 18px;
+ font-weight: normal;
+ font-style: normal;
+ font-stretch: normal;
+ letter-spacing: 0.6px;
+ text-align: left;
+ color: #788195;
+
+ display: flex;
+ align-items: center;
+ white-space: nowrap;
+
+ &:before {
+ content: '';
+ width: 5px;
+ height: 40px;
+ margin-right: 15px;
+
+ background: #e1e6ec;
+ display: flex;
+ }
+
+ &:after {
+ content: '';
+ width: 100%;
+ height: 1px;
+ line-height: 40px;
+ margin-left: 15px;
+
+ background: #e1e6ec;
+ display: flex;
+ }
+ }
+
+ .title_team {
+ width: 214px;
+ height: 21px;
+ margin-top: 27px;
+ }
+
+ .text_block {
+ max-width: 344px;
+ width: auto;
+ margin-top: 28.5px;
+
+ font-size: 13px;
+ font-weight: normal;
+ font-style: normal;
+ font-stretch: normal;
+ line-height: 1.62;
+ letter-spacing: normal;
+ text-align: left;
+ color: #343a40;
+ }
+ }
+`;
+
+export default TeamTaskWrapper;