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

fix minor problems and use s3

Browse Source
This commit is contained in:
Michael Q Larson
2014-10-20 16:25:24 -07:00
parent fa76554a5b
commit 942b154f70
8 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -137,8 +137,8 @@ app.get('/courses/m101js-mongodb-for-node-js-developers-course', coursesControll
//app.get('/challenges/:id', challengesController.view); //app.get('/challenges/:id', challengesController.view);
//app.get('/challenges', challengesController.index); //app.get('/challenges', challengesController.index);
app.get('/challenges/create-and-deploy-a-website', challengesController.createAndDeployAWebsite) app.get('/challenges/create-and-deploy-a-website', challengesController.createAndDeployAWebsite)
app.get('/challenges/challenges/add-dynamic-content-to-your-website', challengesController.experimentWithHtmlAndCssInCodepen) app.get('/challenges/add-dynamic-content-to-your-website', challengesController.addDynamicContentToYourWebsite)
app.get('/challenges/experiment-with-html-and-css-in-codepen', challengesController.addDynamicContentToYourWebsite) app.get('/challenges/experiment-with-html-and-css-in-codepen', challengesController.experimentWithHtmlAndCssInCodepen)
app.get('/challenges/start-a-pair-programming-session', challengesController.startAPairProgrammingSession) app.get('/challenges/start-a-pair-programming-session', challengesController.startAPairProgrammingSession)
app.get('/login', userController.getLogin); app.get('/login', userController.getLogin);
app.post('/login', userController.postLogin); app.post('/login', userController.postLogin);

32
controllers/challenges.js
View File

@ -24,9 +24,22 @@ exports.createAndDeployAWebsite = function(req, res) {
res.render('challenges/create-and-deploy-a-website', { res.render('challenges/create-and-deploy-a-website', {
name: 'Create and Deploy a Website', name: 'Create and Deploy a Website',
image: 'http://startbootstrap.com/assets/img/templates/landing-page.jpg', image: 'http://startbootstrap.com/assets/img/templates/landing-page.jpg',
video: "", video: "109134466",
directions: ["In the next 5 minutes, you'll create a website and deploy it to the internet!"], directions: ["In the next 5 minutes, you'll create a website and deploy it to the internet!"],
links: ["http://startbootstrap.com/template-overviews/freelancer/", "http://bitballoon.com", "http://atom.io"] links: ["http://startbootstrap.com", "http://bitballoon.com", "http://atom.io"]
});
};
exports.startAPairProgrammingSession = function(req, res) {
res.render('challenges/start-a-pair-programming-session', {
name: "Start Your First Pair Programming Session",
source: "Free Code Camp",
video: "",
image: "https://screenhero.com/img/anim-collaboration.gif",
directions: [
"What's all this Pair Programming stuff about? Let's find out!", "We'll use a popular pair programming tool called Screen Hero. We'll also visit the Free Code Camp chat room.", "We'll show you how to launch pair programming sessions right inside the chat room."
],
links: ["https://screenhero.com/download.html", "https://www.hipchat.com/invite/178107/cc2f6ea4dfac9e48b9a88b305adae48a"]
}); });
}; };
@ -39,7 +52,7 @@ exports.addDynamicContentToYourWebsite = function(req, res) {
directions: [ directions: [
"The website you created earlier is cool, but it's not very interactive.", "Let's make it dynamic with POWr.io's drag-and-drop form and database tools!" "The website you created earlier is cool, but it's not very interactive.", "Let's make it dynamic with POWr.io's drag-and-drop form and database tools!"
], ],
links: ["http://startbootstrap.com/template-overviews/freelancer/", "http://www.powr.io/", "http://bitballoon.com"] links: ["http://startbootstrap.com", "http://www.powr.io", "http://bitballoon.com"]
}); });
}; };
@ -55,17 +68,4 @@ exports.experimentWithHtmlAndCssInCodepen = function(req, res) {
], ],
links: ["http://getbootstrap.com/", "http://www.usatoday.com/", "http://codepen.io/"] links: ["http://getbootstrap.com/", "http://www.usatoday.com/", "http://codepen.io/"]
}); });
};
exports.startAPairProgrammingSession = function(req, res) {
res.render('challenges/start-a-pair-programming-session', {
name: "Start Your First Pair Programming Session",
source: "Free Code Camp",
video: "",
image: "https://screenhero.com/img/anim-collaboration.gif",
directions: [
"What's all this Pair Programming stuff about? Let's find out!", "We'll use a popular pair programming tool called Screen Hero. We'll also visit the Free Code Camp chat room.", "We'll show you how to launch pair programming sessions right inside the chat room."
],
links: ["https://screenhero.com/download.html", "https://www.hipchat.com/invite/178107/cc2f6ea4dfac9e48b9a88b305adae48a"]
});
}; };

