+
欢迎来到CodeRiver
+
+ 使用Github账号登录 +
+ + 创建账号 + +
更多登录方式
+
+ 新浪微博 + 微信 +
+

+ ); + } +} +export default connect()(Guide); diff --git a/src/pages/Login/index.module.less b/src/pages/Login/index.module.less index 7acc2da..1637517 100644 --- a/src/pages/Login/index.module.less +++ b/src/pages/Login/index.module.less @@ -1,95 +1,122 @@ @import "../../assets/css/common.less"; -.loginWrapper{ - height:100%; - background:linear-gradient(#40ADAC,#42A1C1,#4498D4,#4492DD,#458BEB); - .loginInner{ - padding:0 50px; - } - .logo{ - display: inline-block; - width:156px; - height:100px; - .bg-image('../../assets/images/logo'); - margin:0; - margin-top:122px; - } - .title{ - font-size:60px; - color:white; - margin-top:109px; - } - .loginBox{ - text-align: right; - padding-top:20px; - } - .loginBtn{ - font-size:32px; - color:white; +.nickNameWrapper{ + height:100%; + background:linear-gradient(#40ADAC,#42A1C1,#4498D4,#4492DD,#458BEB); + .nickNameInner{ + padding:0 50px; } - .gitHubBtn{ - width:100%; - height:100px; - background: white; - border-radius: 68px; - color:#40AEA8; - font-size:40px; - line-height: 100px; - margin-top:109px; + .nickTip{ + font-size:62px; + color:white; + font-family:HiraginoSansGB-W3; + font-weight:normal; + margin-top:88px; + margin-bottom:112px; } - .gitHubText{ + .check{ display: inline-block; - &:before{ - content:''; - display: inline-block; - vertical-align: middle; - width:40px; - height:40px; - margin-bottom:4px; - .bg-image('../../assets/images/github'); - margin-left:57px; - margin-right:43px; - } + width:48px; + height:45px; + flex-shrink:0; + background: url('../../assets/images/check-icon.png') no-repeat; + background-size:100%; } - .createId{ - display: block; - margin-top:30px; - text-align: center; - background: transparent; - border:2px solid white; + .inputTopText{ + font-size:30px; color:white; } - .loginType{ + .inputBox{ + margin-bottom:59px; + + } + .inputTop{ + .wlflex(); + justify-content: space-between; + } + .toggle{ color:white; - font-size:32px; - margin:50px 0 70px 0; + font-size:30px; + } + .inputItem{ + padding:42px 0 35px 0; + border-bottom:2px solid white; + .wlflex(); + justify-content: space-between; + } + .input{ + background: none; + border:none; + font-size:48px; + color:white; + outline: none; + } + .btnBox{ + margin-top:64px; + .wlflex(); + justify-content: space-between; } - .typeItem{ + .qh{ + display:inline-block; + background: white; + text-align: center; + line-height: 58px; + color:#40AEA8; + font-size:26px; + padding:0 20px; + height:58px; + margin-right:40px; + font-weight: bold; + flex-shrink: 0; + } + .btnComm{ display: inline-block; - font-size:32px; + width:300px; + height:74px; + border:1px solid white; + border-radius: 74px; color:white; - &:before{ - content:''; - display: inline-block; - vertical-align: middle; - margin-right:18px; - } + font-size:28px; + text-align: center; + line-height: 74px; + margin-top:20px; } - - .sinaItem{ - margin-right:64px; - &:before{ - content:''; - width:44px; - height:36px; - .bg-image('../../assets/images/sina'); - } + .mobileInput{ + margin-right:auto; + width:350px; } - .wechatItem{ + .subBtn{ + display: inline-block; + width:100px; + height:100px; + border-radius: 50%; + background:white; + position: relative; &:before{ content:''; - width:40px; - height:32px; - .bg-image('../../assets/images/wechat'); + position: absolute; + left:50%; + top:25px; + margin-left:-20px; + display: inline-block; + border-right: 4px solid @commonColor; + border-top: 4px solid @commonColor; + height: 25px; + width: 25px; + margin-top:28px; + transform: rotate(45deg) translate(-50%,-50%); } } +} + +input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { + color: white; +} +input:-moz-placeholder, textarea:-moz-placeholder { + color: white; +} +input::-moz-placeholder, textarea::-moz-placeholder { + color: white; +} +input:-ms-input-placeholder, textarea:-ms-input-placeholder { + color: white; } \ No newline at end of file diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx index 926733c..7a4693d 100644 --- a/src/pages/Login/index.tsx +++ b/src/pages/Login/index.tsx @@ -1,37 +1,140 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import { Link } from 'dva/router'; - +import Goback from '@components/Goback'; import styles from './index.module.less'; +import util from '@util/index'; + +interface ILoginProps { + dispatch: (object: Object) => Object; + history: any; + password: string; + mobile: number; + passwordErr: boolean; + mobileErr: boolean; +} + +const initialState = { passwordStateHide: true }; +type State = Readonly; -interface ILoginProps {} +class Login extends Component { + readonly state: State = initialState; + public constructor(props) { + super(props); + } + private sendSub = () => { + // const { dispatch, isTrue } = this.props; + // if (nickname === '' || isTrue === false) return; + // dispatch({ + // type: 'nickname/subNickName', + // payload: { nickName: nickname }, + // }); + }; + + private mobileChange(e) { + const { mobileErr } = this.props; + let value = e.target.value, + mobileStates = mobileErr; + if (util.checkMobile(value)) { + mobileStates = true; + } else { + mobileStates = false; + } + this.props.dispatch({ + type: 'loginModel/inputChange', + payload: { mobile: value, mobileErr: mobileStates }, + }); + } + + private passwordChange(e) { + const { passwordErr } = this.props; + let password = e.target.value, + passState = passwordErr, + pwdLen = password.length, + reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/; + if (pwdLen >= 6 && pwdLen <= 18 && reg.test(password)) { + passState = true; + } else { + passState = false; + } + this.props.dispatch({ + type: 'loginModel/inputChange', + payload: { password: password, passwordErr: passState }, + }); + } + private toggleHandle = () => { + this.setState(changePasswordState); + }; -class Login extends Component { public render() { + const { dispatch, password, mobile, mobileErr, passwordErr } = this.props; return ( -

- - 登录 - +

+ +

+ 手机号码 +

+ +49 + { + this.mobileChange(e); + }} + value={mobile} + className={styles.input + ' ' + styles.mobileInput} + type="text" + placeholder="请输入手机号" + /> + {mobileErr ? : null} +

-
欢迎来到CodeRiver
-
- 使用Github账号登录 +
+
+ 输入密码 + + {this.state.passwordStateHide ? '隐藏' : '显示'} + +
+
+ { + this.passwordChange(e); + }} + ref="pwdInput" + value={password} + type={this.state.passwordStateHide ? 'text' : 'password'} + className={styles.input} + placeholder="请输入密码" + /> + {passwordErr ? : null} +

