Skip to content

Commit

Permalink
Updated package.json and added font-awesome-rails gem
Browse files Browse the repository at this point in the history
  • Loading branch information
@waridrox
waridrox committed Jun 20, 2021
1 parent 6e778f5 commit 2ead766
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 84 deletions.
1 change: 1 addition & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ end

gem 'bootsnap', '~> 1.7.5'
gem 'jquery-rails'
gem 'font-awesome-rails'
gem 'listen', '~> 3.2.1'
gem 'mime-types' # , '1.18'
gem 'passenger'
Expand Down
136 changes: 70 additions & 66 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.4.3)
actionpack (= 5.2.4.3)
actioncable (5.2.4.6)
actionpack (= 5.2.4.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.3)
actionpack (= 5.2.4.3)
actionview (= 5.2.4.3)
activejob (= 5.2.4.3)
actionmailer (5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.3)
actionview (= 5.2.4.3)
activesupport (= 5.2.4.3)
actionpack (5.2.4.6)
actionview (= 5.2.4.6)
activesupport (= 5.2.4.6)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.3)
activesupport (= 5.2.4.3)
actionview (5.2.4.6)
activesupport (= 5.2.4.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.3)
activesupport (= 5.2.4.3)
activejob (5.2.4.6)
activesupport (= 5.2.4.6)
globalid (>= 0.3.6)
activemodel (5.2.4.3)
activesupport (= 5.2.4.3)
activerecord (5.2.4.3)
activemodel (= 5.2.4.3)
activesupport (= 5.2.4.3)
activemodel (5.2.4.6)
activesupport (= 5.2.4.6)
activerecord (5.2.4.6)
activemodel (= 5.2.4.6)
activesupport (= 5.2.4.6)
arel (>= 9.0)
activestorage (5.2.4.3)
actionpack (= 5.2.4.3)
activerecord (= 5.2.4.3)
activestorage (5.2.4.6)
actionpack (= 5.2.4.6)
activerecord (= 5.2.4.6)
marcel (~> 0.3.1)
activesupport (5.2.4.3)
activesupport (5.2.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -49,23 +49,25 @@ GEM
bootsnap (1.7.5)
msgpack (~> 1.0)
builder (3.2.4)
capybara (3.33.0)
capybara (3.35.3)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.2.0)
concurrent-ruby (1.1.9)
crass (1.0.6)
docile (1.3.2)
erubi (1.9.0)
execjs (2.7.0)
ffi (1.13.1)
docile (1.4.0)
erubi (1.10.0)
execjs (2.8.1)
ffi (1.15.3)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.8.10)
Expand All @@ -74,11 +76,11 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.3.1)
json (2.5.1)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.6.0)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand Down Expand Up @@ -109,10 +111,10 @@ GEM
mime-types
mimemagic (~> 0.3.0)
terrapin (~> 0.6.0)
parallel (1.19.2)
parser (2.7.1.4)
parallel (1.20.1)
parser (3.0.1.1)
ast (~> 2.4.1)
passenger (6.0.6)
passenger (6.0.9)
rack
rake (>= 0.8.1)
protected_attributes_continued (1.8.1)
Expand All @@ -131,18 +133,18 @@ GEM
rack_session_access (0.2.0)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (5.2.4.3)
actioncable (= 5.2.4.3)
actionmailer (= 5.2.4.3)
actionpack (= 5.2.4.3)
actionview (= 5.2.4.3)
activejob (= 5.2.4.3)
activemodel (= 5.2.4.3)
activerecord (= 5.2.4.3)
activestorage (= 5.2.4.3)
activesupport (= 5.2.4.3)
rails (5.2.4.6)
actioncable (= 5.2.4.6)
actionmailer (= 5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
activemodel (= 5.2.4.6)
activerecord (= 5.2.4.6)
activestorage (= 5.2.4.6)
activesupport (= 5.2.4.6)
bundler (>= 1.3.0)
railties (= 5.2.4.3)
railties (= 5.2.4.6)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -153,9 +155,9 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.4.3)
actionpack (= 5.2.4.3)
activesupport (= 5.2.4.3)
railties (5.2.4.6)
actionpack (= 5.2.4.6)
activesupport (= 5.2.4.6)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
Expand All @@ -167,13 +169,13 @@ GEM
rdiscount (2.2.0.1)
recaptcha (5.5.0)
json
redcarpet (3.5.0)
regexp_parser (1.7.1)
redcarpet (3.5.1)
regexp_parser (2.1.1)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.4)
rmagick (4.1.2)
rexml (3.2.5)
rmagick (4.2.2)
rubocop (0.87.1)
parallel (~> 1.10)
parser (>= 2.7.1.1)
Expand All @@ -183,41 +185,42 @@ GEM
rubocop-ast (>= 0.1.0, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0)
parser (>= 2.7.1.4)
rubocop-performance (1.7.1)
rubocop (>= 0.82.0)
rubocop-ast (0.8.0)
parser (>= 2.7.1.5)
rubocop-performance (1.8.1)
rubocop (>= 0.87.0)
rubocop-ast (>= 0.4.0)
ruby-openid (2.9.2)
ruby-progressbar (1.10.1)
ruby-progressbar (1.11.0)
rubyzip (1.3.0)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
simplecov (0.18.5)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
skylight (4.3.1)
skylight-core (= 4.3.1)
skylight-core (4.3.1)
activesupport (>= 4.2.0)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.3)
skylight (5.1.0)
activesupport (>= 5.2.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (1.0.1)
thor (1.1.0)
thread_safe (0.3.6)
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.7.0)
websocket-driver (0.7.3)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
will_paginate (3.3.0)
Expand All @@ -232,6 +235,7 @@ PLATFORMS
DEPENDENCIES
bootsnap (~> 1.7.5)
capybara
font-awesome-rails
jquery-rails
listen (~> 3.2.1)
mime-types
Expand Down
37 changes: 19 additions & 18 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
{
"name": "spectral-workbench",
{
"name": "spectralworkbench",
"version": "1.0.0",
"repository": "https://github.com/publiclab/spectral-workbench/",
"author": "Public Lab contributors <web@publiclab.org>",
"license": "GPL3",
"license": "GPL-3.0",
"dependencies": {
"ace-builds": "jywarren/ace-builds#v1.2.4",
"bootstrap-css": "jozefizso/bower-bootstrap-css#~2.3.2",
"d3": "mbostock-bower/d3-bower#~3.3.13",
"flot": "flot/flot#~0.7",
"fontawesome": "FortAwesome/Font-Awesome#~4.5.0",
"getusermedia.js": "addyosmani/getUserMedia.js#v1.0rc2",
"jasmine": "pivotal/jasmine#~2",
"jasmine-ajax": "jasmine/jasmine-ajax#v3.2.0",
"jfeed": "mattmarcum/jFeed#*",
"jquery": "jquery/jquery-dist#~2.1.3",
"junction": "theleagueof/junction#*",
"leaflet": "Leaflet/Leaflet#0.7.3",
"moment": "moment/moment#~2.10.6",
"nvd3": "novus/nvd3#~1.7.1",
"spectral-workbench": "publiclab/spectral-workbench.js#~0.1.0"
"ace-builds": "^1.4.12",
"bootstrap": "^3.4.1",
"d3": "^3.5.17",
"flot": "^0.8.0-alpha",
"getusermedia-js": "^1.0.0",
"grunt": "^0.4.0",
"jasmine": "^3.7.0",
"jasmine-ajax": "^4.0.0",
"jquery": "^3.3.1",
"jquery.steps": "^1.0.3",
"junction": "^0.2.0",
"leaflet": "^1.7.1",
"moment": "^2.29.1",
"nvd3": "^1.8.6",
"request": "~2.88.0",
"spectral-workbench": "^0.2.0"
},
"engines": {
"yarn": ">= 1.0.0"
Expand Down

0 comments on commit 2ead766

Please sign in to comment.