1.添加设置组件 2.修改路由部分关于验证的实现 3.form onSubmit

TeemoWan · Feb 29, 2016 · 59dd0f1 · 59dd0f1
1 parent 34bd27f
commit 59dd0f1
Show file tree

Hide file tree

Showing 34 changed files with 286 additions and 84 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -18,7 +18,6 @@ ecmascript
 accounts-password
 alanning:roles
 flemay:less-autoprefixer
-dburles:collection-helpers
 stylus
 semantic:ui
 standard-minifier-css
@@ -27,3 +26,8 @@ kadira:dochead
 meteorhacks:subs-manager
 aldeed:collection2
 kadira:flow-router-ssr
+jagi:astronomy
+jagi:astronomy-slug-behavior
+jagi:astronomy-timestamp-behavior
+jagi:astronomy-validators
+email
diff --git a/.meteor/versions b/.meteor/versions
@@ -23,7 +23,6 @@ [email protected]
 chuangbo:[email protected]
 [email protected]
 cosmos:[email protected]
-dburles:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -44,6 +43,11 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+jagi:[email protected]
+jagi:[email protected]
+jagi:[email protected]
+jagi:[email protected]
+jagi:[email protected]
 [email protected]
 kadira:[email protected]
 kadira:[email protected]

diff --git a/app/main.jsx b/app/main.jsx
@@ -8,6 +8,7 @@ import authModule from './modules/auth';
 import teamModule from './modules/team';
 import documentModule from './modules/document';
 import searchModule from './modules/search';
+import settingsModule from './modules/settings';
 
 // init context
 const context = initContext();
@@ -20,4 +21,5 @@ app.loadModule(authModule);
 app.loadModule(teamModule);
 app.loadModule(documentModule);
 app.loadModule(searchModule);
+app.loadModule(settingsModule);
 app.init();
