Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4938a51

Browse files
author
gondzo
committed
add form signup
1 parent24726bb commit4938a51

File tree

12 files changed

+639
-96
lines changed

12 files changed

+639
-96
lines changed

‎src/api/User.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class UserApi {
4242

4343
register(name,email,password){
4444
consturl=`${this.basePath}/api/v1/register`;
45-
email=Math.floor((Math.random()*100)+1)+email;
4645
returnreqwest({
4746
url,
4847
method:'post',

‎src/components/Header/Header.jsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
importReact,{PropTypes}from'react';
22
importCSSModulesfrom'react-css-modules';
33
import{Link}from'react-router';
4-
importLogInSignUpModalContainerfrom'routes/Home/containers/LogInSignUpModalContainer';
4+
importLogInModalContainerfrom'routes/Home/containers/LogInModalContainer';
5+
importSignupModalContainerfrom'routes/Home/containers/SignupModalContainer';
56
importSearchInputfrom'../SearchInput';
67
importDropdownfrom'../Dropdown';
78
importNotificationfrom'../Notification';
@@ -62,7 +63,10 @@ export const Header = ({location, selectedCategory, categories, user, notificati
6263
</Dropdown>
6364
</li>),
6465
(<likey="login"styleName="login">
65-
<LogInSignUpModalContainer/>
66+
<LogInModalContainer/>
67+
</li>),
68+
(<likey="signup"styleName="login">
69+
<SignupModalContainer/>
6670
</li>),
6771
]
6872
);

‎src/routes/Home/components/LogInSignUpModal/index.js‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/routes/Home/components/LogInSignUpModal/LogInSignUpModal.jsx renamed to src/routes/Home/components/LoginModal/LoginModal.jsx

Lines changed: 8 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Modal from 'react-modal';
77
importButtonfrom'components/Button';
88
importCheckboxfrom'components/Checkbox';
99
importTextFieldfrom'components/TextField';
10-
importstylesfrom'./LogInSignUpModal.scss';
10+
importstylesfrom'./LogInModal.scss';
1111
const{DOM:{ input}}=React;
1212

1313
importUserApifrom'api/User.js';
@@ -47,39 +47,29 @@ const FormField = ({label, error, touched, children}) => (
4747
</div>
4848
);
4949
/*
50-
*LogInSignUpModal
50+
*LogInModal
5151
*/
5252

53-
classLogInSignUpModalextendsReact.Component{
53+
classLogInModalextendsReact.Component{
5454
constructor(){
5555
super();
5656
this.state={
57-
modalLoginIsOpen:false,
58-
modalSignupIsOpen:false,
57+
modalLoginIsOpen:false
5958
};
6059
}
6160

6261
openLoginModal(){
6362
this.setState({modalLoginIsOpen:true});
6463
}
65-
openSignupModal(){
66-
this.setState({modalSignupIsOpen:true});
67-
}
6864

6965
afterOpenLoginModal(){
7066
}
71-
afterOpenSignupModal(){
72-
}
7367

7468
closeLoginModal(){
7569
this.setState({modalLoginIsOpen:false});
7670
}
77-
closeSignupModal(){
78-
this.setState({modalSignupIsOpen:false});
79-
}
8071

8172
login(email,pass){
82-
this.setState({modalSignupIsOpen:false});
8373
this.setState({modalLoginIsOpen:true});
8474
}
8575

@@ -95,27 +85,12 @@ class LogInSignUpModal extends React.Component {
9585
},100);
9686
}
9787

98-
handleSignup(){
99-
userApi.register('first','provider2@qq.com','123456').then((authResult)=>{
100-
console.log(authResult);
101-
browserHistory.push('/browse-provider');
102-
}).catch((err)=>{
103-
console.log(err.responseText);
104-
});
105-
}
106-
107-
signUp(){
108-
this.setState({modalLoginIsOpen:false});
109-
this.setState({modalSignupIsOpen:true});
110-
}
111-
11288
render(){
11389
const{ handleSubmit, pristine, reset, submitting, fields, handleLoggedIn, loggedUser, hasError, errorText}=this.props;
11490

11591
return(
11692
<divstyleName="signin-modal">
11793
<divstyleName="login-signup">
118-
<ahref="#"diff-bcb53b07efe45c4b40d5b2124773ef4cf54ecbf4bc3fac6a7619576c56629f3a-119-94-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">119
94
<ahref="#"diff-bcb53b07efe45c4b40d5b2124773ef4cf54ecbf4bc3fac6a7619576c56629f3a-120-95-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">120
95
</div>
12196
<Modal
@@ -188,73 +163,18 @@ class LogInSignUpModal extends React.Component {
188163
</Button>
189164
</div>
190165
<divstyleName="dont-have">
191-
Don&#8217;t have an account?<ahref="#"className="singup"onClick={this.signUp.bind(this)}>Sign Up</a>
166+
Don&#8217;t have an account?<ahref="#"className="singup">Sign Up</a>
192167
</div>
193168
</form>
194169
</Modal>
195170

196-
<Modal
197-
isOpen={this.state.modalSignupIsOpen}
198-
onAfterOpen={this.afterOpenSignupModal}
199-
onRequestClose={this.closeSignupModal.bind(this)}
200-
style={customStyles}
201-
shouldCloseOnOverlayClick
202-
contentLabel="Login Modal"
203-
>
204-
205-
<divstyleName="modal-header">
206-
<divonClick={this.closeSignupModal.bind(this)}styleName="icon-close-modal"/>
207-
<divstyleName="title">Login to Your Account</div>
208-
</div>
209-
210-
<formstyleName="login-form">
211-
<divstyleName="login-with-fb">
212-
<ahref="#"diff-bcb53b07efe45c4b40d5b2124773ef4cf54ecbf4bc3fac6a7619576c56629f3a-213-170-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">213
-
<istyleName="icon-facebook"/>
214-
<span>Continue with Facebook</span>
215-
</a>
216-
</div>
217-
218-
<divstyleName="login-with-gplus">
219-
<ahref="#"diff-bcb53b07efe45c4b40d5b2124773ef4cf54ecbf4bc3fac6a7619576c56629f3a-220-170-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">220
-
<istyleName="icon-gplus"/>
221-
<span>Continue with Google Plus</span>
222-
</a>
223-
</div>
224-
{/* login with end*/}
225-
<divstyleName="or-border">
226-
<divstyleName="left-line"/>
227-
<divstyleName="or">or</div>
228-
<divstyleName="right-line"/>
229-
</div>
230-
{/* or end*/}
231-
232-
<divstyleName="signup-btn">
233-
<istyleName="icon-email"/>
234-
235-
<Buttoncolor="black"className={styles.btnLogin}onClick={this.handleSignup.bind(this)}>
236-
Sign up with Email
237-
</Button>
238-
239-
</div>
240-
{/* signup-btn end*/}
241-
<divstyleName="by-signup">
242-
By signing up, I agree to Drone Market’s
243-
<ahref="#"diff-bcb53b07efe45c4b40d5b2124773ef4cf54ecbf4bc3fac6a7619576c56629f3a-244-170-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">244
-
and<ahref="#"diff-bcb53b07efe45c4b40d5b2124773ef4cf54ecbf4bc3fac6a7619576c56629f3a-245-170-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">245
-
</div>
246-
{/* by-signup end*/}
247-
<divstyleName="dont-have">
248-
Already have an account?<ahref="#"diff-bcb53b07efe45c4b40d5b2124773ef4cf54ecbf4bc3fac6a7619576c56629f3a-249-170-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">249
-
</div>
250-
</form>
251-
</Modal>
171+
252172
</div>
253173
);
254174
}
255175
}
256176

257-
LogInSignUpModal.propTypes={
177+
LogInModal.propTypes={
258178
handleSubmit:PropTypes.func.isRequired,
259179
};
260180

@@ -274,4 +194,4 @@ const validate = (values) => {
274194
};
275195

276196

277-
exportdefaultreduxForm({form:'loginForm', fields, validate})(CSSModules(LogInSignUpModal,styles));
197+
exportdefaultreduxForm({form:'loginForm', fields, validate})(CSSModules(LogInModal,styles));

src/routes/Home/components/LogInSignUpModal/LogInSignUpModal.scss renamed to src/routes/Home/components/LoginModal/LoginModal.scss

File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
importLogInModalfrom'./LogInModal';
2+
3+
exportdefaultLogInModal;
Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
importReact,{PropTypes}from'react';
2+
importCSSModulesfrom'react-css-modules';
3+
import{Link,browserHistory}from'react-router';
4+
import{Field,reduxForm}from'redux-form';
5+
importcnfrom'classnames';
6+
importModalfrom'react-modal';
7+
importButtonfrom'components/Button';
8+
importCheckboxfrom'components/Checkbox';
9+
importTextFieldfrom'components/TextField';
10+
importstylesfrom'./SignupModal.scss';
11+
const{DOM:{ input}}=React;
12+
13+
importUserApifrom'api/User.js';
14+
constconfig=require('../../../../config');
15+
constuserApi=newUserApi(config.default.api.basePath);
16+
17+
/*
18+
* customStyles
19+
*/
20+
constcustomStyles={
21+
overlay:{
22+
position:'fixed',
23+
top:0,
24+
left:0,
25+
right:0,
26+
bottom:0,
27+
backgroundColor:'rgba(9, 9, 9, 0.58)',
28+
zIndex:'9999',
29+
},
30+
content:{
31+
top:'50%',
32+
left:'50%',
33+
right:'auto',
34+
bottom:'auto',
35+
marginRight:'-50%',
36+
transform:'translate(-50%, -50%)',
37+
padding:'0px',
38+
width:'417px',
39+
borderRadius:'10px',
40+
zIndex:'99999',
41+
},
42+
};
43+
constFormField=({label, error, touched, children})=>(
44+
<divclassName={cn('form-field',{error:error&&touched})}>
45+
{children}
46+
{error&&touched&&<divclassName="error-message">{error}</div>}
47+
</div>
48+
);
49+
/*
50+
* SignupModal
51+
*/
52+
53+
classSignupModalextendsReact.Component{
54+
constructor(){
55+
super();
56+
this.state={
57+
modalSignupIsOpen:false
58+
};
59+
}
60+
61+
openSignupModal(){
62+
this.setState({modalSignupIsOpen:true});
63+
}
64+
65+
afterOpenSignupModal(){
66+
}
67+
68+
closeSignupModal(){
69+
this.setState({modalSignupIsOpen:false});
70+
}
71+
72+
signup(email,pass){
73+
this.setState({modalSignupIsOpen:true});
74+
}
75+
76+
handleSignup(handleSigned,signedUser){
77+
handleSigned();
78+
const_self=this;
79+
setTimeout(()=>{
80+
handleSignup();
81+
if(signedUser){
82+
_self.setState({modalSignupIsOpen:false});
83+
}
84+
},100);
85+
}
86+
87+
render(){
88+
const{ handleSubmit, pristine, reset, submitting, fields, handleSigned, signedUser, hasError, errorText}=this.props;
89+
90+
return(
91+
<divstyleName="signin-modal">
92+
<divstyleName="login-signup">
93+
<ahref="#"diff-272d20c0bd8f77616b84d4f5e629987c3fd8e98aa88964368fc0313dc6cd41e2-empty-94-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">
94+
</div>
95+
<Modal
96+
isOpen={this.state.modalSignupIsOpen}
97+
onAfterOpen={this.afterOpenModal}
98+
onRequestClose={this.closeSignupModal.bind(this)}
99+
style={customStyles}
100+
shouldCloseOnOverlayClick
101+
contentLabel="Signup Modal"
102+
>
103+
104+
<divstyleName="modal-header">
105+
<divonClick={this.closeSignupModal.bind(this)}styleName="icon-close-modal"/>
106+
<divstyleName="title">Create new Account</div>
107+
</div>
108+
109+
<formstyleName="login-form"onSubmit={handleSubmit}>
110+
<divstyleName="login-with-fb">
111+
<ahref="#"diff-272d20c0bd8f77616b84d4f5e629987c3fd8e98aa88964368fc0313dc6cd41e2-empty-112-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">
112+
<istyleName="icon-facebook"/>
113+
<span>Sign Up with Facebook</span>
114+
</a>
115+
</div>
116+
117+
<divstyleName="login-with-gplus">
118+
<ahref="#"diff-272d20c0bd8f77616b84d4f5e629987c3fd8e98aa88964368fc0313dc6cd41e2-empty-119-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">
119+
<istyleName="icon-gplus"/>
120+
<span>Sign Up with Google Plus</span>
121+
</a>
122+
</div>
123+
{/* login with end*/}
124+
<divstyleName="or-border">
125+
<divstyleName="left-line"/>
126+
<divstyleName="or">or</div>
127+
<divstyleName="right-line"/>
128+
</div>
129+
{/* or end*/}
130+
<div>
131+
{hasError&&<spanclassName="error-msg">{errorText.error}</span>}
132+
<divstyleName="email-input">
133+
<FormField{...fields.email}>
134+
<TextField{...fields.email}logintype="email"label="Email"/>
135+
</FormField>
136+
</div>
137+
<div>
138+
<FormField{...fields.password}>
139+
<TextField{...fields.password}logintype="password"label="Password"/>
140+
</FormField>
141+
</div>
142+
</div>
143+
{/* input end*/}
144+
145+
<divstyleName="login-btn">
146+
<Button
147+
type="submit"color="black"
148+
className={styles.btnLogin}onClick={(e)=>this.handleSignup(handleSigned,signedUser)}
149+
>
150+
Sign Up
151+
</Button>
152+
</div>
153+
<divstyleName="dont-have">
154+
Don&#8217;t have an account?<ahref="#"diff-272d20c0bd8f77616b84d4f5e629987c3fd8e98aa88964368fc0313dc6cd41e2-empty-155-0" data-selected="false" role="gridcell" tabindex="-1" valign="top">
155+
</div>
156+
</form>
157+
</Modal>
158+
159+
160+
</div>
161+
);
162+
}
163+
}
164+
165+
SignupModal.propTypes={
166+
handleSubmit:PropTypes.func.isRequired,
167+
};
168+
169+
constfields=['email','password','emailUp','passwordUp'];
170+
171+
constvalidate=(values)=>{
172+
consterrors={};
173+
if(!values.email){
174+
errors.email='Email is required';
175+
}elseif(!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(values.email)){
176+
errors.email='Invalid email address';
177+
}
178+
if(!values.password){
179+
errors.password='Password is required';
180+
}
181+
returnerrors;
182+
};
183+
184+
185+
exportdefaultreduxForm({form:'signupForm', fields, validate})(CSSModules(SignupModal,styles));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp