Merge pull request #20 from near/develop

develop -> main
near · May 10, 2024 · bfc8da4 · bfc8da4
2 parents 17896a9 + 1a6d34d
commit bfc8da4
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 40 deletions.
diff --git a/next.config.js b/next.config.js
@@ -77,7 +77,7 @@ const nextConfig = {
       },
       {
         source: '/horizon',
-        destination: `${appGatewayHostname}/nearhorizon.near/component/HomePage`,
+        destination: `${appGatewayHostname}/nearhorizon.near/widget/HomePage`,
         permanent: true,
       },
       {
@@ -112,12 +112,12 @@ const nextConfig = {
       },
       {
         source: '/signin',
-        destination: `${appGatewayHostname}/applications?requestAuth=1`,
+        destination: `${appGatewayHostname}/signin`,
         permanent: false,
       },
       {
         source: '/signup',
-        destination: `${appGatewayHostname}/applications?requestAuth=1&createAccount=1`,
+        destination: `${appGatewayHostname}/signup`,
         permanent: false,
       },
       {

diff --git a/src/components/CtaSection.tsx b/src/components/CtaSection.tsx
@@ -27,8 +27,6 @@ export const CtaSection = ({ backgroundColor = 'rgb(97, 229, 226)' }: Props) =>
           </Flex>
 
           <Flex $gap="24px" $wrap="$wrap" $alignItems="center" $justifyContent="center">
-            <Button href={CREATE_ACCOUNT_URL} label="Create Account" variant="secondary" size="large" />
-
             <Button
               href="https://docs.near.org/concepts/welcome"
               target="_blank"

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -113,7 +113,7 @@ const sections = [
       },
       {
         title: 'Sandbox',
-        url: '/sandbox',
+        url: 'https://dev.near.org/sandbox',
       },
       {
         title: 'Tools',
@@ -142,15 +142,15 @@ const sections = [
     links: [
       {
         title: 'Applications',
-        url: '/applications',
+        url: 'https://dev.near.org/applications',
       },
       {
         title: 'Components',
-        url: '/components',
+        url: 'https://dev.near.org/components',
       },
       {
         title: 'Gateways',
-        url: '/gateways',
+        url: 'https://dev.near.org/gateways',
       },
     ],
   },
@@ -161,13 +161,9 @@ const sections = [
         title: 'Overview',
         url: '/ecosystem',
       },
-      {
-        title: 'People',
-        url: '/people',
-      },
       {
         title: 'News',
-        url: '/nearweekapp.near/widget/nearweek.com',
+        url: 'https://dev.near.org/nearweekapp.near/widget/nearweek.com',
       },
       {
         title: 'Events',
@@ -184,7 +180,7 @@ const sections = [
     links: [
       {
         title: 'Learn',
-        url: '/learn',
+        url: 'https://dev.near.org/learn',
       },
       {
         title: 'Blog',
@@ -196,23 +192,23 @@ const sections = [
       },
       {
         title: 'Contact us',
-        url: 'https://pages.near.org/about/contact-us/',
+        url: 'https://dev.near.org/contact-us',
       },
       {
         title: 'Brand Toolkit',
         url: 'https://near.org/brand',
       },
       {
         title: 'Privacy',
-        url: 'https://near.org/privacy',
+        url: 'https://dev.near.org/privacy',
       },
       {
         title: 'Terms of Use',
-        url: 'https://near.org/terms',
+        url: 'https://dev.near.org/terms',
       },
       {
         title: 'Cookie Policy',
-        url: 'https://near.org/cookies',
+        url: 'https://dev.near.org/cookies',
       },
     ],
   },

diff --git a/src/components/navigation/categories.ts b/src/components/navigation/categories.ts
@@ -55,12 +55,12 @@ export const navigationCategories = [
           },
           {
             title: 'DevHub',
-            url: '/devhub.near/widget/app',
+            url: 'https://dev.near.org/devhub.near/widget/app',
             icon: 'ph-code ph-bold',
           },
           {
             title: 'Sandbox',
-            url: '/sandbox',
+            url: 'https://dev.near.org/sandbox',
             icon: 'ph-code-block ph-bold',
           },
           {
@@ -87,17 +87,17 @@ export const navigationCategories = [
         links: [
           {
             title: 'Applications',
-            url: '/applications',
+            url: 'https://dev.near.org/applications',
             icon: 'ph-app-window ph-bold',
           },
           {
             title: 'Components',
-            url: '/components',
+            url: 'https://dev.near.org/components',
             icon: 'ph-git-fork ph-bold',
           },
           {
             title: 'Gateways',
-            url: '/gateways',
+            url: 'https://dev.near.org/gateways',
             icon: 'ph-compass ph-bold',
           },
         ],
@@ -122,14 +122,9 @@ export const navigationCategories = [
             url: '/founders',
             icon: 'ph-lightbulb ph-bold',
           },
-          {
-            title: 'People',
-            url: '/people',
-            icon: 'ph-users-three ph-bold',
-          },
           {
             title: 'News',
-            url: '/nearweekapp.near/widget/nearweek.com',
+            url: 'https://dev.near.org/nearweekapp.near/widget/nearweek.com',
             icon: 'ph-newspaper ph-bold',
           },
           {
@@ -203,7 +198,7 @@ export const navigationCategories = [
         links: [
           {
             title: 'Learn',
-            url: '/learn',
+            url: 'https://dev.near.org/learn',
             icon: 'ph-info ph-bold',
           },
           {
@@ -218,7 +213,7 @@ export const navigationCategories = [
           },
           {
             title: 'Contact Us',
-            url: 'https://pages.near.org/about/contact-us/',
+            url: 'https://dev.near.org/contact-us',
             icon: 'ph-question ph-bold',
           },
         ],

diff --git a/src/components/pages/DataAvailability.tsx b/src/components/pages/DataAvailability.tsx
@@ -418,7 +418,7 @@ export const DataAvailability = () => {
               />
 
               <Button
-                href="https://${REPL_NEAR_URL}/blog/why-near-data-availability"
+                href="/blog/why-near-data-availability"
                 target="_blank"
                 label="Intro to NEAR DA"
                 variant="secondary"

diff --git a/src/components/pages/EcosystemOverview.tsx b/src/components/pages/EcosystemOverview.tsx
@@ -84,7 +84,14 @@ export const EcosystemOverview = () => {
             </Text>
             <Text>Horizons is an early stage accelerator for Web3 founders to build, connect, and grow.</Text>
             <div>
-              <Button href="/horizon" label="Explore Horizon" variant="secondary" fill="outline" size="large" />
+              <Button
+                href="/horizon"
+                label="Explore Horizon"
+                target="_blank"
+                variant="secondary"
+                fill="outline"
+                size="large"
+              />
             </div>
           </ContentWithImage>
 

diff --git a/src/components/pages/Founders.tsx b/src/components/pages/Founders.tsx
@@ -207,7 +207,13 @@ export const Founders = () => {
             <Text $size="text-xl" style={{ maxWidth: '658px', textAlign: 'center' }}>
               Reach out to us to provide your feedback or to ask for specific support.
             </Text>
-            <Button href="/contact-us" label="Contact Us" variant="primary" size="large" />
+            <Button
+              href="https://dev.near.org/contact-us"
+              label="Contact Us"
+              target="_blank"
+              variant="primary"
+              size="large"
+            />
           </Flex>
         </Container>
       </Section>

diff --git a/src/components/pages/Home.tsx b/src/components/pages/Home.tsx
@@ -254,7 +254,7 @@ const learnItems = [
     name: 'Learn Center',
     description: 'Starter kit to learn about blockchain technology, web3, and the NEAR protocol.',
     icon: 'ph-book-open-text',
-    url: '/learn',
+    url: 'https://dev.near.org/learn',
   },
 ];
 
@@ -514,6 +514,7 @@ export const Home = () => {
                   href="/components"
                   label="Explore Components"
                   variant="affirmative"
+                  target="_blank"
                   size="large"
                   className="darkButton"
                 />
@@ -572,7 +573,14 @@ export const Home = () => {
                 {`NEAR's`} speed, low cost, and scalability.
               </Text>
               <div>
-                <Button href="/gateways" label="Explore Gateways" variant="secondary" fill="outline" size="large" />
+                <Button
+                  href="/gateways"
+                  label="Explore Gateways"
+                  target="_blank"
+                  variant="secondary"
+                  fill="outline"
+                  size="large"
+                />
               </div>
             </>
           </ContentWithImage>

diff --git a/src/components/pages/OpenWebApplications.tsx b/src/components/pages/OpenWebApplications.tsx
@@ -166,7 +166,14 @@ export const OpenWebApplications = () => {
                 <Text style={{ maxWidth: '598px', marginRight: 'auto' }}>
                   See how developers are using gateways to create rich multi-chain, open web applications
                 </Text>
-                <Button href="/gateways" label="Explore Gateways" variant="secondary" fill="outline" size="large" />
+                <Button
+                  href="/gateways"
+                  label="Explore Gateways"
+                  variant="secondary"
+                  target="_blank"
+                  fill="outline"
+                  size="large"
+                />
               </Flex>
             </Flex>
 
@@ -262,6 +269,7 @@ export const OpenWebApplications = () => {
                 <Button
                   href="/components"
                   label="Explore Components"
+                  target="_blank"
                   variant="secondary"
                   fill="outline"
                   size="large"
@@ -272,7 +280,7 @@ export const OpenWebApplications = () => {
 
             <Grid $columns="1fr 1fr 1fr" $gap="24px">
               {featuredApps.map((app) => (
-                <Card $clickable $dark as="a" href={app.url} key={app.name}>
+                <Card $clickable $dark as="a" href={app.url} key={app.name} target="_blank">
                   <Flex $alignItems="center" $gap="24px">
                     <CardThumbnail>
                       <img src={returnImageSrc(app.image)} alt={app.name} />
@@ -319,7 +327,7 @@ export const OpenWebApplications = () => {
                 target="_blank"
               />
 
-              <Button href="/components" label="Explore Components" variant="primary" size="large" />
+              <Button href="/components" label="Explore Components" target="_blank" variant="primary" size="large" />
             </Flex>
           </Flex>
         </Container>