diff --git a/app/modules/auth/components/forgot_password.jsx b/app/modules/auth/components/forgot_password.jsx
@@ -11,19 +11,17 @@ const ForgotPassword = React.createClass({
  <div className='column'>
  <h2 className='ui teal image header'>
  <img src='/images/logo.png' className='image'/>
- <div className='content'>
- 找回密码
- </div>
+ <div className='content'>找回密码</div>
  </h2>
- <form className='ui large form'>
+ <form className='ui large form' onSubmit={this.handleSubmit}>
  <div className='ui segment'>
  <div className='field'>
  <div className='ui left icon input'>
  <i className='mail icon'/>
  <input type='text' name='email' placeholder='邮箱' onKeyDown={this.handleEmailEnterKeyDown}/>
  </div>
  </div>
- <div className='ui fluid large teal submit button' onClick={this.handleSubmit}>找回密码</div>
+ <div className='ui fluid large teal submit button'>找回密码</div>
  </div>
  {error && <div className='ui error message'><p>{error}</p></div>}
  </form>
@@ -43,7 +41,11 @@ const ForgotPassword = React.createClass({
  }
  },
 
- handleSubmit() {
+ handleSubmit(event) {
+ if (event && event.preventDefault) {
+ event.preventDefault();
+ }
+
  const {forgotPassword} = this.props;
  const {email} = this.refs;
 

diff --git a/app/modules/auth/components/login.jsx b/app/modules/auth/components/login.jsx
@@ -13,11 +13,9 @@ const Login = React.createClass({
  <div className='column'>
  <h2 className='ui teal image header'>
  <img src='/images/logo.png' className='image'/>
- <div className='content'>
- 登录文字工匠
- </div>
+ <div className='content'>登录文字工匠</div>
  </h2>
- <form className={classNames('ui', 'large', 'form', {error: Boolean(error)})}>
+ <form className={classNames('ui', 'large', 'form', {error: Boolean(error)})} onSubmit={this.handleSubmit}>
  <div className='ui segment'>
  <div className='field'>
  <div className='ui left icon input'>
@@ -33,7 +31,7 @@ const Login = React.createClass({
  </div>
  {processing ?
  <div className='ui fluid large loading button'>&nbsp;</div> :
- <div className='ui fluid large teal button' onClick={this.handleSubmit}>登录</div>}
+ <div className='ui fluid large teal button'>登录</div>}
  </div>
  {error && <div className='ui error message'><p>{error}</p></div>}
  </form>
@@ -59,7 +57,11 @@ const Login = React.createClass({
  }
  },
 
- handleSubmit() {
+ handleSubmit(event) {
+ if (event && event.preventDefault) {
+ event.preventDefault();
+ }
+
  const {login} = this.props;
  const {email, password} = this.refs;
 

diff --git a/app/modules/auth/components/register.jsx b/app/modules/auth/components/register.jsx
@@ -13,12 +13,10 @@ const Register = React.createClass({
  <div className='column'>
  <h2 className='ui teal image header'>
  <img src='/images/logo.png' className='image'/>
- <div className='content'>
- 注册文字工匠
- </div>
+ <div className='content'>注册文字工匠</div>
  </h2>
 
- <form className={classNames('ui', 'large', 'form', {error: Boolean(error)})}>
+ <form className={classNames('ui', 'large', 'form', {error: Boolean(error)})} onSubmit={this.handleSubmit}>
  <div className='ui segment'>
  <div className='field'>
  <div className='ui left icon input'>
@@ -41,7 +39,7 @@ const Register = React.createClass({
  </div>
  {processing ?
  <div className='ui fluid large loading button'>&nbsp;</div> :
- <div className='ui fluid large teal button' onClick={this.handleSubmit}>注册</div>}
+ <div className='ui fluid large teal button'>注册</div>}
  </div>
  {error && <div className='ui error message'><p>{error}</p></div>}
  </form>
@@ -74,7 +72,11 @@ const Register = React.createClass({
  }
  },
 
- handleSubmit() {
+ handleSubmit(event) {
+ if (event && event.preventDefault) {
+ event.preventDefault();
+ }
+
  const {register} = this.props;
  const {email, username, password} = this.refs;
 

diff --git a/app/modules/core/components/nav.jsx b/app/modules/core/components/nav.jsx
@@ -19,6 +19,7 @@ const Nav = React.createClass({
  const teamAddPath = FlowRouter.path('team.add');
  const loginPath = FlowRouter.path('auth.login');
  const userHomePath = user ? FlowRouter.path('user.home', {id: user._id}) : '';
+ const settingsDomainPath = FlowRouter.path('settings.domain');
 
  return (
  <div className='ui borderless menu' id='nav'>
@@ -85,7 +86,7 @@ const Nav = React.createClass({
  <a className='item' href={userHomePath}>
  <i className='home icon'/> 主页
  </a>
- <a className='item'>
+ <a className='item' href={settingsDomainPath}>
  <i className='setting icon'/> 设置
  </a>
  <div className='divider'></div>

diff --git a/app/modules/core/routes.jsx b/app/modules/core/routes.jsx
@@ -8,14 +8,15 @@ import NotFound from './containers/not_found.js';
 import Login from '/app/modules/auth/containers/login';
 import Register from '/app/modules/auth/containers/register';
 import ForgotPassword from '/app/modules/auth/containers/forgot_password';
-import UserHome from '/app/modules/user/containers/user_home';
 import TeamHome from '/app/modules/team/containers/team_home';
 import TeamAdd from '/app/modules/team/containers/team_add';
 import DocumentHome from '/app/modules/document/containers/document_home';
 import DocumentIndex from '/app/modules/document/containers/document_index';
 import DocumentAdd from '/app/modules/document/containers/document_add';
 import DocumentEdit from '/app/modules/document/containers/document_edit';
 import Search from '/app/modules/search/containers/search';
+import UserHome from '/app/modules/user/containers/user_home';
+import SettingsDomain from '/app/modules/settings/containers/settings_domain';
 
 const mountWithOptions = withOptions({
  rootId: 'wenzi'
@@ -25,18 +26,6 @@ export default function (injectDeps, {FlowRouter, Meteor}) {
  const LayoutNavContentCtx = injectDeps(LayoutNavContent);
  const LayoutContentCtx = injectDeps(LayoutContent);
 
- const checkLoggedIn = () => {
- if (!Meteor.loggingIn() && !Meteor.userId()) {
- FlowRouter.go('/login');
- }
- };
-
- const redirectIfLoggedIn = (ctx, redirect) => {
- if (Meteor.userId()) {
- redirect('/');
- }
- };
-
  FlowRouter.route('/', {
  name: 'home',
  action: () => {
@@ -48,8 +37,11 @@ export default function (injectDeps, {FlowRouter, Meteor}) {
 
  FlowRouter.route('/login', {
  name: 'auth.login',
- triggersEnter: [ redirectIfLoggedIn ],
  action: () => {
+ if (Meteor.userId()) {
+ FlowRouter.go('/');
+ }
+
  mountWithOptions(LayoutContentCtx, {
  content: () => (<Login />)
  });
@@ -58,8 +50,11 @@ export default function (injectDeps, {FlowRouter, Meteor}) {
 
  FlowRouter.route('/register', {
  name: 'auth.register',
- triggersEnter: [ redirectIfLoggedIn ],
  action: () => {
+ if (Meteor.userId()) {
+ FlowRouter.go('/');
+ }
+
  mountWithOptions(LayoutContentCtx, {
  content: () => (<Register />)
  });
@@ -68,27 +63,24 @@ export default function (injectDeps, {FlowRouter, Meteor}) {
 
  FlowRouter.route('/forgotPassword', {
  name: 'auth.forgotPassword',
- triggersEnter: [ redirectIfLoggedIn ],
  action: () => {
+ if (Meteor.userId()) {
+ FlowRouter.go('/');
+ }
+
  mountWithOptions(LayoutContentCtx, {
  content: () => (<ForgotPassword />)
  });
  }
  });
 
- FlowRouter.route('/user/:id', {
- name: 'user.home',
- action: ({id}) => {
- mountWithOptions(LayoutNavContentCtx, {
- content: () => (<UserHome userId={id}/>)
- });
- }
- });
-
  FlowRouter.route('/team/add', {
  name: 'team.add',
- triggersEnter: [ checkLoggedIn ],
  action: () => {
+ if (!Meteor.userId()) {
+ FlowRouter.go('/login');
+ }
+
  mountWithOptions(LayoutNavContentCtx, {
  content: () => (<TeamAdd />)
  });
@@ -115,8 +107,11 @@ export default function (injectDeps, {FlowRouter, Meteor}) {
 
  FlowRouter.route('/document/add', {
  name: 'document.add',
- triggersEnter: [ checkLoggedIn ],
  action: () => {
+ if (!Meteor.userId()) {
+ FlowRouter.go('/login');
+ }
+
  mountWithOptions(LayoutNavContentCtx, {
  content: () => (<DocumentAdd />)
  });
@@ -134,8 +129,11 @@ export default function (injectDeps, {FlowRouter, Meteor}) {
 
  FlowRouter.route('/document/:id/edit', {
  name: 'document.edit',
- triggersEnter: [ checkLoggedIn ],
  action: ({id}) => {
+ if (!Meteor.userId()) {
+ FlowRouter.go('/login');
+ }
+
  mountWithOptions(LayoutContentCtx, {
  content: () => (<DocumentEdit documentId={id}/>)
  });
@@ -151,6 +149,28 @@ export default function (injectDeps, {FlowRouter, Meteor}) {
  }
  });
 
+ FlowRouter.route('/user/:id', {
+ name: 'user.home',
+ action: ({id}) => {
+ mountWithOptions(LayoutNavContentCtx, {
+ content: () => (<UserHome userId={id}/>)
+ });
+ }
+ });
+
+ FlowRouter.route('/settings/domain', {
+ name: 'settings.domain',
+ action: () => {
+ if (!Meteor.userId()) {
+ FlowRouter.go('/login');
+ }
+
+ mountWithOptions(LayoutNavContentCtx, {
+ content: () => (<SettingsDomain/>)
+ });
+ }
+ });
+
  FlowRouter.notFound = {
  action: () => {
  mountWithOptions(LayoutNavContentCtx, {

diff --git a/app/modules/document/components/document_add.jsx b/app/modules/document/components/document_add.jsx
@@ -47,7 +47,7 @@ const DocumentAdd = React.createClass({
  <div className='ui grid' id='doc-add'>
  <div className='two wide column'></div>
  <div className='twelve wide column'>
- <form className={classNames('ui', 'form', {error: Boolean(error)})}>
+ <form className={classNames('ui', 'form', {error: Boolean(error)})} onSubmit={this.handleSubmit}>
  <h2 className='ui dividing header'>添加文档</h2>
  {error && <div className='ui error message'><p>{error}</p></div>}
  <div className='fields'>
@@ -72,16 +72,20 @@ const DocumentAdd = React.createClass({
  <textarea ref='summary' placeholder='文档简介...' />
  </div>
  {processing ?
- <div className='ui teal loading disabled button'></div> :
- <div className='ui teal button' onClick={this.handleSubmit}>添加文档</div>}
+ <div className='ui teal loading disabled button'>&nbsp;</div> :
+ <div className='ui teal button'>添加文档</div>}
  </form>
  </div>
  <div className='two wide column'></div>
  </div>
  );
  },
 
- handleSubmit() {
+ handleSubmit(event) {
+ if (event && event.preventDefault) {
+ event.preventDefault();
+ }
+
  const {documentAdd} = this.props;
  const {owner, name, summary} = this.refs;
  const [ ownerType, ownerId ] = owner.value.split(':');

diff --git a/app/modules/document/containers/document_add.js b/app/modules/document/containers/document_add.js
@@ -1,4 +1,5 @@
 import {useDeps, composeWithTracker, composeAll} from 'mantra-core';
+import {DocHead} from 'meteor/kadira:dochead';
 import Loading from '/app/modules/core/components/loading.jsx';
 import DocumentAdd from '../components/document_add.jsx';
 
@@ -10,6 +11,12 @@ const composer = ({Collections, WenziSubs, LocalState, clearDocumentAdd}, onData
  let teams = Collections.Teams.find({admins: Meteor.userId()}).fetch();
 
  onData(null, {error, processing, user, teams});
+
+ // SEO
+ DocHead.setTitle('添加文档');
+ DocHead.addMeta({
+ name: 'description', content: '添加文档'
+ });
  }
 
  return clearDocumentAdd;

diff --git a/app/modules/settings/actions/index.js b/app/modules/settings/actions/index.js
@@ -0,0 +1,7 @@
+import settings from './settings';
+
+const actions = {
+ settings
+};
+
+export default actions;