fazo96/homework
1
0
Fork 0
mirror of https://github.com/fazo96/homework.git synced 2025-01-10 12:14:22 +01:00
Code Issues Releases Wiki Activity

updating to meteor 1.0 and iron router 1.0...

Browse Source
This commit is contained in:
fazo96 2014-11-12 14:24:51 +01:00
parent bf3b1a808a
commit 32dd07d50e
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.meteor/release
View File

@ -1 +1 @@
METEOR@0.9.4 METEOR@1.0

55
.meteor/versions
View File

@ -1,20 +1,20 @@
accounts-base@1.1.2 accounts-base@1.1.2
accounts-oauth@1.1.2 accounts-oauth@1.1.2
accounts-password@1.0.3 accounts-password@1.0.4
accounts-twitter@1.0.2 accounts-twitter@1.0.2
application-configuration@1.0.3 application-configuration@1.0.3
autoupdate@1.1.2 autoupdate@1.1.3
base64@1.0.1 base64@1.0.1
binary-heap@1.0.1 binary-heap@1.0.1
blaze-tools@1.0.1 blaze-tools@1.0.1
blaze@2.0.2 blaze@2.0.3
boilerplate-generator@1.0.1 boilerplate-generator@1.0.1
callback-hook@1.0.1 callback-hook@1.0.1
check@1.0.2 check@1.0.2
coffeescript@1.0.4 coffeescript@1.0.4
ctl-helper@1.0.4 ctl-helper@1.0.4
ctl@1.0.2 ctl@1.0.2
ddp@1.0.10 ddp@1.0.11
deps@1.0.5 deps@1.0.5
ejson@1.0.4 ejson@1.0.4
email@1.0.4 email@1.0.4
@ -23,30 +23,35 @@ follower-livedata@1.0.2
geojson-utils@1.0.1 geojson-utils@1.0.1
html-tools@1.0.2 html-tools@1.0.2
htmljs@1.0.2 htmljs@1.0.2
http@1.0.7 http@1.0.8
id-map@1.0.1 id-map@1.0.1
iron:core@0.3.4 iron:controller@1.0.0
iron:dynamic-template@0.4.1 iron:core@1.0.0
iron:layout@0.4.1 iron:dynamic-template@1.0.0
iron:router@0.9.4 iron:layout@1.0.0
iron:location@1.0.1
iron:middleware-stack@1.0.0
iron:router@1.0.1
iron:url@1.0.0
jquery@1.0.1 jquery@1.0.1
json@1.0.1 json@1.0.1
kevohagan:sweetalert@0.0.1 kevohagan:sweetalert@0.3.1
launch-screen@1.0.0
livedata@1.0.11 livedata@1.0.11
localstorage@1.0.1 localstorage@1.0.1
logging@1.0.4 logging@1.0.5
meteor-platform@1.1.2 meteor-platform@1.2.0
meteor@1.1.2 meteor@1.1.3
minifiers@1.1.1 minifiers@1.1.2
minimongo@1.0.4 minimongo@1.0.5
mizzao:bootstrap-3@3.2.0_1 mizzao:bootstrap-3@3.3.0
mobile-status-bar@1.0.1 mobile-status-bar@1.0.1
mongo@1.0.7 mongo@1.0.8
mrt:moment@2.8.1 mrt:moment@2.8.1
natestrauser:font-awesome@4.2.0 natestrauser:font-awesome@4.2.0
npm-bcrypt@0.7.7 npm-bcrypt@0.7.7
oauth1@1.1.1 oauth1@1.1.2
oauth@1.1.1 oauth@1.1.2
observe-sequence@1.0.3 observe-sequence@1.0.3
ordered-dict@1.0.1 ordered-dict@1.0.1
random@1.0.1 random@1.0.1
@ -56,18 +61,18 @@ reload@1.1.1
retry@1.0.1 retry@1.0.1
routepolicy@1.0.2 routepolicy@1.0.2
service-configuration@1.0.2 service-configuration@1.0.2
session@1.0.3 session@1.0.4
sha@1.0.1 sha@1.0.1
spacebars-compiler@1.0.3 spacebars-compiler@1.0.3
spacebars@1.0.3 spacebars@1.0.3
spiderable@1.0.4 spiderable@1.0.5
srp@1.0.1 srp@1.0.1
standard-app-packages@1.0.3 standard-app-packages@1.0.3
templating@1.0.8 templating@1.0.9
tracker@1.0.3 tracker@1.0.3
twitter@1.1.1 twitter@1.1.2
ui@1.0.4 ui@1.0.4
underscore@1.0.1 underscore@1.0.1
url@1.0.1 url@1.0.2
webapp-hashing@1.0.1 webapp-hashing@1.0.1
webapp@1.1.3 webapp@1.1.4

3
client/client.coffee
View File

@ -65,6 +65,7 @@ loggedInController = RouteController.extend
showError() showError()
if not getUser() then Router.go 'home' if not getUser() then Router.go 'home'
else if not amIValid() then Router.go 'verifyEmail' else if not amIValid() then Router.go 'verifyEmail'
@next()
guestController = RouteController.extend guestController = RouteController.extend
action: -> action: ->
@ -75,6 +76,7 @@ guestController = RouteController.extend
showError() showError()
if getUser() if getUser()
if amIValid() is no then Router.go 'verifyEmail' else Router.go 'notes' if amIValid() is no then Router.go 'verifyEmail' else Router.go 'notes'
@next()
Router.map -> Router.map ->
@ -86,6 +88,7 @@ Router.map ->
# Dispatch user to the right landing page based on his account status # Dispatch user to the right landing page based on his account status
if getUser() if getUser()
if amIValid() is yes then Router.go 'notes' else Router.go 'verifyEmail' if amIValid() is yes then Router.go 'notes' else Router.go 'verifyEmail'
@next()
@route 'login', controller: guestController @route 'login', controller: guestController
@route 'register', controller: guestController @route 'register', controller: guestController
@route 'account', controller: loggedInController @route 'account', controller: loggedInController