From ff3ead74c05d4d30ae24dd94c36501aed02e09ac Mon Sep 17 00:00:00 2001 From: Zach Denton Date: Thu, 12 May 2022 16:30:12 -0400 Subject: [PATCH] Update color palette. Closes: #940 --- .../app/views/it1_profiles/_form.html.erb | 30 +++++++++---------- .../server/app/views/layouts/_header.html.erb | 4 +-- .../server/app/views/layouts/it1.html.erb | 8 ++--- .../app/views/onboarding/email.html.erb | 10 +++---- .../server/app/views/shared/_bump.html.erb | 4 +-- .../server/app/views/welcome/index.html.erb | 4 +-- .../server/app/views/welcome/it1.html.erb | 14 ++++----- .../platform/server/config/tailwind.config.js | 6 ++++ ecosystem/platform/server/db/schema.rb | 1 + 9 files changed, 44 insertions(+), 37 deletions(-) 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 4ab96dbc0f1ee..f10ffdb4d64b3 100644 --- a/ecosystem/platform/server/app/views/it1_profiles/_form.html.erb +++ b/ecosystem/platform/server/app/views/it1_profiles/_form.html.erb @@ -19,47 +19,47 @@
-

Public Keys

+

Public Keys

<%= render 'shared/bump' %>

<%= f.label :consensus_key, class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :consensus_key, autofocus: true, required: true, pattern: '0x[a-f0-9]{64}', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :consensus_key, autofocus: true, required: true, pattern: '0x[a-f0-9]{64}', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>

<%= f.label :account_key, class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :account_key, required: true, pattern: '0x[a-f0-9]{64}', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :account_key, required: true, pattern: '0x[a-f0-9]{64}', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>

<%= f.label :network_key, class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :network_key, required: true, pattern: '0x[a-f0-9]{64}', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :network_key, required: true, pattern: '0x[a-f0-9]{64}', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>

-

Validator Node

+

Validator Node

<%= render 'shared/bump' %>

<%= f.label :validator_address, "Address (IP or hostname)", class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :validator_address, required: true, class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :validator_address, required: true, class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>

<%= f.label :validator_port, "Validator (noise) port", class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :validator_port, required: true, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :validator_port, required: true, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>
<%= f.label :validator_metrics_port, "Metrics port", class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :validator_metrics_port, required: true, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :validator_metrics_port, required: true, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>
<%= f.label :validator_api_port, "API port", class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :validator_api_port, required: true, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :validator_api_port, required: true, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>
@@ -67,18 +67,18 @@
-

Full Node

+

Full Node

<%= render 'shared/bump' %>

<%= f.label :fullnode_address, "Address (IP or hostname)", class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :fullnode_address, class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :fullnode_address, class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>

<%= f.label :fullnode_port, class: "font-mono uppercase block mb-2 text-lg" %> - <%= f.text_field :fullnode_port, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.text_field :fullnode_port, pattern: '[0-9]+', class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>
@@ -87,14 +87,14 @@
- <%= f.submit "Validate node", class: "w-full bg-[#1dd7a5] text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mb-8" %> + <%= f.submit "Validate node", class: "w-full bg-teal-400 text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mb-8" %>
<%= recaptcha_tags theme: :dark %>
diff --git a/ecosystem/platform/server/app/views/layouts/_header.html.erb b/ecosystem/platform/server/app/views/layouts/_header.html.erb index 9f299a2fd372d..813aeecb76f10 100644 --- a/ecosystem/platform/server/app/views/layouts/_header.html.erb +++ b/ecosystem/platform/server/app/views/layouts/_header.html.erb @@ -3,7 +3,7 @@ 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" %> + <%= link_to "Docs", "https://aptos.dev/", class: "font-mono border-teal-400 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-teal-400 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 25518bbad6075..0c75a6ec68f89 100644 --- a/ecosystem/platform/server/app/views/layouts/it1.html.erb +++ b/ecosystem/platform/server/app/views/layouts/it1.html.erb @@ -12,13 +12,13 @@

Schedule

<%= render 'shared/bump' %>

All dates and times shown are for Pacific Time.

-

May 13

+

May 13

Registration starts. Node and identity verification begins.

-

May 20

+

May 20

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

-

May 23

+

May 23

Selection process concludes. Email notifications are sent.

-

May 24

+

May 24

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

<% end %>
diff --git a/ecosystem/platform/server/app/views/onboarding/email.html.erb b/ecosystem/platform/server/app/views/onboarding/email.html.erb index 16845e959d17f..99d213f9548b9 100644 --- a/ecosystem/platform/server/app/views/onboarding/email.html.erb +++ b/ecosystem/platform/server/app/views/onboarding/email.html.erb @@ -1,5 +1,5 @@
-

