Merge branch 'master' into bonfire-improvement
Conflicts: views/bonfire/bonfire.jade
This commit is contained in:
1
app.js
1
app.js
@ -215,6 +215,7 @@ app.get(
|
||||
resourcesController.pairProgramWithTeamViewer
|
||||
);
|
||||
app.get('/learn-to-code', resourcesController.about);
|
||||
app.get('/about', resourcesController.about);
|
||||
app.get('/login', userController.getLogin);
|
||||
app.post('/login', userController.postLogin);
|
||||
app.get('/logout', userController.logout);
|
||||
|
@ -17,7 +17,8 @@ exports.index = function(req, res) {
|
||||
}
|
||||
} else {
|
||||
res.render('home', {
|
||||
title: 'Learn to Code and Become a Software Engineer'
|
||||
title: 'Learn to Code and Become a Software Engineer',
|
||||
landingPage: true
|
||||
});
|
||||
}
|
||||
};
|
||||
|
@ -5,6 +5,10 @@
|
||||
"type": "git",
|
||||
"url": "https://github.com/freecodecamp/freecodecamp.git"
|
||||
},
|
||||
"engines": {
|
||||
"node": "0.10.35",
|
||||
"npm": "2.3.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "node app.js",
|
||||
"test": "mocha"
|
||||
@ -42,6 +46,7 @@
|
||||
"mongoose": "^3.8.19",
|
||||
"morgan": "^1.5.0",
|
||||
"newrelic": "^1.13.3",
|
||||
"node": "0.0.0",
|
||||
"node-foursquare": "^0.2.1",
|
||||
"node-linkedin": "^0.3.4",
|
||||
"node-rest-client": "^1.4.3",
|
||||
|
@ -226,10 +226,15 @@ ul {
|
||||
height: 30px;
|
||||
margin-top: -5px;
|
||||
}
|
||||
@media (min-width: 767px) and (max-width: 890px) {
|
||||
height: 30px;
|
||||
margin-top: -5px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.navbar-right {
|
||||
@media (min-width: 768px) {
|
||||
@media (min-width: 767px) {
|
||||
padding-right: 50px;
|
||||
}
|
||||
@media (max-width: 991px) and (min-width: 768px) {
|
||||
|
@ -35,7 +35,5 @@ block content
|
||||
textarea#codeOutput
|
||||
br
|
||||
ul#testSuite.list-group
|
||||
|
||||
br
|
||||
|
||||
script(src='/js/lib/bonfire/framework.js')
|
@ -54,28 +54,28 @@ block content
|
||||
.text-center.negative-35
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.ion-social-html5
|
||||
.black-text HTML5
|
||||
h2.black-text HTML5
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.ion-social-css3
|
||||
.black-text CSS3
|
||||
h2.black-text CSS3
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.ion-social-javascript
|
||||
.black-text JavaScript
|
||||
h2.black-text JavaScript
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.fa.fa-database.font-awesome-padding
|
||||
.black-text Databases
|
||||
h2.black-text Databases
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.ion-social-chrome
|
||||
.black-text DevTools
|
||||
h2.black-text DevTools
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.ion-social-nodejs
|
||||
.black-text Node.js
|
||||
h2.black-text Node.js
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.ion-social-angular
|
||||
.black-text Angular.js
|
||||
h2.black-text Angular.js
|
||||
.col-xs-12.col-sm-12.col-md-3
|
||||
.landing-skill-icon.ion-ios-loop-strong
|
||||
.black-text Agile
|
||||
h2.black-text Agile
|
||||
.big-break
|
||||
h2
|
||||
h2 Why you should join our community:
|
||||
@ -86,4 +86,4 @@ block content
|
||||
li.ion-code Our community is 100% free and open source
|
||||
li.ion-code We all share one goal: to boost our careers with code
|
||||
.big-break
|
||||
a.btn.btn-cta.signup-btn(href="/login") Start learning to code (it's free)
|
||||
a.btn.btn-cta.signup-btn(href="/login") Learn to code today (it's free)
|
@ -1,5 +1,5 @@
|
||||
doctype html
|
||||
html(ng-app='profileValidation')
|
||||
html(ng-app='profileValidation', lang='en')
|
||||
head
|
||||
script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
|
||||
script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js")
|
||||
|
@ -311,3 +311,16 @@
|
||||
img.profile-image(src='https://s3.amazonaws.com/freecodecamp/dominic-jones.jpg' alt="Dominic Jones's picture")
|
||||
h4.text-nowrap York, Pennsylvania
|
||||
p.negative-10 "Born with Sickle Cell Anemia. Professional writer, working on becoming a professional code writer."
|
||||
|
||||
.col-xs-12.col-sm-4.col-md-3.team-member
|
||||
h3.negative-10.text-nowrap James McShane
|
||||
h4.negative-10.text-nowrap JavaScript Engineer
|
||||
img.profile-image(src='https://s3.amazonaws.com/freecodecamp/james-mcshane.jpg' alt="James McShane's picture")
|
||||
h4.text-nowrap Minneapolis, Minnesota
|
||||
p.negative-10 "I just bought our first house, ending a 10 year streak of moving each year. I've used code to solve problems since I was a child."
|
||||
.col-xs-12.col-sm-4.col-md-3.team-member
|
||||
h3.negative-10.text-nowrap Ellie Adam
|
||||
h4.negative-10.text-nowrap Visual Designer
|
||||
img.profile-image(src='https://s3.amazonaws.com/freecodecamp/ellie-adam.jpg' alt="Eliie Adam's picture")
|
||||
h4.text-nowrap Seattle, Washington
|
||||
p.negative-10 "I photograph birds and flowers. I'm a designer who recently decided to learn coding and front end web developement."
|
@ -1,7 +1,10 @@
|
||||
.fcc-footer
|
||||
- if (!landingPage)
|
||||
.fcc-footer
|
||||
.col-xs-12
|
||||
a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank')
|
||||
|
|
||||
a.ion-social-twitch-outline(title="Free Code Camp Live Pair Programming on Twitch.TV", href="http://www.twitch.tv/freecodecamp", target='_blank')
|
||||
|
|
||||
a.ion-social-github(title="Free Code Camp on GitHub", href="http://github.com/freecodecamp", target='_blank')
|
||||
|
|
||||
a.ion-social-twitter(title="Free Code Camp on Twitter", href="http://twitter.com/freecodecamp", target='_blank')
|
||||
@ -10,6 +13,6 @@
|
||||
|
|
||||
a.ion-social-linkedin(title="Free Code Camp on LinkedIn", href="http://linkedin.com/company/4831032?free-code-camp", target='_blank')
|
||||
|
|
||||
a.ion-ios-information(title="About Free Code Camp", href="/learn-to-code")
|
||||
a.ion-information-circled(title="About Free Code Camp", href="/learn-to-code")
|
||||
|
|
||||
a.ion-locked(title="Free Code Camp's Privacy Policy", href="/privacy")
|
@ -4,21 +4,19 @@ meta(http-equiv='X-UA-Compatible', content='IE=edge')
|
||||
meta(name='viewport', content='width=device-width, initial-scale=1.0')
|
||||
meta(name='csrf-token', content=_csrf)
|
||||
meta(name='keywords', content='learn to code, learn how to code, code, coding, software engineer, software developer, mean stack, pair programming, node.js, angular.js, express.js, mongoDB, coding bootcamp')
|
||||
meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Learn Full-stack JavaScript, build a portfolio, and get great references with our coding bootcamp.", property="og:title")
|
||||
meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", property="og:title")
|
||||
meta(content="FreeCodeCamp", property="og:site_name")
|
||||
meta(name='twitter:widgets:csp', content='on')
|
||||
meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a')
|
||||
meta(content="http://www.freecodecamp.com", property="og:url")
|
||||
meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Learn Full-stack JavaScript, build a portfolio, and get great references with our coding bootcamp.", property="og:description")
|
||||
meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", property="og:description")
|
||||
meta(content="https://pbs.twimg.com/profile_images/522961310212833280/XE6vGAaO.jpeg", property="og:image")
|
||||
meta(content="article", property="og:type")
|
||||
meta(content="https://www.facebook.com/freecodecamp", property="article:publisher")
|
||||
meta(content="Responsive", property="article:section")
|
||||
//meta(content="44011818", property="fb:admins")
|
||||
//Google
|
||||
meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Learn Full-stack JavaScript, build a portfolio, and get great references with our coding bootcamp.", name="description")
|
||||
link(href="https://plus.google.com/114148836969274586544", rel="author")
|
||||
//Twitter
|
||||
link(href="https://plus.google.com/+Freecodecamp", rel="publisher")
|
||||
link(href="https://plus.google.com/+Freecodecamp", rel="author")
|
||||
meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", name="description")
|
||||
meta(content="@freecodecamp", name="twitter:creator")
|
||||
meta(content="http://www.freecodecamp.com", name="twitter:url")
|
||||
meta(content="@freecodecamp", name="twitter:site")
|
||||
|
@ -7,7 +7,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
|
||||
span.icon-bar
|
||||
span.icon-bar
|
||||
a.navbar-brand(href='/')
|
||||
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg')
|
||||
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at Free Code Camp logo')
|
||||
.collapse.navbar-collapse
|
||||
ul.nav.navbar-nav.navbar-right.hamburger-dropdown
|
||||
- if (!cc)
|
||||
@ -30,6 +30,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
|
||||
a(href='http://forum.freecodecamp.com' target='_blank') Forum
|
||||
li
|
||||
a(href='/bonfire') Bonfire
|
||||
li
|
||||
if !user
|
||||
li
|
||||
a.btn.signup-btn.signup-btn-nav(href='/login') Sign in
|
||||
|
@ -4,10 +4,13 @@ block content
|
||||
.panel-heading.landing-panel-heading.text-center Live Pair Programming
|
||||
.panel-body
|
||||
.landing-panel-body.text-center
|
||||
h2 We live pair program every Tuesday from 6 p.m. to 7 p.m. (Pacific Time).
|
||||
h2 Our next session will be January 20th, 2015 at 6 p.m. PST!
|
||||
//h2 Join the discussion in our
|
||||
// a(href="chat.freecodecamp.com", target="_blank") FreeCodeCamp chat room.
|
||||
h2 We live pair program every Tuesday from 9 pm to 10 pm EST (Eastern Standard Time).
|
||||
h2 Our next session will be January 27th, 2015 at 9 p.m. EST!
|
||||
h2 Join the discussion in our
|
||||
a(href="chat.freecodecamp.com", target="_blank") FreeCodeCamp chat room.
|
||||
h2 Watch the live stream below or on our
|
||||
a(href="http://twitch.tv/freecodecamp", target='_blank') Twitch.tv channel
|
||||
| .
|
||||
.embed-responsive.embed-responsive-16by9.big-break
|
||||
iframe(src='http://www.twitch.tv/freecodecamp/embed', frameborder='0', scrolling='no')
|
||||
br
|
||||
|
Reference in New Issue
Block a user