Skip to content

Commit

Permalink
Merge branch 'aswinzz-master'
Browse files Browse the repository at this point in the history
Add alert and validation messages for required fields
  • Loading branch information
jlin816 committed Jan 22, 2018
2 parents 67c6ebe + f1ada16 commit 0e575da
Show file tree
Hide file tree
Showing 21 changed files with 1,449 additions and 34 deletions.
10 changes: 8 additions & 2 deletions .env.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@ JWT_SECRET='shhhh super secret code here bro'
ROOT_URL='http://localhost:3000'

# Credentials for the admin user created at app initialization
ADMIN_EMAIL='admin@hackmit.org'
ADMIN_EMAIL='admin@example.com'
ADMIN_PASS='party'

# Used to send verification, registration, and confirmation emails
EMAIL_CONTACT='HackMIT Team <hackmit.reg.system@gmail.com>'
EMAIL_CONTACT='Hackathon Team <team@example.com>'
EMAIL_HOST='smtp.gmail.com'
EMAIL_USER='foo@bar.com'
EMAIL_PASS='password'
EMAIL_PORT='465'
EMAIL_HEADER_IMAGE='https://s3.amazonaws.com/hackmit-assets/Banner_600.jpg'

# Information linked at the bottom of emails
EMAIL_ADDRESS='team@example.com'
HACKATHON_NAME='Hackathon'
TWITTER_HANDLE='hackathon'
FACEBOOK_HANDLE='hackathon'

# Limits the number of users that can join a team
TEAM_MAX_SIZE=4

Expand Down
17 changes: 15 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,25 @@
},
"ADMIN_EMAIL": {
"description": "Credentials for the admin user created at app initialization",
"value": "admin@hackmit.org"
"value": "admin@example.com"
},
"ADMIN_PASS": "party",
"EMAIL_ADDRESS": {
"description": "The email address that is included in the 'email us' link at the bottom of emails.",
"value": "team@example.com"
},
"HACKATHON_NAME": "Hackathon",
"TWITTER_HANDLE": {
"description": "Everything after https://twitter.com/",
"value": "hackathon"
},
"FACEBOOK_HANDLE": {
"description": "Everything after https://facebook.com/",
"value": "hackathon"
},
"EMAIL_CONTACT": {
"description": "Used to send verification, registration, and confirmation emails",
"value": "HackMIT Team <hackmit.reg.system@gmail.com>"
"value": "Hackathon Team <team@example.com>"
},
"EMAIL_HOST": "smtp.gmail.com",
"EMAIL_USER": "foo@bar.com",
Expand Down
Loading

0 comments on commit 0e575da

Please sign in to comment.