routes for starting a new project

4 files changed, 10 insertions, 8 deletions

diff --git a/server/index.js b/server/index.js
index 27d0d8e..b2fb568 100644
--- a/server/index.js
+++ b/server/index.js
@@ -97,8 +97,6 @@ site.route = function () {
 	app.get('/api/profile', middleware.ensureAuthenticated, api.profile.show)
 	app.put('/api/profile', middleware.ensureAuthenticated, api.profile.update)
 
-	app.get('/project/new', middleware.ensureAuthenticated, views.modal);
-
 	app.get('/staff', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.staff.index);
 	app.get('/staff/bless', middleware.ensureAuthenticated, views.staff.bless);
 
@@ -107,11 +105,13 @@ site.route = function () {
 	app.post('/api/docs/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.update)
 	app.delete('/api/docs/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.destroy)
 
-	app.get('/builder', middleware.ensureAuthenticated, views.modal)
-	app.get('/builder/:name', middleware.ensureAuthenticated, views.builder)
+	app.get('/layout', middleware.ensureAuthenticated, views.modal)
+	app.get('/layout/:name', middleware.ensureAuthenticated, views.builder)
 
-	app.get('/editor', middleware.ensureAuthenticated, views.modal)
-	app.get('/editor/:name', middleware.ensureAuthenticated, views.editor)
+	app.get('/project', middleware.ensureAuthenticated, views.modal)
+	app.get('/project/new', middleware.ensureAuthenticated, views.modal)
+	app.get('/project/new/:layout', middleware.ensureAuthenticated, views.editor)
+	app.get('/project/:name', middleware.ensureAuthenticated, views.editor)
 
 	app.get('/api/layouts', middleware.ensureAuthenticated, api.layouts.index)
 	app.get('/api/layouts/:slug', middleware.ensureAuthenticated, api.layouts.show)
diff --git a/server/lib/api.js b/server/lib/api.js
index d760ba9..f840a66 100644
--- a/server/lib/api.js
+++ b/server/lib/api.js
@@ -10,7 +10,8 @@ var passport = require('passport'),
 	config = require('../../config.json'),
 	User = require('./schemas/User'),
 	Documentation = require('./schemas/Documentation'),
-	Layout = require('./schemas/Layout');
+	Layout = require('./schemas/Layout'),
+	Project = require('./schemas/Project');
 
 var api = {
 
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index 5176e06..6f6ec7a 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -11,7 +11,7 @@ var ProjectSchema = new mongoose.Schema({
 		type: String,
 		required: true,
 		validate: [function (val){
-			val = util.sanitize(val || this.displayName || "")
+			val = util.slugify(val || this.name || "")
 			if (! val.length) return false
 			return true
 		},"{PATH} name is required"]
diff --git a/server/lib/util.js b/server/lib/util.js
index 2ff4e16..aaa8274 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -8,6 +8,7 @@ var nonAlphanumerics = new RegExp('[^-_a-zA-Z0-9]', 'g')
 var consecutiveDashes = new RegExp("-+", 'g')
 var entities = new RegExp("[<>&]", 'g')
 
+
 var util = {}
 
 util.trim = function (s){ return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") }