Skip to content

C
console
Commit c589b9f6 authored by nano's avatar nano
Browse files
Options

init

parent 91e80f3a
Show whitespace changes
Inline Side-by-side
Showing with 190 additions and 113 deletions
.idea/workspace.xml
View file @ c589b9f6
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7dc474d0-9fc0-4b76-8c2f-3c98df702116" name="Default" comment=""> <list default="true" id="7dc474d0-9fc0-4b76-8c2f-3c98df702116" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/Common.js" afterPath="$PROJECT_DIR$/src/models/Common.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/index.html" afterPath="$PROJECT_DIR$/public/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Apps.js" afterPath="$PROJECT_DIR$/src/routes/Apps.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Entry.js" afterPath="$PROJECT_DIR$/src/routes/Entry.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -24,39 +25,71 @@ ...@@ -24,39 +25,71 @@
<file leaf-file-name="AppDetail.js" pinned="false" current-in-tab="false"> <file leaf-file-name="AppDetail.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js"> <entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="6830">
<caret line="441" column="31" lean-forward="true" selection-start-line="441" selection-start-column="31" selection-end-line="441" selection-end-column="31" /> <caret line="441" column="31" lean-forward="true" selection-start-line="441" selection-start-column="31" selection-end-line="441" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.html"> <entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126"> <state relative-caret-position="162">
<caret line="7" column="51" lean-forward="true" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" /> <caret line="9" column="6" lean-forward="true" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="router.js" pinned="false" current-in-tab="false"> <file leaf-file-name="Common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/router.js"> <entry file="file://$PROJECT_DIR$/src/models/Common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234"> <state relative-caret-position="158">
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" /> <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="App.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/App.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="19" column="34" lean-forward="true" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Apps.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Apps.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1612">
<caret line="93" column="1" lean-forward="true" selection-start-line="93" selection-start-column="1" selection-end-line="93" selection-end-column="1" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Entry.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/routes/Entry.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="12" column="37" lean-forward="true" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>progress</find>
<find>/</find>
<find>/si</find> <find>/si</find>
<find>/sign</find> <find>/sign</find>
<find>/signi</find> <find>/signi</find>
...@@ -85,6 +118,8 @@ ...@@ -85,6 +118,8 @@
<find>Form.Item</find> <find>Form.Item</find>
<find>validateStatus</find> <find>validateStatus</find>
<find>homepage</find> <find>homepage</find>
<find>pa</find>
<find>params</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -98,7 +133,6 @@ ...@@ -98,7 +133,6 @@
<option value="$PROJECT_DIR$/src/components/Common/Nav.js" /> <option value="$PROJECT_DIR$/src/components/Common/Nav.js" />
<option value="$PROJECT_DIR$/.eslintrc" /> <option value="$PROJECT_DIR$/.eslintrc" />
<option value="$PROJECT_DIR$/src/utils/request.js" /> <option value="$PROJECT_DIR$/src/utils/request.js" />
<option value="$PROJECT_DIR$/src/routes/Entry.js" />
<option value="$PROJECT_DIR$/src/routes/AppDetail.less" /> <option value="$PROJECT_DIR$/src/routes/AppDetail.less" />
<option value="$PROJECT_DIR$/src/services/Packages.js" /> <option value="$PROJECT_DIR$/src/services/Packages.js" />
<option value="$PROJECT_DIR$/src/services/example.js" /> <option value="$PROJECT_DIR$/src/services/example.js" />
...@@ -110,16 +144,17 @@ ...@@ -110,16 +144,17 @@
<option value="$PROJECT_DIR$/src/services/Apps.js" /> <option value="$PROJECT_DIR$/src/services/Apps.js" />
<option value="$PROJECT_DIR$/src/models/Apps.js" /> <option value="$PROJECT_DIR$/src/models/Apps.js" />
<option value="$PROJECT_DIR$/src/models/packages.js" /> <option value="$PROJECT_DIR$/src/models/packages.js" />
<option value="$PROJECT_DIR$/src/models/Common.js" />
<option value="$PROJECT_DIR$/src/index.js" /> <option value="$PROJECT_DIR$/src/index.js" />
<option value="$PROJECT_DIR$/.travis.yml" /> <option value="$PROJECT_DIR$/.travis.yml" />
<option value="$PROJECT_DIR$/package.json" /> <option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/config.js" /> <option value="$PROJECT_DIR$/src/config.js" />
<option value="$PROJECT_DIR$/.roadhogrc.js" /> <option value="$PROJECT_DIR$/.roadhogrc.js" />
<option value="$PROJECT_DIR$/src/routes/Apps.js" />
<option value="$PROJECT_DIR$/src/routes/AppDetail.js" /> <option value="$PROJECT_DIR$/src/routes/AppDetail.js" />
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/public/index.html" /> <option value="$PROJECT_DIR$/public/index.html" />
<option value="$PROJECT_DIR$/src/models/Common.js" />
<option value="$PROJECT_DIR$/src/routes/Apps.js" />
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/routes/Entry.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -181,6 +216,24 @@ ...@@ -181,6 +216,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="moecube-console-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="moecube-console-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="routes" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="moecube-console-web" /> <option name="myItemId" value="moecube-console-web" />
...@@ -312,12 +365,12 @@ ...@@ -312,12 +365,12 @@
<workItem from="1492741762508" duration="2198000" /> <workItem from="1492741762508" duration="2198000" />
<workItem from="1492753784584" duration="5181000" /> <workItem from="1492753784584" duration="5181000" />
<workItem from="1493000910904" duration="789000" /> <workItem from="1493000910904" duration="789000" />
<workItem from="1493002113686" duration="10351000" /> <workItem from="1493002113686" duration="11077000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="88376000" /> <option name="totallyTimeSpent" value="89102000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="740" y="237" width="1225" height="777" extended-state="0" /> <frame x="740" y="237" width="1225" height="777" extended-state="0" />
...@@ -448,13 +501,6 @@ ...@@ -448,13 +501,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/Entry.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/AppDetail.less"> <entry file="file://$PROJECT_DIR$/src/routes/AppDetail.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="108">
...@@ -516,20 +562,6 @@ ...@@ -516,20 +562,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/LoginCallback.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="11" column="15" lean-forward="true" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/App.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="19" column="34" lean-forward="true" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Common/Nav.js"> <entry file="file://$PROJECT_DIR$/src/components/Common/Nav.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414"> <state relative-caret-position="414">
...@@ -603,14 +635,6 @@ ...@@ -603,14 +635,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/Common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="14" column="10" lean-forward="false" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Apps/All.js"> <entry file="file://$PROJECT_DIR$/src/routes/Apps/All.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -675,35 +699,71 @@ ...@@ -675,35 +699,71 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/Apps.js"> <entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="9" column="6" lean-forward="true" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/Common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/App.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228"> <state relative-caret-position="324">
<caret line="66" column="12" lean-forward="true" selection-start-line="66" selection-start-column="12" selection-end-line="66" selection-end-column="12" /> <caret line="19" column="34" lean-forward="true" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js"> <entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="6830">
<caret line="441" column="31" lean-forward="true" selection-start-line="441" selection-start-column="31" selection-end-line="441" selection-end-column="31" /> <caret line="441" column="31" lean-forward="true" selection-start-line="441" selection-start-column="31" selection-end-line="441" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/LoginCallback.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Apps.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1612">
<caret line="93" column="1" lean-forward="true" selection-start-line="93" selection-start-column="1" selection-end-line="93" selection-end-column="1" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router.js"> <entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234"> <state relative-caret-position="198">
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" /> <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/index.html"> <entry file="file://$PROJECT_DIR$/src/routes/Entry.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126"> <state relative-caret-position="126">
<caret line="7" column="51" lean-forward="true" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" /> <caret line="12" column="37" lean-forward="true" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
<folding /> <folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
src/models/Common.js
View file @ c589b9f6
...@@ -35,9 +35,6 @@ export default { ...@@ -35,9 +35,6 @@ export default {
subscriptions: { subscriptions: {
setup({dispatch, history}) { setup({dispatch, history}) {
if (location.pathname != '/loginCallback') {
dispatch({type: 'init'})
}
return history.listen(({pathname, query}) => { return history.listen(({pathname, query}) => {
if (pathname === '/login') { if (pathname === '/login') {
let params = new URLSearchParams() let params = new URLSearchParams()
......
src/routes/Apps.js
View file @ c589b9f6
import React from 'react'; import React from "react";
import { connect } from 'dva'; import {connect} from "dva";
import styles from './Apps.less'; import styles from "./Apps.less";
import { Link } from 'dva/router'; import {Link} from "dva/router";
import { Button, Affix, Icon, Table, Tag } from 'antd' import {Affix, Button, Icon, Table} from "antd";
import Create from '../components/App/Create' import Create from "../components/App/Create";
const columns = [ const columns = [
...@@ -18,20 +18,20 @@ const columns = [ ...@@ -18,20 +18,20 @@ const columns = [
dataIndex: 'name', dataIndex: 'name',
render: name => name && name["zh-CN"], render: name => name && name["zh-CN"],
width: '10%', width: '10%',
},{ }, {
title: "author", title: "author",
dataIndex: 'author', dataIndex: 'author',
width: '10%', width: '10%',
},{ }, {
title: "category", title: "category",
dataIndex: 'category', dataIndex: 'category',
width: '10%', width: '10%',
},{ }, {
title: "homepage", title: "homepage",
dataIndex: 'homepage', dataIndex: 'homepage',
render: homepage => <a href={homepage} target="_blank">{homepage}</a>, render: homepage => <a href={homepage} target="_blank">{homepage}</a>,
width: '10%', width: '10%',
},{ }, {
title: "released_at", title: "released_at",
dataIndex: 'released_at', dataIndex: 'released_at',
sorter: true, sorter: true,
...@@ -44,18 +44,26 @@ const columns = [ ...@@ -44,18 +44,26 @@ const columns = [
}, },
] ]
function Apps({children, dispatch, isCreate, isSubmit, apps}) { class Apps extends React.Component {
componentWillMount() {
const {dispatch} = this.props
console.log(this.props)
}
render() {
const {children, dispatch, isCreate, isSubmit, apps} = this.props
const CreateProps = { const CreateProps = {
visible: isCreate, visible: isCreate,
isLoading: isSubmit, isLoading: isSubmit,
onCancel: () => dispatch({ type: 'App/onCancel'}), onCancel: () => dispatch({type: 'App/onCancel'}),
onCreate: () => dispatch({ type: 'App/onCreate'}), onCreate: () => dispatch({type: 'App/onCreate'}),
onSubmit: (payload) => dispatch({ type: 'App/create', payload}), onSubmit: (payload) => dispatch({type: 'App/create', payload}),
} }
const CreateButtonProps = { const CreateButtonProps = {
onClick: () => dispatch({ type: 'App/onCreate'}), onClick: () => dispatch({type: 'App/onCreate'}),
className: styles.CreateBtn, className: styles.CreateBtn,
shape: "circle", shape: "circle",
type: "primary", type: "primary",
...@@ -73,21 +81,22 @@ function Apps({children, dispatch, isCreate, isSubmit, apps}) { ...@@ -73,21 +81,22 @@ function Apps({children, dispatch, isCreate, isSubmit, apps}) {
<Table {...TableProps}/> <Table {...TableProps}/>
<Affix style={{ position: 'absolute', bottom: 50, right: 50}}> <Affix style={{position: 'absolute', bottom: 50, right: 50}}>
<Button {...CreateButtonProps} > <Button {...CreateButtonProps} >
<Icon type="plus" /> <Icon type="plus"/>
</Button> </Button>
</Affix> </Affix>
<Create {...CreateProps}/> <Create {...CreateProps}/>
</div> </div>
); );
}
} }
function mapStateToProps(state) { function mapStateToProps(state) {
const { const {
Apps: { apps }, Apps: {apps},
App: { isCreate, isSubmit }, App: {isCreate, isSubmit},
} = state } = state
return { return {
apps, apps,
......
src/routes/Entry.js
View file @ c589b9f6
import React from 'react'; import React from "react";
import { connect } from 'dva'; import {connect} from "dva";
import Nav from '../components/Common/Nav' import Nav from "../components/Common/Nav";
import {Layout} from 'antd' import {Layout} from "antd";
function Entry({ children}) { class Entry extends React.Component {
componentWillMount() {
const {dispatch, location:{pathname}} = this.props
if(pathname !== 'loginCallback') {
dispatch({type: 'Common/init'})
}
}
render() {
const {children} = this.props
return ( return (
<Layout style={{ flexDirection: 'row', minHeight: '100%'}}> <Layout style={{flexDirection: 'row', minHeight: '100%'}}>
<Nav /> <Nav />
<Layout style={{ minHeight: '400px'}}> <Layout style={{minHeight: '400px'}}>
{children} {children}
</Layout> </Layout>
</Layout> </Layout>
); );
}
} }
function mapStateToProps(state) { function mapStateToProps(state) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment