From abc5f43c97ddb7acaf81fa7f23140e2122e32a52 Mon Sep 17 00:00:00 2001 From: Jamil Date: Wed, 6 Dec 2023 06:32:29 -0500 Subject: [PATCH] Source Code 3 for website, logo, and helptext updates (#2799) * Use Source Sans 3 as font * Add `:help` slot to sections * Fix other minor grammar / typos --- .../lib/web/components/layouts/app.html.heex | 2 +- .../web/lib/web/components/page_components.ex | 6 +++++ elixir/apps/web/lib/web/live/actors/index.ex | 3 +++ .../live/settings/identity_providers/new.ex | 2 +- .../web/lib/web/live/sites/gateways/index.ex | 21 +++++++++-------- elixir/apps/web/lib/web/live/sites/show.ex | 23 +++++++++++-------- .../apps/web/priv/static/images/logo-text.svg | 9 +++++++- elixir/apps/web/priv/static/images/logo.svg | 4 ++-- website/public/images/logo-text.svg | 9 +++++++- website/src/components/RootLayout/index.tsx | 8 +++---- 10 files changed, 57 insertions(+), 30 deletions(-) diff --git a/elixir/apps/web/lib/web/components/layouts/app.html.heex b/elixir/apps/web/lib/web/components/layouts/app.html.heex index 82ea02eba..3a5fc4160 100644 --- a/elixir/apps/web/lib/web/components/layouts/app.html.heex +++ b/elixir/apps/web/lib/web/components/layouts/app.html.heex @@ -12,7 +12,7 @@ <.sidebar_item current_path={@current_path} navigate={~p"/#{@account}/actors"} - icon="hero-user-circle-solid" + icon="hero-user-solid" > Actors diff --git a/elixir/apps/web/lib/web/components/page_components.ex b/elixir/apps/web/lib/web/components/page_components.ex index 14135abe0..eaf685e22 100644 --- a/elixir/apps/web/lib/web/components/page_components.ex +++ b/elixir/apps/web/lib/web/components/page_components.ex @@ -10,6 +10,8 @@ defmodule Web.PageComponents do attr :flash, :any, doc: "The flash to be displayed above the content" end + slot :help, required: false, doc: "A slot for help text to be displayed above the content" + def section(assigns) do ~H"""
@@ -25,6 +27,10 @@ defmodule Web.PageComponents do +

+ <%= render_slot(help) %> +

+
<.flash kind={:info} flash={Map.get(content, :flash)} style="wide" /> diff --git a/elixir/apps/web/lib/web/live/actors/index.ex b/elixir/apps/web/lib/web/live/actors/index.ex index 7fa21c9c0..67a07f51e 100644 --- a/elixir/apps/web/lib/web/live/actors/index.ex +++ b/elixir/apps/web/lib/web/live/actors/index.ex @@ -36,6 +36,9 @@ defmodule Web.Actors.Index do Add Actor + <:help> + Actors are the people and services that can access your resources. + <:content> <.table id="actors" rows={@actors} row_id={&"user-#{&1.id}"}> <:col :let={actor} label="name" sortable="false"> diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex index 8271aae21..88f78ee59 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex @@ -84,7 +84,7 @@ defmodule Web.Settings.IdentityProviders.New do adapter={@adapter} account={@account} name="OpenID Connect" - description="Authenticate users with a universal OpenID Connect adapter and synchronize users just-in-time provisioning." + description="Authenticate users with a universal OpenID Connect adapter and synchronize users with just-in-time (JIT) provisioning." /> """ end diff --git a/elixir/apps/web/lib/web/live/sites/gateways/index.ex b/elixir/apps/web/lib/web/live/sites/gateways/index.ex index 2dc0d78e8..5989a2ff7 100644 --- a/elixir/apps/web/lib/web/live/sites/gateways/index.ex +++ b/elixir/apps/web/lib/web/live/sites/gateways/index.ex @@ -36,6 +36,11 @@ defmodule Web.Sites.Gateways.Index do <:title> Site <%= @group.name %> Gateways + <:help> + Deploy gateways to terminate connections to your site's resources. All + gateways deployed within a site must be able to reach all + its resources. + <:content> <.table id="gateways" rows={@gateways}> <:col :let={gateway} label="INSTANCE"> @@ -61,16 +66,12 @@ defmodule Web.Sites.Gateways.Index do
No gateways to display. -
-
- <.add_button navigate={~p"/#{@account}/sites/#{@group}/new_token"}> - Deploy a Gateway - -
-
-

- Deploy gateways to terminate connections to your site's resources. All gateways deployed within a site must be able to reach all its resources. -

+ <.link + class="font-medium text-blue-600 hover:underline" + navigate={~p"/#{@account}/sites/#{@group}/new_token"} + > + Deploy a gateway to connect resources. +
diff --git a/elixir/apps/web/lib/web/live/sites/show.ex b/elixir/apps/web/lib/web/live/sites/show.ex index b860ddaf0..9108379dc 100644 --- a/elixir/apps/web/lib/web/live/sites/show.ex +++ b/elixir/apps/web/lib/web/live/sites/show.ex @@ -86,6 +86,11 @@ defmodule Web.Sites.Show do Deploy + <:help :if={is_nil(@group.deleted_at)}> + Deploy gateways to terminate connections to your site's resources. All + gateways deployed within a site must be able to reach all + its resources. + <:content>
<.table id="gateways" rows={@gateways}> @@ -112,16 +117,14 @@ defmodule Web.Sites.Show do
No gateways to display. -
-
- <.add_button navigate={~p"/#{@account}/sites/#{@group}/new_token"}> - Deploy a Gateway - -
-
-

- Deploy gateways to terminate connections to your site's resources. All gateways deployed within a site must be able to reach all its resources. -

+ + <.link + class="font-medium text-blue-600 hover:underline" + navigate={~p"/#{@account}/sites/#{@group}/new_token"} + > + Deploy a gateway to connect resources. + +
diff --git a/elixir/apps/web/priv/static/images/logo-text.svg b/elixir/apps/web/priv/static/images/logo-text.svg index 93238e60b..38d0a87da 100644 --- a/elixir/apps/web/priv/static/images/logo-text.svg +++ b/elixir/apps/web/priv/static/images/logo-text.svg @@ -1,6 +1,13 @@ + - + + + + + + + diff --git a/elixir/apps/web/priv/static/images/logo.svg b/elixir/apps/web/priv/static/images/logo.svg index ae209bdd5..a71e11e5b 100644 --- a/elixir/apps/web/priv/static/images/logo.svg +++ b/elixir/apps/web/priv/static/images/logo.svg @@ -1,11 +1,11 @@ - + - + diff --git a/website/public/images/logo-text.svg b/website/public/images/logo-text.svg index 93238e60b..38d0a87da 100644 --- a/website/public/images/logo-text.svg +++ b/website/public/images/logo-text.svg @@ -1,6 +1,13 @@ + - + + + + + + + diff --git a/website/src/components/RootLayout/index.tsx b/website/src/components/RootLayout/index.tsx index 297448ed1..a2cf81171 100644 --- a/website/src/components/RootLayout/index.tsx +++ b/website/src/components/RootLayout/index.tsx @@ -8,10 +8,10 @@ import Script from "next/script"; import Banner from "@/components/Banner"; import Providers from "@/components/Providers"; import Footer from "@/components/Footer"; -import { Public_Sans } from "next/font/google"; -const public_sans = Public_Sans({ +import { Source_Sans_3 } from "next/font/google"; +const source_sans_3 = Source_Sans_3({ subsets: ["latin"], - weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"], + weight: ["200", "300", "400", "500", "600", "700", "800", "900"], }); import { HiArrowLongRight } from "react-icons/hi2"; @@ -28,7 +28,7 @@ export default function RootLayout({ data-website-uuid="c4df1a31-22d9-4000-82e6-a86cbec0bba0" > - +
{children}