Commit bea06ff0b863eee33d23e2f2e7eb342cac47c9f0
1 parent
d75229d74e
Exists in
master
Fixed teachers view
Showing
4 changed files
with
49 additions
and
83 deletions
Show diff stats
imports/client/views/nonOrg/app/module/AppLayout.js
| ... | ... | @@ -51,20 +51,6 @@ export class AppLayout extends Component { |
| 51 | 51 | OrgUrl = theUrl.replace("http://","http://"+org.slug+"."); |
| 52 | 52 | return ( |
| 53 | 53 | <div className = "appLayout-box"> |
| 54 | - <Navbar color="faded" light toggleable> | |
| 55 | - <NavbarToggler right onClick={this.toggle} /> | |
| 56 | - <NavbarBrand href="/">reactstrap</NavbarBrand> | |
| 57 | - <Collapse isOpen={this.state.isOpen} navbar> | |
| 58 | - <Nav className="ml-auto" navbar> | |
| 59 | - <NavItem> | |
| 60 | - <NavLink href="/components/">Components</NavLink> | |
| 61 | - </NavItem> | |
| 62 | - <NavItem> | |
| 63 | - <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink> | |
| 64 | - </NavItem> | |
| 65 | - </Nav> | |
| 66 | - </Collapse> | |
| 67 | - </Navbar> | |
| 68 | 54 | <div className = "appLayout-wrapOuter"> |
| 69 | 55 | <div className = "appLayout-wrapInner"> |
| 70 | 56 | <div className = "appLayout-menuWrap"> | ... | ... |
imports/client/views/org/enter/loginpane.css
| 1 | 1 | .enterPane__box |
| 2 | 2 | { |
| 3 | - margin: 20px auto; | |
| 3 | + margin: 150px auto; | |
| 4 | 4 | width: 400px; |
| 5 | - height: 100%; | |
| 6 | - padding: 20px; | |
| 7 | - float:right; | |
| 5 | + height: 280px; | |
| 6 | + padding: 10px; | |
| 8 | 7 | -webkit-border-radius: 8px/7px; |
| 9 | 8 | -moz-border-radius: 8px/7px; |
| 10 | 9 | border-radius: 8px/7px; |
| ... | ... | @@ -44,10 +43,10 @@ |
| 44 | 43 | text-decoration: none; |
| 45 | 44 | } |
| 46 | 45 | |
| 47 | - .form-group | |
| 46 | + /*.form-group | |
| 48 | 47 | { |
| 49 | 48 | clear:both; |
| 50 | - } | |
| 49 | + }*/ | |
| 51 | 50 | |
| 52 | 51 | .enterPane__link |
| 53 | 52 | { | ... | ... |
imports/collections/students/serverCsvUpload.js
| ... | ... | @@ -68,7 +68,7 @@ export const addStudentCSV= new ValidatedMethod({ |
| 68 | 68 | }); |
| 69 | 69 | newParentUserId = Users.insert({ |
| 70 | 70 | //emails: [{address:data.parentEmail, verified: false}], |
| 71 | - //username: data['Parent Name*'], | |
| 71 | + //username: data['Parent Name*'], | |
| 72 | 72 | firstName: data['Parent Name*'], |
| 73 | 73 | orgId: orgId, |
| 74 | 74 | role: 'PARENT' |
| ... | ... | @@ -124,7 +124,7 @@ export const studentUploadCsv = new ValidatedMethod({ |
| 124 | 124 | var CSV_valid_buffer = []; |
| 125 | 125 | var CSV_invalid_buffer = []; |
| 126 | 126 | var filename = new Date().getTime().toString(); |
| 127 | - var csv_filepath = '/Users/satheeshnagaraj/Documents/Workspace/Meteor/Youngdesk/ydapp/CSV_Files/'; | |
| 127 | + var csv_filepath = './CSV_Files/'; | |
| 128 | 128 | |
| 129 | 129 | |
| 130 | 130 | for (let i = 0; i < data.length; i++) | ... | ... |
imports/server/pages/verifyEmail.js
| ... | ... | @@ -14,33 +14,39 @@ const finishWithMessage = (res, message, redirect = "/") => { |
| 14 | 14 | <!-- Latest compiled and minified CSS --> |
| 15 | 15 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> |
| 16 | 16 | <style type="text/css"> |
| 17 | + | |
| 17 | 18 | .congo-wrap .header { |
| 18 | - background: #379AC7; | |
| 19 | - background: -webkit-linear-gradient(-90deg, #379AC7, #0460D9); | |
| 20 | - background: linear-gradient(180deg, #379AC7, #0460D9); | |
| 21 | - height: 80px; | |
| 22 | - padding: 11px 0; | |
| 19 | + background: white; | |
| 20 | + height: 50px; | |
| 21 | +} | |
| 22 | + | |
| 23 | +.brand-style | |
| 24 | +{ | |
| 25 | + font-family: 'Ubuntu', sans-serif !important; | |
| 26 | + color:#00b395; | |
| 23 | 27 | } |
| 24 | - .logo img{ | |
| 25 | - width:170px; | |
| 26 | - } | |
| 28 | + | |
| 27 | 29 | .congo-wrap .header .container { |
| 28 | 30 | width: 100%; |
| 29 | - padding:0 20px; | |
| 30 | 31 | } |
| 31 | 32 | .congo-wrap{ |
| 32 | - background:#f6f7f7; | |
| 33 | + background:#00b395; | |
| 33 | 34 | height:100%; |
| 34 | 35 | } |
| 35 | 36 | .widgetbox-congrats { |
| 36 | - max-width: 720px; | |
| 37 | - margin: 0px auto; | |
| 38 | - background: #fff; | |
| 39 | - position: relative; | |
| 40 | - top: 20px; | |
| 41 | - text-align: center; | |
| 42 | - border: 1px solid #eee; | |
| 43 | - font-size: 20px; | |
| 37 | + margin: 20px auto; | |
| 38 | + width: 400px; | |
| 39 | + height: auto; | |
| 40 | + padding: 20px; | |
| 41 | + -webkit-border-radius: 8px/7px; | |
| 42 | + -moz-border-radius: 8px/7px; | |
| 43 | + border-radius: 8px/7px; | |
| 44 | + background-color: white; | |
| 45 | + -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 46 | + -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 47 | + box-shadow: 1px 2px 5px rgba(0,0,0,.31); | |
| 48 | + border: solid 1px #cbc9c9; | |
| 49 | + font-family: 'Ubuntu', sans-serif; | |
| 44 | 50 | } |
| 45 | 51 | |
| 46 | 52 | body { |
| ... | ... | @@ -48,39 +54,40 @@ body { |
| 48 | 54 | padding: 0; |
| 49 | 55 | } |
| 50 | 56 | |
| 51 | -.widgetbox-congrats .congo-msg { | |
| 52 | - padding: 90px 0; | |
| 53 | - border-bottom: 1px solid #eee; | |
| 54 | -} | |
| 55 | - | |
| 56 | -.widgetbox-congrats.congo-msg h4 {margin: 0 !important;padding: 0 !important;} | |
| 57 | 57 | |
| 58 | 58 | .text-blue { |
| 59 | - color: #0059ce; | |
| 59 | + color: #00b395; | |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | .widgetbox-congrats .congo-msg h4 { |
| 63 | 63 | margin: 8px 0; |
| 64 | 64 | font-size: 24px; |
| 65 | + text-align:center; | |
| 65 | 66 | } |
| 66 | 67 | |
| 67 | 68 | .widgetbox-congrats .congo-msg .icon { |
| 68 | - color: #0F67C8; | |
| 69 | + color: #00b395; | |
| 69 | 70 | font-size: 90px; |
| 70 | - font-weight: 100; | |
| 71 | - margin-bottom: 20px; | |
| 72 | - display: block; | |
| 71 | + display: inline-block; | |
| 72 | + width: 100%; | |
| 73 | + text-align: center; | |
| 73 | 74 | } |
| 74 | 75 | |
| 75 | -.widgetbox-congrats .widgetbox-footer { | |
| 76 | - padding: 31px 10px; | |
| 76 | +p | |
| 77 | +{ | |
| 78 | + display: inline-block; | |
| 79 | + width: 100%; | |
| 80 | + text-align: center; | |
| 77 | 81 | } |
| 78 | 82 | |
| 79 | 83 | .widgetbox-congrats .widgetbox-footer .btn { |
| 80 | - background: #0e89d3; | |
| 84 | + background: #00b395; | |
| 81 | 85 | color: #fff; |
| 82 | - padding: 10px 30px; | |
| 83 | 86 | text-transform: uppercase; |
| 87 | + display: inline-block; | |
| 88 | + width: 100%; | |
| 89 | + text-align: center; | |
| 90 | + font-family: 'Ubuntu', sans-serif;s | |
| 84 | 91 | } |
| 85 | 92 | </style> |
| 86 | 93 | |
| ... | ... | @@ -90,9 +97,7 @@ body { |
| 90 | 97 | <div class="congo-wrap"> |
| 91 | 98 | <div class="header"> |
| 92 | 99 | <div class="container"> |
| 93 | - <div class="logo"> | |
| 94 | - <img src="/files/images/svg/logo--white.svg" altt=""/> | |
| 95 | - </div> | |
| 100 | + <span class="brand-style">YOUNGDESK</span> | |
| 96 | 101 | </div> |
| 97 | 102 | </div> |
| 98 | 103 | <div class="container"> |
| ... | ... | @@ -105,7 +110,7 @@ body { |
| 105 | 110 | <p> ${message}</p> |
| 106 | 111 | </div> |
| 107 | 112 | <div class="widgetbox-footer"> |
| 108 | - <a href="${redirect}" class="btn btn-lg btn-prmary">Continue</a> | |
| 113 | + <a href="${redirect}" class="btn btn-md btn-prmary">Continue</a> | |
| 109 | 114 | </div> |
| 110 | 115 | |
| 111 | 116 | </div> |
| ... | ... | @@ -122,8 +127,6 @@ body { |
| 122 | 127 | res.end(output); |
| 123 | 128 | }; |
| 124 | 129 | |
| 125 | - | |
| 126 | - | |
| 127 | 130 | Picker.route('/back/verifyEmail/:token', function(params, req, res, next) { |
| 128 | 131 | |
| 129 | 132 | const user = Users.findOne({'services.email.verificationTokens.token': params.token}); |
| ... | ... | @@ -139,26 +142,4 @@ Picker.route('/back/verifyEmail/:token', function(params, req, res, next) { |
| 139 | 142 | [`emails.${idx}.verified`]: true, |
| 140 | 143 | }}); |
| 141 | 144 | |
| 142 | - | |
| 143 | - | |
| 144 | - | |
| 145 | -// "services": { | |
| 146 | -// "password": { | |
| 147 | -// "bcrypt": "$2a$10$FqOvMve/MonERrLIOCJbruvS9iHoz5ixknGfm/ZAiOt9EiF43W4Z6" | |
| 148 | -// }, | |
| 149 | -// "email": { | |
| 150 | -// "verificationTokens": [ | |
| 151 | -// { | |
| 152 | -// "token": "05T-Ht_BzprDSAOVIYC-yUvDQ3Hp0wNym4eTx2g1VmI", | |
| 153 | -// "address": "krowa@druga.je", | |
| 154 | -// "when": new Date(1479502106631) | |
| 155 | -// } | |
| 156 | -// ] | |
| 157 | -// }, | |
| 158 | - | |
| 159 | - | |
| 160 | - | |
| 161 | - | |
| 162 | - | |
| 163 | - | |
| 164 | 145 | }); | ... | ... |