m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

Browse Source
dev_tpm_ui
杨树明 5 years ago
parent d093bee6c5 896840cac3
commit 4618c88ce8
10 changed files with 86 additions and 27 deletions
Show Stats Download Patch File Download Diff File

1
app/controllers/concerns/laboratory_helper.rb
Unescape View File

@ -11,6 +11,7 @@ module LaboratoryHelper
def current_laboratory def current_laboratory
@_current_laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)) @_current_laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1))
# Rails.logger.info("current_laboratory is ######{@_current_laboratory.try(:identifier)}, domain is #{request.subdomain}")
end end
def default_laboratory def default_laboratory

4
app/views/hack_user_lastest_codes/show.json.jbuilder
Unescape View File

@ -1,7 +1,8 @@
json.hack do json.hack do
json.(@hack, :id, :name, :difficult, :time_limit, :description, :score, :identifier, :status, :praises_count) json.(@hack, :id, :name, :difficult, :time_limit, :description, :score, :identifier, :status, :praises_count)
json.language @hack.language json.language @hack.language
json.username @hack.user.real_name json.username @hack.user&.real_name
json.user_path "/users/#{@hack.user&.login}"
json.code @my_hack.code json.code @my_hack.code
json.pass_count @hack.pass_num json.pass_count @hack.pass_num
json.submit_count @hack.submit_num json.submit_count @hack.submit_num
@ -19,5 +20,4 @@ json.user do
json.partial! 'users/user', user: current_user json.partial! 'users/user', user: current_user
json.hack_manager @hack.manager?(current_user) json.hack_manager @hack.manager?(current_user)
json.admin current_user.admin_or_business? json.admin current_user.admin_or_business?
end end

6
public/react/src/modules/courses/coursesDetail/CoursesBanner.js
Unescape View File

