@@ -153,7 +155,7 @@ function HeaderPageCCF(props) {
{i.name}
- {window.location.href=`/zone/${deptId}/news/${i.id}`}}>
{
avatarVisible &&
@@ -129,34 +137,34 @@ function Index(props){
@@ -165,108 +173,117 @@ function Index(props){
(
-
(
-
(
-
(
-
(
-
(
-
(
-
(
-
(
-
(
-
(
-
(
-
{/* 创建一个新的bot */}
(
-
{/* 开发bot */}
(
-
{/* bot配置页面 */}
(
-
{/* bot配置 */}
(
-
+ {/* 新建站点 */}
+
+ (
+
+
{/* 个人建站 */}
(
-
diff --git a/src/forge/SecuritySetting/website/index.scss b/src/forge/SecuritySetting/website/index.scss
index 89b9d18c0..aefe8aeca 100644
--- a/src/forge/SecuritySetting/website/index.scss
+++ b/src/forge/SecuritySetting/website/index.scss
@@ -1,8 +1,32 @@
-.default_head{
+.default_head {
height: 65px;
line-height: 64px;
border-bottom: 1px solid rgba(224, 230, 245, 1);
- color:#151d40;
- font-size:17px;
- padding-bottom:20px;
+ color: #151d40;
+ font-size: 17px;
+ padding-bottom: 20px;
+
+ Button {
+ float: right;
+ width: 100px;
+ height: 36px;
+ margin-top: 8px;
+ color: #fff;
+ background-color: #466aff;
+ border-color: #466aff;
+ }
+}
+.bushu {
+ border-radius: 4px;
+ background-color: rgba(164, 173, 179, 1);
+ color: rgba(255, 255, 255, 1);
+ font-size: 20px;
+ text-align: center;
+ float: right;
+ top:-40px;
+}
+.form{
+ border: 1px solid rgba(164, 173, 179, 1);
+ padding: 10px;
+ border-radius: 4px;
}
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/website/mySiteList.jsx b/src/forge/SecuritySetting/website/mySiteList.jsx
index 4c2417778..b7cf9f9bf 100644
--- a/src/forge/SecuritySetting/website/mySiteList.jsx
+++ b/src/forge/SecuritySetting/website/mySiteList.jsx
@@ -1,16 +1,44 @@
import React, { useState, useEffect, Fragment } from "react";
-import { Button, Icon, message, Modal } from "antd";
+import { Button, Icon, message, Modal, Form, Drawer } from "antd";
import './index.scss';
+import axios from "axios";
-function MySiteList(props){
- const {current_user} = props;
+function MySiteList(props) {
+ const { form, current_user } = props;
+ const [sitelist, setSitelist] = useState(undefined);
- useEffect(()=>{
- document.title='我的站点';
+ useEffect(() => {
+ document.title = '我的站点';
+ axios.get('/site_pages.json').then(result => {
+ if (result) {
+ setSitelist(result.data.pages);
+ }
+ })
}, [])
- return
-
+
+
+ return (
+
@@ -32,6 +51,22 @@ function ServerIndex(props){
() => ()
}
>
+ {
+ page?
+ (
+ :
+ (
+ }
(
+
+ })
+ {window.location.href=`/${owner}/${projectsId}/service/site`}}>{name?name:""}
+
+
{/*
- 
- setAvatarVisible(true)}>修改头像
+
+ setAvatarVisible(true)}>修改头像
{current_user && current_user.username}
- 个人信息 -
- 基本资料 -
- 账号管理 +
- 基本资料 +
- 账号管理
- 消息通知 -
- 我的通知 -
- 通知管理 +
- 我的通知 +
- 通知管理
- 安全设置 -
- SSH密钥 -
- 我的CLA +
- SSH密钥 +
- 我的CLA
- Bot开发 -
- 我的Bot -
- Bot安装 +
- 我的Bot +
- Bot安装
- 个人建站 -
- 我的站点 +
- 我的站点
我的站点
-
+
+ )
}
export default MySiteList;
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/website/new/index.jsx b/src/forge/SecuritySetting/website/new/index.jsx
new file mode 100644
index 000000000..65f7ee509
--- /dev/null
+++ b/src/forge/SecuritySetting/website/new/index.jsx
@@ -0,0 +1,148 @@
+import React, { Fragment, forwardRef, useEffect, useState } from "react";
+import { Form, Input, Select, Space, Button, message, Radio } from "antd";
+import axios from "axios";
+import "./index.scss"
+import { Link } from "react-router-dom";
+
+
+
+function createSite(props) {
+ const { form, current_user } = props;
+ const [content, setContent] = useState(undefined);
+ const [addr, setAddr] = useState(undefined);
+ const [tag, setTag] = useState("");
+ const [proname, setProname] = useState("");
+ const [protag, setProtag] = useState("");
+ const [themename, setThemename] = useState([""]);
+ const { TextArea } = Input;
+ const { getFieldDecorator, validateFields } = props && props.form;
+ const [pagetheme, setPagetheme] = useState(undefined);
+
+
+ useEffect(() => {
+ document.title = '注册新的站点';
+ axios.get('/site_pages/themes.json').then(res => {
+ if (res) {
+ setPagetheme(res.data.themes);
+ }
+ })
+ }, [])
+ function onContentChange(value) {
+ setContent(value);
+ };
+
+ function ChangeAddr(e) {
+ setTag(e.target.value);
+ }
+
+ function checkAddr(rule, value, callback) {
+ let reg = /^[0-9a-zA-Z]+$/;
+ if (!value) {
+ callback();
+ }
+ if (!reg.test(value)) {
+ callback("请输入有效的名称");
+ }
+ setAddr(value);
+ callback();
+ }
+
+ function submit(e) {
+ e.preventDefault();
+ validateFields((err, fieldsValue) => {
+ if (err) {
+ console.log("error");
+ return;
+ }
+ const { site_name, identifier, theme, name, repository_name, clone_addr } = fieldsValue;
+ const prame = { site_name, identifier, language_frame: "hugo", theme:themename[0], user_id: current_user.user_id, name, repository_name, clone_addr:themename[1] };
+ axios.post(`/projects/page_migrate.json`, prame).then(response => {
+ if (response && response.status === 200) {
+ message.success("创建成功");
+ props.history.push(`/settings/mysite`)
+ } else {
+ message.error("创建失败");
+ }
+ })
+ })
+ }
+ console.log(themename);
+
+ return (
+
+ 我的站点
+
+
+
+ {
+ sitelist && sitelist.length > 0 &&
+ sitelist.map((i, k) => {
+ return (
+
+
+ 站点名称: {i.site_name}
+ )
+ })
+ }
+ 建站工具: {i.language_frame}
+ 建站时间: {i.created_at}上次部署时间: {i.last_build_at}
+ +
+
+ )
+}
+export default Form.create()(forwardRef(createSite));
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/website/new/index.scss b/src/forge/SecuritySetting/website/new/index.scss
new file mode 100644
index 000000000..e192c759c
--- /dev/null
+++ b/src/forge/SecuritySetting/website/new/index.scss
@@ -0,0 +1,88 @@
+.Create {
+ border: 1px solid rgba(79, 108, 188, 0.21);
+ padding: 30px;
+
+ .back {
+ border-bottom: 1px solid #e0e6f5;
+
+ .ceTitle {
+ font-weight: 700;
+ color: #151d40;
+ }
+ }
+
+ .Create-title {
+ margin-top: 10px;
+ text-align: center;
+
+ p {
+ position: relative;
+ font-weight: bold;
+ color: #151d40;
+ }
+ }
+
+ .Form {
+ label {
+ font-size: 15px;
+ font-weight: bold;
+ }
+ }
+
+ .Create-Form {
+ margin-top: 20px;
+
+ Button {
+ width: 100px;
+ height: 40px;
+ }
+ }
+
+ .zhuti {
+ border: 1px solid rgba(79, 108, 188, 0.21);
+ display: flex;
+ flex-wrap: wrap;
+ padding: 10px;
+ }
+
+ .zhutikuai {
+ text-align: center;
+
+ li {
+ margin: 9px;
+ float: left;
+ }
+
+ img {
+ width: 147px;
+ height: 92px;
+ display: flex;
+ }
+
+ p {
+ margin-bottom: -10px !important;
+ }
+ }
+
+ .createbutton {
+ color: #fff;
+ background-color: #466aff;
+ border-color: #466aff;
+ text-align: center;
+ }
+
+ .submit {
+ position: relative;
+ left: 40%;
+ }
+
+ .choicebutton {
+ height: auto;
+ padding: 0px;
+ margin-right: 10px;
+ margin-bottom: 10px;
+ float: left;
+ left: 25px;
+ top:13px;
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Server/Index.jsx b/src/forge/Server/Index.jsx
index ef62dc12f..2eb78ab7f 100644
--- a/src/forge/Server/Index.jsx
+++ b/src/forge/Server/Index.jsx
@@ -1,8 +1,9 @@
-import React from 'react';
+import React,{useEffect, useState} from 'react';
import { Route, Switch } from 'react-router-dom';
import "./index.scss";
import Loadable from 'react-loadable';
import Loading from '../../Loading';
+import axios from 'axios';
const List = Loadable({
@@ -18,7 +19,25 @@ const Reposyncer = Loadable({
loader: () => import('./reposyncer'),
loading: Loading,
})
+const Site = Loadable({
+ loader: () => import('./sitedetail'),
+ loading: Loading,
+})
+const Sitecreate = Loadable({
+ loader: ()=> import('./sitecreate'),
+ loading: Loading,
+})
+
function ServerIndex(props){
+ const [page,setPage] = useState(undefined);
+ const { owner , projectsId } = props.match.params;
+ useEffect(() => {
+ axios.get(`/site_pages/x.json?owner=${owner}&repo=${projectsId}`).then((res) => {
+ if (res) {
+ setPage(res.data.data)
+ }
+ })
+ }, [])
return(
+ 我的站点创建新的站点
+
+
+
+ 新建站点
+
+
+
+
+ {window.location.href=`/${owner}/${projectsId}/service/site`}}>{name?name:""}
+
+ {desc?desc:""}
+ + {window.location.href=`/${owner}/${projectsId}/service/site`}} className="btnhover">查看详情 + +
//记得注释
diff --git a/src/forge/Server/sitecreate.jsx b/src/forge/Server/sitecreate.jsx
new file mode 100644
index 000000000..0a1429ee7
--- /dev/null
+++ b/src/forge/Server/sitecreate.jsx
@@ -0,0 +1,146 @@
+import React, { Fragment, forwardRef, useEffect, useState } from "react";
+import { Form, Input, Select, Space, Button, message, Radio } from "antd";
+import axios from "axios";
+import { Link } from "react-router-dom";
+
+
+
+function createSite(props) {
+ const { form, current_user } = props;
+ const [content, setContent] = useState(undefined);
+ const [addr, setAddr] = useState(undefined);
+ const [tag, setTag] = useState("");
+ const [proname, setProname] = useState("");
+ const [protag, setProtag] = useState("");
+ const [themename, setThemename] = useState([""]);
+ const { TextArea } = Input;
+ const { getFieldDecorator, validateFields } = props && props.form;
+ const [pagetheme, setPagetheme] = useState(undefined);
+
+
+ useEffect(() => {
+ document.title = '注册新的站点';
+ axios.get('/site_pages/themes.json').then(res => {
+ if (res) {
+ setPagetheme(res.data.themes);
+ }
+ })
+ }, [])
+ function onContentChange(value) {
+ setContent(value);
+ };
+
+ function ChangeAddr(e) {
+ setTag(e.target.value);
+ }
+
+ function checkAddr(rule, value, callback) {
+ let reg = /[^\a-\z\A-\Z]/;
+ if (!value) {
+ callback();
+ }
+ if (!reg.test(value)) {
+ callback("请输入有效的名称");
+ }
+ setAddr(value);
+ callback();
+ }
+
+ function submit(e) {
+ e.preventDefault();
+ validateFields((err, fieldsValue) => {
+ if (err) {
+ console.log("error");
+ return;
+ }
+ const { site_name, identifier, theme, name, repository_name, clone_addr } = fieldsValue;
+ const prame = { site_name, identifier, language_frame: "hugo", theme:themename[0], user_id: current_user.user_id, name, repository_name, clone_addr:themename[1] };
+ axios.post(`/projects/page_migrate.json`, prame).then(response => {
+ if (response && response.status === 200) {
+ message.success("创建成功");
+ } else {
+ message.error("创建失败");
+ }
+ })
+ })
+ }
+ console.log(themename);
+
+ return (
+
diff --git a/src/forge/Server/sitecreate.jsx b/src/forge/Server/sitecreate.jsx
new file mode 100644
index 000000000..0a1429ee7
--- /dev/null
+++ b/src/forge/Server/sitecreate.jsx
@@ -0,0 +1,146 @@
+import React, { Fragment, forwardRef, useEffect, useState } from "react";
+import { Form, Input, Select, Space, Button, message, Radio } from "antd";
+import axios from "axios";
+import { Link } from "react-router-dom";
+
+
+
+function createSite(props) {
+ const { form, current_user } = props;
+ const [content, setContent] = useState(undefined);
+ const [addr, setAddr] = useState(undefined);
+ const [tag, setTag] = useState("");
+ const [proname, setProname] = useState("");
+ const [protag, setProtag] = useState("");
+ const [themename, setThemename] = useState([""]);
+ const { TextArea } = Input;
+ const { getFieldDecorator, validateFields } = props && props.form;
+ const [pagetheme, setPagetheme] = useState(undefined);
+
+
+ useEffect(() => {
+ document.title = '注册新的站点';
+ axios.get('/site_pages/themes.json').then(res => {
+ if (res) {
+ setPagetheme(res.data.themes);
+ }
+ })
+ }, [])
+ function onContentChange(value) {
+ setContent(value);
+ };
+
+ function ChangeAddr(e) {
+ setTag(e.target.value);
+ }
+
+ function checkAddr(rule, value, callback) {
+ let reg = /[^\a-\z\A-\Z]/;
+ if (!value) {
+ callback();
+ }
+ if (!reg.test(value)) {
+ callback("请输入有效的名称");
+ }
+ setAddr(value);
+ callback();
+ }
+
+ function submit(e) {
+ e.preventDefault();
+ validateFields((err, fieldsValue) => {
+ if (err) {
+ console.log("error");
+ return;
+ }
+ const { site_name, identifier, theme, name, repository_name, clone_addr } = fieldsValue;
+ const prame = { site_name, identifier, language_frame: "hugo", theme:themename[0], user_id: current_user.user_id, name, repository_name, clone_addr:themename[1] };
+ axios.post(`/projects/page_migrate.json`, prame).then(response => {
+ if (response && response.status === 200) {
+ message.success("创建成功");
+ } else {
+ message.error("创建失败");
+ }
+ })
+ })
+ }
+ console.log(themename);
+
+ return (
+
+
+ )
+}
+export default Form.create()(forwardRef(createSite));
\ No newline at end of file
diff --git a/src/forge/Server/sitedetail.jsx b/src/forge/Server/sitedetail.jsx
new file mode 100644
index 000000000..3f49c18e2
--- /dev/null
+++ b/src/forge/Server/sitedetail.jsx
@@ -0,0 +1,70 @@
+import React, { useEffect, useState } from "react";
+import { Button, Select, message, Card } from "antd";
+import axios from "axios";
+function sitelist(props) {
+ const [page, setPage] = useState(undefined);
+ const [branch, setBranch] = useState("");
+ const [branchlist, setBranchlist] = useState(undefined);
+ const Url = window.location.href;
+ const params = Url.split('/');
+ const owner = params[3];
+ const repo = params[4];
+ const { current_user, resetUserInfo, projectDetail, showNotification } = props;
+ const { Option } = Select;
+ useEffect(() => {
+ axios.get(`/site_pages/x.json?owner=${owner}&repo=${repo}`).then((res) => {
+ if (res) {
+ setPage(res.data.data)
+ }
+ })
+ }, [])
+ useEffect(() => {
+ axios.get(`/v1/${owner}/${repo}/branches/all.json`).then((res) => {
+ if (res) {
+ setBranchlist(res.data);
+ }
+ })
+ }, [])
+ function handleClick() {
+ const params = { branch, owner, repo }
+ if (page) {
+ axios.post(`/site_pages/${page.id}/build.json`, params).then((res) => {
+ if (res && res.status === 200) {
+ message.success("部署成功");
+ } else {
+ message.error("部署失败");
+ }
+ })
+ }
+ }
+ function handlechange(value) {
+ let u = value;
+ setBranch(u);
+ }
+ return (
+
+ 我的站点创建新的站点
+
+
+
+ 新建站点
+
+
+
+
+
+
+
+ )
+}
+export default sitelist
+
+
建站工具 {page ? page.language_frame : ""}
+绑定仓库 {page ? page.owner + "/" + page.repo : ""}
+上次部署时间 {page ? page.last_build_at : ""}
创建时间 {page ? page.created_at : ""}
+
+
+
+ 分支数:{projectDetail ? projectDetail.branches_count : ""}
+ +