Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/package.json

@@ -42,8 +42,6 @@
     "immutability-helper": "^2.6.6",
     "install": "^0.12.2",
     "jest": "20.0.4",
-    "js-base64": "^2.5.1",
-    "js-file-download": "^0.4.7",
     "lodash": "^4.17.5",
     "loglevel": "^1.6.1",
     "material-ui": "^1.0.0-beta.40",
@@ -165,7 +163,6 @@
     "babel-plugin-import": "^1.11.0",
     "concat": "^1.0.3",
     "happypack": "^5.0.1",
-    "videojs-for-react": "^0.0.3",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-parallel-uglify-plugin": "^1.1.0"
   }

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -6,7 +6,6 @@ import {getImageUrl} from 'educoder';
 import axios from 'axios'
 import {getUrl} from 'educoder';
 import moment from 'moment'
-import { Base64 } from 'js-base64';
 import CoursesListType from '../coursesPublic/CoursesListType';
 import Showoldfiles from "../coursesPublic/Showoldfiles";
 import Modals from '../../modals/Modals';

public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js

@@ -33,7 +33,6 @@ import '../css/Courses.css'
 import './style.css'
 import moment from 'moment';
 import 'moment/locale/zh-cn';
-import {Base64} from 'js-base64';
 
 const Search = Input.Search;
 const CheckboxGroup = Checkbox.Group;

public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js

@@ -20,7 +20,6 @@ import '../css/Courses.css';
 import './style.css';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
-import {Base64} from 'js-base64';
 
 class ShixunWorkReport extends Component {
 

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -4,7 +4,6 @@ import HomeworkModal from "../coursesPublic/HomeworkModal";
 import {WordsBtn, ActionBtn, handleDateString} from 'educoder';
 import PollDetailTabForthRules from '../poll/PollDetailTabForthRules';
 import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
-import {Base64} from 'js-base64';
 import {
     Button,
     Checkbox,

public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js

@@ -23,7 +23,6 @@ import {
 import {Link, Switch, Route, Redirect} from 'react-router-dom';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
-import {Base64} from 'js-base64';
 import axios from 'axios';
 import '../css/members.css'
 import "../common/formCommon.css"