7
views/challenges/partials/challenge.jade
View File

@ -1,12 +1,12 @@
.panel.panel-info .panel.panel-primary
.panel-heading Challenge: #{name} .panel-heading Challenge: #{name}
.panel.panel-body .panel.panel-body
img.img-center.img-responsive(src=image) img.img-center.img-responsive(src=image)
br br
.visible-xs .visible-xs
iframe(src='//player.vimeo.com/video/109134466', width='300', height='187', frameborder='0', webkitallowfullscreen='', mozallowfullscreen='', allowfullscreen='') iframe(src='//player.vimeo.com/video/#{video}', width='300', height='187', frameborder='0', webkitallowfullscreen='', mozallowfullscreen='', allowfullscreen='')
.hidden-xs .hidden-xs
iframe(src='//player.vimeo.com/video/109134466', width='600', height='375', style="display:block;", frameborder='0', webkitallowfullscreen='', mozallowfullscreen='', allowfullscreen='') iframe(src='//player.vimeo.com/video/#{video}', width='600', height='375', style="display:block;", frameborder='0', webkitallowfullscreen='', mozallowfullscreen='', allowfullscreen='')
h3 Instructions: h3 Instructions:
for direction in directions for direction in directions
p= direction p= direction
@ -17,5 +17,4 @@
li li
a(href=link, target="blank")= link a(href=link, target="blank")= link
br br
a.btn.btn-primary.btn-large.btn-block(href='/curriculum') I've completed this challenge a.btn.btn-primary.btn-large.btn-block(href='/curriculum') I've completed this challenge

2
views/courses/partials/course.jade
View File

@ -1,4 +1,4 @@
.panel.panel-info .panel.panel-primary
.panel-heading Course: #{name} .panel-heading Course: #{name}
.panel.panel-body .panel.panel-body
img.img-center.img-responsive(src=image) img.img-center.img-responsive(src=image)

157
views/home.jade
View File

