gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12533 from no-stack-dub-sack/fix/chore-common-camelCase

Browse Source 
chore(common): updated common to freeCodeCamp
This commit is contained in:
Dylan
2017-01-14 21:36:05 -06:00
committed by GitHub
parent d6c76bde8a 3ed485b14a
commit 95abe8ad72
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/app/redux/reducer.js
View File

@ -2,7 +2,7 @@ import { handleActions } from 'redux-actions';
import types from './types'; import types from './types';
const initialState = { const initialState = {
title: 'Learn To Code | Free Code Camp', title: 'Learn To Code | freeCodeCamp',
isSignInAttempted: false, isSignInAttempted: false,
user: '', user: '',
lang: '', lang: '',
@ -16,7 +16,7 @@ export default handleActions(
{ {
[types.updateTitle]: (state, { payload = 'Learn To Code' }) => ({ [types.updateTitle]: (state, { payload = 'Learn To Code' }) => ({
...state, ...state,
title: payload + ' | Free Code Camp' title: payload + ' | freeCodeCamp'
}), }),
[types.updateThisUser]: (state, { payload: user }) => ({ [types.updateThisUser]: (state, { payload: user }) => ({

4
common/app/routes/settings/components/Settings.jsx
View File

@ -150,7 +150,7 @@ export class Settings extends React.Component {
className='btn-link-social' className='btn-link-social'
href={ '/signout' } href={ '/signout' }
> >
Sign me out of Free Code Camp Sign me out of freeCodeCamp
</Button> </Button>
<Button <Button
block={ true } block={ true }
@ -269,7 +269,7 @@ export class Settings extends React.Component {
className='btn-link-social' className='btn-link-social'
href='/delete-my-account' href='/delete-my-account'
> >
Delete my Free Code Camp account Delete my freeCodeCamp account
</Button> </Button>
<Button <Button
block={ true } block={ true }

4
common/models/user.js
View File

@ -212,7 +212,7 @@ module.exports = function(User) {
text: ` text: `
Hello,\n\n Hello,\n\n
This email is confirming that you requested to This email is confirming that you requested to
reset your password for your Free Code Camp account. reset your password for your freeCodeCamp account.
This is your email: ${ info.email }. This is your email: ${ info.email }.
Go to ${ url } to reset your password. Go to ${ url } to reset your password.
\n \n
@ -441,7 +441,7 @@ module.exports = function(User) {
type: 'email', type: 'email',
to: email, to: email,
from: 'Team@freecodecamp.com', from: 'Team@freecodecamp.com',
subject: 'Welcome to Free Code Camp!', subject: 'Welcome to freeCodeCamp!',
protocol: isDev ? null : 'https', protocol: isDev ? null : 'https',
host: isDev ? 'localhost' : 'freecodecamp.com', host: isDev ? 'localhost' : 'freecodecamp.com',
port: isDev ? null : 443, port: isDev ? null : 443,