- - 创建账号 - -
更多登录方式
-
- 新浪微博 - 微信 +
+ + 使用邮箱 + +

); } } -export default connect()(Login); + +const changePasswordState = (prevState: State) => ({ + passwordStateHide: !prevState.passwordStateHide, +}); + +function mapStateToProps(state) { + return { + mobile: state.loginModel.mobile, + password: state.loginModel.password, + mobileErr: state.loginModel.mobileErr, + passwordErr: state.loginModel.passwordErr, + }; +} + +export default connect(mapStateToProps)(Login); diff --git a/src/pages/NickName/index.tsx b/src/pages/NickName/index.tsx index 0479d6b..1b6de76 100644 --- a/src/pages/NickName/index.tsx +++ b/src/pages/NickName/index.tsx @@ -36,7 +36,7 @@ class NickName extends Component {

-
您的昵称？{isTrue}
+
您的昵称？

昵称 diff --git a/src/router.tsx b/src/router.tsx index 80b8bfe..9292d33 100644 --- a/src/router.tsx +++ b/src/router.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import { Route, Router, Switch } from 'dva/router'; import Login from '@pages/Login'; +import Guide from '@pages/Guide'; import Welcome from '@pages/Welcome'; import NickName from '@pages/NickName'; import Home from '@pages/Home'; @@ -9,13 +10,13 @@ interface RoutersProps { history: any; app: object; } - const Routers = function({ history, app }: RoutersProps) { return ( + diff --git a/src/util/index.tsx b/src/util/index.tsx new file mode 100644 index 0000000..cdf61bf --- /dev/null +++ b/src/util/index.tsx @@ -0,0 +1,10 @@ +class Utils { + checkMobile(mobile) { + if (!/^1[34578]\d{9}$/.test(mobile)) { + return false; + } else { + return true; + } + } +} +export default new Utils(); diff --git a/tsconfig.json b/tsconfig.json index 0264e52..c815652 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,8 @@ "paths": { "@pages/": ["pages/"], "@components/": ["components/"], - "@assets/": ["assets/"] + "@assets/": ["assets/"], + "@util/": ["util/"], }, }, "include": [ From d9b550f560a1292247fe57c723c896cd3944a13d Mon Sep 17 00:00:00 2001 From: flyingalex Date: Sun, 13 Jan 2019 21:54:15 +0800 Subject: [PATCH 12/14] add welcome page --- src/assets/images/welcome/github.png | Bin 0 -> 5688 bytes src/assets/images/welcome/logo.png | Bin 0 -> 18318 bytes src/assets/images/welcome/wechat.png | Bin 0 -> 3493 bytes src/assets/images/welcome/weibo.png | Bin 0 -> 5194 bytes src/components/Image/index.module.less | 3 + src/components/Image/index.tsx | 16 ++++++ src/pages/Welcome/index.module.less | 75 +++++++++++++++++++------ src/pages/Welcome/index.tsx | 44 +++++++++++++++ 8 files changed, 121 insertions(+), 17 deletions(-) create mode 100755 src/assets/images/welcome/github.png create mode 100755 src/assets/images/welcome/logo.png create mode 100755 src/assets/images/welcome/wechat.png create mode 100755 src/assets/images/welcome/weibo.png create mode 100644 src/components/Image/index.module.less create mode 100644 src/components/Image/index.tsx diff --git a/src/assets/images/welcome/github.png b/src/assets/images/welcome/github.png new file mode 100755 index 0000000000000000000000000000000000000000..6266c00bc8ea000cc7a43d1138b7df9e1a3d2dfc GIT binary patch literal 5688 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 Tu`8T#00000NkvXXu0mjf#_5JG literal 0 HcmV?d00001 diff --git a/src/assets/images/welcome/weibo.png b/src/assets/images/welcome/weibo.png new file mode 100755 index 0000000000000000000000000000000000000000..f66b8c9a48f91943455d0392c6affa90887f64e1 GIT binary patch literal 5194 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 Eg1f@}!2kdN literal 0 HcmV?d00001 diff --git a/src/components/Image/index.module.less b/src/components/Image/index.module.less new file mode 100644 index 0000000..0f67bad --- /dev/null +++ b/src/components/Image/index.module.less @@ -0,0 +1,3 @@ +.image { + width: 100%; +} diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx new file mode 100644 index 0000000..b81071d --- /dev/null +++ b/src/components/Image/index.tsx @@ -0,0 +1,16 @@ +import React from 'react'; +import style from './index.module.less'; + +type Props = { + src: string; + className?: string; +}; + +class Image extends React.Component { + render() { + const { src, className } = this.props; + return ; + } +} + +export default Image; diff --git a/src/pages/Welcome/index.module.less b/src/pages/Welcome/index.module.less index 4a7d7f0..8d896b4 100644 --- a/src/pages/Welcome/index.module.less +++ b/src/pages/Welcome/index.module.less @@ -1,29 +1,70 @@ .container { + padding: 20px 50px 0 50px; + color: white; + background-image: linear-gradient(141deg, #9fb8ad 0%, #1fc8db 51%, #2cb5e8 75%); + min-height: 100vh; +} +.top { + text-align: right; + font-size: 32px; +} + +.logo { + margin-top: 122px; + width: 156px; + height: 100px; +} + +.welcomeWord { + margin: 110px 0; + font-size: 60px; +} + +.loginBtn { display: flex; justify-content: center; + font-size: 40px; + height: 100px; align-items: center; - height: 100vh; + padding-right: 60px; + border-radius: 50px; + margin-bottom: 20px; + color: rgba(64, 174, 168, 1); + + .github { + width: 40px; + margin-right: 40px; + } } -.logo { - animation: pulse 3s infinite; +.moreWays { + font-size: 32px; + margin-top: 50px; + margin-bottom: 74px; } -@keyframes pulse { - 0% { - opacity: 0.2; - } - 50% { - opacity: 0.5; - } - 100% { - opacity: 1; +.moreWaysIcon { + display: flex; + font-size: 32px; + padding-bottom: 20px; +} +.weiboContainer { + display: flex; + align-items: center; + margin-right: 64px; + + .weibo { + width: 44px; + margin-right: 18px; } } -.copyright { - position: fixed; - left: 50%; - bottom: 10px; - transform: translateX(-50%); +.wechatContainer { + display: flex; + align-items: center; + + .wechat { + width: 40px; + margin-right: 18px; + } } diff --git a/src/pages/Welcome/index.tsx b/src/pages/Welcome/index.tsx index e69de29..2f86c5a 100644 --- a/src/pages/Welcome/index.tsx +++ b/src/pages/Welcome/index.tsx @@ -0,0 +1,44 @@ +import React from 'react'; +import { Button } from 'antd-mobile'; +import style from './index.module.less'; +import Image from '@components/Image'; +import logo from '@assets/images/welcome/logo.png'; +import github from '@assets/images/welcome/github.png'; +import wechat from '@assets/images/welcome/wechat.png'; +import weibo from '@assets/images/welcome/weibo.png'; + +const Welcome = () => ( +
+
登录
+
+
+ +
+
欢迎来到CodeRiver
+ + +
+
更多登录方式
+
+
+ + 新浪微博 +
+
+ + 微信 +
+
+
+
+
+); + +export default Welcome; From 18e730e7a168377169728fdc824087de2dfcc5ea Mon Sep 17 00:00:00 2001 From: flyingalex Date: Sun, 20 Jan 2019 22:48:19 +0800 Subject: [PATCH 13/14] init repo structure --- configs/webpack.config.js | 3 +- package.json | 3 + postcss.config.js | 15 ++++ src/pages/Count/index.module.less | 7 -- src/pages/Count/index.tsx | 34 ------- src/pages/StatefulCount/index.module.less | 9 -- src/pages/StatefulCount/index.tsx | 58 ------------ src/pages/Welcome/index.module.less | 69 +------------- src/pages/Welcome/index.tsx | 42 +-------- src/utils/helper.ts | 0 yarn.lock | 104 +++++++++++++++++++++- 11 files changed, 126 insertions(+), 218 deletions(-) create mode 100644 postcss.config.js delete mode 100644 src/pages/Count/index.module.less delete mode 100644 src/pages/Count/index.tsx delete mode 100644 src/pages/StatefulCount/index.module.less delete mode 100644 src/pages/StatefulCount/index.tsx create mode 100644 src/utils/helper.ts diff --git a/configs/webpack.config.js b/configs/webpack.config.js index d249328..368e725 100644 --- a/configs/webpack.config.js +++ b/configs/webpack.config.js @@ -25,7 +25,7 @@ module.exports = argv => ({ module: { rules: [ { - test: /\.(png|jpg|gif)$/i, + test: /\.(png|jpg|gif|svg)$/i, use: [ { loader: 'url-loader', @@ -53,6 +53,7 @@ module.exports = argv => ({ localIdentName: '[local]___[hash:base64:5]', }, }, + 'postcss-loader', 'less-loader', ], }, diff --git a/package.json b/package.json index 9b47da8..e84a6d3 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,9 @@ "less-loader": "^4.1.0", "lint-staged": "^8.1.0", "mini-css-extract-plugin": "^0.4.5", + "postcss-less": "^3.1.1", + "postcss-loader": "^3.0.0", + "postcss-px-to-viewport": "^0.0.3", "prettier": "^1.15.3", "react-hot-loader": "^4.6.3", "redbox-react": "1.x", diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 0000000..b08c223 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,15 @@ +module.exports = { + parser: 'postcss-less', + plugins: { + 'postcss-px-to-viewport': { + unitToConvert: 'px', + viewportWidth: 750, + unitPrecision: 5, + viewportUnit: 'vw', + fontViewportUnit: 'vw', // vmin is more suitable. + selectorBlackList: [], + minPixelValue: 1, + mediaQuery: false + }, + } +} diff --git a/src/pages/Count/index.module.less b/src/pages/Count/index.module.less deleted file mode 100644 index 88d1ff9..0000000 --- a/src/pages/Count/index.module.less +++ /dev/null @@ -1,7 +0,0 @@ -.normal { - padding: 50px; -} - -.title { - color: red; -} diff --git a/src/pages/Count/index.tsx b/src/pages/Count/index.tsx deleted file mode 100644 index 18ffd22..0000000 --- a/src/pages/Count/index.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import React, { SFC } from 'react'; -import { connect } from 'dva'; -import style from './index.module.less'; - -type Props = { - count: number; - dispatch: (object: Object) => any; -}; - -const Count: SFC = ({ count, dispatch }) => ( -
-
Dva boilerplate with typescript
-
Count:{count}
-
- - -
-); - -export default connect(({ count }: { count: number }) => ({ - count, -}))(Count); diff --git a/src/pages/StatefulCount/index.module.less b/src/pages/StatefulCount/index.module.less deleted file mode 100644 index 2cf3ca3..0000000 --- a/src/pages/StatefulCount/index.module.less +++ /dev/null @@ -1,9 +0,0 @@ -.normal { - padding: 50px; - color: green; -} - -.title { - color: red; -} - diff --git a/src/pages/StatefulCount/index.tsx b/src/pages/StatefulCount/index.tsx deleted file mode 100644 index 865fb56..0000000 --- a/src/pages/StatefulCount/index.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import React from 'react'; -import { Link } from 'dva/router'; -import { connect } from 'dva'; -import { Button, WhiteSpace } from 'antd-mobile'; -import icon from '@assets/images/react.png'; -import style from './index.module.less'; - -const initialState = { clicksCount: 0 }; -type State = Readonly; - -type Props = { - count: number; - dispatch: (object: Object) => Object; -}; - -class World extends React.Component { - readonly state: State = initialState; - - render() { - const { clicksCount } = this.state; - const { count, dispatch } = this.props; - return ( -
-
Count:{count}
-
- - - -
- Count -
{`You've clicked me ${clicksCount} times!`}
- -
- ); - } - - private handleIncrement = dispatch => { - this.setState(incrementClicksCount); - dispatch({ type: 'count/add' }); - }; - - private handleDecrement = dispatch => { - this.setState(incrementClicksCount); - dispatch({ type: 'count/minus' }); - }; -} - -const incrementClicksCount = (prevState: State) => ({ - clicksCount: prevState.clicksCount + 1, -}); - -export default connect(({ count }: { count: number }) => ({ - count, -}))(World); diff --git a/src/pages/Welcome/index.module.less b/src/pages/Welcome/index.module.less index 8d896b4..1bb8132 100644 --- a/src/pages/Welcome/index.module.less +++ b/src/pages/Welcome/index.module.less @@ -1,70 +1,3 @@ .container { - padding: 20px 50px 0 50px; - color: white; - background-image: linear-gradient(141deg, #9fb8ad 0%, #1fc8db 51%, #2cb5e8 75%); - min-height: 100vh; -} -.top { - text-align: right; - font-size: 32px; -} - -.logo { - margin-top: 122px; - width: 156px; - height: 100px; -} - -.welcomeWord { - margin: 110px 0; - font-size: 60px; -} - -.loginBtn { - display: flex; - justify-content: center; - font-size: 40px; - height: 100px; - align-items: center; - padding-right: 60px; - border-radius: 50px; - margin-bottom: 20px; - color: rgba(64, 174, 168, 1); - - .github { - width: 40px; - margin-right: 40px; - } -} - -.moreWays { - font-size: 32px; - margin-top: 50px; - margin-bottom: 74px; -} - -.moreWaysIcon { - display: flex; - font-size: 32px; - padding-bottom: 20px; -} -.weiboContainer { - display: flex; - align-items: center; - margin-right: 64px; - - .weibo { - width: 44px; - margin-right: 18px; - } -} - -.wechatContainer { - display: flex; - align-items: center; - - .wechat { - width: 40px; - margin-right: 18px; - } + font-size: 50px; } diff --git a/src/pages/Welcome/index.tsx b/src/pages/Welcome/index.tsx index 2f86c5a..435cff3 100644 --- a/src/pages/Welcome/index.tsx +++ b/src/pages/Welcome/index.tsx @@ -1,44 +1,6 @@ import React from 'react'; -import { Button } from 'antd-mobile'; -import style from './index.module.less'; -import Image from '@components/Image'; -import logo from '@assets/images/welcome/logo.png'; -import github from '@assets/images/welcome/github.png'; -import wechat from '@assets/images/welcome/wechat.png'; -import weibo from '@assets/images/welcome/weibo.png'; +import styles from './index.module.less'; -const Welcome = () => ( -
-
登录
-
-
- -
-
欢迎来到CodeRiver
- - -
-
更多登录方式
-
-
- - 新浪微博 -
-
- - 微信 -
-
-
-
-
-); +const Welcome = () =>
welcome login
; export default Welcome; diff --git a/src/utils/helper.ts b/src/utils/helper.ts new file mode 100644 index 0000000..e69de29 diff --git a/yarn.lock b/yarn.lock index 3a2a514..9a9cf1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1849,6 +1849,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4 escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chokidar@^2.0.0, chokidar@^2.0.2: version "2.0.4" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" @@ -2153,6 +2162,16 @@ cosmiconfig@5.0.6: js-yaml "^3.9.0" parse-json "^4.0.0" +cosmiconfig@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc" + integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ== + dependencies: + is-directory "^0.3.1" + js-yaml "^3.9.0" + parse-json "^4.0.0" + require-from-string "^2.0.1" + cosmiconfig@^5.0.7: version "5.0.7" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04" @@ -3886,6 +3905,13 @@ image-size@~0.5.0: resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= +import-cwd@^2.0.0: + version "2.1.0" + resolved "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" + integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk= + dependencies: + import-from "^2.1.0" + import-fresh@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" @@ -3894,6 +3920,13 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" +import-from@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" + integrity sha1-M1238qev/VOqpHHUuAId7ja387E= + dependencies: + resolve-from "^3.0.0" + import-local@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" @@ -4722,6 +4755,11 @@ jest@^23.6.0: import-local "^1.0.0" jest-cli "^23.6.0" +js-base64@^2.1.9: + version "2.5.0" + resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e" + integrity sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g== + js-levenshtein@^1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e" @@ -6217,6 +6255,31 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +postcss-less@^3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.1.tgz#87347038bf9cdec9c47722ecf97648bacd171cc3" + integrity sha512-yVa0hb03p7xj914Z4qDDA/PGwXYvCEfjJizWVYQvnEQr8SgJ098qejCvbCGk1dDYQpQEGKkvYHQCo66DwTocjg== + dependencies: + postcss "^7.0.3" + +postcss-load-config@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484" + integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ== + dependencies: + cosmiconfig "^4.0.0" + import-cwd "^2.0.0" + +postcss-loader@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" + integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== + dependencies: + loader-utils "^1.1.0" + postcss "^7.0.0" + postcss-load-config "^2.0.0" + schema-utils "^1.0.0" + postcss-modules-extract-imports@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a" @@ -6248,11 +6311,29 @@ postcss-modules-values@^1.3.0: icss-replace-symbols "^1.1.0" postcss "^6.0.1" +postcss-px-to-viewport@^0.0.3: + version "0.0.3" + resolved "https://registry.npmjs.org/postcss-px-to-viewport/-/postcss-px-to-viewport-0.0.3.tgz#761259af20ad70adb01f503697337276d7831363" + integrity sha1-dhJZryCtcK2wH1A2lzNydteDE2M= + dependencies: + object-assign "^4.0.1" + postcss "^5.0.2" + postcss-value-parser@^3.3.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== +postcss@^5.0.2: + version "5.2.18" + resolved "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" + integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== + dependencies: + chalk "^1.1.3" + js-base64 "^2.1.9" + source-map "^0.5.6" + supports-color "^3.2.3" + postcss@^6.0.1, postcss@^6.0.23: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" @@ -6262,6 +6343,15 @@ postcss@^6.0.1, postcss@^6.0.23: source-map "^0.6.1" supports-color "^5.4.0" +postcss@^7.0.0, postcss@^7.0.3: + version "7.0.13" + resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708" + integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -7002,6 +7092,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.1: + version "2.0.2" + resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" @@ -7878,7 +7973,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^3.1.2: +supports-color@^3.1.2, supports-color@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= @@ -7892,6 +7987,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-co dependencies: has-flag "^3.0.0" +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + symbol-observable@^1.0.3, symbol-observable@^1.1.0, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" From 1fc59bbba524dc975777fa83ab388695351bf2d2 Mon Sep 17 00:00:00 2001 From: seaseeyoul Date: Mon, 21 Jan 2019 09:01:22 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/webpack.config.js | 9 +- index.html | 7 +- src/index.tsx | 4 +- src/models/login/index.tsx | 12 +- src/models/nickname/index.tsx | 31 ----- src/models/register/index.tsx | 76 +++++++++++ src/pages/Login/index.module.less | 6 +- src/pages/Login/index.tsx | 152 ++++++++++++++++------ src/pages/NickName/index.tsx | 18 +-- src/pages/RegisterPhone/index.module.less | 114 ++++++++++++++++ src/pages/RegisterPhone/index.tsx | 147 +++++++++++++++++++++ src/pages/RegisterPwd/index.module.less | 124 ++++++++++++++++++ src/pages/RegisterPwd/index.tsx | 129 ++++++++++++++++++ src/pages/RegisterRole/index.css | 25 ++++ src/pages/RegisterRole/index.module.less | 123 +++++++++++++++++ src/pages/RegisterRole/index.tsx | 86 ++++++++++++ src/pages/Welcome/index.css | 31 +++++ src/pages/Welcome/index.html | 4 + src/router.tsx | 8 +- src/util/index.tsx | 16 ++- 20 files changed, 1024 insertions(+), 98 deletions(-) delete mode 100644 src/models/nickname/index.tsx create mode 100644 src/models/register/index.tsx create mode 100644 src/pages/RegisterPhone/index.module.less create mode 100644 src/pages/RegisterPhone/index.tsx create mode 100644 src/pages/RegisterPwd/index.module.less create mode 100644 src/pages/RegisterPwd/index.tsx create mode 100644 src/pages/RegisterRole/index.css create mode 100644 src/pages/RegisterRole/index.module.less create mode 100644 src/pages/RegisterRole/index.tsx create mode 100644 src/pages/Welcome/index.css create mode 100644 src/pages/Welcome/index.html diff --git a/configs/webpack.config.js b/configs/webpack.config.js index 4e9060b..ec5dff3 100644 --- a/configs/webpack.config.js +++ b/configs/webpack.config.js @@ -1,3 +1,4 @@ +const fs = require('fs'); const path = require('path'); const webpack = require('webpack'); // plugins @@ -11,7 +12,11 @@ const PROJECT_ROOT = path.join(__dirname, '../'); const SRC = path.join(PROJECT_ROOT, '/', 'src'); const PUBLIC = path.join(PROJECT_ROOT, '/', 'public'); const px2rem = require('postcss-px2rem-exclude'); -// const styleLoader = (mode) => mode === 'production' ? MiniCssExtractPlugin.loader : 'style-loader'; + +let loading = { + html: fs.readFileSync(path.join(__dirname, '../src/pages/Welcome/index.html')), + css: '' +} // px2rem 添加 const getStyleLoaders = (cssOptions, preProcessor,cssModules,hotModles) => { @@ -123,6 +128,8 @@ module.exports = argv => ({ template: 'index.html', favicon: `${SRC}/assets/images/favicon.ico`, inlineSource: 'runtime~.+\\.js', + inject: true, + loading }), new MiniCssExtractPlugin({ filename: '[name].css', diff --git a/index.html b/index.html index 2ece6b9..1abab09 100644 --- a/index.html +++ b/index.html @@ -3,9 +3,12 @@ - Frontend Boilerplate with React and TypeScript + Coderiver + <%= htmlWebpackPlugin.options.loading.css %> -
+
+ <%= htmlWebpackPlugin.options.loading.html %> +
diff --git a/src/index.tsx b/src/index.tsx index 629c868..aebefde 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -4,7 +4,7 @@ import createLoading from 'dva-loading'; import 'lib-flexible'; import '@assets/css/common.css'; import router from './router'; -import nicknameModel from './models/nickname'; +import registerModel from './models/register'; import loginModel from './models/login'; const app = dva({ @@ -21,7 +21,7 @@ app.use(createLoading()); // 4. 注册程序路由 app.router(router); -let models = [loginModel, nicknameModel]; +let models = [loginModel, registerModel]; models.forEach(m => { app.model(m); diff --git a/src/models/login/index.tsx b/src/models/login/index.tsx index 63a49ee..6662546 100644 --- a/src/models/login/index.tsx +++ b/src/models/login/index.tsx @@ -3,14 +3,22 @@ import { routerRedux } from 'dva/router'; export default { namespace: 'loginModel', state: { + isMobileLogin: true, mobileErr: false, passwordErr: false, + mailErr: false, password: '', mobile: '', + mail: '', }, reducers: { inputChange(state, payload) { - console.log(payload.payload); + return { + ...state, + ...payload.payload, + }; + }, + loginStateChange(state, payload) { return { ...state, ...payload.payload, @@ -18,7 +26,7 @@ export default { }, }, effects: { - subNickName({ payload: { nickName } }: any, { call, put }) { + subLogin({ payload }: any, { call, put }) { //coding yield put(routerRedux.push('/')); }, diff --git a/src/models/nickname/index.tsx b/src/models/nickname/index.tsx deleted file mode 100644 index 5da7c53..0000000 --- a/src/models/nickname/index.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import { routerRedux } from 'dva/router'; - -export default { - namespace: 'nickname', - state: { - isTrue: false, - name: '', - }, - reducers: { - nicknameChange(state, { payload: { name } }: any) { - let nameLen = name.length; - let nowState = state.isTrue; - if (nameLen <= 2) { - nowState = false; - } else { - nowState = true; - } - return { - ...state, - name: name, - isTrue: nowState, - }; - }, - }, - effects: { - subNickName({ payload: { nickName } }: any, { call, put }) { - //coding - yield put(routerRedux.push('/')); - }, - }, -}; diff --git a/src/models/register/index.tsx b/src/models/register/index.tsx new file mode 100644 index 0000000..b724983 --- /dev/null +++ b/src/models/register/index.tsx @@ -0,0 +1,76 @@ +import { routerRedux } from 'dva/router'; + +export default { + namespace: 'registerModel', + state: { + isNickTrue: false, + isMailTrue: false, + isPhoneTrue: false, + isPwdTrue: false, + isNotarizeTrue: false, + name: '', + mail: '', + phone: '', + pwd: '', + notarizePwd: '', + role: ['设计师'], + roleData: [ + { + label: 'java工程师', + value: 'java1', + }, + { + label: '前端工程师', + value: '111', + }, + { + label: '牛逼工程师', + value: '112', + }, + { + label: '斗牛工程师', + value: '113', + }, + { + label: '需求工程师', + value: '114', + }, + { + label: '死亡工程师', + value: '115', + }, + ], + }, + reducers: { + nicknameChange(state, { payload: { name } }: any) { + let nameLen = name.length; + let nowState = state.isNickTrue; + if (nameLen <= 2) { + nowState = false; + } else { + nowState = true; + } + return { + ...state, + name: name, + isNickTrue: nowState, + }; + }, + inputChange(state, payload) { + return { + ...state, + ...payload.payload, + }; + }, + }, + effects: { + registerStep2({ payload }: any, { call, put }) { + //coding + yield put(routerRedux.push('/registerPwd')); + }, + pwdSub({ payload }: any, { call, put }) { + //coding + yield put(routerRedux.push('/choicerole')); + }, + }, +}; diff --git a/src/pages/Login/index.module.less b/src/pages/Login/index.module.less index 1637517..0eef821 100644 --- a/src/pages/Login/index.module.less +++ b/src/pages/Login/index.module.less @@ -72,13 +72,17 @@ display: inline-block; width:300px; height:74px; - border:1px solid white; + border:2px solid white; border-radius: 74px; color:white; font-size:28px; text-align: center; line-height: 74px; margin-top:20px; + background:transparent; + &:active{ + background: #dedede; + } } .mobileInput{ margin-right:auto; diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx index 7a4693d..0da93b4 100644 --- a/src/pages/Login/index.tsx +++ b/src/pages/Login/index.tsx @@ -1,6 +1,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import { Link } from 'dva/router'; +import { Toast } from 'antd-mobile'; import Goback from '@components/Goback'; import styles from './index.module.less'; import util from '@util/index'; @@ -12,6 +13,9 @@ interface ILoginProps { mobile: number; passwordErr: boolean; mobileErr: boolean; + mailErr: boolean; + mail: string; + isMobileLogin: boolean; } const initialState = { passwordStateHide: true }; @@ -22,41 +26,67 @@ class Login extends Component { public constructor(props) { super(props); } + private sendSub = () => { - // const { dispatch, isTrue } = this.props; - // if (nickname === '' || isTrue === false) return; - // dispatch({ - // type: 'nickname/subNickName', - // payload: { nickName: nickname }, - // }); + const { + dispatch, + isMobileLogin, + password, + mobile, + mail, + mailErr, + mobileErr, + passwordErr, + } = this.props; + const postParams: any = { password }; + if (isMobileLogin) { + if (!mobileErr) { + Toast.fail('请正确填写手机号', 2); + return; + } + postParams.mobile = mobile; + } else { + if (!mailErr) { + Toast.fail('请正确填写邮箱', 2); + return; + } + postParams.mail = mail; + } + if (!passwordErr) { + Toast.fail('密码格式错误', 2); + return; + } + dispatch({ + type: 'loginModel/subLogin', + payload: postParams, + }); }; private mobileChange(e) { const { mobileErr } = this.props; let value = e.target.value, mobileStates = mobileErr; - if (util.checkMobile(value)) { - mobileStates = true; - } else { - mobileStates = false; - } + mobileStates = util.isMobile(value) ? true : false; this.props.dispatch({ type: 'loginModel/inputChange', payload: { mobile: value, mobileErr: mobileStates }, }); } + private mailChangeHandle(e) { + const { mailErr } = this.props; + let mail = e.target.value, + mailStates = mailErr; + mailStates = util.isMail(mail) ? true : false; + this.props.dispatch({ + type: 'loginModel/inputChange', + payload: { mail: mail, mailErr: mailStates }, + }); + } + private passwordChange(e) { - const { passwordErr } = this.props; let password = e.target.value, - passState = passwordErr, - pwdLen = password.length, - reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/; - if (pwdLen >= 6 && pwdLen <= 18 && reg.test(password)) { - passState = true; - } else { - passState = false; - } + passState = util.checkPwd(password) ? true : false; this.props.dispatch({ type: 'loginModel/inputChange', payload: { password: password, passwordErr: passState }, @@ -65,32 +95,67 @@ class Login extends Component { private toggleHandle = () => { this.setState(changePasswordState); }; + private changeLoginState = () => { + let loginState = this.props.isMobileLogin; + this.props.dispatch({ + type: 'loginModel/loginStateChange', + payload: { isMobileLogin: !loginState }, + }); + }; + private loginChangeTemplage(isMobileLogin) { + const { mobile, mail, mobileErr, mailErr } = this.props; + if (isMobileLogin) { + return ( +
+
+ 手机号码 +
+
+ +49 + { + this.mobileChange(e); + }} + value={mobile} + className={styles.input + ' ' + styles.mobileInput} + type="text" + placeholder="请输入手机号" + /> + {mobileErr ? : null} +
+
+ ); + } else { + return ( +
+
+ 输入邮箱 +
+
+ { + this.mailChangeHandle(e); + }} + value={mail} + className={styles.input + ' ' + styles.mobileInput} + type="text" + placeholder="请输入邮箱" + /> + {mailErr ? : null} +
+
+ ); + } + } public render() { - const { dispatch, password, mobile, mobileErr, passwordErr } = this.props; + const { dispatch, password, passwordErr, isMobileLogin } = this.props; return (

登录
-
-
- 手机号码 -
-
- +49 - { - this.mobileChange(e); - }} - value={mobile} - className={styles.input + ' ' + styles.mobileInput} - type="text" - placeholder="请输入手机号" - /> - {mobileErr ? : null} -
-
+ {this.loginChangeTemplage(isMobileLogin)}

输入密码 @@ -113,9 +178,9 @@ class Login extends Component {

- - 使用邮箱 - + + {isMobileLogin ? '使用邮箱' : '使用手机号码'} +

@@ -134,6 +199,9 @@ function mapStateToProps(state) { password: state.loginModel.password, mobileErr: state.loginModel.mobileErr, passwordErr: state.loginModel.passwordErr, + mailErr: state.loginModel.mailErr, + mail: state.loginModel.mail, + isMobileLogin: state.loginModel.isMobileLogin, }; } diff --git a/src/pages/NickName/index.tsx b/src/pages/NickName/index.tsx index 1b6de76..a6098cc 100644 --- a/src/pages/NickName/index.tsx +++ b/src/pages/NickName/index.tsx @@ -7,7 +7,7 @@ interface INickNameProps { dispatch: (object: Object) => Object; history: any; nickname: string; - isTrue: boolean; + isNickTrue: boolean; } class NickName extends Component { @@ -15,10 +15,10 @@ class NickName extends Component { super(props); } public sendSub = () => { - const { dispatch, nickname, isTrue } = this.props; - if (nickname === '' || isTrue === false) return; + const { dispatch, nickname, isNickTrue } = this.props; + if (nickname === '' || isNickTrue === false) return; dispatch({ - type: 'nickname/subNickName', + type: 'registerModel/subNickName', payload: { nickName: nickname }, }); }; @@ -26,12 +26,12 @@ class NickName extends Component { public nickNameChange(e) { let value = e.target.value; this.props.dispatch({ - type: 'nickname/nicknameChange', + type: 'registerModel/nicknameChange', payload: { name: value }, }); } public render() { - const { dispatch, nickname, isTrue } = this.props; + const { dispatch, nickname, isNickTrue } = this.props; return (
@@ -51,7 +51,7 @@ class NickName extends Component { type="text" placeholder="请输入昵称" /> - {isTrue ? : null} + {isNickTrue ? : null}

@@ -64,8 +64,8 @@ class NickName extends Component { } function mapStateToProps(state) { return { - nickname: state.nickname.name, - isTrue: state.nickname.isTrue, + nickname: state.registerModel.name, + isNickTrue: state.registerModel.isNickTrue, }; } diff --git a/src/pages/RegisterPhone/index.module.less b/src/pages/RegisterPhone/index.module.less new file mode 100644 index 0000000..8955c4b --- /dev/null +++ b/src/pages/RegisterPhone/index.module.less @@ -0,0 +1,114 @@ +@import "../../assets/css/common.less"; +.nickNameWrapper{ + height:100%; + background:linear-gradient(#40ADAC,#42A1C1,#4498D4,#4492DD,#458BEB); + .nickNameInner{ + padding:0 50px; + } + .nickTip{ + font-size:62px; + color:white; + font-family:HiraginoSansGB-W3; + font-weight:normal; + margin-top:88px; + margin-bottom:112px; + } + .check{ + display: inline-block; + width:48px; + height:45px; + flex-shrink:0; + background: url('../../assets/images/check-icon.png') no-repeat; + background-size:100%; + } + .inputTopText{ + font-size:30px; + color:white; + } + .inputItem{ + padding:42px 0 35px 0; + border-bottom:2px solid white; + .wlflex(); + justify-content: space-between; + } + .mobileInput{ + margin-right:auto; + width:350px; + } + .input{ + background: none; + border:none; + font-size:48px; + color:white; + outline: none; + } + .btnBox{ + margin-top:248px; + .wlflex(); + justify-content: space-between; + } + .qh{ + display:inline-block; + background: white; + text-align: center; + line-height: 58px; + color:#40AEA8; + font-size:26px; + padding:0 20px; + height:58px; + margin-right:40px; + font-weight: bold; + flex-shrink: 0; + } + .btnComm{ + display: inline-block; + width:300px; + height:74px; + border:2px solid white; + border-radius: 74px; + color:white; + font-size:28px; + text-align: center; + line-height: 74px; + margin-top:20px; + background:transparent; + &:active{ + background: #dedede; + } + } + .subBtn{ + display: inline-block; + width:100px; + height:100px; + border-radius: 50%; + background:white; + position: relative; + &:before{ + content:''; + position: absolute; + left:50%; + top:25px; + margin-left:-20px; + display: inline-block; + border-right: 4px solid @commonColor; + border-top: 4px solid @commonColor; + height: 25px; + width: 25px; + margin-top:28px; + transform: rotate(45deg) translate(-50%,-50%); + } + } +} + +input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { + color: white; +} +input:-moz-placeholder, textarea:-moz-placeholder { + color: white; +} +input::-moz-placeholder, textarea::-moz-placeholder { + color: white; +} +input:-ms-input-placeholder, textarea:-ms-input-placeholder { + color: white; +} \ No newline at end of file diff --git a/src/pages/RegisterPhone/index.tsx b/src/pages/RegisterPhone/index.tsx new file mode 100644 index 0000000..bb6ffc4 --- /dev/null +++ b/src/pages/RegisterPhone/index.tsx @@ -0,0 +1,147 @@ +import React, { Component } from 'react'; +import { connect } from 'dva'; +import styles from './index.module.less'; +import Goback from '@components/Goback'; +import { Toast } from 'antd-mobile'; +import util from '@util/index'; + +interface IRPhoneProps { + dispatch: (object: Object) => Object; + history: any; + mail: string; + mobile: number; + isMailTrue: boolean; + isPhoneTrue: boolean; +} + +const initialState = { isRegisterState: true }; +type State = Readonly; + +class RegisterPhone extends Component { + readonly state: State = initialState; + public constructor(props) { + super(props); + } + public sendSub = () => { + const { dispatch, isMailTrue, mobile, mail, isPhoneTrue } = this.props; + const { isRegisterState } = this.state; + const postParams: any = {}; + if (isRegisterState) { + if (!isMailTrue) { + Toast.fail('请正确填写邮箱', 2); + return; + } + postParams.mail = mail; + } else { + if (!isPhoneTrue) { + Toast.fail('请正确填写手机号', 2); + return; + } + postParams.mobile = mobile; + } + + dispatch({ + type: 'registerModel/registerStep2', + payload: postParams, + }); + }; + + public mailChange(e) { + let mail = e.target.value, + mailStates = util.isMail(mail) ? true : false; + this.props.dispatch({ + type: 'registerModel/inputChange', + payload: { mail: mail, isMailTrue: mailStates }, + }); + } + public changeStateHandle = () => { + this.setState((prevState: State) => ({ + isRegisterState: !prevState.isRegisterState, + })); + }; + public mobileChange(e) { + let value = e.target.value, + mobileStates = util.isMobile(value) ? true : false; + this.props.dispatch({ + type: 'registerModel/inputChange', + payload: { mobile: value, isPhoneTrue: mobileStates }, + }); + } + + public changeRegisterState() { + const { mail, mobile, isMailTrue, isPhoneTrue } = this.props; + const { isRegisterState } = this.state; + if (isRegisterState) { + return ( +
+
+ 输入邮箱 +
+
+ { + this.mailChange(e); + }} + value={mail} + className={styles.input} + type="text" + placeholder="请输入邮箱" + /> + {isMailTrue ? : null} +
+
+ ); + } else { + return ( +
+
+ 手机号码 +
+
+ +49 + { + this.mobileChange(e); + }} + value={mobile} + className={styles.input + ' ' + styles.mobileInput} + type="text" + placeholder="请输入手机号" + /> + {isPhoneTrue ? : null} +
+
+ ); + } + } + + public render() { + const { dispatch } = this.props; + const { isRegisterState } = this.state; + return ( +
+ +
+
{isRegisterState ? '您的邮箱？' : '您的手机号'}
+ {this.changeRegisterState()} +
+ + {isRegisterState ? '使用手机号码' : '使用邮箱'} + + +
+
+
+ ); + } +} +function mapStateToProps(state) { + return { + isMailTrue: state.registerModel.isMailTrue, + mail: state.registerModel.mail, + isPhoneTrue: state.registerModel.isPhoneTrue, + phone: state.registerModel.phone, + }; +} + +export default connect(mapStateToProps)(RegisterPhone); diff --git a/src/pages/RegisterPwd/index.module.less b/src/pages/RegisterPwd/index.module.less new file mode 100644 index 0000000..1e26ce9 --- /dev/null +++ b/src/pages/RegisterPwd/index.module.less @@ -0,0 +1,124 @@ +@import "../../assets/css/common.less"; +.nickNameWrapper{ + height:100%; + background:linear-gradient(#40ADAC,#42A1C1,#4498D4,#4492DD,#458BEB); + .nickNameInner{ + padding:0 50px; + } + .nickTip{ + font-size:62px; + color:white; + font-family:HiraginoSansGB-W3; + font-weight:normal; + margin-top:88px; + margin-bottom:112px; + } + .check{ + display: inline-block; + width:48px; + height:45px; + flex-shrink:0; + background: url('../../assets/images/check-icon.png') no-repeat; + background-size:100%; + } + .inputTopText{ + font-size:30px; + color:white; + } + .inputItem{ + padding:42px 0 35px 0; + border-bottom:2px solid white; + .wlflex(); + justify-content: space-between; + } + .inputBox{ + margin-bottom:59px; + } + .mobileInput{ + margin-right:auto; + width:350px; + } + .input{ + background: none; + border:none; + font-size:48px; + color:white; + outline: none; + } + .inputTop{ + .wlflex(); + justify-content: space-between; + } + .toggle{ + color:white; + font-size:30px; + } + .btnBox{ + text-align: right; + + } + .qh{ + display:inline-block; + background: white; + text-align: center; + line-height: 58px; + color:#40AEA8; + font-size:26px; + padding:0 20px; + height:58px; + margin-right:40px; + font-weight: bold; + flex-shrink: 0; + } + .btnComm{ + display: inline-block; + width:300px; + height:74px; + border:2px solid white; + border-radius: 74px; + color:white; + font-size:28px; + text-align: center; + line-height: 74px; + margin-top:20px; + background:transparent; + &:active{ + background: #dedede; + } + } + .subBtn{ + display: inline-block; + width:100px; + height:100px; + border-radius: 50%; + background:white; + position: relative; + &:before{ + content:''; + position: absolute; + left:50%; + top:25px; + margin-left:-20px; + display: inline-block; + border-right: 4px solid @commonColor; + border-top: 4px solid @commonColor; + height: 25px; + width: 25px; + margin-top:28px; + transform: rotate(45deg) translate(-50%,-50%); + } + } +} + +input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { + color: white; +} +input:-moz-placeholder, textarea:-moz-placeholder { + color: white; +} +input::-moz-placeholder, textarea::-moz-placeholder { + color: white; +} +input:-ms-input-placeholder, textarea:-ms-input-placeholder { + color: white; +} \ No newline at end of file diff --git a/src/pages/RegisterPwd/index.tsx b/src/pages/RegisterPwd/index.tsx new file mode 100644 index 0000000..d78d108 --- /dev/null +++ b/src/pages/RegisterPwd/index.tsx @@ -0,0 +1,129 @@ +import React, { Component } from 'react'; +import { connect } from 'dva'; +import styles from './index.module.less'; +import Goback from '@components/Goback'; +import util from '@util/index'; + +interface INickNameProps { + dispatch: (object: Object) => Object; + history: any; + notarizePwd: string; + pwd: string; + isPwdTrue: boolean; + isNotarizeTrue: boolean; +} + +const initialState: any = { + passwordStateHide: true, + notariPwdStateHIde: true, +}; +type State = Readonly; + +class NickName extends Component { + readonly state: State = initialState; + public constructor(props) { + super(props); + } + public sendSub = () => { + const { dispatch, pwd, isPwdTrue, isNotarizeTrue, notarizePwd } = this.props; + if (!isNotarizeTrue || !isPwdTrue) return; + dispatch({ + type: 'registerModel/pwdSub', + payload: { pwd: notarizePwd }, + }); + }; + + public pwdChange(e) { + let pwdValue = e.target.value, + passState = util.checkPwd(pwdValue) ? true : false; + this.props.dispatch({ + type: 'registerModel/inputChange', + payload: { pwd: pwdValue, isPwdTrue: passState }, + }); + } + public notarizeChange(e) { + const { pwd } = this.props; + let pwdValue = e.target.value, + nState = util.checkPwd(pwdValue) && pwd === pwdValue ? true : false; + this.props.dispatch({ + type: 'registerModel/inputChange', + payload: { notarizePwd: pwdValue, isNotarizeTrue: nState }, + }); + } + public toggleHandle(typeState: any) { + this.setState((prevState: State) => ({ + [typeState]: !prevState[typeState], + })); + } + public render() { + const { dispatch, pwd, isPwdTrue, isNotarizeTrue, notarizePwd } = this.props; + const { notariPwdStateHIde, passwordStateHide } = this.state; + return ( +
+ +
+
创建密码
+
+
+ 密码 + this.toggleHandle('passwordStateHide')} + > + {passwordStateHide ? '隐藏' : '显示'} + +
+
+ { + this.pwdChange(e); + }} + value={pwd} + className={styles.input} + type={passwordStateHide ? 'text' : 'password'} + placeholder="请输入密码" + /> + {isPwdTrue ? : null} +
+
+
+
+ 确认密码 + this.toggleHandle('notariPwdStateHIde')} + > + {notariPwdStateHIde ? '隐藏' : '显示'} + +
+
+ { + this.notarizeChange(e); + }} + value={notarizePwd} + className={styles.input} + type={notariPwdStateHIde ? 'text' : 'password'} + placeholder="请确认密码" + /> + {isNotarizeTrue ? : null} +
+
+
+ +
+
+
+ ); + } +} +function mapStateToProps(state) { + return { + pwd: state.registerModel.pwd, + notarizePwd: state.registerModel.notarizePwd, + isPwdTrue: state.registerModel.isPwdTrue, + isNotarizeTrue: state.registerModel.isNotarizeTrue, + }; +} + +export default connect(mapStateToProps)(NickName); diff --git a/src/pages/RegisterRole/index.css b/src/pages/RegisterRole/index.css new file mode 100644 index 0000000..698003b --- /dev/null +++ b/src/pages/RegisterRole/index.css @@ -0,0 +1,25 @@ +.am-picker{ + background: #C7DEF6; + position: fixed; + bottom:0; + left:0; + width:100%; + z-index:222; +} +.am-picker-col-mask{ + background-image:linear-gradient(to bottom, rgba(199, 222, 246, 0.95), rgba(199, 222, 246, 0.6)), linear-gradient(to top, rgba(199, 222, 246, 0.95), rgba(199, 222, 246, 0.6)) +} +.am-picker-col-indicator{ + border-top:1px solid #4490E1!important; + border-bottom:1px solid #4490E1!important; +} +.am-picker-col-item{ + font-size:48px; + color:#262C2C; +} +@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx){ + html:not([data-scale]) .am-picker-col-indicator::before { + -webkit-transform-origin: 50% 100%; + transform-origin: 50% 100%; + } +} diff --git a/src/pages/RegisterRole/index.module.less b/src/pages/RegisterRole/index.module.less new file mode 100644 index 0000000..e1129ec --- /dev/null +++ b/src/pages/RegisterRole/index.module.less @@ -0,0 +1,123 @@ +@import "../../assets/css/common.less"; +.nickNameWrapper{ + height:100%; + background:linear-gradient(#40ADAC,#42A1C1,#4498D4,#4492DD,#458BEB); + .nickNameInner{ + padding:0 50px; + } + .nickTip{ + font-size:62px; + color:white; + font-family:HiraginoSansGB-W3; + font-weight:normal; + margin-top:88px; + } + .check{ + display: inline-block; + width:48px; + height:45px; + flex-shrink:0; + background: url('../../assets/images/check-icon.png') no-repeat; + background-size:100%; + } + .inputTopText{ + font-size:30px; + color:white; + } + .roleText{ + font-size:48px; + color:white; + } + .inputItem{ + padding:42px 0 35px 0; + border-bottom:2px solid white; + .wlflex(); + justify-content: space-between; + } + .mobileInput{ + margin-right:auto; + width:350px; + } + .input{ + background: none; + border:none; + font-size:48px; + color:white; + outline: none; + } + .tip{ + font-size:36px; + color:white; + margin-top:48px; + line-height: 50px; + margin-bottom:112px; + } + .btnBox{ + margin-top:115px; + text-align: right; + } + .qh{ + display:inline-block; + background: white; + text-align: center; + line-height: 58px; + color:#40AEA8; + font-size:26px; + padding:0 20px; + height:58px; + margin-right:40px; + font-weight: bold; + flex-shrink: 0; + } + .btnComm{ + display: inline-block; + width:300px; + height:74px; + border:2px solid white; + border-radius: 74px; + color:white; + font-size:28px; + text-align: center; + line-height: 74px; + margin-top:20px; + background:transparent; + &:active{ + background: #dedede; + } + } + .subBtn{ + display: inline-block; + width:100px; + height:100px; + border-radius: 50%; + background:white; + position: relative; + &:before{ + content:''; + position: absolute; + left:50%; + top:25px; + margin-left:-20px; + display: inline-block; + border-right: 4px solid @commonColor; + border-top: 4px solid @commonColor; + height: 25px; + width: 25px; + margin-top:28px; + transform: rotate(45deg) translate(-50%,-50%); + } + } +} + +input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { + color: white; +} +input:-moz-placeholder, textarea:-moz-placeholder { + color: white; +} +input::-moz-placeholder, textarea::-moz-placeholder { + color: white; +} +input:-ms-input-placeholder, textarea:-ms-input-placeholder { + color: white; +} \ No newline at end of file diff --git a/src/pages/RegisterRole/index.tsx b/src/pages/RegisterRole/index.tsx new file mode 100644 index 0000000..ef86fa3 --- /dev/null +++ b/src/pages/RegisterRole/index.tsx @@ -0,0 +1,86 @@ +import React, { Component } from 'react'; +import { connect } from 'dva'; +import { PickerView } from 'antd-mobile'; +import styles from './index.module.less'; +import './index.css'; +import Goback from '@components/Goback'; + +interface INickNameProps { + dispatch: (object: Object) => Object; + history: any; + role: any; + roleData: []; +} + +const initialState = { isShowPick: false }; +type State = Readonly; +class RegisterRole extends Component { + readonly state: State = initialState; + public constructor(props) { + super(props); + } + public sendSub = () => { + // const { dispatch, nickname, isNickTrue } = this.props; + // if (nickname === '' || isNickTrue === false) return; + // dispatch({ + // type: 'registerModel/subNickName', + // payload: { nickName: nickname }, + // }); + }; + + public roleChangeItem = value => { + console.log(value); + // dispatch({ + // type: 'registerModel/subNickName', + // payload: { nickName: nickname }, + // }); + }; + public roleChangeHandle = () => { + this.setState((prevState: State) => ({ + isShowPick: !prevState.isShowPick, + })); + }; + + public render() { + const { dispatch, role, roleData } = this.props; + const { isShowPick } = this.state; + return ( +
+ +
+
您的角色？
+
Coderiver会基于您的角色向您推荐相关项目和团队
+
+
+ 选择角色 +
+
+
{role}
+ +
+
+ {isShowPick ? ( + + ) : null} + +
+ +
+
+
+ ); + } +} +function mapStateToProps(state) { + return { + role: state.registerModel.role, + roleData: state.registerModel.roleData, + }; +} + +export default connect(mapStateToProps)(RegisterRole); diff --git a/src/pages/Welcome/index.css b/src/pages/Welcome/index.css new file mode 100644 index 0000000..1b49a5c --- /dev/null +++ b/src/pages/Welcome/index.css @@ -0,0 +1,31 @@ +.welcomeWrapper{ + display: flex; + justify-content: center; + align-items: center; + height: 100%; +} +.welcomeWrapper .logo{ + animation: dim 2s infinite; +} + +.welcomeWrapper .copyRight{ + position: absolute; + left:50%; + transform: translateX(-50%); + bottom:20px; + font-size:0.1rem; +} + + +@keyframes dim { + 0% { + opacity: 0.4; + } + 50% { + opacity: 0.6; + } + 100% { + opacity: 1; + } + } + diff --git a/src/pages/Welcome/index.html b/src/pages/Welcome/index.html new file mode 100644 index 0000000..e73c29d --- /dev/null +++ b/src/pages/Welcome/index.html @@ -0,0 +1,4 @@ +
+ +
CodrRiver©2018
+
diff --git a/src/router.tsx b/src/router.tsx index 9292d33..c45a1d9 100644 --- a/src/router.tsx +++ b/src/router.tsx @@ -2,9 +2,11 @@ import as React from 'react'; import { Route, Router, Switch } from 'dva/router'; import Login from '@pages/Login'; import Guide from '@pages/Guide'; -import Welcome from '@pages/Welcome'; import NickName from '@pages/NickName'; import Home from '@pages/Home'; +import RegisterPhone from '@pages/RegisterPhone'; +import RegisterPwd from '@pages/RegisterPwd'; +import RegisterRole from '@pages/RegisterRole'; interface RoutersProps { history: any; @@ -14,10 +16,12 @@ const Routers = function({ history, app }: RoutersProps) { return ( - + + + diff --git a/src/util/index.tsx b/src/util/index.tsx index cdf61bf..b500b5f 100644 --- a/src/util/index.tsx +++ b/src/util/index.tsx @@ -1,10 +1,14 @@ class Utils { - checkMobile(mobile) { - if (!/^1[34578]\d{9}$/.test(mobile)) { - return false; - } else { - return true; - } + isMobile(mobile) { + return /^1[34578]\d{9}$/.test(mobile); + } + isMail(mail) { + let reg = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/; + return reg.test(mail); + } + checkPwd(pwd) { + let reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,18}$/; + return reg.test(pwd); } } export default new Utils();

+ 欢迎来到CodeRiver + + 使用Github账号登录 + + + 创建账号 + + 更多登录方式 + + 新浪微博 + 微信 + +

+ 欢迎来到CodeRiver + + 使用Github账号登录 + + + 创建账号 + + 更多登录方式 + + 新浪微博 + 微信 + +

Dva boilerplate with typescript

Count:{count}

+
欢迎来到CodeRiver
+
+ 使用Github账号登录 +
+ + 创建账号 + +
更多登录方式
+
+ 新浪微博 + 微信 +
+

+
欢迎来到CodeRiver
+
+ 使用Github账号登录 +
+ + 创建账号 + +
更多登录方式
+
+ 新浪微博 + 微信 +
+