@ -7,93 +7,94 @@ block content
.row .row
.col-xs-12.col-sm-12.col-md-4 .col-xs-12.col-sm-12.col-md-4
h3 Technical Mastery h3 Technical Mastery
img.img-center.three-by-three.img-responsive(src="images/tools.svg") img.img-center.three-by-three.img-responsive(src="https://s3.amazonaws.com/freecodecamp/tools.svg")
p You'll learn to code by pair programming (where two people code together on one computer) on our coding challenges. p You'll learn to code by pair programming (where two people code together on one computer) on our coding challenges.
.col-xs-12.col-sm-12.col-md-4 .col-xs-12.col-sm-12.col-md-4
h3 Unique Portfolio Projects h3 Unique Portfolio Projects
img.img-center.three-by-three.img-responsive(src="images/portfolio.svg") img.img-center.three-by-three.img-responsive(src="https://s3.amazonaws.com/freecodecamp/portfolio.svg")
p You'll apply your new coding skills by building software solutions for non-profits. p You'll apply your new coding skills by building software solutions for non-profits.
.col-xs-12.col-sm-12.col-md-4 .col-xs-12.col-sm-12.col-md-4
h3 Glowing References h3 Glowing References
img.img-center.three-by-three.img-responsive(src="images/references.svg") img.img-center.three-by-three.img-responsive(src="https://s3.amazonaws.com/freecodecamp/references.svg")
p You'll gain the respect of your peers and the people you help. These connections will help you land the job. p You'll gain the respect of your peers and the people you help. These connections will help you land the job.
a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free) a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free)
br br
br br
a.btn.btn-success(href="/contact") I'm with a non-profit and want free help from a Software Engineer a.btn.btn-success(href="/contact") I'm with a non-profit and want free help from a Software Engineer
br br
.jumbotron .panel.panel-primary
.text-left .panel-heading Frequently Asked Questions
h1.text-center Frequently Asked Questions .panel-body
h2 What will I learn, and in what sequence? .text-left
ul h2 What will I learn, and in what sequence?
p First, you'll learn basic web design tools like: ul
ul p First, you'll learn basic web design tools like:
li &#8226 HTML - the structure of web pages ul
li &#8226 CSS - the design of web pages li &#8226 HTML - the structure of web pages
li &#8226 Bootstrap - a "responsive design" tool that helps your websites look great on tablets and phones li &#8226 CSS - the design of web pages
li &#8226 jQuery - an easy tool for controlling content in the browser li &#8226 Bootstrap - a "responsive design" tool that helps your websites look great on tablets and phones
p Then you'll learn computer science and the art of programming: li &#8226 jQuery - an easy tool for controlling content in the browser
ul p Then you'll learn computer science and the art of programming:
li &#8226 JavaScript - the programming language that all web browsers use ul
li &#8226 Linux - the most popular operating system for servers (but you don't need to learn desktop Linux) li &#8226 JavaScript - the programming language that all web browsers use
li &#8226 Git - the best way to save and share your projects li &#8226 Linux - the most popular operating system for servers (but you don't need to learn desktop Linux)
li &#8226 Databases - SQL is like a giant spread sheet that stores and retrieves your data li &#8226 Git - the best way to save and share your projects
li &#8226 Algorithms - these are basically step-by-step recipies for getting things done li &#8226 Databases - SQL is like a giant spread sheet that stores and retrieves your data
p You'll spend the last half of Free Code Camp using Agile Methodologies and Full Stack JavaScript to build projects for non-profits: li &#8226 Algorithms - these are basically step-by-step recipies for getting things done
ul p You'll spend the last half of Free Code Camp using Agile Methodologies and Full Stack JavaScript to build projects for non-profits:
li &#8226 Agile - a set of software development principles that focus the design and production of a project on the needs of its users. ul
li &#8226 MongoDB - a popular non-relational database li &#8226 Agile - a set of software development principles that focus the design and production of a project on the needs of its users.
li &#8226 AngularJS - a tool for making exciting web interfaces li &#8226 MongoDB - a popular non-relational database
li &#8226 ExpressJS - a powerful web development framework li &#8226 AngularJS - a tool for making exciting web interfaces
li &#8226 NodeJS - a JavaScript-based web server li &#8226 ExpressJS - a powerful web development framework
h2 How will I learn all this? li &#8226 NodeJS - a JavaScript-based web server
ul h2 How will I learn all this?
p By pair programming with other Free Code Camp students on our coding challenges. We've also built an optional curriculum of the best free courses on the web. Eventually, you'll work with people at non-profits to build real-life software solutions. ul
h2 What is 'pair programming', and what's so special about it? p By pair programming with other Free Code Camp students on our coding challenges. We've also built an optional curriculum of the best free courses on the web. Eventually, you'll work with people at non-profits to build real-life software solutions.
ul h2 What is 'pair programming', and what's so special about it?
p Pair programming is where two software engineers share one computer and write code together. They discuss different problem solving approaches, and keep each other motivated. The result is better code than either engineer could have written by themselves. Because of its benefits, many engineers pair program full time. And it's the best way to learn coding. ul
h2 How long does Free Code Camp take? p Pair programming is where two software engineers share one computer and write code together. They discuss different problem solving approaches, and keep each other motivated. The result is better code than either engineer could have written by themselves. Because of its benefits, many engineers pair program full time. And it's the best way to learn coding.
ul h2 How long does Free Code Camp take?
p It takes about 1,000 hours of coding to develop the skills you'll need to get an entry level software engineering job. Many in-person coding bootcamps jam all this into 12 weeks of intensive study. Free Code Camp is fully-online, and there will always be other people at your skill level that you can pair program with, so you can learn at your own pace. Here are some example coding schedules: ul
table.table p It takes about 1,000 hours of coding to develop the skills you'll need to get an entry level software engineering job. Many in-person coding bootcamps jam all this into 12 weeks of intensive study. Free Code Camp is fully-online, and there will always be other people at your skill level that you can pair program with, so you can learn at your own pace. Here are some example coding schedules:
th Time budgeted table.table
th Hours per week th Time budgeted
th Weeks to complete th Hours per week
tr.info th Weeks to complete
td Weekends tr.info
td 10 hours/week td Weekends
td 100 weeks (2 years) td 10 hours/week
tr.success td 100 weeks (2 years)
td Nights and Weekends tr.success
td 20 hours/week td Nights and Weekends
td 50 weeks (1 year) td 20 hours/week
tr.warning td 50 weeks (1 year)
td Full time tr.warning
td 40 hours/week td Full time
td 25 weeks (6 months) td 40 hours/week
tr.danger td 25 weeks (6 months)
td Traditional Bootcamp Pacing tr.danger
td 80 hours/week td Traditional Bootcamp Pacing
td 12 weeks (3 months) td 80 hours/week
h2 Why does Free Code Camp use JavaScript instead of Ruby or Python? td 12 weeks (3 months)
ul h2 Why does Free Code Camp use JavaScript instead of Ruby or Python?
p We love Python and Ruby. But even if you learn them, you'll still need to learn JavaScript. JavaScript is the most important language of all - it's the language of web browsers. It's also the most popular language. ul
br p We love Python and Ruby. But even if you learn them, you'll still need to learn JavaScript. JavaScript is the most important language of all - it's the language of web browsers. It's also the most popular language.
img.img-center.img-responsive(src="http://dberkholz-media.redmonk.com/dberkholz/files/2014/04/github_new_repos-custom.png", style="max-height: 300px;") br
h2 Will I really be able to job afterward? img.img-center.img-responsive(src="http://dberkholz-media.redmonk.com/dberkholz/files/2014/04/github_new_repos-custom.png", style="max-height: 300px;")
ul h2 Will I really be able to job afterward?
p At the end of Free Code Camp, you will have pair programmed around 1,000 hours with dozens of other students, built a portfolio of projects that people are actively using, and a roster of glowing references from non-profits you've helped. 75% of bootcamp graduates get software engineering jobs, and make an average annual salary of $76,000. ul
img.img-center.img-responsive(src="https://www.evernote.com/shard/s116/sh/4bb05639-d86c-4c15-b3a8-e4a43fa22d89/7cf00ed01124fac6e6741b97f8fb9e6f/deep/0/https---www.coursereport.com-2014-graduate-survey.pdf.png") p At the end of Free Code Camp, you will have pair programmed around 1,000 hours with dozens of other students, built a portfolio of projects that people are actively using, and a roster of glowing references from non-profits you've helped. 75% of bootcamp graduates get software engineering jobs, and make an average annual salary of $76,000.
h2 Do you have job placement services? img.img-center.img-responsive(src="https://www.evernote.com/shard/s116/sh/4bb05639-d86c-4c15-b3a8-e4a43fa22d89/7cf00ed01124fac6e6741b97f8fb9e6f/deep/0/https---www.coursereport.com-2014-graduate-survey.pdf.png")
ul h2 Do you have job placement services?
p Yes. We work with reputable technical recruitment firms and can help you find a good job. ul
h2 Is this really free? Do you claim part of my first year's salary like some bootcamps do? p Yes. We work with reputable technical recruitment firms and can help you find a good job.
ul h2 Is this really free? Do you claim part of my first year's salary like some bootcamps do?
p Our name is Free Code Camp. We are a free code camp. If you had to pay us (or sign over future earnings), we'd have to change our name. And we are not going to do that. ul
h2 Does Free Code Camp have an application process? p Our name is Free Code Camp. We are a free code camp. If you had to pay us (or sign over future earnings), we'd have to change our name. And we are not going to do that.
ul h2 Does Free Code Camp have an application process?
p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you perservere, and keep working through our challenges and non-profits' projects, you will become an employable software engineer. ul
br p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you perservere, and keep working through our challenges and non-profits' projects, you will become an employable software engineer.
.text-center br
a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free) .text-center
a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free)

2
views/partials/challenges.jade
View File

@ -1,4 +1,4 @@
.panel.panel-primary .panel.panel-info
.panel-heading Challenges .panel-heading Challenges
.panel-body .panel-body
ol ol

2
views/partials/courses.jade
View File

@ -1,4 +1,4 @@
.panel.panel-primary .panel.panel-info
.panel-heading Free Courses .panel-heading Free Courses
.panel-body .panel-body
ol ol

2
views/partials/navbar.jade
View File

@ -8,7 +8,7 @@
span.icon-bar span.icon-bar
a.navbar-brand(href='/') a.navbar-brand(href='/')
span span
img.navbar-icon(src= "images/fire.svg") img.navbar-icon(src= "https://s3.amazonaws.com/freecodecamp/fire.svg")
| Free Code Camp | Free Code Camp
.collapse.navbar-collapse .collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right ul.nav.navbar-nav.navbar-right