Frontend - add Bootstrap to the layouts

dradis · Jun 23, 2014 · 6f8b22c · 6f8b22c
1 parent ef2dd79
commit 6f8b22c
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -25,9 +25,6 @@ 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'
-
 # Use unicorn as the app server
 # gem 'unicorn'
 
@@ -40,8 +37,9 @@ gem 'spring',        group: :development
 
 # --------------------------------------------------------- Dradis dependencies
 
-# Dradis::Core
+# Dradis::Core, ::Frontend
 gemspec path: 'engines/core'
+gemspec path: 'engines/frontend'
 
 # In Production we need to be able to compile assets
 # gem 'execjs'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,6 +4,15 @@ PATH
     dradis_core (3.0.0)
       rails (~> 4.1.1)
 
+PATH
+  remote: engines/frontend
+  specs:
+    dradis_frontend (3.0.0)
+      bcrypt (~> 3.1.7)
+      bootstrap-sass (~> 2.3.2.2)
+      rails (~> 4.1.1)
+      warden (~> 1.2.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -35,6 +44,9 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
+    bcrypt (3.1.7)
+    bootstrap-sass (2.3.2.2)
+      sass (~> 3.2)
     builder (3.2.2)
     capybara (2.3.0)
       mime-types (>= 1.16)
@@ -185,6 +197,8 @@ GEM
     uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    warden (1.2.3)
+      rack (>= 1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -198,6 +212,7 @@ DEPENDENCIES
   coffee-rails (~> 4.0.0)
   database_cleaner
   dradis_core!
+  dradis_frontend!
   factory_girl (~> 2.6.4)
   guard-rspec
   jbuilder (~> 2.0)

diff --git a/engines/frontend/app/assets/javascripts/dradis/frontend/manifests/application.js.coffee b/engines/frontend/app/assets/javascripts/dradis/frontend/manifests/application.js.coffee
@@ -0,0 +1,10 @@
+//= require jquery
+//= require bootstrap
+//= require_self
+
+jQuery ->
+  if $('body').hasClass('unauthenticated')
+    $('body').
+      removeClass('unauthenticated').
+      addClass('alert').
+      addClass('alert-error')
diff --git a/engines/frontend/app/assets/stylesheets/dradis/frontend/manifests/application.css.scss b/engines/frontend/app/assets/stylesheets/dradis/frontend/manifests/application.css.scss
@@ -1,6 +1,10 @@
 /*
  *= require_self
  */
+
+@import 'bootstrap';
+@import 'bootstrap-responsive';
+
 body.authenticated {
   background-color: green;
 }

diff --git a/engines/frontend/app/views/layouts/dradis/frontend/application.html.erb b/engines/frontend/app/views/layouts/dradis/frontend/application.html.erb
@@ -1,11 +1,17 @@
+<!DOCTYPE html>
 <html>
   <head>
-    <title>Foobar</title>
+    <title>Unauthenticated</title>
     <%= stylesheet_link_tag    'dradis/frontend/manifests/application', media: 'all', 'data-turbolinks-track' => true %>
-    <%= javascript_include_tag 'dradis/frontend/manifests/application', 'data-turbolinks-track' => true %>
     <%= csrf_meta_tags %>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
   <body class="unauthenticated">
-    <%= yield %>
+    <div class="container">
+      <%= yield%>
+    </div>
+
+    <%= javascript_include_tag 'dradis/frontend/manifests/application', 'data-turbolinks-track' => true %>
   </body>
 </html>
diff --git a/engines/frontend/app/views/layouts/dradis/frontend/authenticated.html.erb b/engines/frontend/app/views/layouts/dradis/frontend/authenticated.html.erb
@@ -1,11 +1,17 @@
+<!DOCTYPE html>
 <html>
   <head>
-    <title>Foobar</title>
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <title>Authenticated</title>
+    <%= stylesheet_link_tag    'dradis/frontend/manifests/application', media: 'all', 'data-turbolinks-track' => true %>
     <%= csrf_meta_tags %>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
   <body class="authenticated">
-    <%= yield %>
+    <div class="container">
+      <%= yield%>
+    </div>
+
+    <%= javascript_include_tag 'dradis/frontend/manifests/application', 'data-turbolinks-track' => true %>
   </body>
 </html>
diff --git a/engines/frontend/dradis_frontend.gemspec b/engines/frontend/dradis_frontend.gemspec
@@ -19,4 +19,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency 'rails', '~> 4.1.1'
+  s.add_dependency 'bcrypt', '~> 3.1.7'
+  s.add_dependency 'bootstrap-sass', '~> 2.3.2.2'
+  s.add_dependency 'warden', '~> 1.2.3'
 end
diff --git a/engines/frontend/lib/dradis_frontend.rb b/engines/frontend/lib/dradis_frontend.rb
@@ -1,6 +1,9 @@
 require 'dradis/frontend/version'
 require 'dradis/frontend/engine'
 
+require 'bootstrap-sass'
+require 'warden'
+
 module Dradis
   module Frontend
   end

diff --git a/vendor/cache/bcrypt-3.1.7.gem b/vendor/cache/bcrypt-3.1.7.gem
diff --git a/vendor/cache/bootstrap-sass-2.3.2.2.gem b/vendor/cache/bootstrap-sass-2.3.2.2.gem
diff --git a/vendor/cache/warden-1.2.3.gem b/vendor/cache/warden-1.2.3.gem