diff --git a/.meteor/packages b/.meteor/packages index 51d78ea..95dc211 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -3,7 +3,6 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -standard-app-packages underscore accounts-password accounts-base @@ -18,7 +17,6 @@ meteorhacks:npm themeteorchef:bert meteorhacks:ssr -fourseven:scss standard-minifiers @@ -28,3 +26,7 @@ digilord:faker kadira:flow-router kadira:blaze-layout meteorhacks:fast-render +meteor-base +session +templating +fourseven:scss diff --git a/.meteor/versions b/.meteor/versions index a3a7c76..760441e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -32,9 +32,9 @@ ecmascript@0.1.4 ecmascript-collections@0.1.6 ejson@1.0.7 email@1.0.7 -fastclick@1.0.7 -fourseven:scss@2.1.1 +fourseven:scss@3.2.0 geojson-utils@1.0.4 +hot-code-push@1.0.0 html-tools@1.0.5 htmljs@1.0.5 http@1.1.1 @@ -42,12 +42,11 @@ id-map@1.0.4 jquery@1.11.4 kadira:blaze-layout@2.1.0 kadira:flow-router@2.6.2 -launch-screen@1.0.4 livedata@1.0.15 localstorage@1.0.5 logging@1.0.8 meteor@1.1.7 -meteor-platform@1.2.3 +meteor-base@1.0.1 meteorhacks:async@1.0.0 meteorhacks:fast-render@2.10.0 meteorhacks:inject-data@1.4.1 @@ -56,7 +55,6 @@ meteorhacks:picker@1.0.3 meteorhacks:ssr@2.1.2 minifiers@1.1.7 minimongo@1.0.9 -mobile-status-bar@1.0.6 mongo@1.1.1 mongo-id@1.0.1 npm-bcrypt@0.7.8_2 @@ -78,7 +76,6 @@ sha@1.0.4 spacebars@1.0.7 spacebars-compiler@1.0.7 srp@1.0.4 -standard-app-packages@1.0.6 standard-minifiers@1.0.0 templating@1.1.3 templating-tools@1.0.0 diff --git a/both/routes/authenticated.js b/both/routes/authenticated.js index ad525c7..f00eed5 100644 --- a/both/routes/authenticated.js +++ b/both/routes/authenticated.js @@ -1,4 +1,4 @@ -let authenticated = FlowRouter.group({ +let authenticatedRoutes = FlowRouter.group({ triggersEnter: [ () => { if ( !Meteor.loggingIn() && !Meteor.userId() ) { FlowRouter.go( 'login' ); @@ -7,7 +7,7 @@ let authenticated = FlowRouter.group({ }] }); -authenticated.route( '/', { +authenticatedRoutes.route( '/', { name: 'index', triggersEnter: [ () => { Session.set( 'currentRoute', 'index' ); diff --git a/both/routes/public.js b/both/routes/public.js index 64c7499..005246e 100644 --- a/both/routes/public.js +++ b/both/routes/public.js @@ -1,4 +1,4 @@ -let public = FlowRouter.group({ +let publicRoutes = FlowRouter.group({ triggersEnter: [ () => { if ( Meteor.userId() ) { FlowRouter.go( 'index' ); @@ -7,7 +7,7 @@ let public = FlowRouter.group({ }] }); -public.route( '/signup', { +publicRoutes.route( '/signup', { name: 'signup', triggersEnter: [ () => { Session.set( 'currentRoute', 'signup' ); @@ -17,7 +17,7 @@ public.route( '/signup', { } }); -public.route( '/login', { +publicRoutes.route( '/login', { name: 'login', triggersEnter: [ () => { Session.set( 'currentRoute', 'login' ); @@ -27,7 +27,7 @@ public.route( '/login', { } }); -public.route( '/recover-password', { +publicRoutes.route( '/recover-password', { name: 'recover-password', triggersEnter: [ () => { Session.set( 'currentRoute', 'recover-password' ); @@ -37,7 +37,7 @@ public.route( '/recover-password', { } }); -public.route( '/reset-password/:token', { +publicRoutes.route( '/reset-password/:token', { name: 'reset-password', triggersEnter: [ () => { Session.set( 'currentRoute', 'reset-password' ); diff --git a/client/templates/authenticated/index.html b/client/templates/authenticated/index.html index 7124bdf..0d56c6e 100644 --- a/client/templates/authenticated/index.html +++ b/client/templates/authenticated/index.html @@ -1,3 +1,8 @@ - {{> loading}} + diff --git a/client/templates/globals/header.html b/client/templates/globals/header.html index c582689..fb04244 100644 --- a/client/templates/globals/header.html +++ b/client/templates/globals/header.html @@ -8,7 +8,7 @@ - Application Name + Application Name