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

Feature: Update home page design #235

Merged
merged 54 commits into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d750f7f
Upload home page assets
Bilelkihal Apr 19, 2023
d6cd44d
Update home page design according to the one on figma
Bilelkihal Apr 19, 2023
d94738c
Upload home page assets
Bilelkihal Apr 19, 2023
1cd1df6
Update home page design according to the one on figma
Bilelkihal Apr 19, 2023
1e09473
tmp1
Bilelkihal Apr 20, 2023
d553665
Do the logic of the annotator and recommender field in the home page
Bilelkihal Apr 28, 2023
222a696
with the previous commit
Bilelkihal Apr 28, 2023
d9e8cdd
upload nav bar assets
Bilelkihal Apr 28, 2023
18e722d
update nav bar design
Bilelkihal Apr 28, 2023
e56d6eb
make a function to determine the active page
Bilelkihal Apr 28, 2023
5f45a5d
Make the portal's logo in the nav bar clickable (take to the home page)
Bilelkihal Apr 28, 2023
92c4bb2
Merge remote-tracking branch 'origin/feature/update-home-page-design'…
syphax-bouazzouni May 3, 2023
4c24d5c
optimize and remove the unused methods in the home index action
syphax-bouazzouni May 3, 2023
e0ddd47
implement toggle input component
syphax-bouazzouni May 3, 2023
3d0bf86
fix a code typo for 'benefit' in the home view
syphax-bouazzouni May 3, 2023
30ee286
replace the two buttons with toggle input
syphax-bouazzouni May 3, 2023
b7c652d
tmp
Bilelkihal May 4, 2023
35bea52
Merge branch 'development' into feature/update-nav-bar-design
syphax-bouazzouni May 8, 2023
f74dd52
tmp
Bilelkihal May 10, 2023
d94ecde
tmp
Bilelkihal May 10, 2023
603d571
tmp
Bilelkihal May 10, 2023
3e0c79a
Merge branch 'development' into feature/update-home-page-design
Bilelkihal May 12, 2023
54a0728
update home search input field design
Bilelkihal May 12, 2023
a66ebc7
implement home search field js logic
Bilelkihal May 12, 2023
6dde139
add home page search input field css
Bilelkihal May 12, 2023
80298e4
add an auto scroll down to the annotator and recommeder on text display
Bilelkihal May 12, 2023
7dc968b
fix home page alignement and syntax errors
Bilelkihal May 12, 2023
5f9af0f
fix 'benefits' typo error on home page
Bilelkihal May 12, 2023
775b83d
don't show faireness service in the home page if disabled
Bilelkihal May 12, 2023
80b632e
combine support and collaboration sections in the home page
Bilelkihal May 12, 2023
4abdbea
optimize and remove the unused methods in the home index action rewrite
Bilelkihal May 12, 2023
10c586f
Do the requested changes on the PR
Bilelkihal May 15, 2023
f40d149
Merge remote-tracking branch 'origin/feature/update-nav-bar-design' i…
Bilelkihal May 15, 2023
94465b7
move home search logic to a stimilus controller
Bilelkihal May 16, 2023
368d8d5
Fix home twitter container size when the page is still loading
Bilelkihal May 16, 2023
d40e912
[Refactor] dynamic home page logos, and make it clickable
Bilelkihal May 17, 2023
b801128
[fix] add home search stimilus controller to the index.js
Bilelkihal May 17, 2023
8eea785
Merge remote-tracking branch 'origin/feature/update-home-page-design'…
Bilelkihal May 17, 2023
b5621fa
Remove duplicated js code from home page
Bilelkihal May 17, 2023
dd7902c
Done concept details updates 22/05/2022 15:32
syphax-bouazzouni May 9, 2023
642f15a
add home page assets
Bilelkihal May 23, 2023
cf71f20
Merge branch 'development' into feature/update-home-page-design
Bilelkihal May 23, 2023
1c2de07
Update home page design
Bilelkihal May 23, 2023
b49db0b
in home controller: remove undesired code and add needed variables on…
Bilelkihal May 23, 2023
678b8ae
integrate recommender and annotator in the home page
Bilelkihal May 23, 2023
728af0e
add home search field logic
Bilelkihal May 23, 2023
1a22966
extract home search link paths to constants
Bilelkihal May 23, 2023
0669461
replace event listeners by stimulus actions in home search controller
Bilelkihal May 23, 2023
510322a
Merge remote-tracking branch 'origin/feature/update-home-page-design'…
Bilelkihal May 23, 2023
440b55a
Extract SVGs from home page's html to svg files and use inline_svg gem
Bilelkihal May 24, 2023
705939f
Add hove effects to the buttons of home page
Bilelkihal May 24, 2023
5348483
Undo overriding bootstrap class (container-fluid) on the home page
Bilelkihal May 25, 2023
1de014b
Replace css class .hide by the existing bootstrap class on the home page
Bilelkihal May 25, 2023
c015d98
replace static portal name and title with a configurable one
Bilelkihal May 25, 2023
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
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
4 changes: 4 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ GEM
importmap-rails (1.1.6)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
inline_svg (1.9.0)
activesupport (>= 3.0)
nokogiri (>= 1.6)
io-console (0.6.0)
irb (1.6.4)
reline (>= 0.3.0)
Expand Down Expand Up @@ -469,6 +472,7 @@ DEPENDENCIES
i18n
iconv
importmap-rails
inline_svg
jquery-rails
jquery-ui-rails
jsbundling-rails
Expand Down
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.
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
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/play-white.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/play.svg
3 changes: 3 additions & 0 deletions app/assets/images/upload.svg
Loading