Skip to content

Commit

Permalink
Merge branch 'development' into feature/update-concepts-design
Browse files Browse the repository at this point in the history
  • Loading branch information
syphax-bouazzouni authored Jun 7, 2023
2 parents 3ee5736 + 21f2fde commit a5688e1
Show file tree
Hide file tree
Showing 77 changed files with 1,595 additions and 378 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ gem 'thin'
gem 'view_component', '~> 2.72'
gem 'turnout'
gem 'will_paginate', '~> 3.0'
gem 'inline_svg'

gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development'

Expand Down
48 changes: 26 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ GEM
sassc-rails (>= 2.0.0)
brakeman (5.4.1)
builder (3.2.4)
capistrano (3.17.2)
capistrano (3.17.3)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand All @@ -115,7 +115,7 @@ GEM
capistrano-bundler (>= 1.1, < 3)
capistrano-yarn (2.0.2)
capistrano (~> 3.0)
capybara (3.39.0)
capybara (3.39.1)
addressable
matrix
mini_mime (>= 0.1.3)
Expand All @@ -135,7 +135,7 @@ GEM
daemons (1.4.1)
dalli (3.2.4)
date (3.3.3)
debug (1.7.2)
debug (1.8.0)
irb (>= 1.5.0)
reline (>= 0.3.1)
diff-lcs (1.5.0)
Expand All @@ -160,7 +160,7 @@ GEM
flamegraph (0.9.5)
globalid (1.1.0)
activesupport (>= 5.0)
graphql (2.0.21)
graphql (2.0.22)
graphql-client (0.18.0)
activesupport (>= 3.0)
graphql
Expand Down Expand Up @@ -201,9 +201,9 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.20.0)
loofah (2.21.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
lookbook (1.5.5)
actioncable
activemodel
Expand Down Expand Up @@ -232,7 +232,7 @@ GEM
mini_mime (1.1.2)
mini_portile2 (2.8.2)
minitest (5.18.0)
msgpack (1.7.0)
msgpack (1.7.1)
multi_json (1.15.0)
multipart-post (2.3.0)
mysql2 (0.5.3)
Expand All @@ -256,8 +256,10 @@ GEM
netrc (0.11.0)
newrelic_rpm (9.2.2)
nio4r (2.5.9)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
nokogiri (1.14.2-x86_64-linux)
racc (~> 1.4)
nokogiri (1.15.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oj (3.14.3)
open_uri_redirections (0.2.1)
Expand Down Expand Up @@ -297,9 +299,10 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails-i18n (7.0.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rails-i18n (7.0.7)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
rails_autolink (1.1.8)
Expand All @@ -323,15 +326,15 @@ GEM
json
redcarpet (3.6.0)
regexp_parser (2.8.0)
reline (0.3.3)
reline (0.3.4)
io-console (~> 0.5)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rouge (4.1.0)
rouge (4.1.2)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
Expand All @@ -340,7 +343,7 @@ GEM
rspec-mocks (3.12.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.2)
rspec-rails (6.0.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
Expand All @@ -349,7 +352,7 @@ GEM
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.0)
rubocop (1.50.2)
rubocop (1.51.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
Expand All @@ -359,11 +362,11 @@ GEM
rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.1)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_parser (3.20.0)
ruby_parser (3.20.1)
sexp_processor (~> 4.16)
rubyzip (2.3.2)
sassc (2.4.0)
Expand Down Expand Up @@ -394,14 +397,14 @@ GEM
stackprof (0.2.25)
stimulus-rails (1.2.1)
railties (>= 6.0.0)
temple (0.10.0)
terser (1.1.14)
temple (0.10.2)
terser (1.1.16)
execjs (>= 0.3.0, < 3)
thin (1.8.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.2.1)
thor (1.2.2)
tilt (2.1.0)
time (0.2.2)
date
Expand Down Expand Up @@ -443,10 +446,11 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.34)
zeitwerk (2.6.8)
zeitwerk (2.6.7)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
bcrypt_pbkdf (>= 1.0, < 2.0)
Expand Down
3 changes: 3 additions & 0 deletions app/assets/images/arrow-right-outlined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/check-outlined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 82 additions & 0 deletions app/assets/images/home-random-bubbles.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/logo-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/collaboration/cnrs_logo.jpg
Binary file not shown.
Binary file added app/assets/images/logos/collaboration/d2kab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/collaboration/d2kab_logo.png
Binary file not shown.
Binary file added app/assets/images/logos/collaboration/inrae.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/collaboration/inrae_logo.jpg
Binary file not shown.
Binary file added app/assets/images/logos/collaboration/lirmm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/collaboration/lirmm_logo.png
Binary file not shown.
Binary file removed app/assets/images/logos/collaboration/sifr_logo.jpg
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/collaboration/um_logo.png
Binary file not shown.
Binary file not shown.
Binary file added app/assets/images/logos/supports/anr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/supports/anr_logo.png
Binary file not shown.
Binary file added app/assets/images/logos/supports/eu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/supports/ibc_logo.jpg
Binary file not shown.
Binary file removed app/assets/images/logos/supports/msca_eu_logo.jpg
Binary file not shown.
Binary file added app/assets/images/logos/supports/numev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/logos/supports/numev_logo.png
Binary file not shown.
3 changes: 3 additions & 0 deletions app/assets/images/loop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/ontoportal-icon.svg
5 changes: 5 additions & 0 deletions app/assets/images/orange-warning.svg
3 changes: 3 additions & 0 deletions app/assets/images/play-white.svg
3 changes: 3 additions & 0 deletions app/assets/images/play.svg
Loading

0 comments on commit a5688e1

Please sign in to comment.