Skip to content

Commit

Permalink
schneems#4 Finished.
Browse files Browse the repository at this point in the history
  • Loading branch information
kylegracey committed Apr 13, 2013
1 parent 8ee647e commit 0f2b45a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ <h3> I'm a header</h3>
<p>Navigation:</p>
<a href='index.html'>Home</a>
<a href='me.html'>Me</a>
<a href='http://www.kylegracey.com'>Portfolio</a>
</div>
<hr />
<div>
<h1> Hello</h1>
<p>
The time is now:
2013-04-13 14:28:50 -0500
2013-04-13 14:33:25 -0500
</p>

<p>
Expand Down
1 change: 1 addition & 0 deletions public/me.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ <h3> I'm a header</h3>
<p>Navigation:</p>
<a href='index.html'>Home</a>
<a href='me.html'>Me</a>
<a href='http://www.kylegracey.com'>Portfolio</a>
</div>
<hr />
<div>
Expand Down
5 changes: 5 additions & 0 deletions server_simple.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,10 @@
## Capture control+c to shut down the server
trap 'INT' do server.shutdown end

## Adding from homework instructions
server.mount_proc '/' do |req, res|
res.body = 'Hello, world!'
end

## Start the server
server.start
1 change: 1 addition & 0 deletions views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<p>Navigation:</p>
<%= link_to('Home', 'index.html') %>
<%= link_to('Me', 'me.html') %>
<%= link_to('Portfolio', 'http://www.kylegracey.com') %>
</div>
<hr />
<div>
Expand Down

0 comments on commit 0f2b45a

Please sign in to comment.