@ -722,10 +722,12 @@ class CoursesBanner extends Component {
color: rgba(255,255,255,0.3) !important; color: rgba(255,255,255,0.3) !important;
} }
.ant-tooltip-inner{ .ant-tooltip-inner{
background:#99CCFF !important;
background:rgba(204,204,204,0.2) !important;
} }
.ant-tooltip-arrow::before{ .ant-tooltip-arrow::before{
background:#99CCFF !important;
background:rgba(204,204,204,0.2) !important;
} }
.antsoancss{ .antsoancss{
color: #fff; color: #fff;

48
public/react/src/modules/developer/components/myMonacoEditor/index2.js
Unescape View File

@ -0,0 +1,48 @@
/*
* @Description:
* @Author: tangjiang
* @Github:
* @Date: 2019-12-27 19:18:09
* @LastEditors: tangjiang
* @LastEditTime: 2019-12-27 19:19:23
*/
import React, { useState } from 'react';
import Editor from "@monaco-editor/react";
function App() {
const [theme, setTheme] = useState("light");
const [language, setLanguage] = useState("javascript");
const [isEditorReady, setIsEditorReady] = useState(false);
function handleEditorDidMount() {
setIsEditorReady(true);
}
function toggleTheme() {
setTheme(theme === "light" ? "dark" : "light");
}
function toggleLanguage() {
setLanguage(language === "javascript" ? "python" : "javascript");
}
return (
<React.Fragment>
<LinkToRepo />
<button onClick={toggleTheme} disabled={!isEditorReady}>
Toggle theme
</button>
<button onClick={toggleLanguage} disabled={!isEditorReady}>
Toggle language
</button>
<Editor
height="calc(100% - 19px)" // By default, it fully fits with its parent
theme={theme}
language={language}
value={'c'}
editorDidMount={handleEditorDidMount}
/>
</React.Fragment>
);
}

10
public/react/src/modules/developer/newOrEditTask/rightpane/index.js
Unescape View File

@ -4,10 +4,10 @@
* @Github: * @Github:
* @Date: 2019-12-01 10:18:35 * @Date: 2019-12-01 10:18:35
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-27 10:17:07 * @LastEditTime : 2019-12-27 19:33:50
*/ */
import './index.scss'; import './index.scss';
import React from 'react'; import React, { useState, useEffect } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import MyMonacoEditor from '../../components/myMonacoEditor'; import MyMonacoEditor from '../../components/myMonacoEditor';
// import ControlSetting from '../../components/controlSetting'; // import ControlSetting from '../../components/controlSetting';
@ -18,6 +18,7 @@ function RightPane (props, ref) {
const { const {
// identifier, // identifier,
code, code,
showCode,
language, language,
// onSubmitForm, // onSubmitForm,
saveOjFormCode saveOjFormCode
@ -46,7 +47,7 @@ function RightPane (props, ref) {
<div className={'right_pane_code_wrap'}> <div className={'right_pane_code_wrap'}>
<MyMonacoEditor <MyMonacoEditor
language={language} language={language}
code={code} code={showCode}
onCodeChange={handleCodeChange}/> onCodeChange={handleCodeChange}/>
{/* <ControlSetting {/* <ControlSetting
@ -60,9 +61,10 @@ function RightPane (props, ref) {
} }
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
const { ojForm, testCases, code, identifier } = state.ojFormReducer; const { ojForm, testCases, code, identifier, showCode } = state.ojFormReducer;
return { return {
code, code,
showCode,
identifier, identifier,
language: ojForm.language, language: ojForm.language,
input: (testCases[0] && testCases[0].input) || '', input: (testCases[0] && testCases[0].input) || '',

4
public/react/src/modules/developer/studentStudy/leftpane/taskDescription/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-27 09:49:30 * @Date: 2019-11-27 09:49:30
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-27 18:42:59 * @LastEditTime : 2019-12-27 20:22:55
*/ */
import '../index.scss'; import '../index.scss';
import React from 'react'; import React from 'react';
@ -37,7 +37,7 @@ const TaskDescription = (props) => {
</p> </p>
<p className={'header_flex'}> <p className={'header_flex'}>
<span className={'flex_label'}>出题者:</span> <span className={'flex_label'}>出题者:</span>
<Link to={`/users/${userInfo.login}/courses`} target="_blank" style={{ color: '#5091FF'}}>{username}</Link> <Link to={hack.user_path || '/'} target="_blank" style={{ color: '#5091FF'}}>{username}</Link>
</p> </p>
</div> </div>
<div className="task_desc_area"> <div className="task_desc_area">

19
public/react/src/modules/developer/studentStudy/rightpane/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-27 14:59:51 * @Date: 2019-11-27 14:59:51
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-27 10:28:41 * @LastEditTime : 2019-12-27 19:23:46
*/ */
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
@ -45,13 +45,14 @@ const RightPane = (props) => {
// const [code, setCode] = useState(editor_code || hack.code); // const [code, setCode] = useState(editor_code || hack.code);
// let initFlag = true; // let initFlag = true;
useEffect(() => { // useEffect(() => {
if (editor_code) { // if (editor_code) {
setEditorCode(editor_code); // setEditorCode(editor_code);
} else { // } else {
setEditorCode(hack.code); // setEditorCode(hack.code);
} // }
}, [hack, editor_code]); // }, [hack, editor_code]);
const handleSubmitForm = () => { const handleSubmitForm = () => {
// 提交时， 先调用提交接口，提交成功后，循环调用测评接口 // 提交时， 先调用提交接口，提交成功后，循环调用测评接口
@ -119,7 +120,7 @@ const RightPane = (props) => {
notice={notice} notice={notice}
identifier={identifier} identifier={identifier}
language={hack.language} language={hack.language}
code={editorCode} code={editor_code || hack.code}
hadCodeUpdate={hadCodeUpdate} hadCodeUpdate={hadCodeUpdate}
onCodeChange={handleCodeChange} onCodeChange={handleCodeChange}
onUpdateNotice={handleUpdateNotice} onUpdateNotice={handleUpdateNotice}

11
public/react/src/redux/actions/ojForm.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-20 16:35:46 * @Date: 2019-11-20 16:35:46
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-27 18:50:22 * @LastEditTime : 2019-12-27 20:13:01
*/ */
import types from './actionTypes'; import types from './actionTypes';
import CONST from '../../constants'; import CONST from '../../constants';
@ -286,19 +286,22 @@ export const validateOjForm = (props, type, cb) => {
} else if (type === 'challenge') { } else if (type === 'challenge') {
cb && cb(); cb && cb();
} else { } else {
const {identifier} = res.data;
// message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功'); // message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功');
notification.success({ notification.success({
message: '提示', message: '提示',
description: paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功' description: paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功'
}); });
const {identifier} = res.data;
// 保存成功后的identifier // 保存成功后的identifier
identifier && dispatch({ identifier && dispatch({
type: types.SAVE_OJ_FORM_ID, type: types.SAVE_OJ_FORM_ID,
payload: identifier payload: identifier
}); });
// 保存成功后，调用编辑接口并改变路
if (paramsObj['submitType'] === 'add' && identifier) { if (paramsObj['submitType'] === 'add' && identifier) {
props.history.push(`/problems/${identifier}/edit`) dispatch(getOJFormById(identifier));
props.history.push(`/problems/${identifier}/edit`);
}; };
} }
// 保存或更新后，调用start接口 // 保存或更新后，调用start接口
@ -502,7 +505,7 @@ export const deleteTestCase = (obj) => {
export const getOJFormById = (id) => { export const getOJFormById = (id) => {
return (dispatch) => { return (dispatch) => {
fetchGetOjById(id).then(res => { fetchGetOjById(id).then(res => {
console.log('获取OJ表单信息成功: ', res); // console.log('获取OJ表单信息成功: ', res);
dispatch({ dispatch({
type: types.SAVE_EDIT_OJ_FORM_AND_TEST_CASE, type: types.SAVE_EDIT_OJ_FORM_AND_TEST_CASE,
payload: res.data payload: res.data

4
public/react/src/redux/reducers/ojForUserReducer.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-27 13:41:48 * @Date: 2019-11-27 13:41:48
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-27 16:52:30 * @LastEditTime : 2019-12-27 19:56:06
*/ */
import types from "../actions/actionTypes"; import types from "../actions/actionTypes";
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
@ -179,7 +179,7 @@ const ojForUserReducer = (state = initialState, action) => {
commitTestRecordDetail: {}, // 调试代码执行结果 commitTestRecordDetail: {}, // 调试代码执行结果
commitRecordDetail: {}, // 提交成功后记录提交的详情 commitRecordDetail: {}, // 提交成功后记录提交的详情
commitRecord: [], // 提交记录 commitRecord: [], // 提交记录
userCode: '', // 保存当前用户输入的代码 // userCode: '', // 保存当前用户输入的代码
isUpdateCode: false, // 是否更新了代码内容 isUpdateCode: false, // 是否更新了代码内容
userCodeTab: 'task', // 学员测评tab位置: task | record | comment userCodeTab: 'task', // 学员测评tab位置: task | record | comment
userTestInput: '', // 用户自定义输入值 userTestInput: '', // 用户自定义输入值

6
public/react/src/redux/reducers/ojFormReducer.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-20 16:40:32 * @Date: 2019-11-20 16:40:32
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-27 10:35:06 * @LastEditTime : 2019-12-27 20:00:26
*/ */
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
import types from '../actions/actionTypes'; import types from '../actions/actionTypes';
@ -61,6 +61,7 @@ const init = {
position: 1, // TODO 每次加载信息时同步指定positio值 position: 1, // TODO 每次加载信息时同步指定positio值
score: 200, // 分值： 选择难易度后自动计算分值 200 | 500 | 1000 score: 200, // 分值： 选择难易度后自动计算分值 200 | 500 | 1000
code: '', // 提交的代码 code: '', // 提交的代码
showCode: '', // 编辑器显示的代码
identifier: '', // OJ表单id identifier: '', // OJ表单id
loading: false, // 僵尸loading标志 loading: false, // 僵尸loading标志
testCodeStatus: 'default', // 调试代码状态 default(默认值) | loading(加载中) | loaded(加载完成) | userCase(用户自定义测试用例) | finish(测试完成) testCodeStatus: 'default', // 调试代码状态 default(默认值) | loading(加载中) | loaded(加载完成) | userCase(用户自定义测试用例) | finish(测试完成)
@ -216,7 +217,8 @@ const ojFormReducer = (state = initialState, action) => {
testCases: curTestCases, testCases: curTestCases,
testCasesValidate: curTcValidates, testCasesValidate: curTcValidates,
testCodeStatus: hack_sets.length > 0 ? 'userCase' : 'default', testCodeStatus: hack_sets.length > 0 ? 'userCase' : 'default',
isPublish: status isPublish: status,
showCode: cbcode
} }
case types.CHANGE_PUBLISH_VALUE: case types.CHANGE_PUBLISH_VALUE:
return { return {

Write Preview
Loading…
Cancel
Save