| <%= list_index_no(@params_page.to_i, index) %> |
<%= shixun.identifier %> |
<%= link_to overflow_hidden_span(shixun.name), "/shixuns/#{shixun.identifier}", :target => "_blank", :title => shixun.name %> |
@@ -33,7 +33,7 @@
<%= shixun.challenges.where(:st => 0).size %> |
<%= shixun.challenges.where(:st => 1).size %> |
<%= shixun_authentication_status shixun %> |
- <%= link_to shixun.owner.try(:real_name),"/users/#{shixun.owner.try(:login)}",target:'_blank' %> |
+ <%= link_to shixun.user.try(:real_name),"/users/#{shixun.user.try(:login)}",target:'_blank' %> |
<%= format_time shixun.created_at %> |
class="ml-3 mr5 magic-checkbox" id="join_teacher_homepage_<%= shixun.id %>">
@@ -41,7 +41,7 @@
|
<% if shixun.status == 0 %>
- <%= link_to(l(:button_delete), admins_shixun_path(shixun), :method => :delete, :data => { confirm: "您确定要删除吗？" } ) %>
+ <%= delete_link l(:button_delete), admins_shixun_path(shixun, element: ".shixun-item-#{shixun.id}"), class: 'delete-shixun-action' %>
<% end %>
|
diff --git a/config/routes.rb b/config/routes.rb
index 4b525eeac..ad4cd56d5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1049,6 +1049,9 @@ Rails.application.routes.draw do
resources :shixuns, only: [:index,:destroy]
resources :shixun_settings, only: [:index,:update]
resources :shixun_feedback_messages, only: [:index]
+ resources :shixun_recycles, only: [:index, :destroy] do
+ post :resume, on: :member
+ end
resources :department_applies,only: [:index,:destroy] do
collection do
post :merge
diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index 4acbb35a7..86938e51d 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -267,7 +267,7 @@ module.exports = {
// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
// You can remove this if you don't use Moment.js:
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
- new MonacoWebpackPlugin(),
+ new MonacoWebpackPlugin(),
],
// Some libraries import Node modules but don't use them in the browser.
// Tell Webpack to provide empty mocks for them so importing them works.
diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index 1cc105517..f312da3e6 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -11,6 +11,7 @@ const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
const eslintFormatter = require('react-dev-utils/eslintFormatter');
const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin');
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
const paths = require('./paths');
const getClientEnvironment = require('./env');
@@ -371,6 +372,7 @@ module.exports = {
// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
// You can remove this if you don't use Moment.js:
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+ new MonacoWebpackPlugin(),
],
// Some libraries import Node modules but don't use them in the browser.
// Tell Webpack to provide empty mocks for them so importing them works.
diff --git a/public/react/index.js b/public/react/index.js
new file mode 100644
index 000000000..cb8cb4f94
--- /dev/null
+++ b/public/react/index.js
@@ -0,0 +1,46 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+import './index.css';
+import './indexPlus.css';
+import App from './App';
+
+// 加之前main.js 18.1MB
+// import { message } from 'antd';
+import message from 'antd/lib/message';
+import 'antd/lib/message/style/css';
+
+import { AppContainer } from 'react-hot-loader';
+
+import registerServiceWorker from './registerServiceWorker';
+
+import { configureUrlQuery } from 'react-url-query';
+
+import history from './history';
+
+// link the history used in our app to url-query so it can update the URL with it.
+configureUrlQuery({ history });
+// ----------------------------------------------------------------------------------- 请求配置
+
+window.__useKindEditor = false;
+
+
+const render = (Component) => {
+ ReactDOM.render(
+