diff --git a/.tags b/.tags index 388b1988..1dfff2bf 100644 --- a/.tags +++ b/.tags @@ -254,11 +254,6 @@ static.form /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroup render /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/ProjectList/UpDateModal.js /^ render() {$/;" function line:152 validator /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/ProjectList/UpDateModal.js /^ validator(rule, value, callback) {$/;" function line:191 validator /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/ProjectList/UpDateModal.js /^ validator(rule, value, callback) {$/;" function line:224 -constructor /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ constructor(props) {$/;" function line:27 -state.login /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ this.state = {$/;" property line:29 -static.checkLoginState /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ static propTypes = {$/;" property line:34 -componentDidMount /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ componentDidMount() {$/;" function line:39 -render /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ render() {$/;" function line:72 createStore /Users/qitmac000445/Desktop/YAPI/yapi/client/reducer/create.js /^export default function createStore(initialState = {}) {$/;" function line:8 module.exports.parser /Users/qitmac000445/Desktop/YAPI/yapi/client/.eslintrc.js /^module.exports = {$/;" property line:1 module.exports.extends /Users/qitmac000445/Desktop/YAPI/yapi/client/.eslintrc.js /^ parser: 'babel-eslint',$/;" property line:2 @@ -411,3 +406,14 @@ inputNewGroupDesc /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/Projec selectGroup /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ selectGroup(e) {$/;" function line:151 searchGroup /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ searchGroup(e, value) {$/;" function line:175 render /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ render () {$/;" function line:185 +constructor /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/Group/Group.js /^ constructor(props) {$/;" function line:10 +render /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/Group/Group.js /^ render () {$/;" function line:14 +from.children /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/Project/Project.js /^ static propTypes = {$/;" property line:6 +constructor /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/Project/Project.js /^ constructor(props) {$/;" function line:13 +componentWillMount /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/Project/Project.js /^ componentWillMount() {$/;" function line:17 +render /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/Project/Project.js /^ render () {$/;" function line:20 +constructor /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ constructor(props) {$/;" function line:26 +state.login /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ this.state = {$/;" property line:28 +static.checkLoginState /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ static propTypes = {$/;" property line:33 +componentDidMount /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ componentDidMount() {$/;" function line:38 +render /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ render() {$/;" function line:71 diff --git a/.tags1 b/.tags1 index 3a940a30..8c93bd61 100644 --- a/.tags1 +++ b/.tags1 @@ -4,19 +4,8 @@ !_TAG_PROGRAM_NAME Exuberant Ctags // !_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/ !_TAG_PROGRAM_VERSION 5.8 // -from.groupList /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ static propTypes = {$/;" property line:35 -state.addGroupModalVisible /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ state = {$/;" property line:46 -state.editGroupModalVisible /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ addGroupModalVisible: false,$/;" property line:47 -state.newGroupName /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ editGroupModalVisible: false,$/;" property line:48 -state.newGroupDesc /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ newGroupName: '',$/;" property line:49 -state.currGroupName /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ newGroupDesc: '',$/;" property line:50 -state.currGroupDesc /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ currGroupName: '',$/;" property line:51 -state.groupList /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ currGroupDesc: '',$/;" property line:52 -constructor /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ constructor(props) {$/;" function line:56 -showModal /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ showModal(type) {$/;" function line:80 -hideModal /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ hideModal(type) {$/;" function line:95 -inputNewGroupName /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ inputNewGroupName(e, type) {$/;" function line:134 -inputNewGroupDesc /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ inputNewGroupDesc(e, type) {$/;" function line:142 -selectGroup /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ selectGroup(e) {$/;" function line:151 -searchGroup /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ searchGroup(e, value) {$/;" function line:175 -render /Users/qitmac000445/Desktop/YAPI/yapi/client/containers/ProjectGroups/GroupList/GroupList.js /^ render () {$/;" function line:185 +constructor /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ constructor(props) {$/;" function line:26 +state.login /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ this.state = {$/;" property line:28 +static.checkLoginState /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ static propTypes = {$/;" property line:33 +componentDidMount /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ componentDidMount() {$/;" function line:38 +render /Users/qitmac000445/Desktop/YAPI/yapi/client/Application.js /^ render() {$/;" function line:71 diff --git a/client/Application.js b/client/Application.js index 3fc1826a..f903c880 100644 --- a/client/Application.js +++ b/client/Application.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import { Route, HashRouter, Redirect, Switch } from 'react-router-dom'; -import { Home, ProjectGroups, Interface, News, AddInterface, Follows } from './containers/index'; +import { Home, Group, Project, News, AddInterface, Follows } from './containers/index'; import User from './containers/User/User.js'; import Header from './components/Header/Header'; import Footer from './components/Footer/Footer'; @@ -52,9 +52,9 @@ export default class App extends Component { - + - + diff --git a/client/containers/ProjectGroups/ProjectGroups.js b/client/containers/Group/Group.js similarity index 90% rename from client/containers/ProjectGroups/ProjectGroups.js rename to client/containers/Group/Group.js index e8b9d08b..0db97fb0 100644 --- a/client/containers/ProjectGroups/ProjectGroups.js +++ b/client/containers/Group/Group.js @@ -4,9 +4,9 @@ import ProjectList from './ProjectList/ProjectList.js'; import Subnav from '../../components/Subnav/Subnav.js'; import { Row, Col } from 'antd'; -import './ProjectGroups.scss' +import './Group.scss' -export default class ProjectGroups extends Component { +export default class Group extends Component { constructor(props) { super(props) } diff --git a/client/containers/ProjectGroups/ProjectGroups.scss b/client/containers/Group/Group.scss similarity index 100% rename from client/containers/ProjectGroups/ProjectGroups.scss rename to client/containers/Group/Group.scss diff --git a/client/containers/ProjectGroups/GroupList/GroupList.js b/client/containers/Group/GroupList/GroupList.js similarity index 100% rename from client/containers/ProjectGroups/GroupList/GroupList.js rename to client/containers/Group/GroupList/GroupList.js diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/Group/GroupList/GroupList.scss similarity index 100% rename from client/containers/ProjectGroups/GroupList/GroupList.scss rename to client/containers/Group/GroupList/GroupList.scss diff --git a/client/containers/ProjectGroups/ProjectList/ProjectList.js b/client/containers/Group/ProjectList/ProjectList.js similarity index 100% rename from client/containers/ProjectGroups/ProjectList/ProjectList.js rename to client/containers/Group/ProjectList/ProjectList.js diff --git a/client/containers/ProjectGroups/ProjectList/ProjectList.scss b/client/containers/Group/ProjectList/ProjectList.scss similarity index 100% rename from client/containers/ProjectGroups/ProjectList/ProjectList.scss rename to client/containers/Group/ProjectList/ProjectList.scss diff --git a/client/containers/ProjectGroups/ProjectList/UpDateModal.js b/client/containers/Group/ProjectList/UpDateModal.js similarity index 100% rename from client/containers/ProjectGroups/ProjectList/UpDateModal.js rename to client/containers/Group/ProjectList/UpDateModal.js diff --git a/client/containers/Project/Project.js b/client/containers/Project/Project.js new file mode 100644 index 00000000..ec40cb14 --- /dev/null +++ b/client/containers/Project/Project.js @@ -0,0 +1,28 @@ +import React, { Component } from 'react' +import PropTypes from 'prop-types' + +export default class GroupList extends Component { + + static propTypes = { + children: PropTypes.element + } + + state = { + } + + constructor(props) { + super(props) + } + + componentWillMount() { + } + + render () { + return ( +
+ 我是项目页喔 + {this.props.children} +
+ ) + } +} diff --git a/client/containers/index.js b/client/containers/index.js index e4a2fc29..f8bd0378 100644 --- a/client/containers/index.js +++ b/client/containers/index.js @@ -1,8 +1,9 @@ import Header from '../components/Header/Header.js' import Home from './Home/Home.js' import Login from './Login/LoginWrap.js' -import ProjectGroups from './ProjectGroups/ProjectGroups.js' +import Group from './Group/Group.js' import Interface from './Interface/Interface.js' +import Project from './Project/Project.js' import News from './News/News.js' import AddInterface from './AddInterface/AddInterface.js' import DevTools from './DevTools/DevTools.js' @@ -12,8 +13,9 @@ export { Header, Home, Login, - ProjectGroups, + Group, Interface, + Project, AddInterface, News, DevTools, diff --git a/client/routes.js b/client/routes.js deleted file mode 100644 index 7e4edfdd..00000000 --- a/client/routes.js +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react' -import { Route, HashRouter } from 'react-router-dom' -import { Header, Home, ProjectGroups, Interface, News, AddInterface, Follows } from './containers/index' -import User from './containers/User/User.js' - -export default () => { - return ( - -
-
- - - - - - - - - - -
- - ) -}