- {i.author && i.author.name}/{i.name}
+ { window.location.href = `/${i.author && i.author.login}/${i.identifier}` }} className="infotitle task-hide">{i.author && i.author.name}/{i.name}
{i.praises_count > 0 ? {i.praises_count} :"" }
{i.forked_count > 0 ? {i.forked_count}:""}
diff --git a/src/forge/Team/Index.jsx b/src/forge/Team/Index.jsx
index 81266ca64..f435cb76b 100644
--- a/src/forge/Team/Index.jsx
+++ b/src/forge/Team/Index.jsx
@@ -39,7 +39,7 @@ const ProjectDetail = Loadable({
loader: () => import("../Main/Detail"),
loading: Loading,
});
-export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
+const team = CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
((props)=>{
return (
@@ -114,4 +114,8 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
)
})
-))))
\ No newline at end of file
+)))
+
+team.preFetch = ProjectDetail.preFetch
+
+export default withRouter(team)
\ No newline at end of file
diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx
index 9affebca3..36fe2f331 100644
--- a/src/forge/users/GeneralView/ConcentrateProject.jsx
+++ b/src/forge/users/GeneralView/ConcentrateProject.jsx
@@ -87,7 +87,7 @@ function ConcentrateProject({
list.map((i,k)=>{
return(
{i.description}
{/* 项目标签 */} {i.topics &&
diff --git a/src/forge/users/Index.jsx b/src/forge/users/Index.jsx
index 8ed8b1e4e..305269c42 100644
--- a/src/forge/users/Index.jsx
+++ b/src/forge/users/Index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component } from 'react';
import { Route, Switch } from "react-router-dom";
import Loadable from "react-loadable";
import Loading from "../../Loading";
@@ -15,32 +15,89 @@ const ProjectDetail = Loadable({
loader: () => import("../Main/Detail"),
loading: Loading,
});
-export default withRouter(
- (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
+class DetailTop extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {}
+ }
+
+ getProject = (num) => {
+ const { projectsId, owner } = this.props.match.params;
+ const url = `https://www.gitlink.org.cn/${owner}/${projectsId}/simple.json`;
+ axios.get(url).then((result) => {
+ if (result && result.data) {
+ this.setState({
+ project: result.data,
+ open_devops: result.data.open_devops,
+ platform: result.data.platform && result.data.platform !== 'educoder'
+ })
+ if (result.data.type !== 0 && result.data.mirror_status === 1) {
+ console.log("--------start channel --------");
+ // 是镜像项目，且未完成迁移
+ this.canvasChannel();
+ if (num) {
+ this.setState({
+ secondSync: true,
+ firstSync: false
+ })
+ } else {
+ this.setState({
+ firstSync: true,
+ secondSync: false
+ })
+ }
+ this.setState({
+ mirror_status:1
+ })
+ } else if (result.data.mirror_status === 2) {
+ this.setState({
+ mirror_status:2,
+ firstSync: false
+ })
+ this.deleteProjectBack();
+ } else {
+ this.setState({
+ firstSync: false,
+ secondSync: false,
+ mirror_status:0
+ })
+ this.getBanner();
+ this.getDetail();
+ }
+ }
+ })
+ }
+
+ render() {
// 个人中心新增的二级目录都需在此添加一次。将项目放组织和个人名下后，此处根据二级目录作判断，
let secondRouter = '';
- if (props.location.pathname) {
- secondRouter = props.location.pathname.split('/')[2];
+ if (this.props.location.pathname) {
+ secondRouter = this.props.location.pathname.split('/')[2];
}
let userRouterArr = ['statistics', 'projects', 'notice', 'devops', 'organizes', 'info', 'following', 'followers', 'password' , "general", "blockchain"];
+
return (
-
{secondRouter && (!userRouterArr.includes(secondRouter)) ? (
- : (
- }
)
- }))))
-)
\ No newline at end of file
+ }
+}
+const user = (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(DetailTop))))
+
+user.preFetch = ProjectDetail.preFetch
+
+export default withRouter(user)
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index d4cd20736..01ee36c19 100644
--- a/src/index.js
+++ b/src/index.js
@@ -7,20 +7,27 @@ import './index.css';
import App from './App';
import { configureUrlQuery } from 'react-url-query';
import history from './history';
+import configureStore from './redux/stores/configureStore';
+import { Provider } from 'react-redux';
configureUrlQuery({ history });
+const store = configureStore();
window.__useKindEditor = false;
const render = (Component) => {
- ReactDOM.render(
-
+ ReactDOM.hydrate(
+
{/*
+
-
+
+
,
document.getElementById('root')
)
diff --git a/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js b/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js
index b2f1ca4e1..1c211ff0f 100644
--- a/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js
+++ b/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js
@@ -6,9 +6,9 @@
* @LastEditors: tangjiang
* @LastEditTime: 2019-12-02 16:33:35
*/
-import 'quill/dist/quill.core.css';
-import 'quill/dist/quill.bubble.css';
-import 'quill/dist/quill.snow.css';
+// import 'quill/dist/quill.core.css';
+// import 'quill/dist/quill.bubble.css';
+// import 'quill/dist/quill.snow.css';
import './index.scss';
import React, { useState, useImperativeHandle, useRef, useEffect } from 'react';
import { Form, Input, InputNumber, Button, Select } from 'antd';
diff --git a/src/modules/developer/quillEditor/index.js b/src/modules/developer/quillEditor/index.js
index 6a54ea138..21fc055d5 100644
--- a/src/modules/developer/quillEditor/index.js
+++ b/src/modules/developer/quillEditor/index.js
@@ -11,7 +11,7 @@
// import 'quill/dist/quill.snow.css';
// import 'katex/dist/katex.css';
import './index.scss';
-import 'katex/dist/katex.min.css';
+// import 'katex/dist/katex.min.css';
import React from 'react';
import katex from 'katex';
const Quill = require('quill');
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 0cdbf6c85..d0a56e056 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -331,7 +331,7 @@ class LoginDialog extends Component {
this.setState({
isphone: flag,
//查询第三方登录信息
- settings: JSON.parse(localStorage.getItem("chromesetting")),
+ settings: JSON.parse(localStorage.getItem("chromesetting") || '{}'),
})
if (this.props.isRender != undefined) {
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 3f0ae26db..d7135382e 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -17,7 +17,7 @@ export function TPMIndexHOC(WrappedComponent) {
return class II extends React.Component {
constructor(props) {
super(props);
- window.$('#root').css('position', 'relative');
+ // window.$('#root').css('position', 'relative');
this.state = {
tpmLoading: true,
@@ -61,7 +61,13 @@ export function TPMIndexHOC(WrappedComponent) {
window.removeEventListener('keyup', this.keyupListener)
}
componentWillMount() {
- this.fetchUsers();
+ if (!__SERVER__) {
+ this.fetchUsers();
+ } else {
+ this.setState({
+ current_user: {}
+ })
+ }
}
componentDidMount() {
diff --git a/src/redux/actions/actionTypes.js b/src/redux/actions/actionTypes.js
index c35d054eb..67fa40929 100644
--- a/src/redux/actions/actionTypes.js
+++ b/src/redux/actions/actionTypes.js
@@ -106,7 +106,13 @@ const types = {
IS_SHOW_WXCODE_TEST_CASES: 'IS_SHOW_WXCODE_TEST_CASES',
SHOW_WX_CODE_LOADING: 'SHOW_WX_CODE_LOADING',
SHOW_WX_CODE_DIALOG: 'SHOW_WX_CODE_DIALOG',
- SET_GOLD_AND_EXPERIENCE: 'SET_GOLD_AND_EXPERIENCE'
+ SET_GOLD_AND_EXPERIENCE: 'SET_GOLD_AND_EXPERIENCE',
+ /** 服务端渲染 */
+ GET_PROJECT_BASE: 'GET_PROJECT_BASE',
+ GET_PROJECT_DETAIL: 'GET_PROJECT_DETAIL',
+ GET_PROJECT_ENTRIES: 'GET_PROJECT_ENTRIES',
+ GET_PROJECT_MENU: 'GET_PROJECT_MENU',
+ GET_PROJECT_README: 'GET_PROJECT_README',
}
export default types;
diff --git a/src/redux/actions/index.js b/src/redux/actions/index.js
index 5f95d2b8b..79d565967 100644
--- a/src/redux/actions/index.js
+++ b/src/redux/actions/index.js
@@ -126,6 +126,16 @@ import {
changeWXCodeEvaluateLoading,
changeWXCodeEvaluateDialog
} from './wxCode';
+
+import {
+ setProject,
+ clearProject,
+ setProjectDetail,
+ setProjectEntries,
+ setProjectMenuList,
+ setProjectReadMe
+} from './server.js';
+
export default {
toggleTodo,
getOJList,
@@ -223,5 +233,12 @@ export default {
evaluateWxCode,
showWXCodeTextCase,
changeWXCodeEvaluateLoading,
- changeWXCodeEvaluateDialog
+ changeWXCodeEvaluateDialog,
+ // 服务端渲染
+ setProject,
+ clearProject,
+ setProjectDetail,
+ setProjectEntries,
+ setProjectMenuList,
+ setProjectReadMe
}
\ No newline at end of file
diff --git a/src/redux/actions/server.js b/src/redux/actions/server.js
new file mode 100644
index 000000000..6d20fd002
--- /dev/null
+++ b/src/redux/actions/server.js
@@ -0,0 +1,79 @@
+import types from './actionTypes';
+import { getProjectFunc, getProjectDetailFunc, getProjectEntriesFunc, getBannerFunc, getProjectReadMe } from '../../services/project'
+
+
+// 获取项目信息
+export const setProject = ({ owner,projectsId }) => {
+ return (dispatch) => {
+ return getProjectFunc(owner, projectsId).then(res => {
+ dispatch({
+ type: types.GET_PROJECT_BASE,
+ payload: res.data
+ });
+ return res.data
+ })
+ }
+}
+
+export const clearProject = (type) => {
+ return {
+ type: type,
+ payload: ''
+ }
+}
+
+// 获取项目详情信息
+export const setProjectDetail = ({ owner,projectsId }) => {
+ return (dispatch) => {
+ return getProjectDetailFunc(owner, projectsId).then(res => {
+ dispatch({
+ type: types.GET_PROJECT_DETAIL,
+ payload: res.data
+ });
+ return res.data
+ })
+ }
+}
+
+// 获取文件列表
+export const setProjectEntries = ({ owner,projectsId, branch }) => {
+ return (dispatch) => {
+ return getProjectEntriesFunc(owner, projectsId, branch).then(res => {
+ dispatch({
+ type: types.GET_PROJECT_ENTRIES,
+ payload: res.data
+ });
+ return res.data
+ })
+ }
+}
+
+// 获取banner
+export const setProjectMenuList = ({ owner,projectsId }) => {
+ return (dispatch) => {
+ return getBannerFunc(owner, projectsId).then(res => {
+ dispatch({
+ type: types.GET_PROJECT_MENU,
+ payload: res.data
+ });
+ return res.data
+ })
+ }
+}
+
+// 获取readMe
+export const setProjectReadMe = ({ owner,projectsId, branch }) => {
+ return (dispatch) => {
+ return getProjectReadMe(owner, projectsId, branch).then(res => {
+ if (res && res.data) {
+ dispatch({
+ type: types.GET_PROJECT_README,
+ payload: res.data
+ });
+ return res.data
+ }
+ })
+ }
+}
+
+
diff --git a/src/redux/reducers/index.js b/src/redux/reducers/index.js
index afb58078c..b2f1e90d5 100644
--- a/src/redux/reducers/index.js
+++ b/src/redux/reducers/index.js
@@ -18,6 +18,7 @@ import commentReducer from './commentReducer';
import tpiReducer from './tpiReducer';
import staticReducer from './staticReducer';
import wxcodeReducer from './wxcodeReducer';
+import projectReducer from './projectReducer'
export default combineReducers({
testReducer,
@@ -30,5 +31,6 @@ export default combineReducers({
commentReducer,
tpiReducer,
staticReducer,
- wxcodeReducer
+ wxcodeReducer,
+ projectReducer
});
diff --git a/src/redux/reducers/projectReducer.js b/src/redux/reducers/projectReducer.js
new file mode 100644
index 000000000..a0a46ffe1
--- /dev/null
+++ b/src/redux/reducers/projectReducer.js
@@ -0,0 +1,48 @@
+import types from "../actions/actionTypes";
+
+const initialState = {
+ defaultDetail: '', // 当前项目基本信息
+ projectBase: '', // 当前项目详情
+ projectEntries: '', // 当前文件列表
+ projectMenu: '', // 当前menu
+ projectReadMe: '', // 当前readme
+};
+
+const projectReducer = (state = initialState, action) => {
+ switch (action.type) {
+ case types.GET_PROJECT_DETAIL:
+ return {
+ ...state,
+ defaultDetail: action.payload
+ }
+ case types.GET_PROJECT_BASE:
+ return {
+ ...state,
+ projectBase: action.payload
+ }
+ case types.GET_PROJECT_ENTRIES:
+ return {
+ ...state,
+ projectEntries: action.payload
+ }
+ case types.GET_PROJECT_MENU:
+ return {
+ ...state,
+ projectMenu: action.payload
+ }
+ case types.GET_PROJECT_README:
+ return {
+ ...state,
+ projectReadMe: action.payload
+ }
+ default:
+ return {
+ ...state
+ }
+ }
+}
+
+export default projectReducer;
+export {
+ projectReducer
+};
diff --git a/src/redux/stores/configureStore.js b/src/redux/stores/configureStore.js
index de80c0b69..c10632860 100644
--- a/src/redux/stores/configureStore.js
+++ b/src/redux/stores/configureStore.js
@@ -12,7 +12,13 @@ import rootReducer from '../reducers';
const configureStore = () => createStore(
rootReducer,
+ window.__initState__,
applyMiddleware(thunk)
);
export default configureStore;
+
+export const serverStore = ()=>{
+ return createStore(rootReducer, applyMiddleware(thunk));
+}
+
diff --git a/src/services/project.js b/src/services/project.js
new file mode 100644
index 000000000..77dacbd91
--- /dev/null
+++ b/src/services/project.js
@@ -0,0 +1,30 @@
+import axios from 'axios';
+import { url } from '../../config/ssrUrl';
+
+const baseUrl = `${url}/api`
+
+//
+export async function getProjectFunc (owner, projectsId) {
+ const url = `${baseUrl}/${owner}/${projectsId}/simple.json`;
+ return axios.get(url);
+}
+
+export async function getProjectDetailFunc (owner, projectsId) {
+ const url = `${baseUrl}/${owner}/${projectsId}/detail.json`;
+ return axios.get(url);
+}
+
+export async function getProjectEntriesFunc (owner, projectsId, branch) {
+ const url = `${baseUrl}/${owner}/${projectsId}/entries.json`;
+ return axios.get(url, {params: { ref: branch }});
+}
+
+export async function getBannerFunc (owner, projectsId) {
+ const url = `${baseUrl}/${owner}/${projectsId}/menu_list.json`;
+ return axios.get(url);
+}
+
+export async function getProjectReadMe (owner, projectsId, branch) {
+ const url = `${baseUrl}/${owner}/${projectsId}/readme.json`;
+ return axios.get(url, {params: { ref: branch }});
+}
\ No newline at end of file