我的站点 / 新建站点
+
+ 我的站点
- 您尚未通过实名认证，无法使用此服务，如需使用，请先进行实名认证。
+
+
+ {pages && pages.map(item=>{
+ const {owner, repo, url, last_build_at} = item
+ return
+
+ })}
+
}
+
+
+ {last_build_at && window.open(url)}}>{item.site_name}
+ {last_build_at ? "已部署" : "未部署"}
+
+
+
+ 主题： {item.theme}
+ |
+ 建站工具：{item.language_frame}
+
+
@@ -32,6 +37,12 @@ function ServerIndex(props){
() => ()
}
>
+ {/* 个人建站服务 */}
+ (
(
+
+ })
+ 个人建站服务
+
+
)
diff --git a/src/forge/Server/pages/index.jsx b/src/forge/Server/pages/index.jsx
new file mode 100644
index 000000000..e7f9ac05c
--- /dev/null
+++ b/src/forge/Server/pages/index.jsx
@@ -0,0 +1,187 @@
+import React, { Fragment, useEffect, useState } from 'react';
+import { Spin, message, Button, Form, Input, Select, Descriptions } from 'antd';
+import axios from 'axios';
+import SelectBranch from '../../../forge/Branch/Select';
+import './index.scss';
+import { Link } from 'react-router-dom';
+
+function Pages(props) {
+ const {current_user, history, form, projectDetail, defaultBranch} = 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){
+ setPageInfo(res.data.data)
+ }
+ 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) || "部署失败，请稍后重试");
+ }
+ setBuilding(false);
+ })
+ }
+
+ return (
+
+ 个人建站服务
+
+ 支持Hugo、Jekyll、Hexo静态网站服务
+ + 查看详情 + +
+
+ }
+ {id_card_verify &&
+ {/* 未开通 */}
+ {!pageInfo && }
+ {/* 已开通 */}
+ {pageInfo && }
+
+ )
+}
+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..24c4d753a
--- /dev/null
+++ b/src/forge/Server/pages/index.scss
@@ -0,0 +1,8 @@
+.buildResult{
+ padding: 10px 20px;
+ background-color: rgb(20, 20, 20);
+ color: white;
+}
+.theme-btn{
+ color: $primary-color;
+}
\ No newline at end of file
diff --git a/src/forge/users/Material/verification.jsx b/src/forge/users/Material/verification.jsx
index 2fb684145..5b2014a85 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());
From 99b2c03583579479d876e21cbb509b2cace9677a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 28 Aug 2023 10:46:11 +0800
Subject: [PATCH 02/53] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=BB=BA=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/SecuritySetting/Index.jsx | 5 +-
.../SecuritySetting/bot/exploit/index.scss | 5 ++
.../SecuritySetting/website/createSite.jsx | 51 +++++++++++--------
src/forge/SecuritySetting/website/index.scss | 5 +-
.../SecuritySetting/website/mySiteList.jsx | 35 +++++++++----
src/forge/Server/Index.jsx | 5 +-
src/forge/Server/List.jsx | 10 ++--
src/forge/Server/pages/index.jsx | 44 +++++++++++-----
src/forge/Server/pages/index.scss | 1 +
src/forge/users/Material/Index.jsx | 4 +-
src/forge/users/Material/verification.jsx | 9 ++--
11 files changed, 115 insertions(+), 59 deletions(-)
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index 82e2155c0..77d70c53f 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -79,6 +79,7 @@ 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);
@@ -266,12 +267,12 @@ function Index(props){
)}
>
+ 个人建站服务{!pageInfo && !loading && id_card_verify && ' - 新建站点'}
+
+ {/* 未通过实名认证 */}
+ {!id_card_verify && 您尚未通过实名认证，无法使用此服务，如需使用，请先进行实名认证。
+
+
+
+ {window.open(pageInfo.url)}} className='theme-btn'>{pageInfo.site_name}
+ {pageInfo.url}
+ {pageInfo.language_frame}
+ {pageInfo.created_at}
+ {pageInfo.last_build_at && {pageInfo.last_build_at} }
+
+ {!isBuild && }
+ {isBuild &&
}
+ {result &&
+
}
+ 部署
+
+ 部署分支：
+ {setBranch(params)}}
+ owner={owner}
+ history={props.history}
+ tagflag={false}
+ branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
+ >
+ 选择您要部署的分支
+
+
+
+
+
+
+
}
+ 部署结果
+ {result.map(item=>
+ {item}
)}