From e67baaca3bba4028f1fbe42d53fae60e0ef54f61 Mon Sep 17 00:00:00 2001 From: Fernando Serapio Date: Wed, 20 Sep 2023 16:27:42 -0600 Subject: [PATCH 1/3] add and updated g2 badges in the footer --- preview/app/controllers/components_controller.rb | 12 +++++++----- src/core/Footer/component.html.erb | 7 ++++--- src/core/Footer/component.jsx | 10 ++++++---- src/core/core.rb | 12 ++++++++---- src/core/images/best-support-2023.svg | 1 + src/core/images/fastest-implementation-2023.svg | 1 + src/core/images/high-performer-2023.svg | 1 + src/core/images/highest-user-adoption-2023.svg | 1 + 8 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 src/core/images/best-support-2023.svg create mode 100644 src/core/images/fastest-implementation-2023.svg create mode 100644 src/core/images/high-performer-2023.svg create mode 100644 src/core/images/highest-user-adoption-2023.svg diff --git a/preview/app/controllers/components_controller.rb b/preview/app/controllers/components_controller.rb index ed08a2f8..9b828a19 100644 --- a/preview/app/controllers/components_controller.rb +++ b/preview/app/controllers/components_controller.rb @@ -219,13 +219,15 @@ def footer_react_props paths: { ably_stack: helpers.asset_path('ably_ui/core/images/ably-stack.svg'), highest_performer: - helpers.asset_path('ably_ui/core/images/high-performer-2022.png'), + helpers.asset_path('ably_ui/core/images/high-performer-2023.svg'), + best_support: + helpers.asset_path('ably_ui/core/images/best-support-2023.svg'), + fastest_implementation: + helpers.asset_path('ably_ui/core/images/fastest-implementation-2023.svg'), highest_user_adoption: helpers.asset_path( - 'ably_ui/core/images/highest-user-adoption-2022.png' - ), - users_love_us: - helpers.asset_path('ably_ui/core/images/users-love-us-2022.png') + 'ably_ui/core/images/highest-user-adoption-2023.svg' + ) } } end diff --git a/src/core/Footer/component.html.erb b/src/core/Footer/component.html.erb index b27b75b4..c8d84573 100644 --- a/src/core/Footer/component.html.erb +++ b/src/core/Footer/component.html.erb @@ -204,9 +204,10 @@
- <%= image_tag(highest_user_adoption, alt: "Highest User Adoption 2022", class: "mr-24 h-80") %> - <%= image_tag(users_love_us, alt: "Users Love Us", class: "mr-24 h-80") %> - <%= image_tag(highest_performer, alt: "High Performer 2022", class: "mr-24 h-80") %> + <%= image_tag(highest_user_adoption, alt: "Highest User Adoption 2023", class: "mr-24 h-80") %> + <%= image_tag(best_support, alt: "Best Support 2023", class: "mr-24 h-80") %> + <%= image_tag(fastest_implementation, alt: "Fastest Implementation 2023", class: "mr-24 h-80") %> + <%= image_tag(highest_performer, alt: "High Performer 2023", class: "mr-24 h-80") %>
diff --git a/src/core/Footer/component.jsx b/src/core/Footer/component.jsx index 159a14cd..3d058f6b 100644 --- a/src/core/Footer/component.jsx +++ b/src/core/Footer/component.jsx @@ -295,9 +295,10 @@ export default function Footer({ paths, urlBase }) {
- Highest User Adoption 2022 - Users Love Us - High Performer 2022 + Highest User Adoption 2023 + Best Support 2023 + Fastest Implementation 2023 + High Performer 2023
@@ -361,7 +362,8 @@ Footer.propTypes = { ablyStack: T.string, highestPerformer: T.string, highestUserAdoption: T.string, - usersLoveUs: T.string, + bestSupport: T.string, + fastestImplementation: T.string, }), urlBase: T.string, }; diff --git a/src/core/core.rb b/src/core/core.rb index f3d2f5c8..06a698d3 100644 --- a/src/core/core.rb +++ b/src/core/core.rb @@ -43,15 +43,19 @@ def aws_logo_path end def highest_performer - asset_path 'ably_ui/core/images/high-performer-2022.png' + asset_path 'ably_ui/core/images/high-performer-2023.svg' end def highest_user_adoption - asset_path 'ably_ui/core/images/highest-user-adoption-2022.png' + asset_path 'ably_ui/core/images/highest-user-adoption-2023.svg' end - def users_love_us - asset_path 'ably_ui/core/images/users-love-us-2022.png' + def best_support + asset_path 'ably_ui/core/images/best-support-2023.svg' + end + + def fastest_implementation + asset_path 'ably_ui/core/images/fastest-implementation-2023.svg' end end diff --git a/src/core/images/best-support-2023.svg b/src/core/images/best-support-2023.svg new file mode 100644 index 00000000..630bce14 --- /dev/null +++ b/src/core/images/best-support-2023.svg @@ -0,0 +1 @@ + diff --git a/src/core/images/fastest-implementation-2023.svg b/src/core/images/fastest-implementation-2023.svg new file mode 100644 index 00000000..c6530255 --- /dev/null +++ b/src/core/images/fastest-implementation-2023.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/core/images/high-performer-2023.svg b/src/core/images/high-performer-2023.svg new file mode 100644 index 00000000..b61e4ce0 --- /dev/null +++ b/src/core/images/high-performer-2023.svg @@ -0,0 +1 @@ + diff --git a/src/core/images/highest-user-adoption-2023.svg b/src/core/images/highest-user-adoption-2023.svg new file mode 100644 index 00000000..e6c46f9c --- /dev/null +++ b/src/core/images/highest-user-adoption-2023.svg @@ -0,0 +1 @@ + From 142db03af9e16688ffc68105956e5a9226436d61 Mon Sep 17 00:00:00 2001 From: Fernando Serapio Date: Wed, 20 Sep 2023 16:41:22 -0600 Subject: [PATCH 2/3] update cypress snapshots --- .../footer/__snapshots__/snapshots.js.snap | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/cypress/integration/core/footer/__snapshots__/snapshots.js.snap b/cypress/integration/core/footer/__snapshots__/snapshots.js.snap index 8afde49f..b9ec4e4d 100644 --- a/cypress/integration/core/footer/__snapshots__/snapshots.js.snap +++ b/cypress/integration/core/footer/__snapshots__/snapshots.js.snap @@ -300,16 +300,20 @@ exports[`Footer Snapshot Test > react > test case common to both #0`] = ` > Highest User Adoption 2022Users Love UsHigh Performer 2022High Performer 2023 @@ -712,19 +716,24 @@ exports[`Footer Snapshot Test > view component > test case common to both #0`] = class="col-span-full sm:col-span-1 inline-flex sm:ml-auto sm:items-center" > Highest User Adoption 2022 + Best Support 2023 Users Love Us High Performer 2022 From f43fad66598759eb8ce137ba425d0eca8d0d5583 Mon Sep 17 00:00:00 2001 From: Dominik Piatek Date: Thu, 21 Sep 2023 09:15:10 +0100 Subject: [PATCH 3/3] Publish v8.7.0-dev.142db03 and update preview app --- Gemfile.lock | 2 +- lib/ably_ui/version.rb | 2 +- package.json | 2 +- preview/Gemfile | 2 +- preview/Gemfile.lock | 4 ++-- preview/package.json | 2 +- preview/yarn.lock | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 234c1f1c..a74373bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - ably-ui (8.7.0.dev.09301de) + ably-ui (8.7.0.dev.142db03) view_component (>= 2.33, < 2.50) GEM diff --git a/lib/ably_ui/version.rb b/lib/ably_ui/version.rb index b5cb39a9..54fbf6c1 100644 --- a/lib/ably_ui/version.rb +++ b/lib/ably_ui/version.rb @@ -1,3 +1,3 @@ module AblyUi - VERSION = '8.7.0.dev.09301de' + VERSION = '8.7.0.dev.142db03' end diff --git a/package.json b/package.json index 609493ed..9d4063b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ably/ui", - "version": "8.7.0-dev.09301de", + "version": "8.7.0-dev.142db03", "description": "Home of the Ably design system library ([design.ably.com](https://design.ably.com)). It provides a showcase, development/test environment and a publishing pipeline for different distributables.", "repository": { "type": "git", diff --git a/preview/Gemfile b/preview/Gemfile index 937c77d0..b1088398 100644 --- a/preview/Gemfile +++ b/preview/Gemfile @@ -37,7 +37,7 @@ gem 'view_component', '~> 2.33.0', require: 'view_component/engine' gem 'responders' -gem 'ably-ui', '8.7.0.dev.09301de', require: 'ably_ui' +gem 'ably-ui', '8.7.0.dev.142db03', require: 'ably_ui' # https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias gem 'psych', '< 4' diff --git a/preview/Gemfile.lock b/preview/Gemfile.lock index b04e6ec1..42f7d16b 100644 --- a/preview/Gemfile.lock +++ b/preview/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - ably-ui (8.7.0.dev.09301de) + ably-ui (8.7.0.dev.142db03) view_component (>= 2.33, < 2.50) actioncable (6.0.5.1) actionpack (= 6.0.5.1) @@ -175,7 +175,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - ably-ui (= 8.7.0.dev.09301de) + ably-ui (= 8.7.0.dev.142db03) bootsnap (>= 1.4.2) byebug dotenv-rails diff --git a/preview/package.json b/preview/package.json index f46dc05e..f95ae15e 100644 --- a/preview/package.json +++ b/preview/package.json @@ -2,7 +2,7 @@ "name": "preview", "private": true, "dependencies": { - "@ably/ui": "8.7.0-dev.09301de", + "@ably/ui": "8.7.0-dev.142db03", "@babel/preset-react": "^7.12.5", "@rails/ujs": "^6.0.0", "@rails/webpacker": "4.3.0", diff --git a/preview/yarn.lock b/preview/yarn.lock index b50c70a8..6d234397 100644 --- a/preview/yarn.lock +++ b/preview/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@ably/ui@8.7.0-dev.09301de": - version "8.7.0-dev.09301de" - resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.7.0-dev.09301de.tgz#e53318d098358bc1c710a2218e3621a06959f8b8" - integrity sha512-T+RbNR3aSxGGnujwRp6vs7xlqPMNg1kT/wwdkEm3ZbiX+1QiSI50gvUWoQn3zNsr/Dk66xRf2EggJfuoTukrmQ== +"@ably/ui@8.7.0-dev.142db03": + version "8.7.0-dev.142db03" + resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.7.0-dev.142db03.tgz#ef483fda83f7e3d70a35b4c05bbd97971c37466d" + integrity sha512-FvrWZbtWJ2yPYyTRcJV8zEGzCTh9+rynnlxMh0VePc3vKx2e2mSwj+B8/cfa5dYt6BNm95NI6ruc0Pzn59RTHA== dependencies: addsearch-js-client "^0.7.0" array-flat-polyfill "^1.0.1"