From ff64cb5385298dce9565be6c4c705854a5c0c2d8 Mon Sep 17 00:00:00 2001 From: Zach Denton Date: Thu, 12 May 2022 14:10:27 -0400 Subject: [PATCH] Add more design elements. --- ecosystem/platform/server/.env.example | 3 +++ .../app/controllers/overview_controller.rb | 7 ++++-- .../app/views/it1_profiles/_form.html.erb | 6 ++--- .../app/views/it1_profiles/edit.html.erb | 2 +- .../app/views/layouts/_application.html.erb | 1 + .../server/app/views/layouts/_footer.html.erb | 4 ++-- .../server/app/views/layouts/_header.html.erb | 6 ++++- .../server/app/views/layouts/it1.html.erb | 22 +++++++++++++++---- .../server/app/views/shared/_bump.html.erb | 7 ++++++ .../app/views/shared/_it1_schedule.html.erb | 15 ------------- .../server/app/views/welcome/index.html.erb | 4 ++-- .../server/app/views/welcome/it1.html.erb | 19 ++++++++-------- .../platform/server/config/tailwind.config.js | 13 +++++++++++ 13 files changed, 70 insertions(+), 39 deletions(-) create mode 100644 ecosystem/platform/server/app/views/shared/_bump.html.erb delete mode 100644 ecosystem/platform/server/app/views/shared/_it1_schedule.html.erb diff --git a/ecosystem/platform/server/.env.example b/ecosystem/platform/server/.env.example index 3c9f25b50dc8e..f3c395f509e45 100644 --- a/ecosystem/platform/server/.env.example +++ b/ecosystem/platform/server/.env.example @@ -42,3 +42,6 @@ SENTRY_DSN= # Persona PERSONA_API_KEY= PERSONA_URL_PREFIX= + +# Typekit +TYPEKIT_CSS_ID= diff --git a/ecosystem/platform/server/app/controllers/overview_controller.rb b/ecosystem/platform/server/app/controllers/overview_controller.rb index 388729f8bc5f9..c84f217fb331b 100644 --- a/ecosystem/platform/server/app/controllers/overview_controller.rb +++ b/ecosystem/platform/server/app/controllers/overview_controller.rb @@ -1,10 +1,13 @@ +# frozen_string_literal: true + # Copyright (c) Aptos # SPDX-License-Identifier: Apache-2.0 -# frozen_string_literal: true class OverviewController < ApplicationController before_action :authenticate_user! before_action :ensure_confirmed! - def index; end + def index + redirect_to root_path + end end diff --git a/ecosystem/platform/server/app/views/it1_profiles/_form.html.erb b/ecosystem/platform/server/app/views/it1_profiles/_form.html.erb index e03d104188ec9..4ab96dbc0f1ee 100644 --- a/ecosystem/platform/server/app/views/it1_profiles/_form.html.erb +++ b/ecosystem/platform/server/app/views/it1_profiles/_form.html.erb @@ -20,7 +20,7 @@

Public Keys

-
+
<%= render 'shared/bump' %>

<%= f.label :consensus_key, class: "font-mono uppercase block mb-2 text-lg" %> @@ -38,7 +38,7 @@

Validator Node

-
+
<%= render 'shared/bump' %>

<%= f.label :validator_address, "Address (IP or hostname)", class: "font-mono uppercase block mb-2 text-lg" %> @@ -68,7 +68,7 @@

Full Node

-
+
<%= render 'shared/bump' %>

<%= f.label :fullnode_address, "Address (IP or hostname)", class: "font-mono uppercase block mb-2 text-lg" %> diff --git a/ecosystem/platform/server/app/views/it1_profiles/edit.html.erb b/ecosystem/platform/server/app/views/it1_profiles/edit.html.erb index 2620ac824371d..54481800ebb23 100644 --- a/ecosystem/platform/server/app/views/it1_profiles/edit.html.erb +++ b/ecosystem/platform/server/app/views/it1_profiles/edit.html.erb @@ -1,5 +1,5 @@

-

Incentivized Testnet

+

Incentivized Testnet

<%= render 'shared/bump_hero' %>
diff --git a/ecosystem/platform/server/app/views/layouts/_application.html.erb b/ecosystem/platform/server/app/views/layouts/_application.html.erb index f616940fda567..2a3de95f64fb2 100644 --- a/ecosystem/platform/server/app/views/layouts/_application.html.erb +++ b/ecosystem/platform/server/app/views/layouts/_application.html.erb @@ -8,6 +8,7 @@ <%= favicon_link_tag asset_path('favicon.ico') %> + <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> <%= render 'layouts/google_analytics' %> diff --git a/ecosystem/platform/server/app/views/layouts/_footer.html.erb b/ecosystem/platform/server/app/views/layouts/_footer.html.erb index 78111c1ed4d78..98e793ca1b7e6 100644 --- a/ecosystem/platform/server/app/views/layouts/_footer.html.erb +++ b/ecosystem/platform/server/app/views/layouts/_footer.html.erb @@ -1,4 +1,4 @@ -
+
@@ -13,7 +13,7 @@
- + diff --git a/ecosystem/platform/server/app/views/layouts/_header.html.erb b/ecosystem/platform/server/app/views/layouts/_header.html.erb index 7413260d3809e..9f299a2fd372d 100644 --- a/ecosystem/platform/server/app/views/layouts/_header.html.erb +++ b/ecosystem/platform/server/app/views/layouts/_header.html.erb @@ -1,5 +1,9 @@ -
+
Aptos +
+ <%= link_to "Docs", "https://aptos.dev/", class: "font-mono border-[#1dd7a5] border rounded w-36 text-center py-1 uppercase text-sm" %> + <%= link_to "Explorer", "https://explorer.devnet.aptos.dev/", class: "hidden sm:block font-mono border-[#1dd7a5] border rounded w-36 text-center py-1 uppercase text-sm" %> +
diff --git a/ecosystem/platform/server/app/views/layouts/it1.html.erb b/ecosystem/platform/server/app/views/layouts/it1.html.erb index 51719a7c4606d..25518bbad6075 100644 --- a/ecosystem/platform/server/app/views/layouts/it1.html.erb +++ b/ecosystem/platform/server/app/views/layouts/it1.html.erb @@ -1,13 +1,27 @@ <%= render 'layouts/application' do %>
-

