Merge branch 'refactor/update_iron_router'

Ryan Glover
2 parents 2a6a545664 eeaf2c3792
Showing 5 changed files Show diff stats
.meteor/packages
.meteor/versions
client/routes/filters.coffee
client/routes/routes-authenticated.coffee
client/routes/routes-public.coffee
@@ -13,7 +13,7 @@ check
 audit-argument-checks
 iron:router
 pinglamb:bootstrap3
-particle4dev:sass
 cmather:handlebars-server
 themeteorchef:jquery-validation
+particle4dev:sass@0.3.0
  
@@ -26,10 +26,14 @@ html-tools@1.0.2
 htmljs@1.0.2
 http@1.0.8
 id-map@1.0.1
-iron:core@0.3.4
-iron:dynamic-template@0.4.1
-iron:layout@0.4.1
-iron:router@0.9.4
+iron:controller@1.0.0
+iron:core@1.0.0
+iron:dynamic-template@1.0.0
+iron:layout@1.0.0
+iron:location@1.0.0
+iron:middleware-stack@1.0.0
+iron:router@1.0.0
+iron:url@1.0.0
 jquery@1.0.1
 json@1.0.1
 launch-screen@1.0.0
@@ -13,7 +13,8 @@
 checkUserLoggedIn = ->
   if not Meteor.loggingIn() and not Meteor.user()
     Router.go '/login'
-    @pause
+  else
+    @next()
  
 ###
   Filter: Check if a User Exists
@@ -23,9 +24,10 @@ checkUserLoggedIn = -&gt;
 userAuthenticated = ->
   if not Meteor.loggingIn() and Meteor.user()
     Router.go '/'
+  else
+    @next()
  
 # Run Filters
