diff --git a/imports/client/views/nonOrg/app/module/AppLayout.js b/imports/client/views/nonOrg/app/module/AppLayout.js index 49ff8f8..a552a31 100644 --- a/imports/client/views/nonOrg/app/module/AppLayout.js +++ b/imports/client/views/nonOrg/app/module/AppLayout.js @@ -51,20 +51,6 @@ export class AppLayout extends Component { OrgUrl = theUrl.replace("http://","http://"+org.slug+"."); return (
- - - reactstrap - - - -
diff --git a/imports/client/views/org/enter/loginpane.css b/imports/client/views/org/enter/loginpane.css index 7438ee8..a88d16d 100644 --- a/imports/client/views/org/enter/loginpane.css +++ b/imports/client/views/org/enter/loginpane.css @@ -1,10 +1,9 @@ .enterPane__box { - margin: 20px auto; + margin: 150px auto; width: 400px; - height: 100%; - padding: 20px; - float:right; + height: 280px; + padding: 10px; -webkit-border-radius: 8px/7px; -moz-border-radius: 8px/7px; border-radius: 8px/7px; @@ -44,10 +43,10 @@ text-decoration: none; } - .form-group + /*.form-group { clear:both; - } + }*/ .enterPane__link { diff --git a/imports/collections/students/serverCsvUpload.js b/imports/collections/students/serverCsvUpload.js index a15f891..eef9462 100644 --- a/imports/collections/students/serverCsvUpload.js +++ b/imports/collections/students/serverCsvUpload.js @@ -68,7 +68,7 @@ export const addStudentCSV= new ValidatedMethod({ }); newParentUserId = Users.insert({ //emails: [{address:data.parentEmail, verified: false}], - //username: data['Parent Name*'], + //username: data['Parent Name*'], firstName: data['Parent Name*'], orgId: orgId, role: 'PARENT' @@ -124,7 +124,7 @@ export const studentUploadCsv = new ValidatedMethod({ var CSV_valid_buffer = []; var CSV_invalid_buffer = []; var filename = new Date().getTime().toString(); - var csv_filepath = '/Users/satheeshnagaraj/Documents/Workspace/Meteor/Youngdesk/ydapp/CSV_Files/'; + var csv_filepath = './CSV_Files/'; for (let i = 0; i < data.length; i++) diff --git a/imports/server/pages/verifyEmail.js b/imports/server/pages/verifyEmail.js index 6db2dff..56fb114 100644 --- a/imports/server/pages/verifyEmail.js +++ b/imports/server/pages/verifyEmail.js @@ -14,33 +14,39 @@ const finishWithMessage = (res, message, redirect = "/") => { @@ -90,9 +97,7 @@ body {
- + YOUNGDESK
@@ -105,7 +110,7 @@ body {

${message}

@@ -122,8 +127,6 @@ body { res.end(output); }; - - Picker.route('/back/verifyEmail/:token', function(params, req, res, next) { const user = Users.findOne({'services.email.verificationTokens.token': params.token}); @@ -139,26 +142,4 @@ Picker.route('/back/verifyEmail/:token', function(params, req, res, next) { [`emails.${idx}.verified`]: true, }}); - - - -// "services": { -// "password": { -// "bcrypt": "$2a$10$FqOvMve/MonERrLIOCJbruvS9iHoz5ixknGfm/ZAiOt9EiF43W4Z6" -// }, -// "email": { -// "verificationTokens": [ -// { -// "token": "05T-Ht_BzprDSAOVIYC-yUvDQ3Hp0wNym4eTx2g1VmI", -// "address": "krowa@druga.je", -// "when": new Date(1479502106631) -// } -// ] -// }, - - - - - - });