Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore

Author: Menion93

.gitignore

@@ -17,6 +17,7 @@ $RECYCLE.BIN/
 webserver/.*/
 data
 start_mongo.bat
+webserver/data/
 .*
 
 

configuration/Vagrantfile

@@ -32,7 +32,11 @@
             v.memory = 1024 
     	end
 
-		db.vm.provision :shell, path: "script/conf.sh", :args => "db" 
+		db.vm.provision :shell, path: "script/conf.sh", :args => "db"
+		db.vm.provision :puppet do |puppet|
+  				puppet.manifests_path = "puppet/manifest"
+  				puppet.manifest_file = "initMongo.pp"
+		end
 	end
 
 end

configuration/puppet/manifest/initMongo.pp

@@ -0,0 +1 @@
+include  '::mongodb::server'

configuration/script/conf.sh

@@ -1,15 +1,16 @@
 #!/bin/bash
 
-echo $1
-
-#configuration for only database machine 
-if [ $1 == "db" ]; then
- apt-get install -y mongodb
+echo "$1"
 
 #configuration on  all virtual machine machine
 apt-get update
-apt-get install -y nodejs
 
+if [ $1 == "ws" ]; then
+	sudo apt-get install -y nodejs; sudo ln -s /usr/bin/nodejs /usr/bin/node
+fi
+#prepare database machine for puppet provisioning
+if [ $1 == "db" ]; then
+	mkdir -p /etc/puppet/modules; puppet module install puppetlabs-mongodb
+fi
 echo "configuration complete"
 
-fi

webserver/controller/controller.js

@@ -0,0 +1,26 @@
+//Created by Miriana on 19/04/2016.
+
+var controller = {
+    getIngredients: function(req, res, next) {
+        res.render('ingredients.jade');
+    },
+    getPizzas: function(req, res, next) {
+        res.render('pizzas.jade');
+    },
+    createIngredient: function(req, res, next) {
+        res.render('newIngredient.jade');
+    },
+    createPizza: function(req, res, next) {
+        res.render('newPizza.jade');
+    },
+    showSavedIngredient: function(req, res, next) {
+        res.render('savedIngredient.jade');                 //add second param is the ingredient object
+                                                            // in order to show its attributes
+    },
+    showSavedPizza: function(req, res, next) {
+        res.render('savedPizza.jade');                      //add second param is the ingredient object
+                                                            // in order to show its attributes
+    } 
+}
+
+module.exports = controller;

webserver/routes/index.js

@@ -1,9 +1,23 @@
 var express = require('express');
+var controller = require('../controller/controller');
 var router = express.Router();
 
 /* GET home page. */
 router.get('/', function(req, res, next) {
-  res.render('index', { title: 'Express' });
+  res.render('index');
 });
 
+router.get('/ingredients', controller.getIngredients);
+
+router.get('/pizzas', controller.getPizzas);
+
+router.get('/newIngredient', controller.createIngredient);
+
+router.get('/newPizza', controller.createPizza);
+
+router.post('/save_ingredient', controller.showSavedIngredient);
+
+router.post('/save_pizza', controller.showSavedPizza);
+
+
 module.exports = router;

webserver/views/index.jade

@@ -1,5 +1,16 @@
 extends layout
 
 block content
-  h1= title
-  p Welcome to #{title}
+  h1 PROPOSE YOUR PIZZA!!
+  h2 Take a look at existing pizza or propose your idea
+  ul
+    li
+      a(href='/ingredients') Existing ingredients
+    li
+      a(href='/pizzas') Existing pizzas
+    li
+      a(href='/newIngredient') Propose your ingredient
+    li
+      a(href='/newPizza') Propose your pizza
+  footer
+    small Design by Andrea Salvoni, Miriana Mancini and Valerio Gregori

webserver/views/ingredients.jade

@@ -0,0 +1,9 @@
+//Created by Miriana on 19/04/2016.
+
+extends layout
+
+block content
+    h1 Existing ingredients:
+    br
+    a(href='/') Torna alla homepage
+

webserver/views/newIngredient.jade

@@ -0,0 +1,17 @@
+//Created by Miriana on 19/04/2016.
+
+extends layout
+
+block content
+    h1 Your idea is important for us!
+    h2 Propose your ingredient:
+    form(action='/save_ingredient', method='POST')
+        | Name:
+        input(type='text', name='name')
+        br
+        | Description:
+        input(type='text', name='description')
+        br
+        input(type='submit', value='Save')
+    br
+    a(href='/') Torna alla homepage

webserver/views/newPizza.jade

@@ -0,0 +1,23 @@
+//Created by Miriana on 19/04/2016.
+
+extends layout
+
+block content
+    h1 Your idea is important for us!
+    h2 Propose your pizza:
+    form(action='/save_pizza', method='POST')
+        | Name:
+        input(type='text', name='name')
+        br
+        | Description:
+        input(type='text', name='description')
+        br
+        | Base:
+        input(type='text', name='base')
+        br
+        //| Ingredient's list:
+        //input(type='text', name='ingredient_list')
+        br
+        input(type='submit', value='Save')
+    br
+    a(href='/') Torna alla homepage

webserver/views/pizzas.jade

@@ -0,0 +1,8 @@
+//Created by Miriana on 19/04/2016.
+
+extends layout
+
+block content
+    h1 Existing pizzas:
+    br
+    a(href='/') Torna alla homepage

webserver/views/savedIngredient.jade

@@ -0,0 +1,8 @@
+//Created by Miriana on 19/04/2016.
+
+extends layout
+
+block content
+    h1 Thanks for your contribute!
+    br
+    a(href='/') Torna alla homepage

webserver/views/savedPizza.jade

@@ -0,0 +1,8 @@
+//Created by Miriana on 19/04/2016.
+
+extends layout
+
+block content
+    h1 Thanks for your contribute!
+    br
+    a(href='/') Torna alla homepage