Skip to content

Commit 8dc5520

Browse files
committed
Add login form text
1 parent 4485aa4 commit 8dc5520

5 files changed

Lines changed: 73 additions & 25 deletions

File tree

img/example.png

11.8 KB
Loading

js/components/blocks/LoadingBlock.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const LoadingBlock = React.createClass({
1111
return (
1212
<div className="content-block">
1313
<img
14-
src="img/animated_loading_icon.gif"
14+
src="build/img/animated_loading_icon.gif"
1515
className="center-block loading-icon"
1616
/>
1717
</div>

js/components/blocks/LoginForm.js

Lines changed: 47 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import React from 'react';
44
import Reflux from 'reflux';
55
//
66
import { Input, Button, Alert } from 'react-bootstrap';
7+
import FontAwesome from 'react-fontawesome';
8+
//
9+
import ShareBlock from './ShareBlock';
710
//
811
import UserActions from '../../actions/UserActions';
912
//
@@ -25,29 +28,50 @@ const LoginForm = React.createClass({
2528
console.log('userStore', userStore);
2629
//
2730
return (
28-
<div className="login-form">
29-
{
30-
!userStore ?
31-
<form className="form-horizontal">
32-
{
33-
userStore && userStore.alertType ?
34-
<div className="clearfix">
35-
<Alert bsStyle={userStore.alertType}>
36-
{userStore.alertMessage}
37-
</Alert>
38-
</div> :
39-
null
40-
}
41-
<Button
42-
bsStyle="primary"
43-
className="pull-right"
44-
onClick={this.handleLoginClick}
45-
>
46-
Login with Github
47-
</Button>
48-
</form> :
49-
null
50-
}
31+
<div className="container login-container">
32+
<p className="login-header">
33+
GITHUBIFY.<span className="header-title">me</span>
34+
</p>
35+
<h4 className="login-page-paragraph">
36+
Welcome to the place where you can easily manage and organize tags for your Github repositories. You will have ability to set tags for your own repos, repositories that you have been added to as a collaborator and even starred repos!
37+
</h4>
38+
<h4 className="login-page-paragraph">
39+
<strong>Note:</strong> maximum count of tags per user is 30
40+
</h4>
41+
<img
42+
src="build/img/example.png"
43+
className="center-block example-tags img-responsive"
44+
/>
45+
<div className="login-form">
46+
{
47+
!userStore ?
48+
<form className="form-horizontal">
49+
{
50+
userStore && userStore.alertType ?
51+
<div className="clearfix">
52+
<Alert bsStyle={userStore.alertType}>
53+
{userStore.alertMessage}
54+
</Alert>
55+
</div> :
56+
null
57+
}
58+
<Button
59+
bsStyle="primary"
60+
className="center-block text-center"
61+
onClick={this.handleLoginClick}
62+
>
63+
Login with Github
64+
<FontAwesome
65+
className="login-button-icon"
66+
name="github"
67+
/>
68+
</Button>
69+
Tell your friends:
70+
<ShareBlock />
71+
</form> :
72+
null
73+
}
74+
</div>
5175
</div>
5276
);
5377
}

js/components/blocks/ShareBlock.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const ShareBlock = React.createClass({
2929

3030
render() {
3131
let shareUrl = 'http://githubify.me/';
32-
let title = 'Githubify.me';
32+
let title = 'Githubify.me (place to manage and organize tags for your repos)';
3333
//
3434
return (
3535
<div className="share-block center-block">

less/components.less

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,15 @@
7979
.tag {
8080
font-size: @font-size-h4;
8181
margin-right: 5px;
82+
margin-bottom: 5px;
8283
background: lighten(@brand-primary, 37%);
8384
border: 1px solid @brand-primary;
8485
border-radius: 7px;
8586
color: darken(@brand-primary, 10%);
8687
padding: 4px 10px 5px;
8788
cursor: pointer;
8889
position: relative;
90+
display: inline-table;
8991
&:hover, &.active {
9092
color: #fff;
9193
background: @brand-primary;
@@ -190,3 +192,25 @@
190192
display: table-cell;
191193
margin-left: 5px;
192194
}
195+
196+
.login-button-icon {
197+
margin-left: 5px;
198+
}
199+
200+
.login-header {
201+
margin: 30px 0;
202+
font-size: 42px;
203+
}
204+
205+
.login-page-paragraph {
206+
text-indent: 45px;
207+
margin-bottom: 20px;
208+
line-height: 28px;
209+
}
210+
211+
.example-tags {
212+
margin-bottom: 40px;
213+
&:hover {
214+
.box-shadow(0 0 20px -5px rgba(0,0,0,.2));
215+
}
216+
}

0 commit comments

Comments
 (0)