Skip to content

Commit

Permalink
Merge pull request #285 from ably/MAW-510-add-new-g-2-badges-to-our-f…
Browse files Browse the repository at this point in the history
…ooter-fall-2023

[MAW-510] Add new G2 badges to our footer
  • Loading branch information
Dominik authored Sep 21, 2023
2 parents aa8e5f3 + f43fad6 commit d589ef5
Show file tree
Hide file tree
Showing 16 changed files with 61 additions and 39 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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
Expand Down
33 changes: 21 additions & 12 deletions cypress/integration/core/footer/__snapshots__/snapshots.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -300,16 +300,20 @@ exports[`Footer Snapshot Test > react > test case common to both #0`] = `
>
<img
class="mr-24 h-80"
src="/assets/ably_ui/core/images/highest-user-adoption-2022-b3cbeb5fa43cab3c21df256f644f88bf16b628b2ff4f04e54b5c9ef0260dd315.png"
alt="Highest User Adoption 2022"
src="/assets/ably_ui/core/images/highest-user-adoption-2023-4b17ebf975a5cccd153773f2c6c335939aadcd1a1be6747acdcdd9726df20e1e.svg"
alt="Highest User Adoption 2023"
/><img
class="mr-24 h-80"
src="/assets/ably_ui/core/images/users-love-us-2022-1c82775859c473f3e7a2faade55ffade3d9fd78d522f3e15ef2f4aa843f07ada.png"
alt="Users Love Us"
src="/assets/ably_ui/core/images/best-support-2023-7fe905c7403b48f0807a804039cfd29249c6940c26f9f252622539eeb41b4fdb.svg"
alt="Best Support 2023"
/><img
class="mr-24 h-80"
src="/assets/ably_ui/core/images/high-performer-2022-eae68980f68e8fc65a310e6ca80cee47c4e92e039bb2feb036f713ea9b9839b2.png"
alt="High Performer 2022"
src="/assets/ably_ui/core/images/fastest-implementation-2023-be57cbfe8710c1410123b3cb0d8d53af6686bc474ec67ad27a3a2a5487491963.svg"
alt="Fastest Implementation 2023"
/><img
class="mr-24 h-80"
src="/assets/ably_ui/core/images/high-performer-2023-ac10f9d55cb30665367332a487471b78a3643aadb04cea0324bfb81542ed0291.svg"
alt="High Performer 2023"
/>
</div>
</div>
Expand Down Expand Up @@ -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"
>
<img
alt="Highest User Adoption 2022"
alt="Highest User Adoption 2023"
class="mr-24 h-80"
src="/assets/ably_ui/core/images/highest-user-adoption-2023-4b17ebf975a5cccd153773f2c6c335939aadcd1a1be6747acdcdd9726df20e1e.svg"
/>
<img
alt="Best Support 2023"
class="mr-24 h-80"
src="/assets/ably_ui/core/images/highest-user-adoption-2022-b3cbeb5fa43cab3c21df256f644f88bf16b628b2ff4f04e54b5c9ef0260dd315.png"
src="/assets/ably_ui/core/images/best-support-2023-7fe905c7403b48f0807a804039cfd29249c6940c26f9f252622539eeb41b4fdb.svg"
/>
<img
alt="Users Love Us"
alt="Fastest Implementation 2023"
class="mr-24 h-80"
src="/assets/ably_ui/core/images/users-love-us-2022-1c82775859c473f3e7a2faade55ffade3d9fd78d522f3e15ef2f4aa843f07ada.png"
src="/assets/ably_ui/core/images/fastest-implementation-2023-be57cbfe8710c1410123b3cb0d8d53af6686bc474ec67ad27a3a2a5487491963.svg"
/>
<img
alt="High Performer 2022"
alt="High Performer 2023"
class="mr-24 h-80"
src="/assets/ably_ui/core/images/high-performer-2022-eae68980f68e8fc65a310e6ca80cee47c4e92e039bb2feb036f713ea9b9839b2.png"
src="/assets/ably_ui/core/images/high-performer-2023-ac10f9d55cb30665367332a487471b78a3643aadb04cea0324bfb81542ed0291.svg"
/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/ably_ui/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module AblyUi
VERSION = '8.7.0.dev.09301de'
VERSION = '8.7.0.dev.142db03'
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion preview/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions preview/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions preview/app/controllers/components_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions preview/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@ably/[email protected].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/[email protected].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"
Expand Down
7 changes: 4 additions & 3 deletions src/core/Footer/component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,10 @@
</div>
</div>
<div class="col-span-full sm:col-span-1 inline-flex sm:ml-auto sm:items-center">
<%= 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") %>
</div>
</div>
<div class="max-w-screen-xl ui-grid-px mx-auto">
Expand Down
10 changes: 6 additions & 4 deletions src/core/Footer/component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,10 @@ export default function Footer({ paths, urlBase }) {
</div>

<div className="col-span-full sm:col-span-1 inline-flex sm:ml-auto sm:items-center">
<img className="mr-24 h-80" src={paths.highestUserAdoption} alt="Highest User Adoption 2022" />
<img className="mr-24 h-80" src={paths.usersLoveUs} alt="Users Love Us" />
<img className="mr-24 h-80" src={paths.highestPerformer} alt="High Performer 2022" />
<img className="mr-24 h-80" src={paths.highestUserAdoption} alt="Highest User Adoption 2023" />
<img className="mr-24 h-80" src={paths.bestSupport} alt="Best Support 2023" />
<img className="mr-24 h-80" src={paths.fastestImplementation} alt="Fastest Implementation 2023" />
<img className="mr-24 h-80" src={paths.highestPerformer} alt="High Performer 2023" />
</div>
</div>

Expand Down Expand Up @@ -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,
};
12 changes: 8 additions & 4 deletions src/core/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/core/images/best-support-2023.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d589ef5

Please sign in to comment.