diff --git a/routes/index.js b/routes/index.js index 162e005..9f6517a 100644 --- a/routes/index.js +++ b/routes/index.js @@ -31,10 +31,10 @@ router.post('/', function(req, res,next) { var invalid = {}; var validInputs = true; - hours = ("0" + hours).slice(-2); - minutes = ("0" + minutes).slice(-2); + var time = hours + ":" + minutes + ampm; + console.log("--time: " + time); if(!numberValidator(number)){ invalid.number = 'Invalid Number'; @@ -141,6 +141,6 @@ function dateValidator(date){ function timeValidator(time){ //var re = /^\d{1,2}\:\d{2}am$|^\d{1,2}\:\d{2}pm$/; - var re = /^[0-9]\:[0-5][0-9]am$|^[0-9]\:[0-5][0-9]pm$|^1[0-2]\:[0-5][0-9]am$|^1[0-2]\:[0-5][0-9]pm$/; + var re = /^[0-9]\:[0-5][0-9]AM$|^[0-9]\:[0-5][0-9]PM$|^1[0-2]\:[0-5][0-9]AM$|^1[0-2]\:[0-5][0-9]PM$/; return re.test(time); } \ No newline at end of file diff --git a/views/blogposts/7-21-15.jade b/views/blogposts/7-21-15.jade index a6c96f4..eca2a5d 100644 --- a/views/blogposts/7-21-15.jade +++ b/views/blogposts/7-21-15.jade @@ -1,53 +1,53 @@ div.blog-post h2.blog-post-title First Blog Post p.blog-post-meta July 21st 2015 by Mitchell - p. - My first blog post introduces this website and the motives behind it. - I discuss setting up a Node.js webserver for the first time and - my experiences with it thus far. + p + |My first blog post introduces this website and the motives behind it. + |I discuss setting up a Node.js webserver for the first time and + |my experiences with it thus far. hr - p. - I have had this site up for awhile now, but I've decided to turn it - into a blog style website, more or less. I first started working on the site - because I wanted to learn new web development tools, in this case, Node.js and MongoDB. - p. - I already had previous experience with SQL databases and other server side scripting - languages such as PHP and JSP, but I heard good things about Node.js and I wanted to - familiarize myself with a NoSQL database. At first, Node.js was a bit confusing to work - with and figure everything out. Now that I am starting to get the hang of Node and MongoDB - I am enjoying them more and more. + p + |I have had this site up for awhile now, but I've decided to turn it + |into a blog style website, more or less. I first started working on the site + |because I wanted to learn new web development tools, in this case, Node.js and MongoDB. + p + |I already had previous experience with SQL databases and other server side scripting + |languages such as PHP and JSP, but I heard good things about Node.js and I wanted to + |familiarize myself with a NoSQL database. At first, Node.js was a bit confusing to work + |with and figure everything out. Now that I am starting to get the hang of Node and MongoDB + |I am enjoying them more and more. h2 Setting up Node.js for the first time - p. - There are multiple ways to get up and running with Node. Node uses "modules" and has some - that are already built in. Others need to be installed with the NPM package manager, which - will become your friend. I am going focus on installing Node.js with Express, which is a - web framework for Node.js. - code$ sudo apt-get install nodejs + p + |There are multiple ways to get up and running with Node. Node uses "modules" and has some + |that are already built in. Others need to be installed with the NPM package manager, which + |will become your friend. I am going focus on installing Node.js with Express, which is a + |web framework for Node.js. + code $ sudo apt-get install nodejs br - code$ sudo apt-get install npm + code $ sudo apt-get install npm br - p. - Once you have both Node.js and NPM installed, install Express and MongoDB. - We are going to install and use express generator to easily create a skeleton that we can - work from. - code$ npm install express-generator -g + p + |Once you have both Node.js and NPM installed, install Express and MongoDB. + |We are going to install and use express generator to easily create a skeleton that we can + |work from. + code $ npm install express-generator -g br p |Based on your system, installing MongoDB may be a bit different. a(href="http://docs.mongodb.org/manual/") Here is a guide on how to install. p Once express generator is installed, it is extremely simple to set up a new Node application. - code$ express myapp + code $ express myapp br p This will generate a new fold "myapp" with prebuild folders and files. - code$ cd myapp + code $ cd myapp br - code$ npm install + code $ npm install br - code$ npm start - p. - Now as easy as that sounds, you have a Node web application running on your machine. - You can navigate to your web app at localhost:3000 (It's configured to use port 3000 by default) + code $ npm start + p + |Now as easy as that sounds, you have a Node web application running on your machine. + |You can navigate to your web app at localhost:3000 (It's configured to use port 3000 by default) p |Express organizes everything nicely in the a(href="https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller") Model View Controller @@ -55,6 +55,6 @@ div.blog-post |If you are implementing a database, you would also create a "models" folder. |There is also a folder which contains Node modules. |When you use NPM to install new modules this is where they will be located. - p. - Node is a very powerful tool that I plan on exploring more in the future. - As development of this site continues, I plan to submit more content similar to this. \ No newline at end of file + p + |Node is a very powerful tool that I plan on exploring more in the future. + |As development of this site continues, I plan to submit more content similar to this. \ No newline at end of file diff --git a/views/index.jade b/views/index.jade index fb0edf1..e14c2d1 100644 --- a/views/index.jade +++ b/views/index.jade @@ -69,7 +69,10 @@ block content option(value=i)= i select.form-control.timeForm(name="minutes") -for(var i = 1; i < 60; i++) - option(value=i)= i + if(i < 10) + option(value="0" + i)= "0" + i + else + option(value=i)= i select.form-control.timeForm(name="ampm") option(value="am") AM option(calue="pm") PM diff --git a/views/success.jade b/views/success.jade index 23cd25c..a95fc9c 100644 --- a/views/success.jade +++ b/views/success.jade @@ -3,7 +3,6 @@ extends layout block content div.header div.centerDiv - h1.headerText.textCenter mitchellG.me div.container div.form-signin