Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix new developer/user startup #7

Merged
merged 2 commits into from
Nov 12, 2018
Merged

fix new developer/user startup #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8882e7c
fix new user startup
sjgllghr Nov 11, 2018
b914600
remove team code, fix password confirm
sjgllghr Nov 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions survey-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ All of the code for the project is current in the `survey-app` folder. This proj
* MongoDB
* Mac: `brew install mongodb`
* [Windows](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/)
* If this is your first time using MongoDB, you will also need to set up a `/data/db` directory with the correct permissions.
* [Mac and Windows Examples](https://stackoverflow.com/questions/41420466/mongodb-shuts-down-with-code-100)

## Set up
* Clone the repository
Expand Down
4 changes: 2 additions & 2 deletions survey-app/models/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ User.add({
password: { type: Types.Password, initial: true, required: true },
assignedPath: {type: Types.Relationship, ref: 'ModulePath', many: false},
team: { type: Types.Relationship, ref: 'Team'},
location: {type: Types.Location, initial: true, required: true},
phone: { type: Types.Text, required: true, initial: true}
location: {type: Types.Location, initial: true, },
phone: { type: Types.Text, initial: true}
}, 'Permissions', {
isAdmin: { type: Boolean, label: 'Can access Keystone', index: true },
});
Expand Down
2 changes: 1 addition & 1 deletion survey-app/templates/views/assessment.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extends ../layouts/default
block content
.container-fluid: .row.show-grid#assessment-mid
.container
if path.length
if path.length && team.length
.col-sm-8
h2 #{path[0].name} Path
.col-sm-4#assessment-label
Expand Down
7 changes: 1 addition & 6 deletions survey-app/templates/views/join.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,12 @@ block content
div.jumbotron
h3 Create an account
form(method="POST", action="signup", role="form")
div.form-group
label Team Code
input.form-control(type="text", name="code", placeholder="Enter Code")
span.help-block Don't have a code? #[a(href="/") Message your team administrator]
hr
div.form-group
label Password (8+ characters, containing at least one number and capital)
input.form-control(type="password", name="password", placeholder="********")
div.form-group
label Confirm Password
input.form-control(type="confirm", name="confirm", placeholder="********")
input.form-control(type="password", name="confirm", placeholder="********")
div.form-group
label First Name
input.form-control(type="text", name="first", placeholder="First Name")
Expand Down