Sunny Negi / Meteor-projects

Download as
Browse Code ยป

Commit 334a76815c2abaa6d4030b16a386a966c6272ee8

Authored by Ryan Glover
1 parent 36bac78bb3
Exists in master

little tasks and naming cleanups

Showing 7 changed files with 29 additions and 17 deletions   Show diff stats
... ... @@ -3,7 +3,6 @@
3 3 # 'meteor add' and 'meteor remove' will edit this file for you,
4 4 # but you can also edit it by hand.
5 5  
6   -standard-app-packages
7 6 underscore
8 7 accounts-password
9 8 accounts-base
... ... @@ -18,7 +17,6 @@ meteorhacks:npm
18 17  
19 18 themeteorchef:bert
20 19 meteorhacks:ssr
21   -fourseven:scss
22 20 standard-minifiers
23 21  
24 22  
... ... @@ -28,3 +26,7 @@ digilord:faker
28 26 kadira:flow-router
29 27 kadira:blaze-layout
30 28 meteorhacks:fast-render
  29 +meteor-base
  30 +session
  31 +templating
  32 +fourseven:scss
... ...
... ... @@ -32,9 +32,9 @@ ecmascript@0.1.4
32 32 ecmascript-collections@0.1.6
33 33 ejson@1.0.7
34 34 email@1.0.7
35   -fastclick@1.0.7
36   -fourseven:scss@2.1.1
  35 +fourseven:scss@3.2.0
37 36 geojson-utils@1.0.4
  37 +hot-code-push@1.0.0
38 38 html-tools@1.0.5
39 39 htmljs@1.0.5
40 40 http@1.1.1
... ... @@ -42,12 +42,11 @@ id-map@1.0.4
42 42 jquery@1.11.4
43 43 kadira:blaze-layout@2.1.0
44 44 kadira:flow-router@2.6.2
45   -launch-screen@1.0.4
46 45 livedata@1.0.15
47 46 localstorage@1.0.5
48 47 logging@1.0.8
49 48 meteor@1.1.7
50   -meteor-platform@1.2.3
  49 +meteor-base@1.0.1
51 50 meteorhacks:async@1.0.0
52 51 meteorhacks:fast-render@2.10.0
53 52 meteorhacks:inject-data@1.4.1
... ... @@ -56,7 +55,6 @@ meteorhacks:picker@1.0.3
56 55 meteorhacks:ssr@2.1.2
57 56 minifiers@1.1.7
58 57 minimongo@1.0.9
59   -mobile-status-bar@1.0.6
60 58 mongo@1.1.1
61 59 mongo-id@1.0.1
62 60 npm-bcrypt@0.7.8_2
... ... @@ -78,7 +76,6 @@ sha@1.0.4
78 76 spacebars@1.0.7
79 77 spacebars-compiler@1.0.7
80 78 srp@1.0.4
81   -standard-app-packages@1.0.6
82 79 standard-minifiers@1.0.0
83 80 templating@1.1.3
84 81 templating-tools@1.0.0
... ...
both/routes/authenticated.js
Diff comments   View file @334a768
1   -let authenticated = FlowRouter.group({
  1 +let authenticatedRoutes = FlowRouter.group({
2 2 triggersEnter: [ () => {
3 3 if ( !Meteor.loggingIn() && !Meteor.userId() ) {
4 4 FlowRouter.go( 'login' );
... ... @@ -7,7 +7,7 @@ let authenticated = FlowRouter.group({
7 7 }]
8 8 });
9 9  
10   -authenticated.route( '/', {
  10 +authenticatedRoutes.route( '/', {
11 11 name: 'index',
12 12 triggersEnter: [ () => {
13 13 Session.set( 'currentRoute', 'index' );
... ...
both/routes/public.js
Diff comments   View file @334a768
1   -let public = FlowRouter.group({
  1 +let publicRoutes = FlowRouter.group({
2 2 triggersEnter: [ () => {
3 3 if ( Meteor.userId() ) {
4 4 FlowRouter.go( 'index' );
... ... @@ -7,7 +7,7 @@ let public = FlowRouter.group({
7 7 }]
8 8 });
9 9  
10   -public.route( '/signup', {
  10 +publicRoutes.route( '/signup', {
11 11 name: 'signup',
12 12 triggersEnter: [ () => {
13 13 Session.set( 'currentRoute', 'signup' );
... ... @@ -17,7 +17,7 @@ public.route( '/signup', {
17 17 }
18 18 });
19 19  
20   -public.route( '/login', {
  20 +publicRoutes.route( '/login', {
21 21 name: 'login',
22 22 triggersEnter: [ () => {
23 23 Session.set( 'currentRoute', 'login' );
... ... @@ -27,7 +27,7 @@ public.route( '/login', {
27 27 }
28 28 });
29 29  
30   -public.route( '/recover-password', {
  30 +publicRoutes.route( '/recover-password', {
31 31 name: 'recover-password',
32 32 triggersEnter: [ () => {
33 33 Session.set( 'currentRoute', 'recover-password' );
... ... @@ -37,7 +37,7 @@ public.route( '/recover-password', {
37 37 }
38 38 });
39 39  
40   -public.route( '/reset-password/:token', {
  40 +publicRoutes.route( '/reset-password/:token', {
41 41 name: 'reset-password',
42 42 triggersEnter: [ () => {
43 43 Session.set( 'currentRoute', 'reset-password' );
... ...
client/templates/authenticated/index.html
Diff comments   View file @334a768
1 1 <template name="index">
2   - {{> loading}}
  2 + <div class="jumbotron text-center" style="padding: 20px;">
  3 + <h2>Base</h2>
  4 + <p>A starting point for Meteor applications.</p>
  5 + <p><a class="btn btn-success" href="http://themeteorchef.com/base" role="button">Read the Documentation</a></p>
  6 + <p style="font-size: 16px; color: #aaa;">Currently at v3.0.0</p>
  7 + </div>
3 8 </template>
... ...
client/templates/globals/header.html
Diff comments   View file @334a768
... ... @@ -8,7 +8,7 @@
8 8 <span class="icon-bar"></span>
9 9 <span class="icon-bar"></span>
10 10 </button>
11   - <a class="navbar-brand" href="{{pathFor 'index'}}">Application Name</a>
  11 + <a class="navbar-brand" href="{{brandLink}}">Application Name</a>
12 12 </div>
13 13 <div id="navbar-collapse" class="collapse navbar-collapse">
14 14 {{#if currentUser}}
... ...
client/templates/globals/header.js
Diff comments   View file @334a768
  1 +Template.header.helpers({
  2 + brandLink() {
  3 + let login = FlowRouter.path( 'login' ),
  4 + index = FlowRouter.path( 'index' );
  5 + return !Meteor.loggingIn() && !Meteor.userId() ? login : index;
  6 + }
  7 +});
  8 +
1 9 Template.header.events({
2 10 'click .logout' () {
3 11 Meteor.logout( ( error ) => {
... ...