Commit d0857390aee2aad0fb84f81ed2bd3df6cac65368
Exists in
master
Merge branch 'new-student-form' of https://bitbucket.org/youngdesk/ydapp into new-student-form
Showing
3 changed files
Show diff stats
imports/client/views/core/Form.js
imports/client/views/org/admin/students/AddStudentFormContainer.js
1 | 1 | import React, { Component } from 'react' |
2 | 2 | import { AddStudentForm } from './addStudentForm' |
3 | 3 | import StudentForm from './StudentForm' |
4 | -import Form from '../../../core/Form' | |
5 | -import Validator from '../../../core/Validator' | |
6 | -import { isRequired, isValidEmail } from '../../../core/validations' | |
4 | +import Form from '/imports/client/views/core/Form' | |
5 | +import Validator from '/imports/client/views/core/Validator' | |
6 | +import { isRequired, isValidEmail } from '/imports/client/views/core/validations' | |
7 | 7 | import { addStudentManually } from '/imports/collections/students/methods'; |
8 | 8 | |
9 | 9 | export class AddStudentFormContainer extends Component { |
... | ... | @@ -33,6 +33,7 @@ export class AddStudentFormContainer extends Component { |
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | + //render callback | |
36 | 37 | render() { |
37 | 38 | return ( |
38 | 39 | <Form | ... | ... |
imports/client/views/org/admin/students/StudentForm.js
... | ... | @@ -6,11 +6,10 @@ import { |
6 | 6 | FormControl, |
7 | 7 | Button |
8 | 8 | } from 'react-bootstrap' |
9 | -// import DatePicker from 'react-bootstrap-date-picker' | |
10 | -import DatePicker from '../../../core/DatePicker' | |
11 | -import Label from '../../../core/Label' | |
12 | -import Stepper from '../../../core/Stepper' | |
13 | -import ErrorLabel from '../../../core/ErrorLabel' | |
9 | +import DatePicker from '/imports/client/views/core/DatePicker' | |
10 | +import Label from '/imports/client/views/core/Label' | |
11 | +import Stepper from '/imports/client/views/core/Stepper' | |
12 | +import ErrorLabel from '/imports/client/views/core/ErrorLabel' | |
14 | 13 | |
15 | 14 | const StudentForm = props => ( |
16 | 15 | <div className="stepy-validation"> | ... | ... |