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.

Sign up for GitHub

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

Update sectors pages #495

Merged
merged 3 commits into from
Oct 23, 2024
Merged

Update sectors pages #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd10624
Update sectors pages
barbara-chaves Oct 22, 2024
6b401b6
chore: Update rails
martintomas Oct 23, 2024
560b5b8
tests: fix BETA MQ tests
martintomas Oct 23, 2024
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
116 changes: 58 additions & 58 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
actioncable (6.1.7.9)
actionpack (= 6.1.7.9)
activesupport (= 6.1.7.9)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionmailbox (6.1.7.9)
actionpack (= 6.1.7.9)
activejob (= 6.1.7.9)
activerecord (= 6.1.7.9)
activestorage (= 6.1.7.9)
activesupport (= 6.1.7.9)
mail (>= 2.7.1)
actionmailer (6.1.7.8)
actionpack (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionmailer (6.1.7.9)
actionpack (= 6.1.7.9)
actionview (= 6.1.7.9)
activejob (= 6.1.7.9)
activesupport (= 6.1.7.9)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.8)
actionview (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionpack (6.1.7.9)
actionview (= 6.1.7.9)
activesupport (= 6.1.7.9)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.8)
actionpack (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
actiontext (6.1.7.9)
actionpack (= 6.1.7.9)
activerecord (= 6.1.7.9)
activestorage (= 6.1.7.9)
activesupport (= 6.1.7.9)
nokogiri (>= 1.8.5)
actionview (6.1.7.8)
activesupport (= 6.1.7.8)
actionview (6.1.7.9)
activesupport (= 6.1.7.9)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -60,28 +60,28 @@ GEM
sassc
sassc-rails
xdan-datetimepicker-rails (~> 2.5.1)
activejob (6.1.7.8)
activesupport (= 6.1.7.8)
activejob (6.1.7.9)
activesupport (= 6.1.7.9)
globalid (>= 0.3.6)
activemodel (6.1.7.8)
activesupport (= 6.1.7.8)
activemodel (6.1.7.9)
activesupport (= 6.1.7.9)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.1.7.8)
activemodel (= 6.1.7.8)
activesupport (= 6.1.7.8)
activerecord (6.1.7.9)
activemodel (= 6.1.7.9)
activesupport (= 6.1.7.9)
activerecord-import (1.4.0)
activerecord (>= 4.2)
activestorage (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activesupport (= 6.1.7.8)
activestorage (6.1.7.9)
actionpack (= 6.1.7.9)
activejob (= 6.1.7.9)
activerecord (= 6.1.7.9)
activesupport (= 6.1.7.9)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.8)
activesupport (6.1.7.9)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -251,7 +251,7 @@ GEM
activesupport (>= 5.2)
htmlentities (4.3.4)
httpclient (2.8.3)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
Expand Down Expand Up @@ -301,7 +301,7 @@ GEM
minitest (5.25.1)
msgpack (1.5.3)
multi_json (1.15.0)
net-imap (0.4.14)
net-imap (0.4.17)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -341,27 +341,27 @@ GEM
puma (5.6.9)
nio4r (~> 2.0)
racc (1.8.1)
rack (2.2.9)
rack (2.2.10)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-proxy (0.7.2)
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.8)
actioncable (= 6.1.7.8)
actionmailbox (= 6.1.7.8)
actionmailer (= 6.1.7.8)
actionpack (= 6.1.7.8)
actiontext (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activemodel (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
rails (6.1.7.9)
actioncable (= 6.1.7.9)
actionmailbox (= 6.1.7.9)
actionmailer (= 6.1.7.9)
actionpack (= 6.1.7.9)
actiontext (= 6.1.7.9)
actionview (= 6.1.7.9)
activejob (= 6.1.7.9)
activemodel (= 6.1.7.9)
activerecord (= 6.1.7.9)
activestorage (= 6.1.7.9)
activesupport (= 6.1.7.9)
bundler (>= 1.15.0)
railties (= 6.1.7.8)
railties (= 6.1.7.9)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -374,9 +374,9 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
railties (6.1.7.9)
actionpack (= 6.1.7.9)
activesupport (= 6.1.7.9)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -506,7 +506,7 @@ GEM
diff-lcs
patience_diff
test-prof (1.0.9)
thor (1.3.1)
thor (1.3.2)
tilt (2.0.10)
timecop (0.9.5)
timeout (0.4.1)
Expand Down Expand Up @@ -547,7 +547,7 @@ GEM
rails (>= 3.2.16)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.17)
zeitwerk (2.6.18)

PLATFORMS
ruby
Expand Down
3 changes: 3 additions & 0 deletions app/assets/images/icons/hover-cursor.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/tpi/sectors-bubble-chart-legend.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 66 additions & 5 deletions app/assets/stylesheets/tpi/_bubble-chart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ $cell-height: 80px;
$cell-height-banks: 100px;
$legend-image-width: 60px;

.mq-sector-pie-chart-title {
display: flex;
gap: 8px;
color: $blue-darker;
margin-top: 28px;
line-height: 20px;
}

.bubble-chart__container {
width: 100%;
padding: 50px 0;
Expand Down Expand Up @@ -63,11 +71,59 @@ $legend-image-width: 60px;

.bubble-chart_circle {
circle:hover {
stroke-width: 14;
stroke: $black;
stroke-width: 2;
stroke: #FFDD49;
}
}
.bubble-chart_tooltip {
z-index: 10;
background-color: $white;
border: 1.5px solid $black;
padding: 20px;
font-size: 14px;
width: max-content;
max-width: 430px;
min-width: 400px;

h4 {
color: $blue-dark;
font-size: 12px !important;
text-transform: uppercase;
font-weight: 400;
}
&_header {
font-size: 20px !important;
line-height: 24px;
font-weight: 700;
margin-block: 8px 20px;
}
&_text {
display: grid;
grid-template-columns: repeat(2, 1fr);
margin-block: 12px;
font-size: 16px;
max-height: 200px;
overflow-y: auto;
gap: 12px 20px;

.bubble-chart_tooltip_list_item {
margin-left: 20px;
a {
text-decoration: underline;
color: black;
}
}

}
button {
float: right;
margin-top: 20px;
height: 40px !important;
width: 62px !important;
}
}


.bubble-tip {
font-size: 14px;
padding: 10px;
Expand Down Expand Up @@ -115,6 +171,10 @@ $legend-image-width: 60px;
}
}

.bubble-chart_circle {
cursor: pointer;
}

.bubble-chart__title {
color: $grey-dark;
font-size: $size-6;
Expand All @@ -139,14 +199,15 @@ $legend-image-width: 60px;
.bubble-chart__legend-titles-container {
position: absolute;
color: $dark;
left: calc(#{$legend-image-width} + 10px);
top: -10px;
left: calc(#{$legend-image-width} + 6px);
top: -7.5px;
}

.bubble-chart__legend-title {
font-size: 12px;
line-height: 15px;
font-family: $font-family-regular;
margin: 2px 0;
// margin: 2px 0;
display: block;
}

Expand Down
11 changes: 8 additions & 3 deletions app/assets/stylesheets/tpi/charts/companies_accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ $tpi-level-chart-colors: #86A9F9 #5587F7 #2465F5 #0A4BDC #083AAB #9747FF;

.mobile_bubble-chart__container {
margin: 0 -0.75rem;
padding: 50px 0 0;
padding: 0;

.mq-sector-pie-chart-title {
margin: 16px 12px 20px 12px;
}

.accordions-list {
color: $white;
Expand Down Expand Up @@ -72,10 +76,11 @@ $tpi-level-chart-colors: #86A9F9 #5587F7 #2465F5 #0A4BDC #083AAB #9747FF;
.go-to-button__container {
padding-top: 1.5rem;
text-align: center;
width: 100%;

margin-inline: 12px;
a {
border-width: 2px;
width: 100%;
font-size: $size-5;
border-radius: 0;
height: 30px;
Expand Down
Loading
Loading