Commit dc0d0c739f0cd274ab2881a17e76c3860952849b
1 parent
eb7931b255
Exists in
master
merged Ajays code
Showing
11 changed files
with
611 additions
and
215 deletions
Show diff stats
client/main.html
| ... | ... | @@ -14,13 +14,16 @@ |
| 14 | 14 | type='text/css' |
| 15 | 15 | /> |
| 16 | 16 | |
| 17 | + <link href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet"> | |
| 18 | + | |
| 17 | 19 | <link href="css/assets/css/icons/icomoon/styles.css" rel="stylesheet" type="text/css"> |
| 18 | 20 | <link href="css/assets/css/bootstrap.css" rel="stylesheet" type="text/css"> |
| 19 | 21 | <link href="css/assets/css/core.css" rel="stylesheet" type="text/css"> |
| 20 | 22 | <link href="css/assets/css/components.css" rel="stylesheet" type="text/css"> |
| 21 | 23 | <link href="css/assets/css/colors.css" rel="stylesheet" type="text/css"> |
| 24 | + <link href="css/assets/css/custom.css" rel="stylesheet" type="text/css"> | |
| 22 | 25 | <link href="https://fonts.googleapis.com/css?family=Alef" rel='stylesheet'> |
| 23 | - | |
| 26 | + | |
| 24 | 27 | <link |
| 25 | 28 | href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" |
| 26 | 29 | rel="stylesheet" | ... | ... |
client/stylesheets/custom.css
imports/client/layouts/NonOrgApp.css
| ... | ... | @@ -0,0 +1,14 @@ |
| 1 | +.brand-style | |
| 2 | +{ | |
| 3 | + color:#00b395 !important; | |
| 4 | + font-size: x-large; | |
| 5 | + margin-left: -45px !important; | |
| 6 | + font-family: 'Ubuntu', sans-serif; | |
| 7 | +} | |
| 8 | + | |
| 9 | +.navbar-default .navbar-nav > li > a | |
| 10 | +{ | |
| 11 | + color:#00b395 !important; | |
| 12 | + font-family: 'Ubuntu', sans-serif; | |
| 13 | + font-size: larger; | |
| 14 | +} | ... | ... |
imports/client/layouts/NonOrgApp.js
| 1 | 1 | import React, { Component } from 'react'; |
| 2 | 2 | import { Grid } from 'react-bootstrap'; |
| 3 | +import { Link } from 'react-router'; | |
| 4 | +import { Row, Col, FormGroup, | |
| 5 | + ControlLabel, FormControl, | |
| 6 | + InputGroup, Button, | |
| 7 | + Navbar,Modal, Nav, NavItem, | |
| 8 | + Glyphicon, Collapse, | |
| 9 | + NavbarToggler, NavbarBrand, | |
| 10 | + NavLink, DropdownItem, DropdownToggle, DropdownMenu, | |
| 11 | + NavDropdown, MenuItem } from 'react-bootstrap'; | |
| 12 | +import { LinkContainer } from 'react-router-bootstrap'; | |
| 13 | +import './NonOrgApp.css'; | |
| 3 | 14 | /** |
| 4 | 15 | * user based redirection will take place here |
| 5 | 16 | */ |
| ... | ... | @@ -13,6 +24,21 @@ import { Grid } from 'react-bootstrap'; |
| 13 | 24 | render(){ |
| 14 | 25 | return ( |
| 15 | 26 | <div> |
| 27 | + <Navbar> | |
| 28 | + <Navbar.Header> | |
| 29 | + <Navbar.Brand className='brand-style'> | |
| 30 | + <Link to="/">YOUNGDESK</Link> | |
| 31 | + </Navbar.Brand> | |
| 32 | + <Navbar.Toggle /> | |
| 33 | + </Navbar.Header> | |
| 34 | + <Navbar.Collapse> | |
| 35 | + <Nav pullRight> | |
| 36 | + <LinkContainer to="login" > | |
| 37 | + <NavItem className='nav-item' eventKey={ 2 } href="/login">Log in</NavItem> | |
| 38 | + </LinkContainer> | |
| 39 | + </Nav> | |
| 40 | + </Navbar.Collapse> | |
| 41 | + </Navbar> | |
| 16 | 42 | <Grid> |
| 17 | 43 | { this.props.children } |
| 18 | 44 | </Grid> | ... | ... |
imports/client/views/nonOrg/enter/SignupView.js
| 1 | -import React from 'react'; | |
| 2 | -import { Link } from 'react-router'; | |
| 3 | -import { Row, Col, FormGroup, | |
| 4 | - ControlLabel, FormControl, | |
| 5 | - InputGroup, Button } from 'react-bootstrap'; | |
| 6 | -import handleSignup from './signup'; | |
| 7 | -import { Orgs } from '/imports/collections/orgs/index'; | |
| 8 | -import './signup.css'; | |
| 9 | - | |
| 10 | -export default class Signup extends React.Component { | |
| 11 | - constructor(props) { | |
| 12 | - super(props); | |
| 13 | - this.state = { | |
| 14 | - orgSlug: "" | |
| 15 | - }; | |
| 16 | - } | |
| 17 | - componentWillMount(){ | |
| 18 | - Meteor.subscribe('allOrgsSlug'); | |
| 19 | - } | |
| 20 | - | |
| 21 | - componentDidMount() { | |
| 22 | - handleSignup({ component: this }); | |
| 23 | - } | |
| 24 | - handleChange(e) { | |
| 25 | - this.setState({ orgSlug: e.target.value }); | |
| 26 | - } | |
| 27 | - handleSubmit(event) { | |
| 28 | - event.preventDefault(); | |
| 29 | - } | |
| 30 | - checkExistingOrgSlug() { | |
| 31 | - if(this.state.orgSlug==""){return null} | |
| 32 | - searchOrg = Orgs.find({slug:this.state.orgSlug}).fetch(); | |
| 33 | - if(searchOrg.length>0){ | |
| 34 | - return "error" | |
| 35 | - }else{ | |
| 36 | - return "success" | |
| 37 | - } | |
| 38 | - } | |
| 39 | - render() { | |
| 40 | - return ( | |
| 41 | - <div className="Signup"> | |
| 42 | - <Row> | |
| 43 | - <Col md={ 12 }> | |
| 44 | - <h4 className="page-header">Sign Up</h4> | |
| 45 | - <form | |
| 46 | - ref={ form => (this.signupForm = form) } | |
| 47 | - onSubmit={ this.handleSubmit } | |
| 48 | - > | |
| 49 | - <Row> | |
| 50 | - <Col xs={ 10 } sm={ 10 }> | |
| 51 | - <FormGroup controlId="orgSlugField" validationState={this.checkExistingOrgSlug()}> | |
| 52 | - <ControlLabel>Organisation URL</ControlLabel> | |
| 53 | - <InputGroup> | |
| 54 | - <FormControl | |
| 55 | - type ="text" | |
| 56 | - ref ="orgSlug" | |
| 57 | - name ="orgSlug" | |
| 58 | - placeholder ="Organisation URL" | |
| 59 | - onChange = {(e) => this.handleChange(e)} | |
| 60 | - /> | |
| 61 | - <InputGroup.Addon>@yd.com</InputGroup.Addon> | |
| 62 | - </InputGroup> | |
| 63 | - </FormGroup> | |
| 64 | - </Col> | |
| 65 | - </Row> | |
| 66 | - <Row> | |
| 67 | - <Col xs={ 6 } sm={ 6 }> | |
| 68 | - <FormGroup> | |
| 69 | - <ControlLabel>Organisation Name</ControlLabel> | |
| 70 | - <FormControl | |
| 71 | - type="text" | |
| 72 | - ref="orgName" | |
| 73 | - name="orgName" | |
| 74 | - placeholder="Organisation Name" | |
| 75 | - /> | |
| 76 | - </FormGroup> | |
| 77 | - </Col> | |
| 78 | - </Row> | |
| 79 | - <Row> | |
| 80 | - <Col xs={ 6 } sm={ 6 }> | |
| 81 | - <FormGroup> | |
| 82 | - <ControlLabel>First Name</ControlLabel> | |
| 83 | - <FormControl | |
| 84 | - type="text" | |
| 85 | - ref="firstName" | |
| 86 | - name="firstName" | |
| 87 | - placeholder="First Name" | |
| 88 | - /> | |
| 89 | - </FormGroup> | |
| 90 | - </Col> | |
| 91 | - <Col xs={ 6 } sm={ 6 }> | |
| 92 | - <FormGroup> | |
| 93 | - <ControlLabel>Last Name</ControlLabel> | |
| 94 | - <FormControl | |
| 95 | - type="text" | |
| 96 | - ref="lastName" | |
| 97 | - name="lastName" | |
| 98 | - placeholder="Last Name" | |
| 99 | - /> | |
| 100 | - </FormGroup> | |
| 101 | - </Col> | |
| 102 | - </Row> | |
| 103 | - <FormGroup> | |
| 104 | - <ControlLabel>Email Address</ControlLabel> | |
| 105 | - <FormControl | |
| 106 | - type="text" | |
| 107 | - ref="emailAddress" | |
| 108 | - name="emailAddress" | |
| 109 | - placeholder="Email Address" | |
| 110 | - /> | |
| 111 | - </FormGroup> | |
| 112 | - <FormGroup> | |
| 113 | - <ControlLabel>Password</ControlLabel> | |
| 114 | - <FormControl | |
| 115 | - type="password" | |
| 116 | - ref="password" | |
| 117 | - name="password" | |
| 118 | - placeholder="Password" | |
| 119 | - /> | |
| 120 | - </FormGroup> | |
| 121 | - {/* <Col md={12} */} | |
| 122 | - <Button type="submit" style={{float: 'right'}} bsStyle="success">Sign Up</Button> | |
| 123 | - | |
| 124 | - </form> | |
| 125 | - </Col> | |
| 126 | - </Row> | |
| 127 | - </div> | |
| 128 | - ); | |
| 129 | - } | |
| 130 | -} | |
| 1 | +import React from 'react'; | |
| 2 | +import { Link } from 'react-router'; | |
| 3 | +import { Icon } from '/imports/client/components/Icon'; | |
| 4 | +import { LinkContainer } from 'react-router-bootstrap'; | |
| 5 | +import { Row, Col, FormGroup, | |
| 6 | + ControlLabel, FormControl, | |
| 7 | + InputGroup, Button, | |
| 8 | + Navbar,Modal, Nav, NavItem, | |
| 9 | + Glyphicon, Collapse, | |
| 10 | + NavbarToggler, NavbarBrand, | |
| 11 | + NavLink, DropdownItem, DropdownToggle, DropdownMenu, | |
| 12 | + NavDropdown, MenuItem } from 'react-bootstrap'; | |
| 13 | +import handleSignup from './signup'; | |
| 14 | +import { Orgs } from '/imports/collections/orgs/index'; | |
| 15 | +import { Meteor } from 'meteor/meteor'; | |
| 16 | + | |
| 17 | +import './signup.css'; | |
| 18 | + | |
| 19 | +export default class Signup extends React.Component { | |
| 20 | + constructor(props) { | |
| 21 | + super(props); | |
| 22 | + this.state = { | |
| 23 | + orgSlug: "" | |
| 24 | + }; | |
| 25 | + } | |
| 26 | + componentWillMount(){ | |
| 27 | + Meteor.subscribe('allOrgsSlug'); | |
| 28 | + } | |
| 29 | + | |
| 30 | + componentDidMount() { | |
| 31 | + handleSignup({ component: this }); | |
| 32 | + } | |
| 33 | + handleChange(e) { | |
| 34 | + this.setState({ orgSlug: e.target.value }); | |
| 35 | + } | |
| 36 | + handleSubmit(event) { | |
| 37 | + event.preventDeult(); | |
| 38 | + } | |
| 39 | + checkExistingOrgSlug() { | |
| 40 | + if(this.state.orgSlug==""){return null} | |
| 41 | + searchOrg = Orgs.find({slug:this.state.orgSlug}).fetch(); | |
| 42 | + if(searchOrg.length>0){ | |
| 43 | + return "error" | |
| 44 | + }else{ | |
| 45 | + return "success" | |
| 46 | + } | |
| 47 | + } | |
| 48 | + | |
| 49 | + render() | |
| 50 | + { | |
| 51 | + // const {user, org} = this.props.data; | |
| 52 | + return( | |
| 53 | + <div> | |
| 54 | + <div className="wrapper"> | |
| 55 | + <div className="Content"> | |
| 56 | + <Row> | |
| 57 | + <Col md={ 12 }> | |
| 58 | + <h1>Welcome to YoungDesk!!!</h1> | |
| 59 | + | |
| 60 | + <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor | |
| 61 | + incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation | |
| 62 | + ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit | |
| 63 | + in voluptate velit esse cillum dolore eu fugiat nulla pariatur.Excepteur sint occaecat cupidatat non proident, | |
| 64 | + sunt in culpa qui officia deserunt mollit anim id est laborum.</p> | |
| 65 | + </Col> | |
| 66 | + </Row> | |
| 67 | + <Row> | |
| 68 | + <Col> | |
| 69 | + <br></br> | |
| 70 | + <br></br> | |
| 71 | + </Col> | |
| 72 | + </Row> | |
| 73 | + <Row> | |
| 74 | + <Col md={ 3 }> | |
| 75 | + <div className="service-box"> | |
| 76 | + <i className="fa fa-4x fa-diamond"></i> | |
| 77 | + <h6>Lorem Ipsum</h6> | |
| 78 | + </div> | |
| 79 | + </Col> | |
| 80 | + <Col md={ 3 }> | |
| 81 | + <div className="service-box"> | |
| 82 | + <i className="fa fa-4x fa-paper-plane"></i> | |
| 83 | + <h6>Lorem Ipsum</h6> | |
| 84 | + </div> | |
| 85 | + </Col> | |
| 86 | + <Col md={ 3 }> | |
| 87 | + <div className="service-box"> | |
| 88 | + <i className="fa fa-4x fa-newspaper-o"></i> | |
| 89 | + <h6>Lorem Ipsum</h6> | |
| 90 | + </div> | |
| 91 | + </Col> | |
| 92 | + <Col md={ 3 }> | |
| 93 | + <div className="service-box"> | |
| 94 | + <i className="fa fa-4x fa-heart"></i> | |
| 95 | + <h6>Lorem Ipsum</h6> | |
| 96 | + </div> | |
| 97 | + </Col> | |
| 98 | + </Row> | |
| 99 | + <Row> | |
| 100 | + <Col> | |
| 101 | + <br></br> | |
| 102 | + <hr></hr> | |
| 103 | + </Col> | |
| 104 | + </Row> | |
| 105 | + <Row> | |
| 106 | + <Col md={ 12 }> | |
| 107 | + <div className="service-box"> | |
| 108 | + <h2 className="section-heading">Lets Get In Touch!</h2> | |
| 109 | + </div> | |
| 110 | + </Col> | |
| 111 | + </Row> | |
| 112 | + <hr width="10%"></hr> | |
| 113 | + <Row> | |
| 114 | + <Col md={ 6 }> | |
| 115 | + <div className="service-box"> | |
| 116 | + <i className="fa fa-phone fa-2x"></i> | |
| 117 | + <p className="contact">123-456-6789</p> | |
| 118 | + </div> | |
| 119 | + </Col> | |
| 120 | + <Col md={ 6 }> | |
| 121 | + <div className="service-box"> | |
| 122 | + <i className="fa fa-envelope-o fa-2x"></i> | |
| 123 | + <p className="contact">feedback@youngdesk.com</p> | |
| 124 | + </div> | |
| 125 | + </Col> | |
| 126 | + </Row> | |
| 127 | + </div> | |
| 128 | + | |
| 129 | + <div className="Signup"> | |
| 130 | + <Row> | |
| 131 | + <Col md={ 12 }> | |
| 132 | + <h4 className="page-header">Sign up with Us</h4> | |
| 133 | + <hr></hr> | |
| 134 | + <form | |
| 135 | + ref={ form => (this.signupForm = form) } | |
| 136 | + onSubmit={ this.handleSubmit } | |
| 137 | + > | |
| 138 | + <span className="side-heading"> Organisation Details </span> | |
| 139 | + | |
| 140 | + <Row> | |
| 141 | + <Col md={ 12 }> | |
| 142 | + <FormGroup controlId="orgSlugField" validationState={this.checkExistingOrgSlug()}> | |
| 143 | + {/* <ControlLabel>Organisation URL</ControlLabel> */} | |
| 144 | + <InputGroup> | |
| 145 | + <FormControl | |
| 146 | + type ="text" | |
| 147 | + ref ="orgSlug" | |
| 148 | + name ="orgSlug" | |
| 149 | + placeholder ="Organisation URL" | |
| 150 | + onChange = {(e) => this.handleChange(e)} | |
| 151 | + /> | |
| 152 | + <InputGroup.Addon>@yd.com</InputGroup.Addon> | |
| 153 | + </InputGroup> | |
| 154 | + </FormGroup> | |
| 155 | + </Col> | |
| 156 | + </Row> | |
| 157 | + | |
| 158 | + <Row> | |
| 159 | + <Col md={12}> | |
| 160 | + <FormGroup> | |
| 161 | + {/* <ControlLabel>Organisation Name</ControlLabel> */} | |
| 162 | + <FormControl | |
| 163 | + type="text" | |
| 164 | + ref="orgName" | |
| 165 | + name="orgName" | |
| 166 | + placeholder="Organisation Name" | |
| 167 | + /> | |
| 168 | + </FormGroup> | |
| 169 | + </Col> | |
| 170 | + </Row> | |
| 171 | + <hr width="25%"></hr> | |
| 172 | + <span className="side-heading"> Personal Details </span> | |
| 173 | + <Row> | |
| 174 | + <Col xs={ 6 } md={4} > | |
| 175 | + <FormGroup> | |
| 176 | + {/* <ControlLabel>First Name</ControlLabel> */} | |
| 177 | + <FormControl | |
| 178 | + type="text" | |
| 179 | + ref="firstName" | |
| 180 | + name="firstName" | |
| 181 | + placeholder="First Name" | |
| 182 | + /> | |
| 183 | + </FormGroup> | |
| 184 | + </Col> | |
| 185 | + <Col xs={ 6 } md={4}> | |
| 186 | + <FormGroup> | |
| 187 | + {/* <ControlLabel>Middle Name</ControlLabel> */} | |
| 188 | + <FormControl | |
| 189 | + type="text" | |
| 190 | + ref="midName" | |
| 191 | + name="midName" | |
| 192 | + placeholder="Middle Name" | |
| 193 | + /> | |
| 194 | + </FormGroup> | |
| 195 | + </Col> | |
| 196 | + <Col xs={ 6 } md={4}> | |
| 197 | + <FormGroup> | |
| 198 | + {/* <ControlLabel>Last Name</ControlLabel> */} | |
| 199 | + <FormControl | |
| 200 | + type="text" | |
| 201 | + ref="lastName" | |
| 202 | + name="lastName" | |
| 203 | + placeholder="Last Name" | |
| 204 | + /> | |
| 205 | + </FormGroup> | |
| 206 | + </Col> | |
| 207 | + </Row> | |
| 208 | + <hr width="25%"></hr> | |
| 209 | + <span className="side-heading">User Credentials</span> | |
| 210 | + <FormGroup> | |
| 211 | + {/* <ControlLabel>Email Address</ControlLabel> */} | |
| 212 | + <FormControl | |
| 213 | + type="text" | |
| 214 | + ref="emailAddress" | |
| 215 | + name="emailAddress" | |
| 216 | + placeholder="Email Address" | |
| 217 | + /> | |
| 218 | + </FormGroup> | |
| 219 | + <FormGroup> | |
| 220 | + {/* <ControlLabel>Password</ControlLabel> */} | |
| 221 | + <FormControl | |
| 222 | + type="password" | |
| 223 | + ref="password" | |
| 224 | + name="password" | |
| 225 | + placeholder="Password" | |
| 226 | + /> | |
| 227 | + </FormGroup> | |
| 228 | + {/* <Col md={12} */} | |
| 229 | + <Button type="submit" style={{float:"right"}} className='blue'>Sign Up</Button> | |
| 230 | + | |
| 231 | + </form> | |
| 232 | + </Col> | |
| 233 | + </Row> | |
| 234 | + </div> | |
| 235 | + </div> | |
| 236 | + </div> | |
| 237 | + | |
| 238 | + ); | |
| 239 | + } | |
| 240 | +} | ... | ... |
imports/client/views/nonOrg/enter/signup.css
| 1 | 1 | .Signup |
| 2 | 2 | { |
| 3 | + float: right; | |
| 4 | + margin: 20px auto; | |
| 5 | + width: 400px; | |
| 6 | + height: auto; | |
| 7 | + padding: 20px; | |
| 8 | + -webkit-border-radius: 8px/7px; | |
| 9 | + -moz-border-radius: 8px/7px; | |
| 10 | + border-radius: 8px/7px; | |
| 3 | 11 | background-color: white; |
| 4 | - margin: auto; | |
| 5 | - width: 40%; | |
| 6 | - border: 3px solid #73AD21; | |
| 7 | - padding: 10px; | |
| 12 | + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 13 | + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 14 | + box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 15 | + border: solid 1px #cbc9c9; | |
| 16 | + font-family: 'Ubuntu', sans-serif; | |
| 17 | +} | |
| 18 | + | |
| 19 | +.Content | |
| 20 | +{ | |
| 21 | + margin: 20px auto; | |
| 22 | + width: 750px; | |
| 23 | + height: auto; | |
| 24 | + padding: 20px; | |
| 25 | + font-family: 'Ubuntu', sans-serif; | |
| 26 | + color: white; | |
| 27 | + float:left; | |
| 28 | +} | |
| 29 | + | |
| 30 | +.section-heading | |
| 31 | +{ | |
| 32 | + text-align: center; | |
| 33 | +} | |
| 34 | + | |
| 35 | +.contact | |
| 36 | +{ | |
| 37 | + text-align: center; | |
| 38 | + text-indent: 0px !important; | |
| 39 | +} | |
| 40 | + | |
| 41 | +.container | |
| 42 | +{ | |
| 43 | + /*width:1300px !important;*/ | |
| 44 | +} | |
| 45 | + | |
| 46 | +h1 | |
| 47 | +{ | |
| 48 | + font-size: 45px !important; | |
| 49 | +} | |
| 50 | + | |
| 51 | +p | |
| 52 | +{ | |
| 53 | + text-indent: 50px; | |
| 54 | + text-align: justify; | |
| 55 | + font-size:15px; | |
| 56 | +} | |
| 57 | + | |
| 58 | +h6 | |
| 59 | +{ | |
| 60 | + text-align: center; | |
| 61 | +} | |
| 62 | + | |
| 63 | +i | |
| 64 | +{ | |
| 65 | + display: inline-block; | |
| 66 | + width: 100%; | |
| 67 | + text-align: center; | |
| 68 | +} | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | +.wrapper | |
| 73 | +{ | |
| 74 | + overflow: hidden; | |
| 8 | 75 | } |
| 9 | 76 | |
| 10 | 77 | .page-header |
| 11 | 78 | { |
| 12 | 79 | text-align: center; |
| 80 | + color:#00b395; | |
| 81 | + font-weight: bolder; | |
| 82 | +} | |
| 83 | + | |
| 84 | +.side-heading | |
| 85 | +{ | |
| 86 | + /*padding: 10px;*/ | |
| 87 | + text-align: left; | |
| 88 | + font-weight: bold; | |
| 89 | + color:#00b395; | |
| 90 | + font-size: 14px; | |
| 91 | +} | |
| 92 | + | |
| 93 | +hr { | |
| 94 | + display: block; | |
| 95 | + height: 1px; | |
| 96 | + border: 0; | |
| 97 | + border-top: 1px solid #00b395; | |
| 98 | + padding: 0; | |
| 99 | +} | |
| 100 | + | |
| 101 | +.blue { | |
| 102 | + background-color: #00b395; | |
| 103 | + background-image: -webkit-linear-gradient(top,#00b395,#00cdaa); | |
| 104 | + background-image: -moz-linear-gradient(top,#00b395,#00cdaa); | |
| 105 | + background-image: -ms-linear-gradient(top,#00b395,#00cdaa); | |
| 106 | + background-image: -o-linear-gradient(top,#00b395,#00cdaa); | |
| 107 | + background-image: linear-gradient(top,#00b395,#00cdaa); | |
| 108 | + | |
| 109 | + border: 1px solid #00b395; | |
| 110 | + color: white; | |
| 111 | + | |
| 112 | + font-size: 13px; | |
| 113 | + font-weight: bold; | |
| 114 | + text-align: center; | |
| 115 | + height: 27px; | |
| 116 | + line-height: 27px; | |
| 117 | + min-width: 54px; | |
| 118 | + padding: 0 10px; | |
| 119 | + text-decoration: none; | |
| 120 | +} | |
| 121 | + | |
| 122 | +.blue:hover { | |
| 123 | + border: 1px solid #00b395; | |
| 124 | + | |
| 125 | + color: white; | |
| 126 | + background-color: #00b395; | |
| 127 | + background-image: -webkit-linear-gradient(top,#00b395,#009f85); | |
| 128 | + background-image: -moz-linear-gradient(top,#00b395,#009f85); | |
| 129 | + background-image: -ms-linear-gradient(top,#00b395,#009f85); | |
| 130 | + background-image: -o-linear-gradient(top,#00b395,#009f85); | |
| 131 | + background-image: linear-gradient(top,#00b395,#009f85); | |
| 132 | + | |
| 133 | + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1); | |
| 134 | + -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1); | |
| 135 | + box-shadow: 0 1px 1px rgba(0,0,0,.1); | |
| 136 | + width: auto; | |
| 137 | + height: 27px; | |
| 13 | 138 | } | ... | ... |
imports/client/views/org/enter/LoginPane.js
| ... | ... | @@ -28,7 +28,7 @@ export class LoginPane extends React.Component { |
| 28 | 28 | </Link> |
| 29 | 29 | <div className="enterPane__box"> |
| 30 | 30 | <div className="enterPane__header"> |
| 31 | - Login | |
| 31 | + <h4>Login</h4> | |
| 32 | 32 | </div> |
| 33 | 33 | <Alert color="danger" isOpen={ this.props.data.visible || this.props.data.error.length !== 0 }> |
| 34 | 34 | { this.props.data.error } |
| ... | ... | @@ -36,6 +36,7 @@ export class LoginPane extends React.Component { |
| 36 | 36 | <Alert color="success" isOpen={ this.props.data.visible || this.props.data.message.length !== 0 }> |
| 37 | 37 | { this.props.data.message } |
| 38 | 38 | </Alert> |
| 39 | + <hr width="25%"></hr> | |
| 39 | 40 | <Form onSubmit={ (e) => this.props.onLogin(e) }> |
| 40 | 41 | <Col md={12}> |
| 41 | 42 | <FormGroup> |
| ... | ... | @@ -44,7 +45,7 @@ export class LoginPane extends React.Component { |
| 44 | 45 | onChange={ (e) => this.props.onUpdate('email', e.currentTarget.value) } |
| 45 | 46 | name="email" |
| 46 | 47 | id="email" |
| 47 | - placeholder="Enter your email" /> | |
| 48 | + placeholder="Email" /> | |
| 48 | 49 | </FormGroup></Col> |
| 49 | 50 | <Col md={12}> |
| 50 | 51 | <FormGroup> |
| ... | ... | @@ -53,28 +54,30 @@ export class LoginPane extends React.Component { |
| 53 | 54 | onChange={ (e) => this.props.onUpdate('password', e.currentTarget.value) } |
| 54 | 55 | name="password" |
| 55 | 56 | id="password" |
| 56 | - placeholder="Enter your password" /> | |
| 57 | + placeholder="Password" /> | |
| 57 | 58 | </FormGroup> |
| 58 | 59 | </Col> |
| 59 | - <Col md={12}> | |
| 60 | + <Col md={6}> | |
| 61 | + <FormGroup className="enterPane__formGroupLogin--center"> | |
| 62 | + <Link style={{float:"left"}} className="enterPane__link" | |
| 63 | + to={ setQueryParam(this.props.location, { enter: 'forgot' }) }> | |
| 64 | + Forgot your password? | |
| 65 | + </Link> | |
| 66 | + </FormGroup> | |
| 67 | + </Col> | |
| 68 | + <Col md={6}> | |
| 60 | 69 | <FormGroup> |
| 61 | 70 | <ActionButton |
| 62 | 71 | loading={ this.props.data.loading }> |
| 63 | 72 | <Button |
| 64 | - color="success" size="sm" | |
| 65 | - type="submit" | |
| 66 | - block> | |
| 73 | + className='blue' | |
| 74 | + type="submit" style={{float:"right"}}> | |
| 67 | 75 | Log in |
| 68 | 76 | </Button> |
| 69 | 77 | </ActionButton> |
| 70 | 78 | </FormGroup> |
| 71 | 79 | </Col> |
| 72 | - <FormGroup className="enterPane__formGroupLogin--center"> | |
| 73 | - <Link className="enterPane__link" | |
| 74 | - to={ setQueryParam(this.props.location, { enter: 'forgot' }) }> | |
| 75 | - Forgotten password? | |
| 76 | - </Link> | |
| 77 | - </FormGroup> | |
| 80 | + | |
| 78 | 81 | </Form> |
| 79 | 82 | </div> |
| 80 | 83 | </div> | ... | ... |
imports/client/views/org/enter/loginpane.css
| 1 | -.enterPane__box{ | |
| 2 | -background-color: white; | |
| 3 | -margin: auto; | |
| 4 | - width: 30%; | |
| 5 | - border: 3px solid #73AD21; | |
| 6 | - padding: 10px; | |
| 1 | +.enterPane__box | |
| 2 | +{ | |
| 3 | + margin: 20px auto; | |
| 4 | + width: 400px; | |
| 5 | + height: 100%; | |
| 6 | + padding: 20px; | |
| 7 | + float:right; | |
| 8 | + -webkit-border-radius: 8px/7px; | |
| 9 | + -moz-border-radius: 8px/7px; | |
| 10 | + border-radius: 8px/7px; | |
| 11 | + background-color: white; | |
| 12 | + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 13 | + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 14 | + box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 15 | + border: solid 1px #cbc9c9; | |
| 16 | + font-family: 'Ubuntu', sans-serif; | |
| 7 | 17 | } |
| 8 | 18 | |
| 9 | - .enterPane__header{ | |
| 19 | + .enterPane__header | |
| 20 | + { | |
| 10 | 21 | text-align: center; |
| 11 | - font-weight: bold; | |
| 22 | + color:#00b395; | |
| 23 | + font-weight: bolder; | |
| 24 | + } | |
| 25 | + | |
| 26 | + .blue { | |
| 27 | + background-color: #00b395; | |
| 28 | + background-image: -webkit-linear-gradient(top,#00b395,#00cdaa); | |
| 29 | + background-image: -moz-linear-gradient(top,#00b395,#00cdaa); | |
| 30 | + background-image: -ms-linear-gradient(top,#00b395,#00cdaa); | |
| 31 | + background-image: -o-linear-gradient(top,#00b395,#00cdaa); | |
| 32 | + background-image: linear-gradient(top,#00b395,#00cdaa); | |
| 33 | + | |
| 34 | + border: 1px solid #00b395; | |
| 35 | + color: white; | |
| 36 | + | |
| 37 | + font-size: 13px; | |
| 38 | + font-weight: bold; | |
| 39 | + text-align: center; | |
| 40 | + height: 27px; | |
| 41 | + line-height: 27px; | |
| 42 | + min-width: 54px; | |
| 43 | + padding: 0 10px; | |
| 44 | + text-decoration: none; | |
| 45 | + } | |
| 46 | + | |
| 47 | + .form-group | |
| 48 | + { | |
| 49 | + clear:both; | |
| 50 | + } | |
| 51 | + | |
| 52 | + .enterPane__link | |
| 53 | + { | |
| 54 | + text-decoration: underline; | |
| 55 | + } | |
| 56 | + | |
| 57 | + .blue:hover { | |
| 58 | + border: 1px solid #00b395; | |
| 59 | + | |
| 60 | + color: white; | |
| 61 | + background-color: #00b395; | |
| 62 | + background-image: -webkit-linear-gradient(top,#00b395,#009f85); | |
| 63 | + background-image: -moz-linear-gradient(top,#00b395,#009f85); | |
| 64 | + background-image: -ms-linear-gradient(top,#00b395,#009f85); | |
| 65 | + background-image: -o-linear-gradient(top,#00b395,#009f85); | |
| 66 | + background-image: linear-gradient(top,#00b395,#009f85); | |
| 67 | + | |
| 68 | + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1); | |
| 69 | + -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1); | |
| 70 | + box-shadow: 0 1px 1px rgba(0,0,0,.1); | |
| 71 | + width: auto; | |
| 72 | + height: 27px; | |
| 12 | 73 | } | ... | ... |
imports/client/views/verify/EmailPane.js
| ... | ... | @@ -39,38 +39,28 @@ export class EmailPane extends React.Component { |
| 39 | 39 | const {user} = this.props; |
| 40 | 40 | |
| 41 | 41 | return ( |
| 42 | - <div className = "wizardPane-box"> | |
| 43 | - <div className = "wizardPane-section"> | |
| 44 | - {/* <div className="icon-circle icon-lg"> | |
| 45 | - <i className="icon icon-simple icon-envelope"></i> | |
| 46 | - </div> */} | |
| 47 | - <div className = "wizardPane-title"> | |
| 48 | - Enter your email address | |
| 49 | - </div> | |
| 50 | - <div className = "col-xs-8 horizontalform verifyEmail wizardPane-text"> | |
| 51 | - <div className="form-row"> | |
| 52 | - <Col sm={4}> | |
| 53 | - Enter email | |
| 54 | - </Col> | |
| 55 | - <Col sm={8}> | |
| 56 | - <input | |
| 57 | - type = "text" | |
| 58 | - value = {this.state.email} | |
| 59 | - onChange = {(evt) => this.onUpdate('email', evt.currentTarget.value)} | |
| 60 | - placeholder = "Email" | |
| 61 | - /> | |
| 42 | + <div className = "wizardPane-box1"> | |
| 43 | + <div> | |
| 44 | + <i className="fa fa-envelope-o fa-3x"></i> | |
| 45 | + </div> | |
| 46 | + <div> | |
| 47 | + <Row> | |
| 48 | + <Col md={12}> | |
| 49 | + <FormGroup> | |
| 50 | + <ControlLabel className='subheading'>Email</ControlLabel> | |
| 51 | + <FormControl | |
| 52 | + type="text" | |
| 53 | + value = {this.state.email} | |
| 54 | + onChange = {(evt) => this.onUpdate('email', evt.currentTarget.value)} | |
| 55 | + placeholder="Organisation Name" | |
| 56 | + /> | |
| 57 | + </FormGroup> | |
| 62 | 58 | </Col> |
| 59 | + </Row> | |
| 63 | 60 | </div> |
| 64 | - | |
| 65 | - </div> | |
| 66 | - </div> | |
| 67 | - <div className = "wizardPane-section wizardPane-footer"> | |
| 68 | - <div | |
| 69 | - className = "wizardPane-button btn btn-blue" | |
| 70 | - onClick = {() => this.onSetEmail()} | |
| 71 | - > | |
| 72 | - Send verification email | |
| 73 | - </div> | |
| 61 | + <div className = "wizardPane-sectionD wizardPane-footer"> | |
| 62 | + <Button type="submit" onClick = {() => this.onSetEmail()} className='blue'>Verify Now</Button> | |
| 63 | + {/* <Button type="submit" onClick = {() => this.onSetEmail()} className='blue'>Sign Up</Button> */} | |
| 74 | 64 | </div> |
| 75 | 65 | </div> |
| 76 | 66 | ); |
| ... | ... | @@ -85,12 +75,11 @@ export class EmailPane extends React.Component { |
| 85 | 75 | |
| 86 | 76 | <div className = "wizardPane-title"> |
| 87 | 77 | {/* <i className="icon-envelope icon"></i> */} |
| 88 | - <h3>Your email needs verification</h3> | |
| 89 | - </div> | |
| 90 | - <div className = "wizardPane-text"> | |
| 91 | - Please check your email – we sent a verification link to<br/> | |
| 78 | + <h3>Hi, your email needs verification</h3> | |
| 79 | + | |
| 80 | + <span>Please check your email – we sent a verification link to | |
| 92 | 81 | <span className = "EmailVerify"> |
| 93 | - {user.emails[0].address}</span> | |
| 82 | + {user.emails[0].address}</span></span> | |
| 94 | 83 | </div> |
| 95 | 84 | </div> |
| 96 | 85 | <div className = "wizardPane-sectionD wizardPane-footer"> | ... | ... |
imports/client/views/verify/emailpane.css
| 1 | +.wizardPane-box | |
| 2 | +{ | |
| 3 | + margin: 20px auto; | |
| 4 | + width: 400px; | |
| 5 | + height: auto; | |
| 6 | + padding: 20px; | |
| 7 | + -webkit-border-radius: 8px/7px; | |
| 8 | + -moz-border-radius: 8px/7px; | |
| 9 | + border-radius: 8px/7px; | |
| 10 | + background-color: white; | |
| 11 | + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 12 | + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 13 | + box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 14 | + border: solid 1px #cbc9c9; | |
| 15 | + font-family: 'Ubuntu', sans-serif; | |
| 16 | +} | |
| 17 | + | |
| 18 | +.wizardPane-box1 | |
| 19 | +{ | |
| 20 | + margin: 20px auto; | |
| 21 | + width: 300px; | |
| 22 | + height: auto; | |
| 23 | + padding: 20px; | |
| 24 | + -webkit-border-radius: 8px/7px; | |
| 25 | + -moz-border-radius: 8px/7px; | |
| 26 | + border-radius: 8px/7px; | |
| 27 | + background-color: white; | |
| 28 | + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 29 | + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 30 | + box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 31 | + border: solid 1px #cbc9c9; | |
| 32 | + font-family: 'Ubuntu', sans-serif; | |
| 33 | +} | |
| 34 | + | |
| 1 | 35 | .wizardPane-sectionD |
| 2 | 36 | { |
| 3 | 37 | background-color: white; |
| 4 | 38 | margin: auto; |
| 5 | - width: 30%; | |
| 39 | + width: 100%; | |
| 6 | 40 | padding: 10px; |
| 7 | 41 | top:50px; |
| 8 | 42 | cursor: pointer; |
| 9 | 43 | font-weight: bold; |
| 10 | - color: crimson; | |
| 44 | + color: #00b395; | |
| 11 | 45 | font-style: italic; |
| 46 | + text-align: center; | |
| 12 | 47 | } |
| 13 | 48 | |
| 14 | 49 | .EmailVerify |
| 15 | 50 | { |
| 16 | 51 | color:green; |
| 17 | 52 | font-weight: bold; |
| 53 | + font-style: normal !important; | |
| 54 | + color: #00b395; | |
| 55 | +} | |
| 56 | + | |
| 57 | +.subheading | |
| 58 | +{ | |
| 59 | + font-weight: bold; | |
| 60 | + color: #00b395; | |
| 18 | 61 | } |
| 19 | 62 | |
| 20 | 63 | .wizardPane-link:hover |
| ... | ... | @@ -22,32 +65,52 @@ |
| 22 | 65 | text-decoration: underline; |
| 23 | 66 | } |
| 24 | 67 | |
| 68 | +i | |
| 69 | +{ | |
| 70 | + display: inline-block; | |
| 71 | + width: 100%; | |
| 72 | + text-align: center; | |
| 73 | +} | |
| 74 | + | |
| 75 | +h3 | |
| 76 | +{ | |
| 77 | + margin-top: 0px !important; | |
| 78 | + text-align: center; | |
| 79 | + color: white; | |
| 80 | +} | |
| 81 | + | |
| 82 | +span | |
| 83 | +{ | |
| 84 | + font-size: 14px; | |
| 85 | + color: white; | |
| 86 | +} | |
| 87 | + | |
| 25 | 88 | .wizardPane-section1 |
| 26 | 89 | { |
| 27 | - margin:auto; | |
| 28 | - width: 30%; | |
| 29 | - padding: 10px; | |
| 30 | - background:#fff; | |
| 31 | - -webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; | |
| 32 | - -moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; | |
| 33 | - box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; | |
| 90 | + /*margin: 20px auto;*/ | |
| 91 | + width: 360px; | |
| 92 | + height: auto; | |
| 93 | + padding: 10px; | |
| 94 | + -webkit-border-radius: 8px/7px; | |
| 95 | + -moz-border-radius: 8px/7px; | |
| 96 | + border-radius: 8px/7px; | |
| 97 | + background-color: darkslategray; | |
| 34 | 98 | |
| 35 | 99 | } |
| 36 | 100 | |
| 37 | 101 | .wizardPane-section |
| 38 | 102 | { |
| 39 | - margin:auto; | |
| 40 | - width: 30%; | |
| 41 | - padding: 10px; | |
| 42 | - background:#fff; | |
| 43 | - -webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; | |
| 44 | - -moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; | |
| 45 | - box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; | |
| 103 | + width: 360px; | |
| 104 | + height: auto; | |
| 105 | + padding: 10px; | |
| 106 | + -webkit-border-radius: 8px/7px; | |
| 107 | + -moz-border-radius: 8px/7px; | |
| 108 | + border-radius: 8px/7px; | |
| 109 | + background-color: black; | |
| 46 | 110 | |
| 47 | 111 | } |
| 48 | 112 | |
| 49 | 113 | .wizardPane-title |
| 50 | 114 | { |
| 51 | - font-size: 20px; | |
| 52 | - color:black; | |
| 115 | + color:white; | |
| 53 | 116 | } | ... | ... |
imports/collections/students/methods.js
| ... | ... | @@ -80,8 +80,8 @@ export const addStudentManually = new ValidatedMethod({ |
| 80 | 80 | newParentId = Parents.insert({ |
| 81 | 81 | userId: newParentUserId, |
| 82 | 82 | orgId: orgId, |
| 83 | - address: data.address, | |
| 84 | - gender: data.gender, | |
| 83 | + address: data.address, | |
| 84 | + gender: data.gender, | |
| 85 | 85 | dob: data.dob, |
| 86 | 86 | rollNo: data.rollNo, |
| 87 | 87 | class: data.studentclass, |
| ... | ... | @@ -89,11 +89,7 @@ export const addStudentManually = new ValidatedMethod({ |
| 89 | 89 | bloodGroup: data.bloodGroup, |
| 90 | 90 | community: data.community, |
| 91 | 91 | }); |
| 92 | - console.log("newParentUserId"); | |
| 93 | - console.log(newParentUserId); | |
| 94 | 92 | } |
| 95 | - console.log("newUserId"); | |
| 96 | - console.log(newStudentId); | |
| 97 | 93 | if(newStudentId){ |
| 98 | 94 | Students.insert({ |
| 99 | 95 | userId: newStudentId, | ... | ... |