diff --git a/Gemfile b/Gemfile index 6c9238a..593e988 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.1.2' +ruby '1.9.3' gem 'rails', '4.1.0' @@ -26,6 +26,9 @@ gem 'omniauth-facebook' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' +#added this fix +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw] + # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' diff --git a/Gemfile.lock b/Gemfile.lock index c5fdadf..cf90f00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,6 +29,7 @@ GEM tzinfo (~> 1.1) arel (5.0.1.20140414130214) bcrypt (3.1.7) + bcrypt (3.1.7-x86-mingw32) bootstrap-sass (3.2.0.0) sass (~> 3.2) builder (3.2.2) @@ -132,6 +133,7 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.9) + sqlite3 (1.3.9-x86-mingw32) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -142,6 +144,8 @@ GEM coffee-rails tzinfo (1.2.1) thread_safe (~> 0.1) + tzinfo-data (1.2014.5) + tzinfo (>= 1.0.0) uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) @@ -151,6 +155,7 @@ GEM PLATFORMS ruby + x86-mingw32 DEPENDENCIES bootstrap-sass (~> 3.2.0) @@ -167,5 +172,6 @@ DEPENDENCIES sdoc sqlite3 turbolinks + tzinfo-data uglifier (>= 1.3.0) underscore-rails diff --git a/app/assets/stylesheets/main.css b/app/assets/stylesheets/main.css new file mode 100644 index 0000000..71ba6c3 --- /dev/null +++ b/app/assets/stylesheets/main.css @@ -0,0 +1,3 @@ +h1, h4{ +text-align: center; +} \ No newline at end of file diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index ef73e71..f4de91f 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,10 +1,12 @@

This is Project PHL's Homepage

-

Yo

- <% if user_signed_in? %> -

Yo, you're signed in!

- <%= link_to "Click Here to Log out!", destroy_user_session_path, method: :delete %> + <% if user_signed_in? %> + <%= button_to "Click Here to Log out!", destroy_user_session_path, :class => "btn btn-primary", method: :delete %> <% else %> - <%= link_to "Sign in with Facebook", user_omniauth_authorize_path(:facebook) %> +

Game On lets people connect with one another through competitive sport.

+

Try it out!

+
+
+
<%= button_to "Sign in with Facebook", user_omniauth_authorize_path(:facebook), :class => "btn btn-primary" %>
<% end %>
diff --git a/db/schema.rb b/db/schema.rb index f6124ac..7471f7e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -13,13 +13,6 @@ ActiveRecord::Schema.define(version: 20140727195650) do - create_table "check_ins", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - t.integer "user_id" - t.integer "event_id" - end - create_table "check_ins", force: true do |t| t.datetime "created_at" t.datetime "updated_at"