merge

1 files changed, 82 insertions, 47 deletions

diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 794079e..61b1d1b 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -9,6 +9,7 @@ var SiteRouter = Router.extend({
 		"click [data-role='new-project-modal']": 'newProject',
 		"click [data-role='edit-project-modal']": 'editProject',
 		"click [data-role='edit-profile-modal']": 'editProfile',
+		"click [data-role='edit-subscription-modal']": 'editSubscription',
 		"click [data-role='new-document-modal']": 'newDocument',
 		"click [data-role='edit-document-modal']": 'editDocument',
 		"click [data-role='destroy-document-modal']": 'destroyDocument',
@@ -17,36 +18,55 @@ var SiteRouter = Router.extend({
 	},
 	
 	routes: {
+		"/":                             'home',
+		"/home":                         'home',
+		"/login":                        'signin',
+		"/signin":                       'signin',
+		"/signup":                       'signup',
+
+		"/auth/usernameTaken":           'usernameTaken',
+		"/auth/password":                'passwordReset',
+		"/auth/forgotPassword":          'passwordForgot',
+
+		"/profile":                      'profile',
+		"/profile/edit":                 'editProfile',
+		"/profile/billing":              'editSubscription',
+		"/profile/:name":                'profile',
+		"/about/:name/edit":             'editDocument',
+		"/about/new":                    'newDocument',
+
+		"/layout":                       'layoutPicker',
+		"/layout/:name":                 'layoutEditor',
+
+		"/blueprint":                    'blueprintEditor',
+		"/blueprint/:name":              'blueprintEditor',
+
+		"/project":                      'projectPicker',
+		"/project/new":                  'newProject',
+		"/project/blueprint/:blueprint": 'projectNewWithBlueprint',
+		"/project/new/:layout":          'projectNewWithLayout',
+		"/project/:name":                'projectViewer',
+		"/project/:name/edit":           'projectEditor',
+		"/project/:name/view":           'projectViewer',
+
+		"/test/blueprint":      'blueprintEditor',
+	},
+	
+	mobileRoutes: {
 		"/":                    'home',
+		"/home":                'home',
 		"/login":               'signin',
+		"/signin":              'signin',
 		"/signup":              'signup',
-
 		"/auth/usernameTaken":  'usernameTaken',
 		"/auth/password":       'passwordReset',
 		"/auth/forgotPassword": 'passwordForgot',
 
 		"/profile":             'profile',
 		"/profile/edit":        'editProfile',
+		"/profile/billing":     'editSubscription',
 		"/profile/:name":       'profile',
-		"/about/:name/edit":    'editDocument',
-		"/about/new":           'newDocument',
-
-		"/layout":              'layoutPicker',
-		"/layout/:name":        'layoutEditor',
 
-		"/project":             'projectPicker',
-		"/project/new":         'newProject',
-		"/project/new/:layout": 'projectNewWithLayout',
-		"/project/:name":       'projectViewer',
-		"/project/:name/edit":  'projectEditor',
-		"/project/:name/view":  'projectViewer',
-		
-		"/test/wallpaper":      'testWallpaper',
-	},
-	
-	mobileRoutes: {
-		"/":                    'home',
-		"/profile":             'profile',
 		"/project/:name":       'projectViewer',
 	},
 
@@ -58,6 +78,7 @@ var SiteRouter = Router.extend({
 		this.newProjectModal = new NewProjectModal()
 		this.editProjectModal = new EditProjectModal()
 		this.editProfileModal = new EditProfileModal()
+		this.editSubscriptionModal = new EditSubscriptionModal()
 		this.passwordForgotModal = new PasswordForgot()
 		this.documentModal = new DocumentModal()
 		this.profileView = new ProfileView()
@@ -65,16 +86,22 @@ var SiteRouter = Router.extend({
 		this.route()
 		
 		if (is_mobile) {
-			$(".topLinks").hide()
-			$(".share").hide()
+      // $(".topLinks").hide()
+      // $(".share").hide()
+      $('.projectItem').each(function(){
+        this.href = this.href.replace(/\/edit$/, "")
+      })
 		}
 		
-		$("body").removeClass("loading")
+		setTimeout(function(){
+		  $("body").removeClass("loading")
+		}, 200)
 	},
 
 	layoutEditor: function(e, name){
 		app.mode.builder = true
 		app.launch()
+		if (app.unsupported) return
 
 		this.builderView = app.controller = new BuilderView()
 		this.builderView.load(name)
@@ -97,12 +124,29 @@ var SiteRouter = Router.extend({
 		window.history.pushState(null, document.title, "/project/new")
 		this.newProjectModal.load()
 	},
+	
+	projectNewWithBlueprint: function(e, blueprint){
+		e && e.preventDefault()
+		
+		Rooms.shapesMode = true
+
+		app.mode.editor = true
+		app.launch()
+		if (app.unsupported) return
+
+		blueprint = slugify(blueprint)
+		
+		window.history.pushState(null, document.title, "/project/blueprint/" + blueprint)
+		this.editorView = app.controller = new EditorView()
+		this.editorView.loadBlueprint(blueprint)
+	},
 
 	projectNewWithLayout: function(e, layout){
 		e && e.preventDefault()
 
 		app.mode.editor = true
 		app.launch()
+		if (app.unsupported) return
 
 		layout = slugify(layout)
 		
@@ -123,6 +167,7 @@ var SiteRouter = Router.extend({
 	projectEditor: function(e, name){
 		app.mode.editor = true
 		app.launch()
+		if (app.unsupported) return
 
 		this.editorView = app.controller = new EditorView()
 		this.editorView.load(name)
@@ -131,10 +176,20 @@ var SiteRouter = Router.extend({
 	projectViewer: function(e, name){
 		app.mode.editor = true
 		app.launch()
+		if (app.unsupported) return
 
 		this.readerView = app.controller = new ReaderView()
 		this.readerView.load(name)
 	},
+	
+	blueprintEditor: function(e, name){
+	  environment.init = environment.minimal
+	  app.launch()
+	  if (app.unsupported) return
+
+	  this.blueprintView = app.controller = new BlueprintView ()
+	  this.blueprintView.load(name)
+	},
 
 	signup: function(e){
 		e && e.preventDefault()
@@ -177,7 +232,12 @@ var SiteRouter = Router.extend({
 
 		this.editProfileModal.load()
 	},
+	editSubscription: function(e){
+		e && e.preventDefault()
+		window.history.pushState(null, document.title, "/profile/billing")	
 
+		this.editSubscriptionModal.load()
+	},
 
 	newDocument: function(e){
 		e && e.preventDefault()
@@ -212,30 +272,5 @@ var SiteRouter = Router.extend({
 		// this.documentModal.destroy(name)
 	},
 
-
-	testWallpaper: function(e){
-		var content = document.getElementById("content")
-		content.style.width = "680px"
-		content.style.margin = "0 auto"
-		var wm = new WallpaperManager()
-		app.on('wallpaper-ready', function(){
-			var black = [0,0,0,0]
-			var white = [255,255,255,1.0]
-			var swatches = wm.buildSwatches(black, white, 4)
-			document.body.style.backgroundColor = "#eee"
-			swatches.forEach(function(swatch){
-				swatch.style.margin = "4px"
-				swatch.style.border = "1px solid lime"
-				swatch.style.backgroundColor = "#888"
-				content.appendChild(swatch)
-				swatch.onclick = function(){
-					dataUrl = swatch.toDataURL()
-					document.body.style.backgroundImage = "url(" + dataUrl + ")"
-				}
-			})
-		})
-		wm.init()
-	},
-
 })