craftingguide/website
1
0
Fork 0
Code Pull Requests Actions Activity

Fix routing so both plain and .html routes work

Browse Source
This commit is contained in:
Andrew Miner
2015-05-11 11:23:16 -07:00
parent bab091e9d6
commit 8c54231d52
4 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/coffee/controllers/header_controller.coffee
+1 -1
View File
@@ -40,7 +40,7 @@ module.exports = class HeaderController extends BaseController
logger.error -> "Failed to log out: #{error}" logger.error -> "Failed to log out: #{error}"
.done() .done()
else else
router.navigate Url.login(), trigger:true router.login()
onLogoClicked: -> onLogoClicked: ->
router.navigate '/', trigger:true router.navigate '/', trigger:true
src/coffee/crafting_guide_router.coffee
+35 -9
View File
@@ -87,7 +87,7 @@ module.exports = class CraftingGuideRouter extends backbone.Router
resumeAfterLogin: -> resumeAfterLogin: ->
url = @storage.load 'post-login-url' url = @storage.load 'post-login-url'
url ?= Url.root() url = if (not url? or url is 'null') then Url.root() else url
@navigate url, trigger:true @navigate url, trigger:true
@storage.store 'post-login-url', null @storage.store 'post-login-url', null
@@ -118,15 +118,41 @@ module.exports = class CraftingGuideRouter extends backbone.Router
@_recordPageView() @_recordPageView()
routes: routes:
'(/(index.html))': 'route__home' '': 'route__home'
'browse(/(index.html))': 'route__browse' '/': 'route__home'
'browse/:modSlug(/(index.html))': 'route__browseMod' '/index.html': 'route__home'
'browse/:modSlug/:itemSlug(/(index.html))': 'route__browseModItem'
'browse/:modSlug/tutorials/:tutorialSlug(/(index.html))': 'route__browseTutorial' 'browse': 'route__browse'
'configure(/(index.html))': 'route__configure' 'browse/': 'route__browse'
'craft(/(index.html))': 'route__craft' 'browse/index.html': 'route__browse'
'browse/:modSlug': 'route__browseMod'
'browse/:modSlug/': 'route__browseMod'
'browse/:modSlug/index.html': 'route__browseMod'
'browse/:modSlug/:itemSlug': 'route__browseModItem'
'browse/:modSlug/:itemSlug/': 'route__browseModItem'
'browse/:modSlug/:itemSlug/index.html': 'route__browseModItem'
'browse/:modSlug/tutorials/:tutorialSlug': 'route__browseTutorial'
'browse/:modSlug/tutorials/:tutorialSlug/': 'route__browseTutorial'
'browse/:modSlug/tutorials/:tutorialSlug/index.html': 'route__browseTutorial'
'configure': 'route__configure'
'configure/': 'route__configure'
'configure/index.html': 'route__configure'
'craft': 'route__craft'
'craft/': 'route__craft'
'craft/index.html': 'route__craft'
'craft/:text': 'route__craft' 'craft/:text': 'route__craft'
'login(/(index.html))': 'route__login' 'craft/:text/': 'route__craft'
'craft/:text/index.html': 'route__craft'
'login': 'route__login'
'login/': 'route__login'
'login/index.html': 'route__login'
'item/:itemSlug': 'deprecated__item' 'item/:itemSlug': 'deprecated__item'
'crafting/(:text)': 'deprecated__crafting' 'crafting/(:text)': 'deprecated__crafting'
src/jade/includes/_header.jade
+1 -1
View File
@@ -14,7 +14,7 @@
.divider.bottom .divider.bottom
.login .login
span.name span.name
a(href="/login") Login a(href="/login/") Login
.navBar .navBar
a(data-page="home", href="/") a(data-page="home", href="/")
src/jade/templates/login_page.jade
+3 -2
View File
@@ -51,8 +51,9 @@
.two-thirds-content.hideable.hidden.fetching-token .two-thirds-content.hideable.hidden.fetching-token
img.float-right(src="/images/github-login-large.png") img.float-right(src="/images/github-login-large.png")
h1 Completing log in... h1 Completing log in...
p. p Hang on just a second while we finish logging you in...
Hang on just a second while we finish logging you in... .actions
img(src="/images/wait.gif")
.clear .clear