diff --git a/Gemfile.lock b/Gemfile.lock index 3fa8956..9fbf1f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/samvera/hyrax.git - revision: 1c8750706b816d603fd81d505cd3790a7edd4207 + revision: 36a862f02fbb555ab444a199291b11334763082d branch: master specs: - hyrax (2.2.2) + hyrax (2.4.0) active-fedora (~> 11.5, >= 11.5.2) almond-rails (~> 0.1) awesome_nested_set (~> 3.1) @@ -15,6 +15,7 @@ GIT clipboard-rails (~> 1.5) dry-equalizer (~> 0.2) dry-struct (~> 0.1) + dry-transaction (~> 0.11) dry-validation (~> 0.9) flipflop (~> 2.3) flot-rails (~> 0.0.6) @@ -22,8 +23,8 @@ GIT hydra-derivatives (~> 3.3) hydra-editor (>= 3.3, < 5.0) hydra-head (>= 10.5.0) - hydra-works (~> 0.16) - iiif_manifest (>= 0.3, < 0.5) + hydra-works (>= 0.16, < 2.0) + iiif_manifest (>= 0.3, < 0.6) jquery-datatables-rails (~> 3.4) jquery-ui-rails (~> 6.0) json-schema @@ -77,10 +78,10 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active-fedora (11.5.2) + active-fedora (11.5.4) active-triples (>= 0.11.0, < 2.0.0) - activemodel (>= 4.2, < 6) - activesupport (>= 4.2.4, < 6) + activemodel (>= 4.2, < 5.2) + activesupport (>= 4.2.4, < 5.2) deprecation faraday (~> 0.12.1) faraday-encoding (= 0.0.4) @@ -93,8 +94,8 @@ GEM activesupport (>= 3.0.0) rdf (>= 2.0.2, < 4.0) rdf-vocab (>= 2.0, < 4.0) - active_encode (0.1.1) - activesupport + active_encode (0.4.1) + rails activejob (5.1.6) activesupport (= 5.1.6) globalid (>= 0.3.6) @@ -121,22 +122,22 @@ GEM io-like (~> 0.3.0) arel (8.0.0) ast (2.4.0) - autoprefixer-rails (9.1.4) + autoprefixer-rails (9.3.1) execjs awesome_nested_set (3.1.4) activerecord (>= 4.0.0, < 5.3) aws-eventstream (1.0.1) - aws-partitions (1.102.0) - aws-sdk-core (3.25.0) + aws-partitions (1.111.0) + aws-sdk-core (3.38.0) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-kms (1.7.0) - aws-sdk-core (~> 3) + aws-sdk-kms (1.11.0) + aws-sdk-core (~> 3, >= 3.26.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.17.1) - aws-sdk-core (~> 3, >= 3.21.2) + aws-sdk-s3 (1.23.1) + aws-sdk-core (~> 3, >= 3.26.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) aws-sigv4 (1.0.3) @@ -157,7 +158,7 @@ GEM bixby (1.0.0) rubocop (~> 0.50, <= 0.52.1) rubocop-rspec (~> 1.22, <= 1.22.2) - blacklight (6.15.0) + blacklight (6.18.0) bootstrap-sass (~> 3.2) deprecation globalid @@ -238,7 +239,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.3) connection_pool (2.2.2) crass (1.0.4) daemons (1.2.6) @@ -274,16 +275,30 @@ GEM dry-core (0.4.7) concurrent-ruby (~> 1.0) dry-equalizer (0.2.1) + dry-events (0.1.0) + concurrent-ruby (~> 1.0) + dry-core (~> 0.4) + dry-equalizer (~> 0.2) dry-inflector (0.1.2) dry-logic (0.4.2) dry-container (~> 0.2, >= 0.2.6) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-struct (0.5.1) + dry-matcher (0.7.0) + dry-monads (1.1.0) + concurrent-ruby (~> 1.0) + dry-core (~> 0.4, >= 0.4.4) + dry-equalizer + dry-struct (0.6.0) dry-core (~> 0.4, >= 0.4.3) dry-equalizer (~> 0.2) dry-types (~> 0.13) ice_nine (~> 0.11) + dry-transaction (0.13.0) + dry-container (>= 0.2.8) + dry-events (>= 0.1.0) + dry-matcher (>= 0.7.0) + dry-monads (>= 0.4.0) dry-types (0.13.2) concurrent-ruby (~> 1.0) dry-container (~> 0.3) @@ -298,8 +313,8 @@ GEM dry-equalizer (~> 0.2) dry-logic (~> 0.4, >= 0.4.0) dry-types (~> 0.13.1) - ebnf (1.1.2) - rdf (>= 2.2, < 4.0) + ebnf (1.1.3) + rdf (~> 3.0) sxp (~> 1.0) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) @@ -325,22 +340,22 @@ GEM railties (>= 3.2, < 6.0) globalid (0.4.1) activesupport (>= 4.2.0) - google-api-client (0.23.8) + google-api-client (0.25.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - signet (~> 0.9) + signet (~> 0.10) google_drive (2.1.3) google-api-client (>= 0.11.0, < 1.0.0) googleauth (>= 0.5.0, < 1.0.0) nokogiri (>= 1.5.3, < 2.0.0) - googleauth (0.6.6) + googleauth (0.6.7) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - memoist (~> 0.12) + memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) @@ -349,22 +364,23 @@ GEM tilt hamster (3.0.0) concurrent-ruby (~> 1.0) - hiredis (0.6.1) + hiredis (0.6.3) honeybadger (3.3.0) htmlentities (4.3.4) http_logger (0.5.1) - httparty (0.16.2) + httparty (0.16.3) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - hydra-access-controls (10.5.1) - active-fedora (>= 10.0.0, < 12) + hydra-access-controls (10.6.0) + active-fedora (>= 10.0.0, < 13) activesupport (>= 4, < 6) blacklight (>= 5.16) - blacklight-access_controls (~> 0.6) + blacklight-access_controls (~> 0.6.0) cancancan (~> 1.8) deprecation (~> 1.0) - hydra-core (10.5.1) - hydra-access-controls (= 10.5.1) + hydra-core (10.6.0) + hydra-access-controls (= 10.6.0) railties (>= 4.0.0, < 6) hydra-derivatives (3.4.1) active-fedora (>= 11.3.1, < 13) @@ -383,14 +399,16 @@ GEM sprockets-es6 hydra-file_characterization (0.3.3) activesupport (>= 3.0.0) - hydra-head (10.5.1) - hydra-access-controls (= 10.5.1) - hydra-core (= 10.5.1) + hydra-head (10.6.0) + hydra-access-controls (= 10.6.0) + hydra-core (= 10.6.0) rails (>= 3.2.6) - hydra-pcdm (0.11.0) + hydra-pcdm (1.0.0) active-fedora (>= 10, < 13) + activesupport (< 5.2) mime-types (>= 1) - hydra-works (0.17.0) + hydra-works (1.0.0) + activesupport (>= 4.2.10, < 5.2) hydra-derivatives (~> 3.0) hydra-file_characterization (~> 0.3, >= 0.3.3) hydra-pcdm (>= 0.9) @@ -398,10 +416,10 @@ GEM i18n (1.1.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - iiif_manifest (0.4.0) + iiif_manifest (0.5.0) activesupport (>= 4) io-like (0.3.0) - jbuilder (2.7.0) + jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) jmespath (1.4.0) @@ -417,16 +435,16 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.1.0) - json-ld (3.0.0) + json-ld (3.0.2) multi_json (~> 1.12) rdf (>= 2.2.8, < 4.0) - json-ld-preloaded (3.0.0) - json-ld (>= 2.2, < 4.0) + json-ld-preloaded (3.0.1) + json-ld (~> 3.0) multi_json (~> 1.12) rdf (~> 3.0) - json-schema (2.8.0) + json-schema (2.8.1) addressable (>= 2.4) - jwt (1.5.6) + jwt (2.1.0) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -488,7 +506,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -497,11 +515,11 @@ GEM carrierwave (>= 0.5.8) rails (>= 5.0.0) memoist (0.16.0) - method_source (0.9.0) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_magick (4.8.0) + mini_magick (4.9.2) mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) @@ -525,9 +543,9 @@ GEM nokogumbo (1.5.0) nokogiri oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -557,7 +575,7 @@ GEM nokogiri (~> 1.6) rails (~> 5.0) rdf - rack (2.0.5) + rack (2.0.6) rack-protection (2.0.3) rack rack-test (1.1.0) @@ -592,7 +610,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rdf (3.0.5) + rdf (3.0.6) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-aggregate-repo (2.2.1) @@ -606,7 +624,7 @@ GEM nokogiri (~> 1.8) rdf (>= 2.2.8, < 4.0) rdf-xsd (>= 2.2, < 4.0) - rdf-n3 (3.0.0) + rdf-n3 (3.0.1) rdf (~> 3.0) rdf-normalize (0.3.3) rdf (>= 2.2, < 4.0) @@ -632,22 +650,22 @@ GEM rdf (>= 2.2, < 4.0) rdf-vocab (>= 2.2, < 4.0) rdf-xsd (>= 2.2, < 4.0) - rdf-trig (2.2.0) - ebnf (~> 1.0, >= 1.0.1) - rdf (>= 2.2, < 4.0) - rdf-turtle (>= 2.2, < 4.0) + rdf-trig (3.0.1) + ebnf (~> 1.1) + rdf (~> 3.0) + rdf-turtle (~> 3.0, >= 3.0.3) rdf-trix (2.2.1) rdf (>= 2.2, < 4.0) - rdf-turtle (3.0.1) + rdf-turtle (3.0.3) ebnf (~> 1.1) rdf (~> 3.0) rdf-vocab (3.0.3) rdf (~> 3.0) - rdf-xsd (3.0.0) + rdf-xsd (3.0.1) rdf (~> 3.0) redic (1.5.0) hiredis - redis (4.0.2) + redis (4.0.3) redis-namespace (1.6.0) redis (>= 3.0.4) redlock (0.2.2) @@ -701,7 +719,7 @@ GEM rubyzip (1.2.2) samvera-nesting_indexer (2.0.0) dry-equalizer - sass (3.5.7) + sass (3.7.2) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -730,7 +748,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - signet (0.9.1) + signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) @@ -781,14 +799,14 @@ GEM sshkit (1.17.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - stomp (1.4.4) + stomp (1.4.6) sxp (1.0.1) rdf (>= 2.2, < 4.0) temple (0.8.0) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.8) - tinymce-rails (4.8.2) + tinymce-rails (4.8.4) railties (>= 3.1.1) turbolinks (5.1.1) turbolinks-source (~> 5.1) diff --git a/app/assets/stylesheets/hyrax.scss b/app/assets/stylesheets/hyrax.scss index d770646..3fde6ab 100644 --- a/app/assets/stylesheets/hyrax.scss +++ b/app/assets/stylesheets/hyrax.scss @@ -14,3 +14,4 @@ @import "blacklight_gallery/slideshow"; @import "blacklight_gallery/osd_viewer"; @import 'hyrax/hyrax'; +@import 'hyrax/login_signup';