From 23a91f949975edda8fdfbd2d4a74b553080db93a Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Thu, 12 Apr 2012 22:19:53 -0700 Subject: [PATCH] Handle accepting either /:user or /:user/:reponame as entry points into the app --- despair.rb | 7 +++++-- views/user.haml | 10 +++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/despair.rb b/despair.rb index 04fd2e1..7cf67ad 100644 --- a/despair.rb +++ b/despair.rb @@ -8,8 +8,11 @@ module Despair halt 404 end - get '/:name' do |name| - haml :user, :locals => {:user => name} + get '/:name/?:repo?' do |name, repo| + if ['css', 'js', 'images'].include? name + pass + end + haml :user, :locals => {:user => name, :repo => repo} end end end diff --git a/views/user.haml b/views/user.haml index 0772a44..970a24a 100644 --- a/views/user.haml +++ b/views/user.haml @@ -4,6 +4,13 @@ #{user} of Despair %script{:type => 'text/javascript'} window.despair_username = "#{user}"; + - if repo + window.despair_repo = "#{repo}"; + - else + window.despair_repo = null; + %link{:media => 'screen', + :rel => 'stylesheet', + :href => '/css/despair.css'} %body - if Resin.development? %div{:style => 'float: right;'} @@ -14,7 +21,8 @@ %center %div.spinner %img{:src => '/images/octocat-spinner-64.gif'} - %div.projects + %br/ + %div.projects = embed_amber(:on_ready => "smalltalk.DespairApp._current()._bootstrap_('#{user}');")