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', challengesController.index);
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/experiment-with-html-and-css-in-codepen', challengesController.addDynamicContentToYourWebsite)
app.get('/challenges/add-dynamic-content-to-your-website', 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('/login', userController.getLogin);
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', {
name: 'Create and Deploy a Website',
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!"],
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: [
"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"]
});
};
@ -56,16 +69,3 @@ exports.experimentWithHtmlAndCssInCodepen = function(req, res) {
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.panel-body
img.img-center.img-responsive(src=image)
br
.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
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:
for direction in directions
p= direction
@ -17,5 +17,4 @@
li
a(href=link, target="blank")= link
br
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.panel-body
img.img-center.img-responsive(src=image)

11
views/home.jade
View File

@ -7,24 +7,25 @@ block content
.row
.col-xs-12.col-sm-12.col-md-4
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.
.col-xs-12.col-sm-12.col-md-4
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.
.col-xs-12.col-sm-12.col-md-4
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.
a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free)
br
br
a.btn.btn-success(href="/contact") I'm with a non-profit and want free help from a Software Engineer
br
.jumbotron
.panel.panel-primary
.panel-heading Frequently Asked Questions
.panel-body
.text-left
h1.text-center Frequently Asked Questions
h2 What will I learn, and in what sequence?
ul
p First, you'll learn basic web design tools like:

2
views/partials/challenges.jade
View File

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

2
views/partials/courses.jade
View File

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

2
views/partials/navbar.jade
View File

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