Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pandas hooray #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ doc/

config/database.yml
TODO

.DS_Store
.idea
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ gem 'rake'
gem 'activesupport'
gem 'sinatra'
gem 'sinatra-contrib'
gem 'thin'
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
backports (2.5.3)
daemons (1.1.8)
eventmachine (0.12.10)
i18n (0.6.0)
multi_json (1.3.5)
Expand All @@ -25,6 +26,10 @@ GEM
rack-test
sinatra (~> 1.3.0)
tilt (~> 1.3)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.3.3)

PLATFORMS
Expand All @@ -35,3 +40,4 @@ DEPENDENCIES
rake
sinatra
sinatra-contrib
thin
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bundle exec ruby theweb.rb -p $PORT
4 changes: 4 additions & 0 deletions theweb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@
@the_number = rand(number_as_string)
erb :number
end

get '/about' do
erb :about
end
7 changes: 7 additions & 0 deletions views/about.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<h2>About Me</h2>

<p>
Web programmer by day,<br />
Knitter by night,<br />
Motorcyclist elsewhere in between
</p>
2 changes: 1 addition & 1 deletion views/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<div class="nav-collapse">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="/about">About</a></li>
<li><a href="#contact">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
Expand Down