Incentivized Testnet

-
+

Incentivized Testnet

+
<%= render 'shared/bump_hero' %>
-
+
<%= yield %> - <%= render 'shared/it1_schedule' %> +
+ <%= render 'shared/outline_card' do %> +

Schedule

+
<%= render 'shared/bump' %>
+

All dates and times shown are for Pacific Time.

+

May 13

+

Registration starts. Node and identity verification begins.

+

May 20

+

Node registration locked. Only 48 hours left to complete identity verification.

+

May 23

+

Selection process concludes. Email notifications are sent.

+

May 24

+

Aptos Incentivized Testnet 1 goes live at noon. Validator score tracking begins.

+ <% end %> +
<% end %> diff --git a/ecosystem/platform/server/app/views/shared/_bump.html.erb b/ecosystem/platform/server/app/views/shared/_bump.html.erb new file mode 100644 index 0000000000000..f9ae75c848f43 --- /dev/null +++ b/ecosystem/platform/server/app/views/shared/_bump.html.erb @@ -0,0 +1,7 @@ +
+
+ + + +
+
diff --git a/ecosystem/platform/server/app/views/shared/_it1_schedule.html.erb b/ecosystem/platform/server/app/views/shared/_it1_schedule.html.erb deleted file mode 100644 index 52d95ab6d01c4..0000000000000 --- a/ecosystem/platform/server/app/views/shared/_it1_schedule.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -
- <%= render 'shared/outline_card' do %> -

Schedule

-
-

All dates and times shown are for Pacific Time.

-

May 13

-

Registration starts. Node and identity verification begins.

-

May 20

-

Node registration locked. Only 48 hours left to complete identity verification.

-

May 23

-

Selection process concludes. Email notifications are sent.

-

May 24

-

Aptos Incentivized Testnet 1 goes live at noon. Validator score tracking begins.

- <% end %> -
diff --git a/ecosystem/platform/server/app/views/welcome/index.html.erb b/ecosystem/platform/server/app/views/welcome/index.html.erb index a873ea0abe850..07986f20f628f 100644 --- a/ecosystem/platform/server/app/views/welcome/index.html.erb +++ b/ecosystem/platform/server/app/views/welcome/index.html.erb @@ -1,6 +1,6 @@ -
+
-
+

Ensuring a production-grade Aptos mainnet.
diff --git a/ecosystem/platform/server/app/views/welcome/it1.html.erb b/ecosystem/platform/server/app/views/welcome/it1.html.erb index aa2f2723610a1..a76161348cada 100644 --- a/ecosystem/platform/server/app/views/welcome/it1.html.erb +++ b/ecosystem/platform/server/app/views/welcome/it1.html.erb @@ -1,6 +1,6 @@ -

+
-
+

Ensuring a production-grade Aptos mainnet.
@@ -14,24 +14,24 @@ <%= render "layouts/flash" %> -

-
+
+

Step 1

Node Verification

-
-

+

<%= render 'shared/bump' %>
+

Register your node, and automatically verify that it is set up correctly.

<%= link_to "Register", new_it1_profile_path, class: "w-full bg-[#1dd7a5] text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %>
-
+

Step 2

Identity Verification

-
-

+

<%= render 'shared/bump' %>
+

Identity must be verified by noon (PST) May 23 to get into the selection process.

<% if current_user&.it1_profile&.validator_verified? %> @@ -43,3 +43,4 @@
+
diff --git a/ecosystem/platform/server/config/tailwind.config.js b/ecosystem/platform/server/config/tailwind.config.js index 68dde908f35a7..89bf71ab92fd9 100644 --- a/ecosystem/platform/server/config/tailwind.config.js +++ b/ecosystem/platform/server/config/tailwind.config.js @@ -8,6 +8,19 @@ module.exports = { ], theme: { extend: { + colors: { + 'neutral': { + ...defaultTheme.colors.neutral, + '700': '#393939', + '800': '#212121', + '900': '#171717', + }, + }, + fontFamily: { + 'sans': ['apparat', ...defaultTheme.fontFamily.sans], + 'mono': ['lft-etica-mono', ...defaultTheme.fontFamily.mono], + 'display': ['apparat-semicond', ...defaultTheme.fontFamily.sans], + }, }, }, plugins: [