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 browse page design #217

Merged
merged 62 commits into from
Sep 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f5b8a65
Update browse page design with the new design on figma
Bilelkihal Mar 7, 2023
ceeedb1
Fix the problems in the design of the browse page and make it responsive
Bilelkihal Mar 27, 2023
b2566f7
Add the light color variable for differnet themes
Bilelkihal Mar 27, 2023
325d9b5
Extract the ontologies section in the browse page to be the src of th…
Bilelkihal Mar 27, 2023
8c2dcaf
Change the color of the turbo progress bar
Bilelkihal Mar 27, 2023
e10b7e7
Update the design of the switch component
Bilelkihal Mar 27, 2023
c57eb9f
Add the checked property to the chips component
Bilelkihal Mar 27, 2023
719e456
Add the filtering logic of the browse page
Bilelkihal Mar 27, 2023
75705a6
Add the checked filters count in the browse page
Bilelkihal Mar 27, 2023
c5c98fa
Remove the angular from the browse page
Bilelkihal Mar 27, 2023
b4a201f
In browse page, limit the ontology description to 3 lines and add a b…
Bilelkihal Mar 27, 2023
676d539
remove duplicate action changed->turbo-frame#updateFrame in the browser
syphax-bouazzouni Mar 27, 2023
482f8f1
add text truncate stimulus controller
syphax-bouazzouni Mar 27, 2023
d481108
replace in the browser descriptions js with a controller to show more
syphax-bouazzouni Mar 27, 2023
ac4e2e7
add timeago stimulus controller to show dates in a human readable way
syphax-bouazzouni Mar 27, 2023
8605597
add ontology contacts and format to the ontology card
syphax-bouazzouni Mar 27, 2023
a9b54b9
remove old angular files
syphax-bouazzouni Mar 27, 2023
53f4530
yarn update to install the new JS dependencies
syphax-bouazzouni Mar 27, 2023
16b125d
add ontology browser page and empty state image
syphax-bouazzouni Mar 27, 2023
30fbf0c
refactor useHistory mixin
syphax-bouazzouni Apr 23, 2023
7ad74f1
add count slot to the chips components
syphax-bouazzouni Apr 23, 2023
501d561
add small version of the loader component
syphax-bouazzouni Apr 23, 2023
c3f8f7f
add filters count by ontology
syphax-bouazzouni Apr 23, 2023
4408de7
add the count slots to the chips in the browse page
syphax-bouazzouni Apr 23, 2023
e7d3f5e
use turbo streams to update ontologies result and the filters counts
syphax-bouazzouni Apr 23, 2023
b221479
add ontology browse private icon
syphax-bouazzouni Apr 23, 2023
6609f8a
add admin-color theme variable
syphax-bouazzouni Apr 23, 2023
40ee3c6
add private only switch to the ontologies browser
syphax-bouazzouni Apr 23, 2023
57c04c5
implement the private only ontologies filter
syphax-bouazzouni Apr 23, 2023
1eca78d
add title tooltip for the browser filters chips
syphax-bouazzouni Apr 26, 2023
c217819
update turbo_frame component to use a custom loader
syphax-bouazzouni May 3, 2023
a61614b
handle the case where submission publication attribute is not an array
syphax-bouazzouni May 3, 2023
59acd60
update infinite scroll component to add custom loader and be generic
syphax-bouazzouni May 3, 2023
25a5d03
create and use tree infinite scroll component
syphax-bouazzouni May 3, 2023
3d88f62
create ontology browser card component
syphax-bouazzouni May 3, 2023
764b984
decrease the debounce time of the browser search input
syphax-bouazzouni May 3, 2023
6f0fc3c
remove no more used get_metrics_hash function
syphax-bouazzouni May 3, 2023
3c1a7c7
move submission filters methods to a concern module
syphax-bouazzouni May 3, 2023
956e5ae
add back to top button and counter loader to the browse page
syphax-bouazzouni May 3, 2023
dec1a37
implement and use submissions filter concern
syphax-bouazzouni May 3, 2023
5bf41d1
create browser ontologies partial
syphax-bouazzouni May 3, 2023
0efa403
update chips component to add label attribute
syphax-bouazzouni May 6, 2023
0ebb5e8
update tooltip controller to not show if title is empty
syphax-bouazzouni May 6, 2023
16bd771
update browse page filters section titles
syphax-bouazzouni May 6, 2023
3dbcb3b
use the new chips component 'label' attribute for the browser filters
syphax-bouazzouni May 6, 2023
ed35ab8
fix the wrong browser count when show private only
syphax-bouazzouni May 6, 2023
724ba80
migrate the fair score js code to stimulus to make it work with turbo
syphax-bouazzouni May 7, 2023
764f18e
put again the accidentally removed ontology_params method
syphax-bouazzouni May 23, 2023
acd57f0
prevent zombie submission with no ontology) bug in the browse page
syphax-bouazzouni May 31, 2023
a0d005b
fix browse page layout issues
Bilelkihal Jun 21, 2023
f406a06
fix unable to see full content of the filter collapsible block in the…
Bilelkihal Jun 25, 2023
a74c027
Merge branch 'development' into feature/update-browse-page-design
syphax-bouazzouni Sep 2, 2023
1fa5bc9
move deprecated and view cards of ontology down instead next to name
syphax-bouazzouni Sep 3, 2023
564aac4
remove default margin left of the pill button component
syphax-bouazzouni Sep 3, 2023
7363f21
add tooltip message to the ontology that is the view of another ontology
syphax-bouazzouni Sep 3, 2023
2d66711
change the layout of the browse page to have the upload button and se…
syphax-bouazzouni Sep 3, 2023
817a997
add admin style classes
syphax-bouazzouni Sep 3, 2023
5c11f98
add interactive option for use tooltip controller
syphax-bouazzouni Sep 3, 2023
61e11ad
add disabled state to chips component
syphax-bouazzouni Sep 3, 2023
440af97
show the filter count loader each time changed
syphax-bouazzouni Sep 3, 2023
213b9a2
add released year card to the ontology cards
syphax-bouazzouni Sep 3, 2023
b0916be
add the debug card to the ontologies card if user is admin
syphax-bouazzouni Sep 3, 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
39 changes: 21 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,12 @@ GEM
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
airbrussh (1.4.1)
airbrussh (1.4.2)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
base64 (0.1.1)
bcrypt_pbkdf (1.1.0)
bindata (2.4.15)
bindex (0.8.1)
Expand Down Expand Up @@ -131,7 +132,7 @@ GEM
coderay (1.1.3)
concurrent-ruby (1.2.2)
crass (1.0.6)
css_parser (1.14.0)
css_parser (1.16.0)
addressable
cube-ruby (0.0.3)
daemons (1.4.1)
Expand All @@ -147,7 +148,7 @@ GEM
erubi (1.12.0)
erubis (2.7.0)
eventmachine (1.2.7)
excon (0.100.0)
excon (0.102.0)
execjs (2.8.1)
faraday (2.0.1)
faraday-net_http (~> 2.0)
Expand All @@ -162,9 +163,9 @@ GEM
faraday-net_http (2.1.0)
ffi (1.15.5)
flamegraph (0.9.5)
globalid (1.1.0)
activesupport (>= 5.0)
graphql (2.0.25)
globalid (1.2.0)
activesupport (>= 6.1)
graphql (2.1.0)
graphql-client (0.18.0)
activesupport (>= 3.0)
graphql
Expand Down Expand Up @@ -239,10 +240,11 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.5.0)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
mime-types-data (3.2023.0808)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.19.0)
msgpack (1.7.2)
multi_json (1.15.0)
Expand All @@ -267,22 +269,22 @@ GEM
net-protocol
net-ssh (7.2.0)
netrc (0.11.0)
newrelic_rpm (9.3.1)
newrelic_rpm (9.4.2)
nio4r (2.5.9)
nokogiri (1.15.3)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-darwin)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
oauth2 (1.4.11)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 4)
oj (3.15.1)
oj (3.16.1)
omniauth (2.1.1)
hashie (>= 3.4.6)
rack (>= 2.2.3)
Expand Down Expand Up @@ -320,7 +322,7 @@ GEM
method_source (~> 1.0)
psych (3.3.4)
public_suffix (5.0.3)
puma (5.6.6)
puma (5.6.7)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.8)
Expand Down Expand Up @@ -353,7 +355,7 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rails-i18n (7.0.7)
rails-i18n (7.0.8)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
rails_autolink (1.1.8)
Expand All @@ -377,7 +379,7 @@ GEM
json
redcarpet (3.6.0)
regexp_parser (2.8.1)
reline (0.3.7)
reline (0.3.8)
io-console (~> 0.5)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand All @@ -403,7 +405,8 @@ GEM
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rubocop (1.55.1)
rubocop (1.56.2)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand Down
3 changes: 3 additions & 0 deletions app/assets/images/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.css.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
@import "nav_bar";
@import "ontology_details_header";
@import "ontology_viewer";
@import "browse";
/* Bootstrap and Font Awesome */
@import "bootstrap";
@import "bootstrap_overrides";
Expand Down
22 changes: 21 additions & 1 deletion app/assets/stylesheets/bioportal.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,37 @@
a {
.turbo-progress-bar {
height: 5px;
background-color: var(--light-color);
}

a{
text-decoration: none !important;
}
p {
margin-bottom: 0;
}

body{
position: relative;
}

.alignright {
float:right;
}
.alignleft {
float:left;
}

.admin-border{
border: 1px solid;
border-color: var(--admin-color) !important;
}

.admin-background{
background-color: var(--light-color) !important;
border-color: var(--admin-color) !important;
color: var(--admin-color) !important;
}

#hd {
background: image-url('layout/header_bg.png') repeat-x;
width: 100%;
Expand Down
Loading