Skip to content

Commit

Permalink
Merge pull request #261 from ably/WEB-2789_updated
Browse files Browse the repository at this point in the history
[WEB-2789] - Add events in the Meganav
  • Loading branch information
aralovelace authored Feb 7, 2023
2 parents 4e23c39 + d7c73bd commit d42a23f
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 12 deletions.
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
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.e7c81e7)
ably-ui (8.7.0.dev.79f6c9f)
view_component (>= 2.33, < 2.50)

GEM
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.e7c81e7'
VERSION = '8.7.0.dev.79f6c9f'
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.e7c81e7",
"version": "8.7.0-dev.79f6c9f",
"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.e7c81e7', require: 'ably_ui'
gem 'ably-ui', '8.7.0.dev.79f6c9f', 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.e7c81e7)
ably-ui (8.7.0.dev.79f6c9f)
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.e7c81e7)
ably-ui (= 8.7.0.dev.79f6c9f)
bootsnap (>= 1.4.2)
byebug
dotenv-rails
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.e7c81e7",
"@ably/ui": "8.7.0-dev.79f6c9f",
"@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].e7c81e7":
version "8.7.0-dev.e7c81e7"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.7.0-dev.e7c81e7.tgz#27e204afc9b0a51f073bfb72c1b7c6fa39e16049"
integrity sha512-xb3Lg36coxeqTRJA+tq5jxZZWHWrP3I3o3Z1mAeTtf7A2IFd9aZHwQktTb8BtSXJ0+75htuTu9riXwkhSX2MlA==
"@ably/[email protected].79f6c9f":
version "8.7.0-dev.79f6c9f"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.7.0-dev.79f6c9f.tgz#bfeadcaf45f74352c66caf9f8fddbb50582b9dbd"
integrity sha512-0UzOMQmPv3Ywhf2awKc1Q0ZiYC+qEWhLvDMsM5aa+OF9qHs5hnrk1JIjr8q4mrJrg6W3Lua5HdV7W96x4DlvbA==
dependencies:
addsearch-js-client "^0.7.0"
array-flat-polyfill "^1.0.1"
Expand Down
9 changes: 9 additions & 0 deletions src/core/MeganavContentCompany/component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@
</div>
<% end %>
</li>
<li>
<%= link_to abs_url("/events"), class: "ui-meganav-media-with-image group" do %>
<%= render(AblyUi::Core::Icon.new(name: "icon-display-events-col", size: "2.5rem")) %>
<div class="flex flex-col justify-center">
<p class="ui-meganav-media-heading">Events</p>
<p class="ui-meganav-media-copy">Join Ably at upcoming events.</p>
</div>
<% end %>
</li>
</ul>
</div>

Expand Down
9 changes: 9 additions & 0 deletions src/core/MeganavContentCompany/component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@ const MeganavContentCompany = ({ paths, absUrl }) => {
</div>
</a>
</li>
<li>
<a href={absUrl("/events")} className="ui-meganav-media-with-image group">
<Icon name="icon-display-events-col" size="2.5rem" />
<div className="flex flex-col justify-center">
<p className="ui-meganav-media-heading">Events</p>
<p className="ui-meganav-media-copy">Join Ably at upcoming events.</p>
</div>
</a>
</li>
</ul>
</div>

Expand Down
13 changes: 13 additions & 0 deletions src/core/icons/icon-display-events-col.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d42a23f

Please sign in to comment.