Site Rehaul.

.gitignore

@@ -31,13 +31,7 @@ config/secrets.yml
 /.bundle
 /vendor/bundle
 
-# These should all be checked in to normalise the environment.
-# Gemfile.lock, .ruby-version, .ruby-gemset
-
-# Unless supporting rvm < 1.11.0 or doing something fancy, ignore this.
 .rvmrc
 
-# If using bower-rails, ignore default bower_components path bower.json files.
-/vendor/assets/bower_components
-*.bowerrc
-bower.json
+# Ignore application configuration.
+/config/application.yml

Gemfile

@@ -1,49 +1,32 @@
 source 'https://rubygems.org'
 
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'.
 gem 'rails', '4.1.6'
-# Use sqlite3 as the database for Active Record.
 gem 'sqlite3'
-# Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.3'
-# Use Uglifier as compressor for JavaScript assets.
 gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .js.coffee assets and views.
+gem 'turbolinks'
 gem 'coffee-rails', '~> 4.0.0'
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes.
-# gem 'therubyracer',  platforms: :ruby
-
-# Use jquery as the JavaScript library.
 gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks.
-gem 'turbolinks'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder.
+gem 'font-awesome-rails'
 gem 'jbuilder', '~> 2.0'
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0',          group: :doc
-
-# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring.
-gem 'spring',        group: :development
-
-# Use ActiveModel has_secure_password.
-# gem 'bcrypt', '~> 3.1.7'
+gem 'sdoc', '~> 0.4.0', group: :doc
+gem 'spring', group: :development
 
-# Use unicorn as the app server.
-# gem 'unicorn'
+# Timezone data.
+gem 'tzinfo-data'
 
 # Use Capistrano for deployment.
-# gem 'capistrano-rails', group: :development
 gem 'capistrano', '~> 3.1.0'
 gem 'capistrano-bundler', '~> 1.1.2'
 gem 'capistrano-rails', '~> 1.1.1'
 gem 'capistrano-rbenv', github: "capistrano/rbenv"
 
-# Use debugger.
-# gem 'debugger', group: [:development, :test]
+# User authentication:
+gem 'devise'
+gem 'cancancan'
 
-# Timezone data.
-gem 'tzinfo-data'
+gem 'omniauth-facebook'
+gem 'omniauth-google-oauth2'
 
-# Devise for user authentication:
-gem 'devise'
+# Handle API secrets:
+gem 'figaro'

Gemfile.lock

@@ -39,6 +39,7 @@ GEM
     bcrypt (3.1.9)
     bcrypt (3.1.9-x86-mingw32)
     builder (3.2.2)
+    cancancan (1.12.0)
     capistrano (3.1.0)
       i18n
       rake (>= 10.0.0)
@@ -66,6 +67,13 @@ GEM
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.2.2)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    figaro (1.1.1)
+      thor (~> 0.14)
+    font-awesome-rails (4.4.0.0)
+      railties (>= 3.2, < 5.0)
+    hashie (3.4.2)
     hike (1.2.3)
     i18n (0.6.11)
     jbuilder (2.2.4)
@@ -75,14 +83,34 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
+    jwt (1.5.1)
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
     minitest (5.4.2)
     multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    omniauth-facebook (2.0.1)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-google-oauth2 (0.2.6)
+      omniauth (> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-oauth2 (1.3.1)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
     orm_adapter (0.5.0)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -152,14 +180,19 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  cancancan
   capistrano (~> 3.1.0)
   capistrano-bundler (~> 1.1.2)
   capistrano-rails (~> 1.1.1)
   capistrano-rbenv!
   coffee-rails (~> 4.0.0)
   devise
+  figaro
+  font-awesome-rails
   jbuilder (~> 2.0)
   jquery-rails
+  omniauth-facebook
+  omniauth-google-oauth2
   rails (= 4.1.6)
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)

app/assets/stylesheets/application.css

@@ -10,16 +10,9 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
+ *= require font-awesome
  *= require bootstrap.min
+ *= require bootstrap-social.min
  *= require_tree .
  *= require_self
  */
-
-@font-face {
-  font-family: 'Glyphicons Halflings';
-    src: url('../assets/glyphicons-halflings-regular.eot');
-    src: url('../assets/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), 
-    url('../assets/glyphicons-halflings-regular.woff') format('woff'), 
-    url('../assets/glyphicons-halflings-regular.ttf') format('truetype'), 
-    url('../assets/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}