Merge branch 'master' into west-african-language-update

base-org · Nov 26, 2024 · e31834f · e31834f
2 parents 5b6a9b3 + 5f9afda
commit e31834f
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 57 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,6 +15,15 @@
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
 
   // ESLint
   "editor.codeActionsOnSave": ["source.fixAll.eslint"],

diff --git a/apps/base-docs/docusaurus.config.js b/apps/base-docs/docusaurus.config.js
@@ -130,11 +130,11 @@ const config = {
           eventContext: 'navbar',
         },
         {
-          to: 'https://base.org/getstarted',
+          to: 'https://base.org/build',
           navposition: 'bottomLeft',
           label: 'Get Started',
           type: 'custom-navbarLink',
-          eventLabel: 'getstarted',
+          eventLabel: 'build',
           eventContext: 'navbar',
         },
         {

diff --git a/apps/base-docs/src/components/Hero/HeroButton/index.tsx b/apps/base-docs/src/components/Hero/HeroButton/index.tsx
@@ -12,7 +12,7 @@ export default function HeroButton() {
 
   return (
     <a
-      href="https://base.org/getstarted/?utm_source=basedocs&utm_medium=hero"
+      href="https://base.org/build/?utm_source=basedocs&utm_medium=hero"
       className={styles.cta}
       target="_blank"
       rel="noreferrer noopener"

diff --git a/apps/web/app/(base-org)/(root)/page.tsx b/apps/web/app/(base-org)/(root)/page.tsx
@@ -28,7 +28,7 @@ export default async function Home() {
               <Container>
                 <Title level={TitleLevel.Title1}>Base is for everyone.</Title>
                 <div className="mt-4 flex gap-4">
-                  <Link href="/getstarted?utm_source=dotorg&medium=hero">
+                  <Link href="/build?utm_source=dotorg&medium=hero">
                     <Button variant={ButtonVariants.Secondary} iconName="baseOrgDiagonalUpArrow">
                       Start building
                     </Button>

diff --git a/apps/web/app/(base-org)/build/page.tsx b/apps/web/app/(base-org)/build/page.tsx
@@ -0,0 +1,38 @@
+import type { Metadata } from "next";
+import AnalyticsProvider from "../../../contexts/Analytics";
+import Hero from "../../../src/components/GetStarted/Hero";
+import Essentials from "../../../src/components/GetStarted/Essentials";
+import Funding from "../../../src/components/GetStarted/Funding";
+import GetNoticed from "../../../src/components/GetStarted/GetNoticed";
+import GetInvolved from "apps/web/src/components/GetStarted/GetInvolved";
+import StartBuilding from "../../../src/components/GetStarted/StartBuilding";
+import BuildWithUsFooter from "../../../src/components/GetStarted/BuildWithUsFooter";
+import Container from "apps/web/src/components/base-org/Container";
+
+export const metadata: Metadata = {
+	metadataBase: new URL("https://base.org"),
+	title: "Base | Build",
+	openGraph: {
+		title: "Base | Build",
+		url: "/build",
+		images: ["https://base.org/images/getstarted-open-graph.png"],
+	},
+};
+
+export default async function GoToCommunity() {
+	return (
+		<AnalyticsProvider context="builder_resource_kit">
+			<Hero />
+			<Container>
+				<main className="mt-20 flex w-full flex-col items-center gap-20 font-display text-gray-5">
+					<Essentials />
+					<Funding />
+					<GetNoticed />
+					<GetInvolved />
+					<StartBuilding />
+					<BuildWithUsFooter />
+				</main>
+			</Container>
+		</AnalyticsProvider>
+	);
+}
diff --git a/apps/web/app/(base-org)/getstarted/page.tsx b/apps/web/app/(base-org)/getstarted/page.tsx
diff --git a/apps/web/app/(basenames)/name/[username]/page.tsx b/apps/web/app/(basenames)/name/[username]/page.tsx
@@ -39,7 +39,7 @@ export default async function Username({ params }: UsernameProfileProps) {
   await redirectIfNotNameOwner(username);
 
   const usernameProfilePageClasses = classNames(
-    'mx-auto mt-32 flex min-h-screen w-full max-w-[1440px] flex-col justify-between gap-10 px-4 px-4 pb-40 md:flex-row md:px-8',
+    'mx-auto mt-32 flex min-h-screen w-full max-w-[1440px] flex-col justify-between gap-10 px-4 px-4 pb-16 md:flex-row md:px-8',
   );
 
   return (

diff --git a/apps/web/next.config.js b/apps/web/next.config.js
@@ -119,7 +119,7 @@ const contentSecurityPolicy = {
     'https://unpkg.com/@lottiefiles/dotlottie-web@0.31.1/dist/dotlottie-player.wasm', // lottie player
     `https://${process.env.NEXT_PUBLIC_PINATA_GATEWAY_URL}`,
   ],
-  'frame-src': ["https://p.datadoghq.com"],
+  'frame-src': ['https://p.datadoghq.com'],
   'frame-ancestors': ["'self'", baseXYZDomains],
   'form-action': ["'self'", baseXYZDomains],
   'img-src': [
@@ -259,7 +259,12 @@ module.exports = extendBaseConfig(
         },
         {
           source: '/onchainsummer',
-          destination: '/getstarted',
+          destination: '/build',
+          permanent: true,
+        },
+        {
+          source: '/getstarted',
+          destination: '/build',
           permanent: true,
         },
         {

diff --git a/apps/web/src/components/Basenames/UsernameProfile/index.tsx b/apps/web/src/components/Basenames/UsernameProfile/index.tsx
@@ -17,13 +17,19 @@ export default function UsernameProfile() {
     );
 
   return (
-    <div className="mx-auto grid min-h-screen grid-cols-1 gap-10 md:grid-cols-[25rem_minmax(0,1fr)]">
-      <div className="w-full">
-        <UsernameProfileSidebar />
-      </div>
-      <div className="w-full">
-        <UsernameProfileContent />
+    <div className="flex flex-col gap-10 items-center">
+      <div className="mx-auto grid min-h-screen grid-cols-1 gap-10 md:grid-cols-[25rem_minmax(0,1fr)]">
+        <div className="w-full">
+          <UsernameProfileSidebar />
+        </div>
+        <div className="w-full">
+          <UsernameProfileContent />
+        </div>
       </div>
+      <span className="mt-24">
+        Content displayed on this profile page is rendered directly from the decentralized Basenames
+        protocol, and is not maintained or moderated by, nor under the control of, Coinbase.
+      </span>
     </div>
   );
 }
diff --git a/apps/web/src/components/base-org/root/BuildExploreSection/index.tsx b/apps/web/src/components/base-org/root/BuildExploreSection/index.tsx
@@ -33,7 +33,7 @@ export default async function BuildExploreSection() {
               </div>
             </div>
           </CardLink>
-          <CardLink href="/getstarted">
+          <CardLink href="/build">
             <div className="flex items-center gap-4">
               <ImageAdaptive
                 src={resourcesIllustration as StaticImageData}

diff --git a/apps/web/src/components/base-org/root/SlidingTextSection/index.tsx b/apps/web/src/components/base-org/root/SlidingTextSection/index.tsx
@@ -8,8 +8,8 @@ import { CSSProperties, useRef } from 'react';
 export default function SlidingTextSection() {
   const containerRef = useRef<HTMLDivElement>(null);
 
-  const text =
-    ' Base is for everyone - القاعدة للجميع - Base es para todos - 基地适合所有人 - La Base è per tutti - Base est pour tout le monde - Base ni ya kila mtu - Base yɛ ma obiara - Base nye amesiame tɔ - Base ji he ni mɔ fɛɛ mɔ yɔɔ - ';
+  const text = ' Base is for everyone - بایس للجمیع - Base es para todos - 基地适合所有人 - La Base è per tutti - Base est pour tout le monde - Base ni ya kila mtu - Base yɛ ma obiara - Base nye amesiame tɔ - Base ji he ni mɔ fɛɛ mɔ yɔɔ - ';
+
 
   const containerClasses = classNames(
     'relative w-full overflow-hidden rounded-2xl bg-blue p-8',

diff --git a/apps/web/src/components/base-org/shared/TopNavigation/index.tsx b/apps/web/src/components/base-org/shared/TopNavigation/index.tsx
@@ -30,11 +30,11 @@ const links: TopNavigationLink[] = [
   {
     name: 'Build',
     analyticContext: 'build',
-    href: '/getstarted',
+    href: '/build',
     subItems: [
       {
         name: 'Get Started',
-        href: '/getstarted',
+        href: '/build',
       },
       { name: 'Docs', href: 'https://docs.base.org' },
       { name: 'Learn', href: 'https://docs.base.org/base-learn/docs/welcome' },
@@ -92,7 +92,7 @@ const links: TopNavigationLink[] = [
   },
 ];
 
-const cryptoExcludedPaths = ['/jobs', '/about', '/ecosystem', '/getstarted'];
+const cryptoExcludedPaths = ['/jobs', '/about', '/ecosystem', '/build'];
 
 export default function TopNavigation() {
   const pathname = usePathname();