From 9efd7c2d69f8085245bacbd55e26ace9fea1d397 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Wed, 4 Dec 2013 13:09:30 +1100 Subject: [PATCH] Getting the darkswarm build flow up and running. Like a boss --- Gemfile | 1 + Gemfile.lock | 3 + Guardfile | 66 +++++++++---------- .../darkswarm/{all.css => all.scss} | 4 +- .../stylesheets/darkswarm/header.css.scss | 0 app/controllers/darkswarm_controller.rb | 5 ++ app/views/darkswarm/index.html.haml | 1 + app/views/home/_login.html.haml | 2 +- app/views/layouts/darkswarm.html.haml | 8 +-- app/views/shared/_login_panel.html.haml | 5 ++ config/routes.rb | 2 + 11 files changed, 54 insertions(+), 43 deletions(-) rename app/assets/stylesheets/darkswarm/{all.css => all.scss} (79%) create mode 100644 app/assets/stylesheets/darkswarm/header.css.scss create mode 100644 app/controllers/darkswarm_controller.rb create mode 100644 app/views/darkswarm/index.html.haml create mode 100644 app/views/shared/_login_panel.html.haml diff --git a/Gemfile b/Gemfile index e91e4dda38..ddeaf0a5ac 100644 --- a/Gemfile +++ b/Gemfile @@ -88,6 +88,7 @@ group :development do gem 'debugger-linecache' gem 'guard' gem 'guard-livereload' + gem 'rack-livereload' gem 'guard-rails' gem 'guard-zeus' gem 'guard-rspec' diff --git a/Gemfile.lock b/Gemfile.lock index c28af0d90f..c38dcc9ee2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -367,6 +367,8 @@ GEM rack (1.4.5) rack-cache (1.2) rack (>= 0.4) + rack-livereload (0.3.15) + rack rack-ssl (1.3.3) rack rack-test (0.6.2) @@ -535,6 +537,7 @@ DEPENDENCIES poltergeist pry-debugger rabl + rack-livereload rack-ssl rails (= 3.2.14) representative_view diff --git a/Guardfile b/Guardfile index 19f09f30d4..52b9faac02 100644 --- a/Guardfile +++ b/Guardfile @@ -2,49 +2,49 @@ # More info at https://github.com/guard/guard#readme guard 'livereload' do - watch(%r{app/views/.+\.(erb|haml|slim)$}) - watch(%r{app/helpers/.+\.rb}) + #watch(%r{app/views/.+\.(erb|haml|slim)$}) + #watch(%r{app/helpers/.+\.rb}) watch(%r{public/.+\.(css|js|html)}) - watch(%r{config/locales/.+\.yml}) + #watch(%r{config/locales/.+\.yml}) # Rails Assets Pipeline watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" } end -guard 'rails' do - watch('Gemfile.lock') - watch(%r{^(config|lib)/.*}) -end +#guard 'rails' do + #watch('Gemfile.lock') + #watch(%r{^(config|lib)/.*}) +#end -guard 'zeus' do - # uses the .rspec file - # --colour --fail-fast --format documentation --tag ~slow - watch(%r{^spec/.+_spec\.rb$}) - watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } - watch(%r{^app/(.+)\.haml$}) { |m| "spec/#{m[1]}.haml_spec.rb" } - watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } - watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] } -end +#guard 'zeus' do + ## uses the .rspec file + ## --colour --fail-fast --format documentation --tag ~slow + #watch(%r{^spec/.+_spec\.rb$}) + #watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } + #watch(%r{^app/(.+)\.haml$}) { |m| "spec/#{m[1]}.haml_spec.rb" } + #watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } + #watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] } +#end -guard :rspec do - watch(%r{^spec/.+_spec\.rb$}) - watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } - watch('spec/spec_helper.rb') { "spec" } +#guard :rspec do + #watch(%r{^spec/.+_spec\.rb$}) + #watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } + #watch('spec/spec_helper.rb') { "spec" } - # Rails example - watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } - watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" } - watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] } - watch(%r{^spec/support/(.+)\.rb$}) { "spec" } - watch('config/routes.rb') { "spec/routing" } - watch('app/controllers/application_controller.rb') { "spec/controllers" } + ## Rails example + #watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } + #watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" } + #watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] } + #watch(%r{^spec/support/(.+)\.rb$}) { "spec" } + #watch('config/routes.rb') { "spec/routing" } + #watch('app/controllers/application_controller.rb') { "spec/controllers" } - # Capybara features specs - watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$}) { |m| "spec/features/#{m[1]}_spec.rb" } + ## Capybara features specs + #watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$}) { |m| "spec/features/#{m[1]}_spec.rb" } - # Turnip features and steps - watch(%r{^spec/acceptance/(.+)\.feature$}) - watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' } -end + ## Turnip features and steps + #watch(%r{^spec/acceptance/(.+)\.feature$}) + #watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' } +#end diff --git a/app/assets/stylesheets/darkswarm/all.css b/app/assets/stylesheets/darkswarm/all.scss similarity index 79% rename from app/assets/stylesheets/darkswarm/all.css rename to app/assets/stylesheets/darkswarm/all.scss index d9bcccc9cc..b5d1542d11 100644 --- a/app/assets/stylesheets/darkswarm/all.css +++ b/app/assets/stylesheets/darkswarm/all.scss @@ -5,8 +5,6 @@ *= require_self - * Stuff we haven't yet ported from search - - *= require ../search/foundation_and_overrides + *= require foundation *= require_tree . */ diff --git a/app/assets/stylesheets/darkswarm/header.css.scss b/app/assets/stylesheets/darkswarm/header.css.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/controllers/darkswarm_controller.rb b/app/controllers/darkswarm_controller.rb new file mode 100644 index 0000000000..b1a7422e02 --- /dev/null +++ b/app/controllers/darkswarm_controller.rb @@ -0,0 +1,5 @@ +class DarkswarmController < ApplicationController + def index + + end +end diff --git a/app/views/darkswarm/index.html.haml b/app/views/darkswarm/index.html.haml new file mode 100644 index 0000000000..5938185c06 --- /dev/null +++ b/app/views/darkswarm/index.html.haml @@ -0,0 +1 @@ +TESTING diff --git a/app/views/home/_login.html.haml b/app/views/home/_login.html.haml index e5b9aa5c20..31fafd05d9 100644 --- a/app/views/home/_login.html.haml +++ b/app/views/home/_login.html.haml @@ -15,4 +15,4 @@ %label = f.check_box :remember_me = f.label :remember_me, t(:remember_me) - %p= f.submit t(:login), :class => 'button primary', :tabindex => 3, :id => "login_spree_user_remember_me" \ No newline at end of file + %p= f.submit t(:login), :class => 'button primary', :tabindex => 3, :id => "login_spree_user_remember_me" diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 230f54e0da..b7835bcac2 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -21,12 +21,8 @@ = yield %section#sidebar{ role: "complementary" } - .login-panel - #login-content.hide - = render "home/login" - #sign-up-content.hide - = render "home/signup" - + = render partial: "shared/login_panel" + = yield :sidebar = yield :scripts diff --git a/app/views/shared/_login_panel.html.haml b/app/views/shared/_login_panel.html.haml new file mode 100644 index 0000000000..8266eaf0b5 --- /dev/null +++ b/app/views/shared/_login_panel.html.haml @@ -0,0 +1,5 @@ +.login-panel + #login-content.hide + = render "home/login" + #sign-up-content.hide + = render "home/signup" diff --git a/config/routes.rb b/config/routes.rb index d96ba028e9..91fbf0eb73 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Openfoodnetwork::Application.routes.draw do root :to => 'home#temp_landing_page' + resources :enterprises do collection do get :suppliers @@ -37,6 +38,7 @@ Openfoodnetwork::Application.routes.draw do end get "new_landing_page", :controller => 'home', :action => "new_landing_page" + get "darkswarm", controller: :darkswarm, action: :index get "about_us", :controller => 'home', :action => "about_us" namespace :open_food_network do