-
{ tempConfig[temp].mainTitle }
+
+
{
mainList && mainList.length>0 &&
(
diff --git a/src/forge/Information/Pages/newsCreate.jsx b/src/forge/Information/Pages/newsCreate.jsx
new file mode 100644
index 000000000..84483c794
--- /dev/null
+++ b/src/forge/Information/Pages/newsCreate.jsx
@@ -0,0 +1,175 @@
+import React,{ useState , useEffect } from 'react';
+import { Breadcrumb, Button, Form, Input, message, Select } from 'antd';
+import { getZoneUrl } from 'educoder';
+import MdEditor from '../../../modules/tpm/challengesnew/tpm-md-editor';
+import RichEditor from '../../Component/RichEditor';
+import UploadImage from '../../Team/Component/UploadImage';
+import { tempConfig } from '../tempInfo';
+import '../index.scss';
+import { Base64 } from 'js-base64';
+import { addNewsByDirId, getDirListById, getNewsDetailByAu, updateDoc } from '../api';
+import { httpUrl } from '../fetch';
+
+function NewsCreate(props){
+ const {history, id} = props;
+ const temp = props.temp;
+ const { getFieldDecorator, validateFields , setFieldsValue, setFields } = props.form;
+ const { deptId, id: newsId } = props.match.params;
+ const pathname = props.location.pathname;
+ const [type, setType] = useState(new URLSearchParams(props.location.search.substring(1)).get('type'));
+ const [value, setValue] = useState(undefined);
+ const [imageUrl, setImageUrl] = useState(undefined)
+ const [dirList, setDirList] = useState(undefined);
+ const [loading, setLoading] = useState(false);
+ const [isEdit, setIsEdit] = useState(false);
+ const layout = {
+ labelCol: { span: 2 },
+ wrapperCol: { span: 14 },
+ };
+
+ useEffect(()=>{
+ id && getDircList();
+ },[id])
+
+ useEffect(()=>{
+ if(pathname){
+ if(pathname.endsWith("/edit")){
+ setIsEdit(true);
+ getNewsDetail();
+ }else{
+ setIsEdit(false);
+ }
+ }
+ },[pathname])
+
+ function getDircList(){
+ getDirListById(id).then(res=>{
+ if(res){
+ setDirList(res.data.rows);
+ }
+ })
+ }
+
+ function getNewsDetail() {
+ getNewsDetailByAu(newsId).then(res=>{
+ if(res && res.data){
+ const {name, summary, cmsDir, content, headImg, editorType} = res.data.data;
+ setType(editorType === "rich_editor" ? 'richEditor' : 'mdEditor')
+ setFieldsValue({
+ name,
+ summary,
+ dirId: cmsDir && cmsDir.id,
+ content: Base64.decode(content),
+ headImg
+ });
+ setImageUrl(headImg);
+ setValue(Base64.decode(content));
+ }
+ })
+ }
+
+ // 新建文章
+ function submit(e){
+ e.preventDefault();
+ validateFields((err, fieldsValue)=>{
+ const hasContent = type === "richEditor" && fieldsValue.content === "{tempConfig[temp].mainTitle}
+ {role && role.role !== "None" &&
+ {role.role === "Member" && }
+ {role.role === "Member" ?
+
+ : }
+
}
+
+
+ {tempConfig[temp].mainTitle}
+ {isEdit ? '编辑' : '新建'}文章
+
+
+ )
+}
+export default Form.create()(NewsCreate);
\ No newline at end of file
diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx
index b7b315c21..f68b2c3b1 100644
--- a/src/forge/Information/Pages/selfList.jsx
+++ b/src/forge/Information/Pages/selfList.jsx
@@ -18,6 +18,7 @@ function SelfList(props){
const [ visible ,setVisible ] = useState(false);
const [ deleId , setDeleId] = useState(undefined);
const pathname = props.location.pathname;
+ const { deptId} = props.match.params;
const { id , temp } = props;
const limit = 15;
@@ -57,7 +58,7 @@ function SelfList(props){
function getNew(){
getNewsMyList(id,{
- auditStatus:status,
+ auditStatus:status===0 ? 2 : status === 2 ? 0 : 1,
pageSize:limit
}).then(result=>{
setList(result.data.rows);
@@ -109,7 +110,7 @@ function SelfList(props){
+
+
+ -
@@ -139,7 +140,7 @@ function SelfList(props){
{moment(i.createTime).format("YYYY/MM/DD")}
- 编辑
+ 编辑
{setVisible(true);setDeleId(i.id)}}>删除
资源发布
-
-
+ 搜索 :undefined}
/>
+ {role && role.role !== "None" &&
+ {role.role === "Member" && }
+
+
}
diff --git a/src/forge/Information/Pages/sourceCreate.jsx b/src/forge/Information/Pages/sourceCreate.jsx
new file mode 100644
index 000000000..526df0e12
--- /dev/null
+++ b/src/forge/Information/Pages/sourceCreate.jsx
@@ -0,0 +1,235 @@
+import React,{ useState , useEffect } from 'react';
+import { Breadcrumb, Button, Form, Icon, Input, message, Select, Upload } from 'antd';
+import { getZoneUrl } from 'educoder';
+import '../index.scss';
+import { Link } from 'react-router-dom';
+import { getTypeByFileId, getSourceZoneList, addResource, getSourceDetailByAu, updateMyResource } from '../api';
+
+function SourceCreate(props){
+ const {history, id} = props;
+ const { getFieldDecorator, validateFields , setFieldsValue, setFields } = props.form;
+ const { deptId, sourceid} = props.match.params;
+ const pathname = props.location.pathname;
+ const [ zoneList , setZoneList ] = useState(undefined);
+ const [files, setFiles] = useState([]);
+ const [loadingBut, setLoadingBut] = useState(false);
+ const [isEdit, setIsEdit] = useState(false);
+
+ const layout = {
+ labelCol: { span: 2 },
+ wrapperCol: { span: 14 },
+ };
+
+ useEffect(()=>{
+ id && getZoneList();
+ },[id])
+
+ useEffect(()=>{
+ if(pathname){
+ if(pathname.endsWith("/edit")){
+ setIsEdit(true);
+ getSourceDetail();
+ }else{
+ setIsEdit(false);
+ }
+ }
+ },[pathname])
+
+ function getSourceDetail() {
+ getSourceDetailByAu(sourceid).then(res=>{
+ if(res && res.data){
+ const {name, domainId, summary, fileList} = res.data.data;
+ const fileMap = fileList.map(item=>{
+ const {fileId, fileSizeInfo, fileOriginName, zoneResourceType: {id, name}} = item;
+ return {
+ uid: fileId,
+ status: "done",
+ response: {fileId: fileId, fileSize: fileSizeInfo},
+ name: fileOriginName,
+ zoneResourceType:{id, name}
+ }
+ })
+ setFiles(fileMap);
+ setFieldsValue({
+ name,
+ domainId,
+ summary,
+ fileList: fileMap
+ });
+ }
+ })
+ }
+
+ function getZoneList(){
+ getSourceZoneList(id).then(response=>{
+ if(response && response.data){
+ setZoneList(response.data.rows);
+ }
+ }).catch(error=>{})
+ }
+
+ // 新建文章
+ function submit(e){
+ e.preventDefault();
+ validateFields((err, fieldsValue)=>{
+ if(err || !files.length){
+ !files.length && setFields({fileList: {value:undefined,errors:[new Error('请上传资源附件！')]}});
+ return;
+ }
+ const fileIds = files.map(item=>{return item.response.fileId}).toString();
+ const params = {
+ ...fieldsValue,
+ zoneId: id,
+ fileIds
+ }
+ delete params.fileList;
+ if(isEdit){
+ delete params.zoneId;
+ params.id= parseInt(sourceid, 10);
+ updateMyResource(params).then((res)=>{
+ const {data:{code, msg}} = res;
+ if(code === 200){
+ message.success("编辑成功");
+ history.push(`/zone/${deptId}/source/self`);
+ }else{
+ message.error(msg || '编辑失败，请联系管理员！')
+ }
+ })
+ return;
+ }
+ addResource(params).then((res)=>{
+ const {data:{code, msg}} = res;
+ if(code === 200){
+ message.success("新增成功");
+ history.push(`/zone/${deptId}/source/self`);
+ }else{
+ message.error(msg || '新增失败，请联系管理员！')
+ }
+ })
+ })
+ }
+
+ function beforeUpload(file){
+ if (file.size > 200 * 1024 * 1024) {
+ message.error('单个文件限制200MB以内');
+ return false;
+ }
+ if(files){
+ const sameNameFIles = files.filter(item=>item.name === file.name);
+ if(sameNameFIles.length >= 1){
+ message.error("请不要重复上传同名文件!");
+ return false;
+ }
+ }
+ return true;
+ }
+
+ async function onChange({file, fileList: fileListByUpload}){
+ if(file && (file.status === "done" || file.status === 'uploading' || file.status === 'removed')){
+ setLoadingBut(true);
+ const fileList = [...files];
+ const index = fileList.findIndex(item=>item.uid === file.uid);
+ if(index !== -1){
+ fileList[index] = file;
+ }else{
+ fileList.push(file);
+ }
+ setFiles(fileList);
+ if(!file.response) return
+ if(file.response.code !== 200){
+ message.error(file.response.msg || '上传失败，请联系管理员！')
+ fileList.pop()
+ setFiles([...fileList]);
+ setLoadingBut(false);
+ }else{
+ // 获取此附件的资源类别
+ await getTypeByFileId(id, file.response.fileId).then((res)=>{
+ const {data:{code, data: data1, msg}} = res;
+ if(code !== 200){
+ return message.error(msg);
+ }
+ fileList[fileList.length-1].zoneResourceType = {
+ id: data1.id,
+ name: data1.name
+ }
+ })
+ setFiles([...fileList]);
+ setLoadingBut(false);
+ }
+ }
+ }
+
+ function deleteFile(uid){
+ const fileList = files.filter(item=>item.uid !== uid);
+ setFiles(fileList);
+ }
+
+ return(
+
@@ -262,6 +266,13 @@ function Index(props){
(
+ }
{/* 个人建站 */}
{
+ document.title = "创建站点";
+ }, []);
+
+ useEffect(()=>{
+ axios.get(`/site_pages/themes.json`, {params: {language_frame: language}}).then(res=>{
+ if(res && res.status === 200){
+ setThemes(res.data.themes);
+ setTheme(res.data.themes[0])
+ }
+ })
+ }, [language])
+
+ useEffect(()=>{
+ if(theme && theme.clone_url && theme && theme.clone_url.indexOf("/") > -1){
+ let arr = theme && theme.clone_url.split("/");
+ let first = arr[arr.length-1];
+ if(first.indexOf(".") > -1){
+ let second = first.split('.')[0];
+ if(!second)return;
+ setFieldsValue({
+ repository_name:second,
+ name:second
+ })
+ }else{
+ setFieldsValue({
+ repository_name:first
+ })
+ }
+ }
+ }, [theme])
+
+ function submit(e) {
+ e.preventDefault();
+ validateFieldsAndScroll((err, values) => {
+ if (!err) {
+ axios.post(`/projects/page_migrate.json`,{
+ ...values,
+ clone_addr: theme && theme.clone_url,
+ theme: theme && theme.name,
+ user_id: current_user.user_id
+ }).then(res=>{
+ if(res && res.status === 200){
+ message.success("新建成功");
+ history.push(`/settings/mysite`);
+ }
+ })
+ }
+ });
+ }
+
+ return (
+
+
+ );
+}
+export default Form.create()(CreateSite);
diff --git a/src/forge/SecuritySetting/website/index.scss b/src/forge/SecuritySetting/website/index.scss
index 89b9d18c0..35214ccf7 100644
--- a/src/forge/SecuritySetting/website/index.scss
+++ b/src/forge/SecuritySetting/website/index.scss
@@ -1,8 +1,33 @@
-.default_head{
+.mySites_head{
height: 65px;
line-height: 64px;
border-bottom: 1px solid rgba(224, 230, 245, 1);
color:#151d40;
font-size:17px;
- padding-bottom:20px;
+}
+.createSiteForm{
+ .themeBox{
+ text-align: center;
+ position: relative;
+ cursor: pointer;
+ }
+ .icon-wancheng{
+ position: absolute;
+ right: 4px;
+ top: -7px;
+ color: #e5e3e0;
+ &.active{
+ color: #ffa13a;
+ }
+ }
+}
+.siteBox{
+ padding: 15px 0;
+ border-bottom: 1px dashed #e0e6f5;
+ .siteName{
+ color: #05101a;
+ &:active, &:hover{
+ color: $primary-color;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/website/mySiteList.jsx b/src/forge/SecuritySetting/website/mySiteList.jsx
index 4c2417778..338c79674 100644
--- a/src/forge/SecuritySetting/website/mySiteList.jsx
+++ b/src/forge/SecuritySetting/website/mySiteList.jsx
@@ -1,16 +1,88 @@
import React, { useState, useEffect, Fragment } from "react";
-import { Button, Icon, message, Modal } from "antd";
+import { Button, Pagination, Spin } from "antd";
import './index.scss';
+import '../../users/Material/Index.scss';
+import '../bot/exploit/index.scss'
+import axios from "axios";
+import Nodata from "../../Nodata";
+import { FlexAJ } from "../../Component/layout";
function MySiteList(props){
- const {current_user} = props;
+ const {current_user, history} = props;
+ const {id_card_verify, website_permission} = current_user;
+ const [total, setTotal] = useState(0);
+ const [pages, setPages] = useState([]);
+ const [loading, setLoading] = useState(false);
+ const [page, setPage] = useState(1);
useEffect(()=>{
document.title='我的站点';
+ window.scrollTo(0,0);
}, [])
- return
-
+ useEffect(()=>{
+ if(id_card_verify){
+ setLoading(true);
+ // 获取站点列表
+ axios.get(`/site_pages.json`, {params: {limit: 15, page: page}}).then(res=>{
+ if(res && res.status === 200){
+ const {total_count, pages} = res.data;
+ setPages(pages);
+ setTotal(total_count);
+ }
+ setLoading(false);
+ })
+ }
+ }, [id_card_verify, page])
+
+ return
+
+ 我的站点
+ {id_card_verify && website_permission && }
+
+ {/* 站点权限被管理员关闭 */}
+ {id_card_verify && !website_permission &&
+ }
+
+ {/* 通过实名认证 */}
+ {id_card_verify &&
+ {!loading && total === 0 ? }
+
}
export default MySiteList;
\ No newline at end of file
diff --git a/src/forge/Server/Index.jsx b/src/forge/Server/Index.jsx
index ef62dc12f..18abf3766 100644
--- a/src/forge/Server/Index.jsx
+++ b/src/forge/Server/Index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
import { Route, Switch } from 'react-router-dom';
import "./index.scss";
import Loadable from 'react-loadable';
@@ -18,7 +18,22 @@ const Reposyncer = Loadable({
loader: () => import('./reposyncer'),
loading: Loading,
})
+// 个人建站服务
+const Pages = Loadable({
+ loader: () => import('./pages'),
+ loading: Loading,
+})
function ServerIndex(props){
+ const { projectDetail } = props;
+ const { owner , projectsId } = props.match.params;
+
+ useEffect(()=>{
+ // 非项目协作者不可进入服务tab （3397）
+ if(projectDetail && projectDetail.permission === ""){
+ props.history.push(`/${owner}/${projectsId}`);
+ }
+ }, [projectDetail])
+
return(
@@ -32,6 +47,12 @@ function ServerIndex(props){
() => ()
}
>
+ {/* 个人建站服务 */}
+ {projectDetail && projectDetail.author.type === "User" && ( }
(
+
+ })
+ 个人建站服务
+
+ }
)
diff --git a/src/forge/Server/pages/index.jsx b/src/forge/Server/pages/index.jsx
new file mode 100644
index 000000000..84c0abf1a
--- /dev/null
+++ b/src/forge/Server/pages/index.jsx
@@ -0,0 +1,207 @@
+import React, { Fragment, useEffect, useState } from 'react';
+import { Spin, message, Button, Form, Input, Select, Descriptions, Alert } from 'antd';
+import axios from 'axios';
+import SelectBranch from '../../../forge/Branch/Select';
+import './index.scss';
+
+function Pages(props) {
+ const {current_user, history, form, projectDetail, defaultBranch, isManager} = props;
+ const { owner , projectsId } = props.match.params;
+ const {id_card_verify} = current_user;
+ const { getFieldDecorator, validateFieldsAndScroll } = form;
+ const [reload, setReload] = useState(undefined);
+ const [loading, setLoading] = useState(false);
+ const [pageInfo, setPageInfo] = useState(undefined);
+ const [tag, setTag] = useState(undefined);
+ const [branch, setBranch ] = useState(null);
+ const [building, setBuilding] = useState(false);
+ const [isBuild, setIsBuild] = useState(false);
+ const [result, setResult] = useState(undefined);
+
+ useEffect(()=>{
+ // 更新网页标题
+ if(projectDetail){
+ const { author, name} = projectDetail;
+ document.title = `个人建站-${author.name}/${name}`;
+ }
+ }, [projectDetail])
+
+ useEffect(()=>{
+ if(id_card_verify){
+ setLoading(true);
+ // 获取站点列表
+ axios.get(`/site_pages/x.json`, {params:{owner, repo: projectsId}}).then(res=>{
+ if(res && res.status === 200){
+ const {last_build_info} = res.data.data
+ setPageInfo(res.data.data);
+ last_build_info && last_build_info.length && setResult(last_build_info);
+ }
+ setLoading(false);
+ })
+ }
+ }, [id_card_verify, reload])
+
+ // 基于仓库创建站点
+ function submit(e) {
+ e.preventDefault();
+ validateFieldsAndScroll((err, values) => {
+ if (!err) {
+ axios.post(`/site_pages.json`,{
+ ...values,
+ owner,
+ repo: projectsId
+ }).then(res=>{
+ if(res && res.status === 200){
+ setReload(Math.random());
+ message.success("创建成功");
+ }
+ })
+ }
+ });
+ }
+
+ // 部署
+ function startBuild(){
+ setBuilding(true);
+ axios.post(`/site_pages/${pageInfo.id}/build.json`,{
+ owner,
+ repo: projectsId,
+ branch: branch || defaultBranch
+ }).then(res=>{
+ if(res && res.data && res.data.status === 0){
+ setResult(res.data.data);
+ }else{
+ message.error((res && res.data && res.data.message) || "部署失败，请稍后重试");
+ }
+ setReload(Math.random());
+ setIsBuild(false);
+ setBuilding(false);
+ })
+ }
+
+ return (
+ 
:
{props.history.push('/settings/phone')}}>手机号管理
{props.history.push('/settings/emails')}}>邮箱管理
{props.history.push('/settings/password')}}>密码管理
- {/* {props.history.push('/settings/verification')}}>身份认证 */}
+ {props.history.push('/settings/verification')}}>实名认证
{props.history.push('/settings/cancel')}}>账号注销
}
diff --git a/src/forge/users/Material/verification.jsx b/src/forge/users/Material/verification.jsx
index 2fb684145..cd6fdd1fb 100644
--- a/src/forge/users/Material/verification.jsx
+++ b/src/forge/users/Material/verification.jsx
@@ -9,7 +9,7 @@ import { getImageUrl } from '../../../common/UrlTool';
export default Form.create()(
forwardRef((props)=>{
const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
- const { resetUserInfo , current_user } = props;
+ const { current_user } = props;
const [loading, setLoading] = useState(false);
const [data, setData] = useState(undefined);
const [reload, setReload] = useState(undefined);
@@ -18,7 +18,7 @@ export default Form.create()(
if(current_user && current_user.login){
setLoading(true);
// 获取用户身份认证信息
- axios.get(`http://ng.learnerhub.net/api/identity_verifications.json`).then(res=>{
+ axios.get(`/identity_verifications.json`).then(res=>{
setLoading(false);
if(res && res.status === 200){
if(res.data && res.data.status === 0){
@@ -38,7 +38,7 @@ export default Form.create()(
validateFields((error, values) => {
if (!error) {
if(data){
- axios.put(`http://ng.learnerhub.net/api/identity_verifications/${data.id}.json`, values).then(res => {
+ axios.put(`/identity_verifications/${data.id}.json`, values).then(res => {
if(res && res.status === 200){
message.success("提交成功");
setReload(Math.random());
@@ -46,7 +46,7 @@ export default Form.create()(
}).catch((error) => {});
}else{
// 新增
- axios.post(`http://ng.learnerhub.net/api/identity_verifications.json`, values).then(res=>{
+ axios.post(`/identity_verifications.json`, values).then(res=>{
if(res && res.status === 200){
message.success("提交成功");
setReload(Math.random());
@@ -67,15 +67,16 @@ export default Form.create()(
+
+ 资源列表
+ {isEdit ? '编辑' : '新建'}资源
+
+
+ )
+}
+export default Form.create()(SourceCreate);
\ No newline at end of file
diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js
index 9a226ea52..2496268cc 100644
--- a/src/forge/Information/api.js
+++ b/src/forge/Information/api.js
@@ -17,6 +17,13 @@ export function getCheckZoneRole(id) {
});
}
+export function getCurrentRole(id) {
+ return fetch({
+ url: `/zone/zoneFront/${id}/checkCurrentRole`,
+ method: 'get',
+ });
+}
+
/********首页接口******/
export function getHomePageList(id) {
return fetch({
@@ -115,6 +122,13 @@ export function applyJoin(id,data) {
}
// 资源模块
+export function addResource(data) {
+ return fetch({
+ url: `/zone/zoneFront/addResource`,
+ method: 'post',
+ data: data
+ });
+}
export function getSourceTypeList(id){
return fetch({
url:`/zone/open/${id}/resourceType/list`,
@@ -158,7 +172,82 @@ export function delSourceMyList(id){
export function postCreateZone(data) {
return fetch({
url: `/zone/application`,
+ })
+}
+
+// 根据文件id获取专区下资源类别
+export function getTypeByFileId(zoneId, fileId){
+ return fetch({
+ url:`/zone/resourceType/zone/${zoneId}/getResourceTypeByFileId/${fileId}`,
+ method: 'get'
+ })
+}
+
+// 新增领域
+export function addSourceType(data) {
+ return fetch({
+ url: `/zone/resourceType`,
method: 'post',
data: data
});
+}
+
+// 修改当前文件对应的资源类别
+export function updateResourceTypeByFileId(data) {
+ return fetch({
+ url: '/zone/resourceType/updateResourceTypeByFileId',
+ method: 'PUT',
+ data: data
+ });
+}
+
+// 获取文章领域列表
+export function getDirListById(id){
+ return fetch({
+ url:`/cms/doc/open/zone/${id}/dirList`,
+ method: 'get'
+ })
+}
+
+// 新增文章
+export function addNewsByDirId(dirId, data) {
+ return fetch({
+ url: `/cms/doc/dir/${dirId}`,
+ method: 'post',
+ data: data
+ });
+}
+
+// 获取文章详细信息（需要用户权限）
+export function getNewsDetailByAu(id){
+ return fetch({
+ url:`/cms/doc/${id}`,
+ method: 'get',
+ })
+}
+
+// 修改文章详细信息（需要用户权限）
+export function updateDoc(id, data) {
+ return fetch({
+ url: `/cms/doc/${id}`,
+ method: 'PUT',
+ data: data
+ });
+}
+
+// 获取资源详细信息（需要用户权限）
+export function getSourceDetailByAu(id){
+ return fetch({
+ url:`/zone/zoneFront/myResource/${id}`,
+ method: 'get',
+ })
+}
+
+// 修改资源详细信息（需要用户权限）
+export function updateMyResource(data) {
+ return fetch({
+ url: `/zone/zoneFront/editResource`,
+ method: 'PUT',
+ data: data
+ });
}
\ No newline at end of file
diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js
index 897cc41d1..69f62c0a0 100644
--- a/src/forge/Information/fetch.js
+++ b/src/forge/Information/fetch.js
@@ -1,5 +1,6 @@
import axios from 'axios';
import { message , notification } from 'antd';
+// import cookie from 'react-cookies';
function beforeFetch(actionUrl){
if (window.location.href.indexOf('localhost') < 0) {
@@ -7,7 +8,7 @@ function beforeFetch(actionUrl){
}
const service = axios.create({
- headers:{Authorization:"a57ec217a1963611f9a0ff591b305dc3d5b3ba1f"},
+ // headers:{Authorization: cookie.load("autologin_trustie")},
baseURL: actionUrl,
timeout: 1800000, // 请求超时时间
});
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index ecfcd227a..e8b70855e 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -8,7 +8,7 @@ import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC"
import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
import Loadable from "react-loadable";
import Loading from "../../Loading";
-import { getMainInfos , getCheckZoneRole } from './api';
+import { getMainInfos , getCheckZoneRole, getCurrentRole } from './api';
import PublicBanner from "./Component/publicBanner";
import './index.scss';
import { IsPC } from 'educoder';
@@ -23,6 +23,10 @@ const SourceDetail = Loadable({
loader: () => import("./Pages/sourceDetail"),
loading: Loading,
});
+const SourceCreate = Loadable({
+ loader: () => import("./Pages/sourceCreate"),
+ loading: Loading,
+});
const VIP = Loadable({
loader: () => import("./Pages/zoneVIP"),
loading: Loading,
@@ -66,6 +70,10 @@ const NewsList = Loadable({
loader: () => import("./Pages/newsList"),
loading: Loading,
});
+const NewsCreate = Loadable({
+ loader: () => import("./Pages/newsCreate"),
+ loading: Loading,
+});
const Main = Loadable({
loader: () => import("./Pages/main"),
@@ -83,8 +91,10 @@ function Index(props){
const { deptId } = props.match.params;
const [ id , setId ] = useState(undefined);
const [ temp , setTemp ] = useState(tempEnum.zone);
+ const [ role , setRole ] = useState(undefined);
const { pathname } = props.history.location;
const sourcedetail = pathname.indexOf(`/zone/${deptId}/newdetail/`)>-1 && IsPC();
+ const {current_user} = props;
useEffect(()=>{
if(deptId && deptId!=="apply"){
@@ -117,6 +127,7 @@ function Index(props){
setId(data.id);
if(data.id){
getAdminUrl(data.id);
+ getRole(data.id)
}
setSeoMeta(`${data.name},`, data.name, data.subTitle, `/zone/${deptId}`)
}
@@ -132,6 +143,15 @@ function Index(props){
}
}).catch(error=>{})
}
+
+ function getRole(id){
+ if(current_user && current_user.login){
+ getCurrentRole(id).then(res=>{
+ setRole(res.data.data);
+ }).catch(error=>{})
+ }
+ }
+
return(
+
+
+
{ (!sourcedetail && deptId!=="apply") && (id ? : )}
@@ -142,10 +162,22 @@ function Index(props){
(
+
+ )}
+ >
+ (
+
+ )}
+ >
(
-
+
)}
>
(
+
+ )}
+ >
+ (
+
(
@@ -169,7 +213,7 @@ function Index(props){
(
-
)}
>
(
-
+
)}
>
{data && data.helperShow === 1 && {
- const { platform } = this.state;
- if (!platform) return;
- const { projectsId, owner } = this.props.match.params;
- const url = `/${owner}/${projectsId}/sync_mirror.json`;
- axios.post(url).then(result => {
- if (result && result.data && result.data.status === 0) {
- this.setState({
- secondSync: true
- })
- this.canvasChannel(true);
- } else {
- this.props.showNotification("镜像同步失败!");
- }
- }).catch(error => {
- console.log(error);
- })
+ const { isManager } = this.state;
+ const { current_user , showLoginDialog } = this.props;
+ if(!(current_user && current_user.login)){
+ showLoginDialog();
+ return
+ }
+ if((current_user && current_user.admin) || isManager){
+ const { platform } = this.state;
+ if (!platform) return;
+ const { projectsId, owner } = this.props.match.params;
+ const url = `/${owner}/${projectsId}/sync_mirror.json`;
+ axios.post(url).then(result => {
+ if (result && result.data && result.data.status === 0) {
+ this.setState({
+ secondSync: true
+ })
+ this.canvasChannel(true);
+ } else {
+ this.props.showNotification("镜像同步失败!");
+ }
+ }).catch(error => {
+ console.log(error);
+ })
+ }
}
textFunc = (forked_from_project_id, fork_info) => {
@@ -580,7 +588,7 @@ class Detail extends Component {
firstSync ? "" :
{
- ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
+ (projectDetail && projectDetail.type && projectDetail.type === 2) ?
同步镜像 : ""
}
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index a21a616af..d88cd3702 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -70,24 +70,28 @@ const Mysite = Loadable({
loader: () => import("./website/mySiteList"),
loading: Loading,
});
+const CreateSite = Loadable({
+ loader: () => import("./website/createSite"),
+ loading: Loading,
+});
function Index(props){
const { current_user,mygetHelmetapi , checkIfLogin } = props;
const { pathname } = props.location;
const notice_url = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice;
+ const {id_card_verify, website_permission} = current_user;
const [ avatarVisible , setAvatarVisible ] = useState(false);
const [active, setActive] = useState(1);
- console.log('active', active);
useEffect(()=>{
if(checkIfLogin() === false){
- props.history.push('/login');
+ props.history.push(`/login?go_page=${pathname}`);
}
},[])
useEffect(()=>{
- console.log('pathname', pathname, ["/settings/profile"].indexOf(pathname));
+ const pattern = /^\/settings\/installbot\/\d+$/;
if(["/settings/profile"].indexOf(pathname) !== -1){
setActive(1);
}else if(["/settings/emails", "/settings/phone", "/settings/password", "/settings/cancel"].indexOf(pathname) !== -1){
@@ -100,11 +104,11 @@ function Index(props){
setActive(5);
}else if(["/settings/CLA"].indexOf(pathname) !== -1){
setActive(6);
- }else if(["/settings/mybot"].indexOf(pathname) !== -1){
+ }else if(["/settings/mybot", "/settings/mybot/new"].indexOf(pathname) !== -1){
setActive(7);
- }else if(["/settings/installbot"].indexOf(pathname) !== -1){
+ }else if(["/settings/installbot"].indexOf(pathname) !== -1 || pattern.test(pathname)){
setActive(8);
- }else if(["/settings/mysite"].indexOf(pathname) !== -1){
+ }else if(["/settings/mysite", "/settings/mysite/create"].indexOf(pathname) !== -1){
setActive(9);
}
}, [pathname])
@@ -154,10 +158,10 @@ function Index(props){
我的Bot
Bot安装
- {/*
-
+
- 个人建站
- 我的站点 -
我的站点 / 新建站点
+
+ 我的站点
- 您的站点权限被锁定，请联系平台管理员。
}
+ {/* 未通过实名认证 */}
+ {!id_card_verify && 您尚未通过实名认证，无法使用此服务，如需使用，请先进行实名认证。
+
+
+
: 个人建站是一个免费的静态网页托管服务，您可以使用 个人建站服务托管个人主页、项目站点等静态网页。
+
+ {pages && pages.map(item=>{
+ const {owner, repo, url, state, state_description, build_state} = item
+ return
+
+ })}
+
}
+
+
+ {state && build_state ? {window.open(url)}}>{item.site_name} : {item.site_name}}
+ {state ? build_state ? "已部署" : "未部署" : '被关闭'}
+
+
+
+ 主题： {item.theme}
+ |
+ 建站工具：{item.language_frame}
+
+ {!state && 关闭原因：{state_description}
}
+
+ {setPage(page)}}
+ total = {total}
+ hideOnSinglePage
+ >
+
+
+ 个人建站服务
+
+ 支持Hugo、Jekyll、Hexo静态网站服务
+ + 查看详情 + +
+
+ }
+ {id_card_verify && isManager &&
+ {/* 未开通 */}
+ {!pageInfo ? : pageInfo.state ? }
+ {!isManager &&
+ )
+}
+export default Form.create()(Pages);
\ No newline at end of file
diff --git a/src/forge/Server/pages/index.scss b/src/forge/Server/pages/index.scss
new file mode 100644
index 000000000..ab9cfa4de
--- /dev/null
+++ b/src/forge/Server/pages/index.scss
@@ -0,0 +1,27 @@
+.buildResult{
+ padding: 10px 20px;
+ background-color: rgb(20, 20, 20);
+ color: white;
+}
+.theme-btn{
+ color: $primary-color;
+ cursor: pointer;
+}
+.pageStateBox{
+ border: 1px solid $primary-color;
+ border-radius: 5px;
+ color: $primary-color;
+ padding: 4px 6px 4px;
+ background-color: rgba(70, 106, 255, 0.09);
+ line-height: 12px;
+ &.public{
+ background-color: rgba(58, 213, 115, 0.08);
+ border-color: #25c589;
+ color: #25c589;
+ }
+ &.private{
+ background-color: rgba(230, 126, 34, 0.08);
+ border-color: rgba(230, 126, 34, 1);
+ color: rgba(230, 126, 34, 1);
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Team/Component/UploadImage.jsx b/src/forge/Team/Component/UploadImage.jsx
index d70d62388..eb1d4a68e 100644
--- a/src/forge/Team/Component/UploadImage.jsx
+++ b/src/forge/Team/Component/UploadImage.jsx
@@ -7,6 +7,7 @@ const TokenKey = 'autologin_trustie';
function UploadImage({ getImage , url, getImageId, maxSize = 2, action = getUploadActionUrl(), getImageUrl }){
const [ imageUrl , setImageUrl ] = useState(undefined);
+ const [loading, setLoading] = useState(false);
useEffect(()=>{
setImageUrl(url);
},[url])
@@ -33,7 +34,9 @@ function UploadImage({ getImage , url, getImageId, maxSize = 2, action = getUplo
}
// 上传完成后
function handleChange(info){
+ setLoading(true);
if(info && info.file && info.file.status === "done"){
+ setLoading(false);
getImageId && getImageId(info.file.response.id);
getImageUrl && getImageUrl(info.file.response.url)
getBase64(info.file.originFileObj, imageUrl =>
@@ -58,7 +61,7 @@ function UploadImage({ getImage , url, getImageId, maxSize = 2, action = getUplo
+ 个人建站服务{!pageInfo && !loading && id_card_verify && isManager && ' - 新建站点'}
+
+ {/* 未通过实名认证 */}
+ {!id_card_verify && 您尚未通过实名认证，无法使用此服务，如需使用，请先进行实名认证。
+
+
+ {/* 已开通 */}
+
+
+ {pageInfo.last_build_at && window.open(pageInfo.url)}} className= {pageInfo.last_build_at && 'theme-btn'}>{pageInfo.site_name}
+ {pageInfo.build_state === null ? '未部署' : pageInfo.build_state ? "已部署" : "部署失败"}
+
+ {pageInfo.last_build_at && window.open(pageInfo.url)}} className= {pageInfo.last_build_at && 'theme-btn'}>{pageInfo.url}
+ {pageInfo.language_frame}
+ {pageInfo.created_at}
+ {pageInfo.last_build_at && {pageInfo.last_build_at} }
+
+ {!isBuild && }
+ {isBuild &&
:
+
}
+ 部署
+
+ 部署分支：
+ {setBranch(params)}}
+ owner={owner}
+ history={props.history}
+ tagflag={false}
+ branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
+ >
+ 选择您要部署的分支
+
+
+
+
+
+
+ {/* 站点权限被关闭 */}
+ {pageInfo &&
}
+ {result &&
+
}
+ 部署结果
+ {result.map(item=>
+ {item}
)}
+ {/* 非管理员权限 */}
+ {pageInfo && pageInfo.state &&
+ {pageInfo.last_build_at && window.open(pageInfo.url)}} className= {pageInfo.last_build_at && 'theme-btn'}>{pageInfo.site_name}
+ {pageInfo.last_build_at && window.open(pageInfo.url)}} className= {pageInfo.last_build_at && 'theme-btn'}>{pageInfo.url}
+ {pageInfo.language_frame}
+ {pageInfo.created_at}
+ {pageInfo.last_build_at && {pageInfo.last_build_at} }
+ }
+
}
+
-
}
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 65cd5c354..715764421 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -331,19 +331,20 @@ form{
border: 1px solid #DDDDDD !important;
background-color: #fff !important;
}
-.ant-btn.ant-btn-background-ghost{
- border-color: #D0D0D0;
-}
-.ant-btn.ant-btn-background-ghost.ant-btn-primary:hover{
- background-color:$primary-color!important;
- border-color: $primary-color;
- color: #fff;
-}
-.ant-btn.ant-btn-background-ghost.ant-btn-danger:hover{
- background-color: #DF0002!important;
- border-color: #DF0002;
- color: #fff;
-}
+// ghost模式按钮：如有影响，单独修改
+// .ant-btn.ant-btn-background-ghost{
+// border-color: #D0D0D0;
+// }
+// .ant-btn.ant-btn-background-ghost.ant-btn-primary:hover{
+// background-color:$primary-color!important;
+// border-color: $primary-color;
+// color: #fff;
+// }
+// .ant-btn.ant-btn-background-ghost.ant-btn-danger:hover{
+// background-color: #DF0002!important;
+// border-color: #DF0002;
+// color: #fff;
+// }
.newPopUl{
li{
height: 30px;
diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx
index 56f6799b0..c15036842 100644
--- a/src/forge/users/Material/Index.jsx
+++ b/src/forge/users/Material/Index.jsx
@@ -35,7 +35,7 @@ function Index(props){
break;
case '/settings/verification':
setType('4');
- documentTitle = "身份认证";
+ documentTitle = "实名认证";
break;
default:
setType('2');
@@ -55,7 +55,7 @@ function Index(props){
点击上传
- 您提交的身份信息未提供，原因：{data.description || "无，如有需要请联系平台管理员"}
+ 您提交的身份信息未审核通过，原因：{data.description || "无，如有需要请联系平台管理员"}
}
- {data.state === "已通过" &&