Welcome, <%= @oauth_username %>!

+

Welcome, <%= @oauth_username %>!

<%= render "layouts/flash" %> @@ -21,7 +21,7 @@ <%= form_with(model: current_user, url: onboarding_email_path, method: :post, data: {turbo: false}, html: {onsubmit: "return validateRecaptcha();"}) do |f| %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email", required: true, placeholder: "ENTER YOUR EMAIL ADDRESS", class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-[#1dd7a5]" %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", required: true, placeholder: "ENTER YOUR EMAIL ADDRESS", class: "font-mono placeholder:text-white text-lg bg-transparent appearance-none border border-white rounded w-full py-2 px-4 focus:ring-0 focus:border-teal-400" %>
@@ -29,13 +29,13 @@
- <%= f.submit "Verify email", class: "w-72 bg-[#1dd7a5] hover:bg-[#1de9b6] cursor-pointer text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded" %> + <%= f.submit "Verify email", class: "w-72 bg-teal-400 hover:bg-teal-300 cursor-pointer text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded" %>
<% end %> diff --git a/ecosystem/platform/server/app/views/shared/_bump.html.erb b/ecosystem/platform/server/app/views/shared/_bump.html.erb index f9ae75c848f43..2851bf9406aa3 100644 --- a/ecosystem/platform/server/app/views/shared/_bump.html.erb +++ b/ecosystem/platform/server/app/views/shared/_bump.html.erb @@ -1,7 +1,7 @@
-
+
-
+
diff --git a/ecosystem/platform/server/app/views/welcome/index.html.erb b/ecosystem/platform/server/app/views/welcome/index.html.erb index 07986f20f628f..8b57acb2bc5ca 100644 --- a/ecosystem/platform/server/app/views/welcome/index.html.erb +++ b/ecosystem/platform/server/app/views/welcome/index.html.erb @@ -11,7 +11,7 @@ Please review the terms and conditions.

- +
@@ -33,6 +33,6 @@ - <%= link_to "Sign up for Testnet", "javascript:document.getElementById('login-dialog').showModal()", class: "w-full bg-[#1dd7a5] text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %> + <%= link_to "Sign up for Testnet", "javascript:document.getElementById('login-dialog').showModal()", class: "w-full bg-teal-400 text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %> diff --git a/ecosystem/platform/server/app/views/welcome/it1.html.erb b/ecosystem/platform/server/app/views/welcome/it1.html.erb index a76161348cada..bebb6aa02da63 100644 --- a/ecosystem/platform/server/app/views/welcome/it1.html.erb +++ b/ecosystem/platform/server/app/views/welcome/it1.html.erb @@ -16,28 +16,28 @@
-

Step 1

+

Step 1

-

Node Verification

+

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" %> + <%= link_to "Register", new_it1_profile_path, class: "w-full bg-teal-400 text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %>
-

Step 2

+

Step 2

-

Identity Verification

+

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? %> - <%= link_to "Verify", onboarding_kyc_redirect_path, class: "w-full bg-[#1dd7a5] text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %> + <%= link_to "Verify", onboarding_kyc_redirect_path, class: "w-full bg-teal-400 text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %> <% else %> - <%= link_to "Verify", "#", class: "w-full bg-[#1dd7a5] text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %> + <%= link_to "Verify", "#", class: "w-full bg-teal-400 text-neutral-800 block p-2 text-center font-mono uppercase text-lg rounded font-bold mt-auto" %> <% end %>
diff --git a/ecosystem/platform/server/config/tailwind.config.js b/ecosystem/platform/server/config/tailwind.config.js index 89bf71ab92fd9..9a55fce88bc71 100644 --- a/ecosystem/platform/server/config/tailwind.config.js +++ b/ecosystem/platform/server/config/tailwind.config.js @@ -15,6 +15,12 @@ module.exports = { '800': '#212121', '900': '#171717', }, + 'teal': { + ...defaultTheme.colors.teal, + '300': '#1de9b6', + '400': '#1bd7a4', + '500': '#187e65', + }, }, fontFamily: { 'sans': ['apparat', ...defaultTheme.fontFamily.sans], diff --git a/ecosystem/platform/server/db/schema.rb b/ecosystem/platform/server/db/schema.rb index bc0b91d371a7a..f1665f067b8ad 100644 --- a/ecosystem/platform/server/db/schema.rb +++ b/ecosystem/platform/server/db/schema.rb @@ -16,6 +16,7 @@ ActiveRecord::Schema[7.0].define(version: 20_220_512_031_021) do # These are extensions that must be enabled in order to support this database + enable_extension 'pgcrypto' enable_extension 'plpgsql' create_table 'active_admin_comments', force: :cascade do |t|