Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove asset pipeline -- it's overkill for getting one CSS file into /admin #117

Merged
merged 1 commit into from
Jul 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ PATH
remote: components
specs:
datastore_admin (0.0.1)
bootstrap-sass (~> 3.3)
sass-rails
sinatra

GEM
Expand Down Expand Up @@ -68,9 +66,6 @@ GEM
activerecord (>= 3.2, <= 4.3)
rake (~> 10.4)
arel (6.0.0)
autoprefixer-rails (5.2.1)
execjs
json
aws-sdk (2.1.2)
aws-sdk-resources (= 2.1.2)
aws-sdk-core (2.1.2)
Expand All @@ -87,9 +82,6 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.5.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
builder (3.2.2)
bullet (4.14.7)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -120,7 +112,6 @@ GEM
activesupport (>= 3.2)
equalizer (0.0.11)
erubis (2.7.0)
execjs (2.5.2)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
Expand Down Expand Up @@ -277,13 +268,6 @@ GEM
ruby-graphviz (1.2.2)
rubyzip (1.1.7)
safe_yaml (1.0.4)
sass (3.4.15)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sentry-raven (0.13.3)
faraday (>= 0.7.6)
sidekiq (3.4.1)
Expand Down Expand Up @@ -314,7 +298,7 @@ GEM
polyamorous (~> 1.1.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
tilt (2.0.1)
timers (4.0.1)
hitimes
tzinfo (1.2.2)
Expand Down
8 changes: 0 additions & 8 deletions components/datastore_admin/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,3 @@ source 'https://rubygems.org'
# Bundler will treat runtime dependencies like base dependencies, and
# development dependencies will be added by default to the :development group.
gemspec

# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org.

# To use a debugger
gem 'byebug', group: [:development, :test]
98 changes: 0 additions & 98 deletions components/datastore_admin/Gemfile.lock

This file was deleted.

3 changes: 0 additions & 3 deletions components/datastore_admin/README.rdoc

This file was deleted.

19 changes: 0 additions & 19 deletions components/datastore_admin/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,3 @@ begin
rescue LoadError
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
end

require 'rdoc/task'

RDoc::Task.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = 'DatastoreAdmin'
rdoc.options << '--line-numbers'
rdoc.rdoc_files.include('README.rdoc')
rdoc.rdoc_files.include('lib/**/*.rb')
end



load 'rails/tasks/statistics.rake'



Bundler::GemHelper.install_tasks

Empty file.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
<html>
<head>
<title>Transitland Datastore Admin</title>
<%= stylesheet_link_tag "datastore_admin/application", media: "all" %>
<%= javascript_include_tag "datastore_admin/application" %>
<%= csrf_meta_tags %>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<style>
body {
padding-top: 80px;
}
</style>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
Expand Down
2 changes: 0 additions & 2 deletions components/datastore_admin/datastore_admin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ Gem::Specification.new do |s|

s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.rdoc']

s.add_dependency 'sass-rails'
s.add_dependency 'bootstrap-sass', '~> 3.3'
s.add_dependency 'sinatra' # for Sidekiq dashboard
end
3 changes: 0 additions & 3 deletions components/datastore_admin/lib/datastore_admin.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
require 'datastore_admin/engine'
require 'datastore_admin/reset_datastore'

# require gems, since they're not auto-required from gemspec
require 'bootstrap-sass'

module DatastoreAdmin
end
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_view/railtie"
require "sprockets/railtie"
# require "rails/test_unit/railtie"

# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Expand All @@ -32,5 +30,7 @@ class Application < Rails::Application
resource '*', :headers => :any, :methods => [:get, :post, :put, :patch, :options]
end
end

config.assets.enabled = false
end
end
11 changes: 0 additions & 11 deletions config/initializers/assets.rb

This file was deleted.

2 changes: 0 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,5 @@
match '*unmatched_route', :to => 'v1/base_api#raise_not_found!', via: :all
end

# NOTE: we're also nesting all assets under /admin
# see config/initializers/assets.rb
mount DatastoreAdmin::Engine => '/admin'
end