diff --git a/client/main.html b/client/main.html index 6595aeb..b162e7e 100644 --- a/client/main.html +++ b/client/main.html @@ -14,13 +14,16 @@ type='text/css' /> + + + - + li > a +{ + color:#00b395 !important; + font-family: 'Ubuntu', sans-serif; + font-size: larger; +} diff --git a/imports/client/layouts/NonOrgApp.js b/imports/client/layouts/NonOrgApp.js index cb5412d..0f82246 100644 --- a/imports/client/layouts/NonOrgApp.js +++ b/imports/client/layouts/NonOrgApp.js @@ -1,5 +1,16 @@ import React, { Component } from 'react'; import { Grid } from 'react-bootstrap'; +import { Link } from 'react-router'; +import { Row, Col, FormGroup, + ControlLabel, FormControl, + InputGroup, Button, + Navbar,Modal, Nav, NavItem, + Glyphicon, Collapse, + NavbarToggler, NavbarBrand, + NavLink, DropdownItem, DropdownToggle, DropdownMenu, + NavDropdown, MenuItem } from 'react-bootstrap'; +import { LinkContainer } from 'react-router-bootstrap'; +import './NonOrgApp.css'; /** * user based redirection will take place here */ @@ -13,6 +24,21 @@ import { Grid } from 'react-bootstrap'; render(){ return (
+ + + + YOUNGDESK + + + + + + + { this.props.children } diff --git a/imports/client/views/nonOrg/enter/SignupView.js b/imports/client/views/nonOrg/enter/SignupView.js index c4dad7c..31891cc 100644 --- a/imports/client/views/nonOrg/enter/SignupView.js +++ b/imports/client/views/nonOrg/enter/SignupView.js @@ -1,130 +1,240 @@ -import React from 'react'; -import { Link } from 'react-router'; -import { Row, Col, FormGroup, - ControlLabel, FormControl, - InputGroup, Button } from 'react-bootstrap'; -import handleSignup from './signup'; -import { Orgs } from '/imports/collections/orgs/index'; -import './signup.css'; - -export default class Signup extends React.Component { - constructor(props) { - super(props); - this.state = { - orgSlug: "" - }; - } - componentWillMount(){ - Meteor.subscribe('allOrgsSlug'); - } - - componentDidMount() { - handleSignup({ component: this }); - } - handleChange(e) { - this.setState({ orgSlug: e.target.value }); - } - handleSubmit(event) { - event.preventDefault(); - } - checkExistingOrgSlug() { - if(this.state.orgSlug==""){return null} - searchOrg = Orgs.find({slug:this.state.orgSlug}).fetch(); - if(searchOrg.length>0){ - return "error" - }else{ - return "success" - } - } - render() { - return ( -
- - -

Sign Up

-
(this.signupForm = form) } - onSubmit={ this.handleSubmit } - > - - - - Organisation URL - - this.handleChange(e)} - /> - @yd.com - - - - - - - - Organisation Name - - - - - - - - First Name - - - - - - Last Name - - - - - - Email Address - - - - Password - - - {/* Sign Up - -
- - -
- ); - } -} +import React from 'react'; +import { Link } from 'react-router'; +import { Icon } from '/imports/client/components/Icon'; +import { LinkContainer } from 'react-router-bootstrap'; +import { Row, Col, FormGroup, + ControlLabel, FormControl, + InputGroup, Button, + Navbar,Modal, Nav, NavItem, + Glyphicon, Collapse, + NavbarToggler, NavbarBrand, + NavLink, DropdownItem, DropdownToggle, DropdownMenu, + NavDropdown, MenuItem } from 'react-bootstrap'; +import handleSignup from './signup'; +import { Orgs } from '/imports/collections/orgs/index'; +import { Meteor } from 'meteor/meteor'; + +import './signup.css'; + +export default class Signup extends React.Component { + constructor(props) { + super(props); + this.state = { + orgSlug: "" + }; + } + componentWillMount(){ + Meteor.subscribe('allOrgsSlug'); + } + + componentDidMount() { + handleSignup({ component: this }); + } + handleChange(e) { + this.setState({ orgSlug: e.target.value }); + } + handleSubmit(event) { + event.preventDeult(); + } + checkExistingOrgSlug() { + if(this.state.orgSlug==""){return null} + searchOrg = Orgs.find({slug:this.state.orgSlug}).fetch(); + if(searchOrg.length>0){ + return "error" + }else{ + return "success" + } + } + + render() + { + // const {user, org} = this.props.data; + return( +
+
+
+ + +

Welcome to YoungDesk!!!

+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor + incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation + ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit + in voluptate velit esse cillum dolore eu fugiat nulla pariatur.Excepteur sint occaecat cupidatat non proident, + sunt in culpa qui officia deserunt mollit anim id est laborum.

+ + + + +

+

+ + + + +
+ +
Lorem Ipsum
+
+ + +
+ +
Lorem Ipsum
+
+ + +
+ +
Lorem Ipsum
+
+ + +
+ +
Lorem Ipsum
+
+ + + + +

+
+ + + + +
+

Lets Get In Touch!

+
+ + +
+ + +
+ +

123-456-6789

+
+ + +
+ +

feedback@youngdesk.com

+
+ + +
+ +
+ + +

Sign up with Us

+
+
(this.signupForm = form) } + onSubmit={ this.handleSubmit } + > + Organisation Details + + + + + {/* Organisation URL */} + + this.handleChange(e)} + /> + @yd.com + + + + + + + + + {/* Organisation Name */} + + + + +
+ Personal Details + + + + {/* First Name */} + + + + + + {/* Middle Name */} + + + + + + {/* Last Name */} + + + + +
+ User Credentials + + {/* Email Address */} + + + + {/* Password */} + + + {/* Sign Up + +
+ + +
+
+
+ + ); + } +} diff --git a/imports/client/views/nonOrg/enter/signup.css b/imports/client/views/nonOrg/enter/signup.css index 973652e..90dc0f6 100644 --- a/imports/client/views/nonOrg/enter/signup.css +++ b/imports/client/views/nonOrg/enter/signup.css @@ -1,13 +1,138 @@ .Signup { + float: right; + margin: 20px auto; + width: 400px; + height: auto; + padding: 20px; + -webkit-border-radius: 8px/7px; + -moz-border-radius: 8px/7px; + border-radius: 8px/7px; background-color: white; - margin: auto; - width: 40%; - border: 3px solid #73AD21; - padding: 10px; + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + box-shadow: 1px 2px 5px rgba(0,0,0,.31); + border: solid 1px #cbc9c9; + font-family: 'Ubuntu', sans-serif; +} + +.Content +{ + margin: 20px auto; + width: 750px; + height: auto; + padding: 20px; + font-family: 'Ubuntu', sans-serif; + color: white; + float:left; +} + +.section-heading +{ + text-align: center; +} + +.contact +{ + text-align: center; + text-indent: 0px !important; +} + +.container +{ + /*width:1300px !important;*/ +} + +h1 +{ + font-size: 45px !important; +} + +p +{ + text-indent: 50px; + text-align: justify; + font-size:15px; +} + +h6 +{ + text-align: center; +} + +i +{ + display: inline-block; + width: 100%; + text-align: center; +} + + + +.wrapper +{ + overflow: hidden; } .page-header { text-align: center; + color:#00b395; + font-weight: bolder; +} + +.side-heading +{ + /*padding: 10px;*/ + text-align: left; + font-weight: bold; + color:#00b395; + font-size: 14px; +} + +hr { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #00b395; + padding: 0; +} + +.blue { + background-color: #00b395; + background-image: -webkit-linear-gradient(top,#00b395,#00cdaa); + background-image: -moz-linear-gradient(top,#00b395,#00cdaa); + background-image: -ms-linear-gradient(top,#00b395,#00cdaa); + background-image: -o-linear-gradient(top,#00b395,#00cdaa); + background-image: linear-gradient(top,#00b395,#00cdaa); + + border: 1px solid #00b395; + color: white; + + font-size: 13px; + font-weight: bold; + text-align: center; + height: 27px; + line-height: 27px; + min-width: 54px; + padding: 0 10px; + text-decoration: none; +} + +.blue:hover { + border: 1px solid #00b395; + + color: white; + background-color: #00b395; + background-image: -webkit-linear-gradient(top,#00b395,#009f85); + background-image: -moz-linear-gradient(top,#00b395,#009f85); + background-image: -ms-linear-gradient(top,#00b395,#009f85); + background-image: -o-linear-gradient(top,#00b395,#009f85); + background-image: linear-gradient(top,#00b395,#009f85); + + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1); + box-shadow: 0 1px 1px rgba(0,0,0,.1); + width: auto; + height: 27px; } diff --git a/imports/client/views/org/enter/LoginPane.js b/imports/client/views/org/enter/LoginPane.js index 56ff8a0..6872dce 100644 --- a/imports/client/views/org/enter/LoginPane.js +++ b/imports/client/views/org/enter/LoginPane.js @@ -28,7 +28,7 @@ export class LoginPane extends React.Component {
- Login +

Login

{ this.props.data.error } @@ -36,6 +36,7 @@ export class LoginPane extends React.Component { { this.props.data.message } +
this.props.onLogin(e) }> @@ -44,7 +45,7 @@ export class LoginPane extends React.Component { onChange={ (e) => this.props.onUpdate('email', e.currentTarget.value) } name="email" id="email" - placeholder="Enter your email" /> + placeholder="Email" /> @@ -53,28 +54,30 @@ export class LoginPane extends React.Component { onChange={ (e) => this.props.onUpdate('password', e.currentTarget.value) } name="password" id="password" - placeholder="Enter your password" /> + placeholder="Password" /> - + + + + Forgot your password? + + + + - - - Forgotten password? - - +
diff --git a/imports/client/views/org/enter/loginpane.css b/imports/client/views/org/enter/loginpane.css index 4c58b9b..7438ee8 100644 --- a/imports/client/views/org/enter/loginpane.css +++ b/imports/client/views/org/enter/loginpane.css @@ -1,12 +1,73 @@ -.enterPane__box{ -background-color: white; -margin: auto; - width: 30%; - border: 3px solid #73AD21; - padding: 10px; +.enterPane__box +{ + margin: 20px auto; + width: 400px; + height: 100%; + padding: 20px; + float:right; + -webkit-border-radius: 8px/7px; + -moz-border-radius: 8px/7px; + border-radius: 8px/7px; + background-color: white; + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + box-shadow: 1px 2px 5px rgba(0,0,0,.31); + border: solid 1px #cbc9c9; + font-family: 'Ubuntu', sans-serif; } - .enterPane__header{ + .enterPane__header + { text-align: center; - font-weight: bold; + color:#00b395; + font-weight: bolder; + } + + .blue { + background-color: #00b395; + background-image: -webkit-linear-gradient(top,#00b395,#00cdaa); + background-image: -moz-linear-gradient(top,#00b395,#00cdaa); + background-image: -ms-linear-gradient(top,#00b395,#00cdaa); + background-image: -o-linear-gradient(top,#00b395,#00cdaa); + background-image: linear-gradient(top,#00b395,#00cdaa); + + border: 1px solid #00b395; + color: white; + + font-size: 13px; + font-weight: bold; + text-align: center; + height: 27px; + line-height: 27px; + min-width: 54px; + padding: 0 10px; + text-decoration: none; + } + + .form-group + { + clear:both; + } + + .enterPane__link + { + text-decoration: underline; + } + + .blue:hover { + border: 1px solid #00b395; + + color: white; + background-color: #00b395; + background-image: -webkit-linear-gradient(top,#00b395,#009f85); + background-image: -moz-linear-gradient(top,#00b395,#009f85); + background-image: -ms-linear-gradient(top,#00b395,#009f85); + background-image: -o-linear-gradient(top,#00b395,#009f85); + background-image: linear-gradient(top,#00b395,#009f85); + + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1); + box-shadow: 0 1px 1px rgba(0,0,0,.1); + width: auto; + height: 27px; } diff --git a/imports/client/views/verify/EmailPane.js b/imports/client/views/verify/EmailPane.js index d49dddf..fbb5d44 100644 --- a/imports/client/views/verify/EmailPane.js +++ b/imports/client/views/verify/EmailPane.js @@ -39,38 +39,28 @@ export class EmailPane extends React.Component { const {user} = this.props; return ( -
-
- {/*
- -
*/} -
- Enter your email address -
-
-
- - Enter email - - - this.onUpdate('email', evt.currentTarget.value)} - placeholder = "Email" - /> +
+
+ +
+
+ + + + Email + this.onUpdate('email', evt.currentTarget.value)} + placeholder="Organisation Name" + /> + +
- -
-
-
-
this.onSetEmail()} - > - Send verification email -
+
+ + {/* */}
); @@ -85,12 +75,11 @@ export class EmailPane extends React.Component {
{/* */} -

Your email needs verification

-
-
- Please check your email – we sent a verification link to
+

Hi, your email needs verification

+ + Please check your email – we sent a verification link to   - {user.emails[0].address} + {user.emails[0].address}
diff --git a/imports/client/views/verify/emailpane.css b/imports/client/views/verify/emailpane.css index 3729101..e08ff1b 100644 --- a/imports/client/views/verify/emailpane.css +++ b/imports/client/views/verify/emailpane.css @@ -1,20 +1,63 @@ +.wizardPane-box +{ + margin: 20px auto; + width: 400px; + height: auto; + padding: 20px; + -webkit-border-radius: 8px/7px; + -moz-border-radius: 8px/7px; + border-radius: 8px/7px; + background-color: white; + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + box-shadow: 1px 2px 5px rgba(0,0,0,.31); + border: solid 1px #cbc9c9; + font-family: 'Ubuntu', sans-serif; +} + +.wizardPane-box1 +{ + margin: 20px auto; + width: 300px; + height: auto; + padding: 20px; + -webkit-border-radius: 8px/7px; + -moz-border-radius: 8px/7px; + border-radius: 8px/7px; + background-color: white; + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); + box-shadow: 1px 2px 5px rgba(0,0,0,.31); + border: solid 1px #cbc9c9; + font-family: 'Ubuntu', sans-serif; +} + .wizardPane-sectionD { background-color: white; margin: auto; - width: 30%; + width: 100%; padding: 10px; top:50px; cursor: pointer; font-weight: bold; - color: crimson; + color: #00b395; font-style: italic; + text-align: center; } .EmailVerify { color:green; font-weight: bold; + font-style: normal !important; + color: #00b395; +} + +.subheading +{ + font-weight: bold; + color: #00b395; } .wizardPane-link:hover @@ -22,32 +65,52 @@ text-decoration: underline; } +i +{ + display: inline-block; + width: 100%; + text-align: center; +} + +h3 +{ + margin-top: 0px !important; + text-align: center; + color: white; +} + +span +{ + font-size: 14px; + color: white; +} + .wizardPane-section1 { - margin:auto; - width: 30%; - padding: 10px; - background:#fff; - -webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; - -moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; - box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; + /*margin: 20px auto;*/ + width: 360px; + height: auto; + padding: 10px; + -webkit-border-radius: 8px/7px; + -moz-border-radius: 8px/7px; + border-radius: 8px/7px; + background-color: darkslategray; } .wizardPane-section { - margin:auto; - width: 30%; - padding: 10px; - background:#fff; - -webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; - -moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; - box-shadow:0 1px 4px rgba(0, 0, 0, 0.3), 0 0 40px rgba(0, 0, 0, 0.1) inset; + width: 360px; + height: auto; + padding: 10px; + -webkit-border-radius: 8px/7px; + -moz-border-radius: 8px/7px; + border-radius: 8px/7px; + background-color: black; } .wizardPane-title { - font-size: 20px; - color:black; + color:white; } diff --git a/imports/collections/students/methods.js b/imports/collections/students/methods.js index 8137e5d..fe866bc 100644 --- a/imports/collections/students/methods.js +++ b/imports/collections/students/methods.js @@ -80,8 +80,8 @@ export const addStudentManually = new ValidatedMethod({ newParentId = Parents.insert({ userId: newParentUserId, orgId: orgId, - address: data.address, - gender: data.gender, + address: data.address, + gender: data.gender, dob: data.dob, rollNo: data.rollNo, class: data.studentclass, @@ -89,11 +89,7 @@ export const addStudentManually = new ValidatedMethod({ bloodGroup: data.bloodGroup, community: data.community, }); - console.log("newParentUserId"); - console.log(newParentUserId); } - console.log("newUserId"); - console.log(newStudentId); if(newStudentId){ Students.insert({ userId: newStudentId,