From e94322ea913504925f1df79e8bd1126cab93d92f Mon Sep 17 00:00:00 2001 From: PDaily Date: Sat, 26 Apr 2014 21:53:31 +0000 Subject: [PATCH 1/2] Added about me --- Gemfile.lock | 2 +- theweb.rb | 11 +++-------- views/about.erb | 2 ++ views/dashboard.erb | 17 +++++++++++------ views/layout.erb | 30 ++++-------------------------- 5 files changed, 21 insertions(+), 41 deletions(-) create mode 100644 views/about.erb diff --git a/Gemfile.lock b/Gemfile.lock index 3d79568..0568176 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GEM eventmachine (0.12.10) i18n (0.6.0) multi_json (1.3.5) - rack (1.4.1) + rack (1.5.2) rack-protection (1.2.0) rack rack-test (0.6.1) diff --git a/theweb.rb b/theweb.rb index a531ce4..73c6a2d 100644 --- a/theweb.rb +++ b/theweb.rb @@ -5,14 +5,9 @@ enable :sessions get '/' do + @title = "Patrick Irwin" + likes = ["Turtles", "Cake", "Puppies", "Ruby"] + @random_likes = likes[rand(likes.length)] erb :dashboard end -post '/number' do - @number_of_randoms = session[:number_of_randoms] || 0 - @number_of_randoms += 1 - session[:number_of_randoms] = @number_of_randoms - number_as_string = params.fetch('number').to_i - @the_number = rand(number_as_string) - erb :number -end diff --git a/views/about.erb b/views/about.erb new file mode 100644 index 0000000..9bc34d8 --- /dev/null +++ b/views/about.erb @@ -0,0 +1,2 @@ +

About Me

+

Oh Hello!

\ No newline at end of file diff --git a/views/dashboard.erb b/views/dashboard.erb index d2559c0..08291f2 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -1,6 +1,11 @@ -

OH HAI THERE

-
- - - -
+

About Me

+
+

Hi, I'm Pat!

+

I like things and stuff, they're pretty awesome!

+

I like:

+ +
\ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb index 8797f75..bf40369 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -4,7 +4,7 @@ - Bootstrap, from Twitter + <%= @title %> @@ -42,11 +42,10 @@ - Randomizer + Patrick Irwin
@@ -61,31 +60,10 @@ <%= yield %> - -
-
-

Heading

-

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

-
-
-

Heading

-

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

-
-
-

Heading

-

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

-

View details »

-
-
-
From 64709bf24659335b953328b5879d9a4c4c9f74eb Mon Sep 17 00:00:00 2001 From: PDaily Date: Sat, 26 Apr 2014 21:57:47 +0000 Subject: [PATCH 2/2] Added some more things I should like --- theweb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theweb.rb b/theweb.rb index 73c6a2d..1fcee75 100644 --- a/theweb.rb +++ b/theweb.rb @@ -6,7 +6,7 @@ get '/' do @title = "Patrick Irwin" - likes = ["Turtles", "Cake", "Puppies", "Ruby"] + likes = ["Turtles", "Cake", "Puppies", "Ruby", "Archer (The Cartoon)", "PC Games", "Stuff", "Apples", "Programming"] @random_likes = likes[rand(likes.length)] erb :dashboard end