From 942b154f7055ec2e35c882edce778baa76317fe5 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Mon, 20 Oct 2014 16:25:24 -0700 Subject: [PATCH] fix minor problems and use s3 --- app.js | 4 +- controllers/challenges.js | 32 ++--- views/challenges/partials/challenge.jade | 7 +- views/courses/partials/course.jade | 2 +- views/home.jade | 157 ++++++++++++----------- views/partials/challenges.jade | 2 +- views/partials/courses.jade | 2 +- views/partials/navbar.jade | 2 +- 8 files changed, 104 insertions(+), 104 deletions(-) diff --git a/app.js b/app.js index f465cd0bce..5d1b1a33f8 100644 --- a/app.js +++ b/app.js @@ -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); diff --git a/controllers/challenges.js b/controllers/challenges.js index 95795b7a70..2033042c89 100644 --- a/controllers/challenges.js +++ b/controllers/challenges.js @@ -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"] }); }; @@ -55,17 +68,4 @@ 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"] - }); }; \ No newline at end of file diff --git a/views/challenges/partials/challenge.jade b/views/challenges/partials/challenge.jade index 540d867b86..afa7a048be 100644 --- a/views/challenges/partials/challenge.jade +++ b/views/challenges/partials/challenge.jade @@ -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 \ No newline at end of file diff --git a/views/courses/partials/course.jade b/views/courses/partials/course.jade index 006b3d1696..8a3673f302 100644 --- a/views/courses/partials/course.jade +++ b/views/courses/partials/course.jade @@ -1,4 +1,4 @@ -.panel.panel-info +.panel.panel-primary .panel-heading Course: #{name} .panel.panel-body img.img-center.img-responsive(src=image) diff --git a/views/home.jade b/views/home.jade index 0b5791cba1..50c3f317ec 100644 --- a/views/home.jade +++ b/views/home.jade @@ -7,93 +7,94 @@ 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 - .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: - ul - li • HTML - the structure of web pages - li • CSS - the design of web pages - li • Bootstrap - a "responsive design" tool that helps your websites look great on tablets and phones - li • jQuery - an easy tool for controlling content in the browser - p Then you'll learn computer science and the art of programming: - ul - li • JavaScript - the programming language that all web browsers use - li • Linux - the most popular operating system for servers (but you don't need to learn desktop Linux) - li • Git - the best way to save and share your projects - li • Databases - SQL is like a giant spread sheet that stores and retrieves your data - li • Algorithms - these are basically step-by-step recipies for getting things done - p You'll spend the last half of Free Code Camp using Agile Methodologies and Full Stack JavaScript to build projects for non-profits: - ul - li • Agile - a set of software development principles that focus the design and production of a project on the needs of its users. - li • MongoDB - a popular non-relational database - li • AngularJS - a tool for making exciting web interfaces - li • ExpressJS - a powerful web development framework - li • NodeJS - a JavaScript-based web server - h2 How will I learn all this? - ul - 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. - h2 What is 'pair programming', and what's so special about it? - ul - 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. - h2 How long does Free Code Camp take? - ul - 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: - table.table - th Time budgeted - th Hours per week - th Weeks to complete - tr.info - td Weekends - td 10 hours/week - td 100 weeks (2 years) - tr.success - td Nights and Weekends - td 20 hours/week - td 50 weeks (1 year) - tr.warning - td Full time - td 40 hours/week - td 25 weeks (6 months) - tr.danger - td Traditional Bootcamp Pacing - td 80 hours/week - td 12 weeks (3 months) - h2 Why does Free Code Camp use JavaScript instead of Ruby or Python? - ul - 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. - br - img.img-center.img-responsive(src="http://dberkholz-media.redmonk.com/dberkholz/files/2014/04/github_new_repos-custom.png", style="max-height: 300px;") - h2 Will I really be able to job afterward? - ul - 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. - 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") - h2 Do you have job placement services? - ul - p Yes. We work with reputable technical recruitment firms and can help you find a good job. - h2 Is this really free? Do you claim part of my first year's salary like some bootcamps do? - ul - 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. - h2 Does Free Code Camp have an application process? - ul - 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. - br - .text-center - a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free) \ No newline at end of file + .panel.panel-primary + .panel-heading Frequently Asked Questions + .panel-body + .text-left + h2 What will I learn, and in what sequence? + ul + p First, you'll learn basic web design tools like: + ul + li • HTML - the structure of web pages + li • CSS - the design of web pages + li • Bootstrap - a "responsive design" tool that helps your websites look great on tablets and phones + li • jQuery - an easy tool for controlling content in the browser + p Then you'll learn computer science and the art of programming: + ul + li • JavaScript - the programming language that all web browsers use + li • Linux - the most popular operating system for servers (but you don't need to learn desktop Linux) + li • Git - the best way to save and share your projects + li • Databases - SQL is like a giant spread sheet that stores and retrieves your data + li • Algorithms - these are basically step-by-step recipies for getting things done + p You'll spend the last half of Free Code Camp using Agile Methodologies and Full Stack JavaScript to build projects for non-profits: + ul + li • Agile - a set of software development principles that focus the design and production of a project on the needs of its users. + li • MongoDB - a popular non-relational database + li • AngularJS - a tool for making exciting web interfaces + li • ExpressJS - a powerful web development framework + li • NodeJS - a JavaScript-based web server + h2 How will I learn all this? + ul + 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. + h2 What is 'pair programming', and what's so special about it? + ul + 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. + h2 How long does Free Code Camp take? + ul + 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: + table.table + th Time budgeted + th Hours per week + th Weeks to complete + tr.info + td Weekends + td 10 hours/week + td 100 weeks (2 years) + tr.success + td Nights and Weekends + td 20 hours/week + td 50 weeks (1 year) + tr.warning + td Full time + td 40 hours/week + td 25 weeks (6 months) + tr.danger + td Traditional Bootcamp Pacing + td 80 hours/week + td 12 weeks (3 months) + h2 Why does Free Code Camp use JavaScript instead of Ruby or Python? + ul + 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. + br + img.img-center.img-responsive(src="http://dberkholz-media.redmonk.com/dberkholz/files/2014/04/github_new_repos-custom.png", style="max-height: 300px;") + h2 Will I really be able to job afterward? + ul + 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. + 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") + h2 Do you have job placement services? + ul + p Yes. We work with reputable technical recruitment firms and can help you find a good job. + h2 Is this really free? Do you claim part of my first year's salary like some bootcamps do? + ul + 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. + h2 Does Free Code Camp have an application process? + ul + 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. + br + .text-center + a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free) \ No newline at end of file diff --git a/views/partials/challenges.jade b/views/partials/challenges.jade index aa6f32e3bc..5ecf4bdd34 100644 --- a/views/partials/challenges.jade +++ b/views/partials/challenges.jade @@ -1,4 +1,4 @@ -.panel.panel-primary +.panel.panel-info .panel-heading Challenges .panel-body ol diff --git a/views/partials/courses.jade b/views/partials/courses.jade index 96981baa3a..bab5798870 100644 --- a/views/partials/courses.jade +++ b/views/partials/courses.jade @@ -1,4 +1,4 @@ -.panel.panel-primary +.panel.panel-info .panel-heading Free Courses .panel-body ol diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index 356d42f8ff..a67e90c043 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -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