-
 Router.onBeforeAction checkUserLoggedIn, except: [
   'signup',
   'login',
-Router.map(->
-  @route('index',
-    path: '/'
-    template: 'index'
-    onBeforeAction: ->
-        # Code to run before route goes here.
-  )
+Router.route('index',
+  path: '/'
+  template: 'index'
+  onBeforeAction: ->
+    # Code to run before route goes here.
+    @next()
 )
-Router.map(->
-
-  @route('signup',
-    path: '/signup'
-    template: 'signup'
-    onBeforeAction: ->
-      Session.set 'currentRoute', 'signup'
-  )
+Router.route('signup',
+  path: '/signup'
+  template: 'signup'
+  onBeforeAction: ->
+    Session.set 'currentRoute', 'signup'
+    @next()
+)
  
-  @route('login',
-    path: '/login'
-    template: 'login'
-    onBeforeAction: ->
-      Session.set 'currentRoute', 'login'
-  )
+Router.route('login',
+  path: '/login'
+  template: 'login'
+  onBeforeAction: ->
+    Session.set 'currentRoute', 'login'
+    @next()
+)
  
-  @route('recover-password',
-    path: '/recover-password'
-    template: 'recoverPassword'
-    onBeforeAction: ->
-      Session.set 'currentRoute', 'recover-password'
-  )
+Router.route('recover-password',
+  path: '/recover-password'
+  template: 'recoverPassword'
+  onBeforeAction: ->
+    Session.set 'currentRoute', 'recover-password'
+    @next()
+)
  
-  @route('reset-password',
-    path: '/reset-password/:token'
-    template: 'resetPassword'
-    onBeforeAction: ->
-      Session.set 'currentRoute', 'reset-password'
-      Session.set 'resetPasswordToken', @params.token
-  )
+Router.route('reset-password',
+  path: '/reset-password/:token'
+  template: 'resetPassword'
+  onBeforeAction: ->
+    Session.set 'currentRoute', 'reset-password'
+    Session.set 'resetPasswordToken', @params.token
+    @next()
 )
...	...	@@ -13,7 +13,7 @@ check
13	13	audit-argument-checks
14	14	iron:router
15	15	pinglamb:bootstrap3
16		-particle4dev:sass
17	16	cmather:handlebars-server
18	17	themeteorchef:jquery-validation
	18	+particle4dev:sass@0.3.0
19	19
...	...
...	...	@@ -26,10 +26,14 @@ html-tools@1.0.2
26	26	htmljs@1.0.2
27	27	http@1.0.8
28	28	id-map@1.0.1
29		-iron:core@0.3.4
30		-iron:dynamic-template@0.4.1
31		-iron:layout@0.4.1
32		-iron:router@0.9.4
	29	+iron:controller@1.0.0
	30	+iron:core@1.0.0
	31	+iron:dynamic-template@1.0.0
	32	+iron:layout@1.0.0
	33	+iron:location@1.0.0
	34	+iron:middleware-stack@1.0.0
	35	+iron:router@1.0.0
	36	+iron:url@1.0.0
33	37	jquery@1.0.1
34	38	json@1.0.1
35	39	launch-screen@1.0.0
...	...
...	...	@@ -13,7 +13,8 @@
13	13	checkUserLoggedIn = ->
14	14	if not Meteor.loggingIn() and not Meteor.user()
15	15	Router.go '/login'
16		- @pause
	16	+ else
	17	+ @next()
17	18
18	19	###
19	20	Filter: Check if a User Exists
...	...	@@ -23,9 +24,10 @@ checkUserLoggedIn = ->
23	24	userAuthenticated = ->
24	25	if not Meteor.loggingIn() and Meteor.user()
25	26	Router.go '/'
	27	+ else
	28	+ @next()
26	29
27	30	# Run Filters
28		-
29	31	Router.onBeforeAction checkUserLoggedIn, except: [
30	32	'signup',
31	33	'login',
...	...
1		-Router.map(->
2		- @route('index',
3		- path: '/'
4		- template: 'index'
5		- onBeforeAction: ->
6		- # Code to run before route goes here.
7		- )
	1	+Router.route('index',
	2	+ path: '/'
	3	+ template: 'index'
	4	+ onBeforeAction: ->
	5	+ # Code to run before route goes here.
	6	+ @next()
8	7	)
...	...
1		-Router.map(->
2		-
3		- @route('signup',
4		- path: '/signup'
5		- template: 'signup'
6		- onBeforeAction: ->
7		- Session.set 'currentRoute', 'signup'
8		- )
	1	+Router.route('signup',
	2	+ path: '/signup'
	3	+ template: 'signup'
	4	+ onBeforeAction: ->
	5	+ Session.set 'currentRoute', 'signup'
	6	+ @next()
	7	+)
9	8
10		- @route('login',
11		- path: '/login'
12		- template: 'login'
13		- onBeforeAction: ->
14		- Session.set 'currentRoute', 'login'
15		- )
	9	+Router.route('login',
	10	+ path: '/login'
	11	+ template: 'login'
	12	+ onBeforeAction: ->
	13	+ Session.set 'currentRoute', 'login'
	14	+ @next()
	15	+)
16	16
17		- @route('recover-password',
18		- path: '/recover-password'
19		- template: 'recoverPassword'
20		- onBeforeAction: ->
21		- Session.set 'currentRoute', 'recover-password'
22		- )
	17	+Router.route('recover-password',
	18	+ path: '/recover-password'
	19	+ template: 'recoverPassword'
	20	+ onBeforeAction: ->
	21	+ Session.set 'currentRoute', 'recover-password'
	22	+ @next()
	23	+)
23	24
24		- @route('reset-password',
25		- path: '/reset-password/:token'
26		- template: 'resetPassword'
27		- onBeforeAction: ->
28		- Session.set 'currentRoute', 'reset-password'
29		- Session.set 'resetPasswordToken', @params.token
30		- )
	25	+Router.route('reset-password',
	26	+ path: '/reset-password/:token'
	27	+ template: 'resetPassword'
	28	+ onBeforeAction: ->
	29	+ Session.set 'currentRoute', 'reset-password'
	30	+ Session.set 'resetPasswordToken', @params.token
	31	+ @next()
31	32	)
...	...