From bb62bf2a3175980769322ca9cb042499624cd9dc Mon Sep 17 00:00:00 2001 From: mildtomato Date: Thu, 3 Dec 2020 17:19:35 +0800 Subject: [PATCH 1/3] update labels --- www/components/Nav/Product.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/components/Nav/Product.tsx b/www/components/Nav/Product.tsx index 10f5bb9096f..b8e3979dbbb 100644 --- a/www/components/Nav/Product.tsx +++ b/www/components/Nav/Product.tsx @@ -66,7 +66,7 @@ const Product = () => {

- Latest news + Latest case studies

    {CaseStudiesData.map((caseStudy: any, idx: number) => ( @@ -95,14 +95,14 @@ const Product = () => { ))}
-
+ {/*
View all posts -
+
*/}
) From b0c4133c2993f2783a04f753bd8ff2906639fa18 Mon Sep 17 00:00:00 2001 From: mildtomato Date: Thu, 3 Dec 2020 17:28:39 +0800 Subject: [PATCH 2/3] fix icons --- www/components/Nav/Company.tsx | 13 ++++++++++--- www/components/Nav/Developers.tsx | 14 +++++++++++--- www/data/Company.json | 12 ++++++++---- www/data/Developers.json | 6 ++++-- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/www/components/Nav/Company.tsx b/www/components/Nav/Company.tsx index d6d82f103c0..7dcdb917277 100644 --- a/www/components/Nav/Company.tsx +++ b/www/components/Nav/Company.tsx @@ -2,9 +2,16 @@ import React from 'react' import CompanyData from 'data/Company.json' import BlogPostsData from 'data/BlogPosts.json' +type Props = { + text: string + description? : string + url? : string + icon? : string +} + const Company = () => { - const iconSections = Object.values(CompanyData).map((company) => { - const { text, description, url } = company + const iconSections = Object.values(CompanyData).map((company : Props) => { + const { text, description, url, icon } = company const content = ( { stroke-linecap="round" stroke-linejoin="round" stroke-width="2" - d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z" + d={icon} />
diff --git a/www/components/Nav/Developers.tsx b/www/components/Nav/Developers.tsx index cb8c6a397a5..1e77ccbaf14 100644 --- a/www/components/Nav/Developers.tsx +++ b/www/components/Nav/Developers.tsx @@ -2,9 +2,17 @@ import React from 'react' import DevelopersData from 'data/Developers.json' import AnnouncementsData from 'data/Announcements.json' +type Props = { + text: string + description? : string + url? : string + icon? : string +} + + const Developers = () => { - const iconSections = Object.values(DevelopersData).map((company) => { - const { text, description, url } = company + const iconSections = Object.values(DevelopersData).map((company : Props) => { + const { text, description, url, icon } = company const content = ( { stroke-linecap="round" stroke-linejoin="round" stroke-width="2" - d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z" + d={icon} />
diff --git a/www/data/Company.json b/www/data/Company.json index 7dbb7c13ea5..8dc8f0d02ca 100644 --- a/www/data/Company.json +++ b/www/data/Company.json @@ -2,21 +2,25 @@ { "text": "Blog", "description": "Read the latest developments from Supabase", - "url": "https://supabase.io/blog" + "url": "https://supabase.io/blog", + "icon": "M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z" }, { "text": "Open Source", "description": "Supabase is an opensource company, supporting existing open source tools and communities wherever possible.", - "url": "https://supabase.io/oss" + "url": "https://supabase.io/oss", + "icon": "M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z" }, { "text": "Humans.txt", "description": "Overview of Supabase staff", - "url": "https://supabase.io/humans.txt" + "url": "https://supabase.io/humans.txt", + "icon": "M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" }, { "text": "Lawyers.txt", "description": "Details of technology used by Supabase", - "url": "https://supabase.io/lawyers.txt" + "url": "https://supabase.io/lawyers.txt", + "icon": "M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" } ] diff --git a/www/data/Developers.json b/www/data/Developers.json index 5d0883bdaa0..2142d36b0a0 100644 --- a/www/data/Developers.json +++ b/www/data/Developers.json @@ -2,11 +2,13 @@ { "text": "Documentation", "description": "Everything you need that makes it simple to get started.", - "url": "https://supabase.io/docs" + "url": "https://supabase.io/docs", + "icon": "M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" }, { "text": "API reference", "description": "Examples and references for using API libraries", - "url": "https://supabase.io/docs/client/supabase-client" + "url": "https://supabase.io/docs/client/supabase-client", + "icon": "M10 20l4-16m4 4l4 4-4 4M6 16l-4-4 4-4" } ] From a963e5d3419a18cecce8a1ef30d03d3a3b054c47 Mon Sep 17 00:00:00 2001 From: mildtomato Date: Thu, 3 Dec 2020 17:29:56 +0800 Subject: [PATCH 3/3] removed company flyout. added 'beta' link --- www/components/Nav/index.tsx | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/www/components/Nav/index.tsx b/www/components/Nav/index.tsx index 70210781e6d..680decdfd98 100644 --- a/www/components/Nav/index.tsx +++ b/www/components/Nav/index.tsx @@ -150,7 +150,7 @@ const Nav = (props: Props) => { className={` inline-flex items-center px-1 border-b-2 border-transparent text-sm font-medium text-gray-500 hover:text-gray-700 dark:text-dark-100 cursor-pointer - `} + ` + (props.active )} onClick={props.onClick} > <> @@ -205,11 +205,11 @@ const Nav = (props: Props) => { onClick={() => handleToggle(() => setOpenDevelopers(!openDevelopers))} active={openDevelopers} /> - handleToggle(() => setOpenCompany(!openCompany))} active={openCompany} - /> + /> */} @@ -217,9 +217,19 @@ const Nav = (props: Props) => { - + {/* - + */} + + Beta +